Skip to content

T
third-party
Commit 5b119348 by François C.
Options

#2416 Fixing Mozilla input number lack off blur event firing

parent 5cfdcae6
Pipeline #1887 failed with stage
in 1 minute 28 seconds
Showing with 161 additions and 130 deletions
orders/static/js/orders_helper.js
...@@ -9,7 +9,8 @@ var suppliers_list = [], ...@@ -9,7 +9,8 @@ var suppliers_list = [],
new_product_supplier_association = { new_product_supplier_association = {
package_qty: null, package_qty: null,
price: null price: null
}; },
qties_values = {};
var dbc = null, var dbc = null,
sync = null, sync = null,
...@@ -30,6 +31,10 @@ var dbc = null, ...@@ -30,6 +31,10 @@ var dbc = null,
var clicked_order_pill = null; var clicked_order_pill = null;
let userAgent = navigator.userAgent;
var timerId; var timerId;
/* - UTILS */ /* - UTILS */
...@@ -124,7 +129,68 @@ function debounceFunction(func, delay = 1000) { ...@@ -124,7 +129,68 @@ function debounceFunction(func, delay = 1000) {
timerId = setTimeout(func, delay); timerId = setTimeout(func, delay);
} }
/* - PRODUCTS */ /* - PRODUCTS */
var process_new_product_qty = function(input) {
// Remove line coloring on input blur
const row = $(input).closest('tr');
row.removeClass('focused_line');
let val = ($(input).val() == '') ? 0 : $(input).val();
const id_split = $(input).attr('id')
.split('_');
const prod_id = id_split[1];
const supplier_id = id_split[3];
if (val == -1) {
let modal_end_supplier_product_association = $('#templates #modal_end_supplier_product_association');
const product = products.find(p => p.id == prod_id);
modal_end_supplier_product_association.find(".product_name").text(product.name);
const supplier = selected_suppliers.find(s => s.id == supplier_id);
modal_end_supplier_product_association.find(".supplier_name").text(supplier.display_name);
openModal(
modal_end_supplier_product_association.html(),
() => {
if (is_time_to('validate_end_supplier_product_association')) {
end_supplier_product_association(product, supplier);
}
},
'Valider',
false,
true,
() => {
// Reset value in input on cancel
const psi = product.suppliersinfo.find(psi_item => psi_item.supplier_id == supplier_id);
$(input).val(psi.qty);
}
);
} else {
val = parseFloat(val);
// If value is a number
if (!isNaN(val)) {
// Save value
save_product_supplier_qty(prod_id, supplier_id, val);
// Update row
const product = products.find(p => p.id == prod_id);
const new_row_data = prepare_datatable_data([product.id])[0];
products_table.row($(input).closest('tr')).data(new_row_data)
.draw();
debounceFunction(update_cdb_order);
display_total_values();
} else {
$(input).val('');
}
}
};
/** /**
* Add a product. * Add a product.
* *
...@@ -1674,151 +1740,94 @@ function display_products(params) { ...@@ -1674,151 +1740,94 @@ function display_products(params) {
row.addClass('focused_line'); row.addClass('focused_line');
}); });
// Manage data on inputs blur // Manage data on inputs blur
$('#products_table').on('blur', 'tbody td .product_qty_input', function () { $('#products_table')
// Remove line coloring on input blur .on('blur', 'tbody td .product_qty_input', function () {
const row = $(this).closest('tr'); process_new_product_qty(this);
})
row.removeClass('focused_line'); .on('keypress', 'tbody td .product_qty_input', function(e) {
// Validate on Enter pressed
let val = ($(this).val() == '') ? 0 : $(this).val(); if (e.which == 13) {
$(this).blur();
const id_split = $(this).attr('id') }
.split('_'); })
const prod_id = id_split[1]; .on('keydown', 'tbody td .product_qty_input', function(e) {
const supplier_id = id_split[3]; if (e.which == 38) {
e.preventDefault();
if (val == -1) {
let modal_end_supplier_product_association = $('#templates #modal_end_supplier_product_association');
const product = products.find(p => p.id == prod_id);
modal_end_supplier_product_association.find(".product_name").text(product.name);
const supplier = selected_suppliers.find(s => s.id == supplier_id);
modal_end_supplier_product_association.find(".supplier_name").text(supplier.display_name); // On arrow up pressed, focus next row input
let next_input = $(this).closest("tr")
.prev()
.find(".product_qty_input");
openModal( next_input.focus();
modal_end_supplier_product_association.html(),
() => {
if (is_time_to('validate_end_supplier_product_association')) {
end_supplier_product_association(product, supplier);
}
},
'Valider',
false,
true,
() => {
// Reset value in input on cancel
const psi = product.suppliersinfo.find(psi_item => psi_item.supplier_id == supplier_id);
$(this).val(psi.qty); // Scroll to a position where the target input is not hidden by the sticky suppliers container
} const suppliers_container_top_offset =
); $("#suppliers_container").offset().top
} else { - $(window).scrollTop()
val = parseFloat(val); + $("#suppliers_container").outerHeight();
const next_input_top_offset = next_input.offset().top - $(window).scrollTop();
// If value is a number if (next_input_top_offset < suppliers_container_top_offset) {
if (!isNaN(val)) { window.scrollTo({
// Save value top: $(window).scrollTop() - $("#suppliers_container").outerHeight()
save_product_supplier_qty(prod_id, supplier_id, val); });
}
} else if (e.which == 40) {
e.preventDefault();
// Update row // On arrow down pressed, focus previous row input
const product = products.find(p => p.id == prod_id); $(this).closest("tr")
const new_row_data = prepare_datatable_data([product.id])[0]; .next()
.find(".product_qty_input")
.focus();
products_table.row($(this).closest('tr')).data(new_row_data) } else if (e.which == 13) {
.draw(); e.preventDefault();
debounceFunction(update_cdb_order); // On enter pressed, focus previous row input
display_total_values(); $(this).closest("tr")
} else { .next()
$(this).val(''); .find(".product_qty_input")
} .focus();
} }
}) })
.on('keypress', 'tbody td .product_qty_input', function(e) { .on('click', 'tbody td .product_actions', function(e) {
// Validate on Enter pressed // Save / unsave selected row
if (e.which == 13) { const p_id = products_table.row($(this).closest('tr')).data().id;
$(this).blur(); const product = products.find(p => p.id == p_id);
}
})
.on('keydown', 'tbody td .product_qty_input', function(e) {
if (e.which == 38) {
e.preventDefault();
// On arrow up pressed, focus next row input
let next_input = $(this).closest("tr")
.prev()
.find(".product_qty_input");
next_input.focus();
// Scroll to a position where the target input is not hidden by the sticky suppliers container
const suppliers_container_top_offset =
$("#suppliers_container").offset().top
- $(window).scrollTop()
+ $("#suppliers_container").outerHeight();
const next_input_top_offset = next_input.offset().top - $(window).scrollTop();
if (next_input_top_offset < suppliers_container_top_offset) {
window.scrollTo({
top: $(window).scrollTop() - $("#suppliers_container").outerHeight()
});
}
} else if (e.which == 40) {
e.preventDefault();
// On arrow down pressed, focus previous row input
$(this).closest("tr")
.next()
.find(".product_qty_input")
.focus();
} else if (e.which == 13) {
e.preventDefault();
// On enter pressed, focus previous row input
$(this).closest("tr")
.next()
.find(".product_qty_input")
.focus();
}
})
.on('click', 'tbody td .product_actions', function(e) {
// Save / unsave selected row
const p_id = products_table.row($(this).closest('tr')).data().id;
const product = products.find(p => p.id == p_id);
let modal_product_actions = $('#templates #modal_product_actions'); let modal_product_actions = $('#templates #modal_product_actions');
modal_product_actions.find(".product_name").text(product.name); modal_product_actions.find(".product_name").text(product.name);
const product_can_be_archived = product.incoming_qty === 0; const product_can_be_archived = product.incoming_qty === 0;
if (product_can_be_archived == true) { if (product_can_be_archived == true) {
modal_product_actions.find('input[name="archive-action"]').prop("disabled", false); modal_product_actions.find('input[name="archive-action"]').prop("disabled", false);
modal_product_actions.find('input[name="archive-action"]').closest("label") modal_product_actions.find('input[name="archive-action"]').closest("label")
.removeClass("checkbox_action_disabled"); .removeClass("checkbox_action_disabled");
} else { } else {
modal_product_actions.find('input[name="archive-action"]').prop("disabled", true); modal_product_actions.find('input[name="archive-action"]').prop("disabled", true);
modal_product_actions.find('input[name="archive-action"]').closest("label") modal_product_actions.find('input[name="archive-action"]').closest("label")
.addClass("checkbox_action_disabled"); .addClass("checkbox_action_disabled");
} }
openModal( openModal(
modal_product_actions.html(), modal_product_actions.html(),
() => { () => {
if (is_time_to('validate_product_actions')) { if (is_time_to('validate_product_actions')) {
commit_actions_on_product(product, modal.find('input')); commit_actions_on_product(product, modal.find('input'));
} }
}, },
'Valider', 'Valider',
false false
); );
modal.find('input[name="minimal_stock"]').val(product.minimal_stock); modal.find('input[name="minimal_stock"]').val(product.minimal_stock);
}); });
// Associate product to supplier on click on 'X' in the table // Associate product to supplier on click on 'X' in the table
$('#products_table').on('click', 'tbody .product_not_from_supplier', function () { $('#products_table').on('click', 'tbody .product_not_from_supplier', function () {
...@@ -2590,6 +2599,28 @@ $(document).ready(function() { ...@@ -2590,6 +2599,28 @@ $(document).ready(function() {
panel.style.display = "block"; panel.style.display = "block";
} }
}); });
if (/Firefox\//.exec(userAgent)) {
// needed to prevent bug using number input arrow to change quantity (https://bugzilla.mozilla.org/show_bug.cgi?id=1012818)
// Have to capture mousedown and mouseup events, instead of using only click event
// Indeed, capturing click only remove the ability to click to have focus on the input to type a number.
$(document).on("mousedown", '[type="number"]', function() {
const clicked = this;
qties_values[$(clicked).attr('id')] = $(clicked).val();
});
$(document).on("mouseup", '[type="number"]', function() {
const clicked = this;
try {
if ($(clicked).val() != qties_values[$(clicked).attr('id')]) {
process_new_product_qty(clicked);
}
} catch(err) {
console.log(err)
}
});
}
} else { } else {
$('#not_connected_content').show(); $('#not_connected_content').show();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment