Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] web_decimal_numpad: float_time format (#1068) 

Recover functionality from https://github.com/OCA/web/pull/720, which was lost in migration to Odoo v11.
pull/1402/head
David Vidal 2018-10-10 09:43:25 +02:00 committed by emagdalena
parent 8b05ded8ac
commit 6cce0eadfc
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_decimal_numpad_dot/__manifest__.py
View File

@ -8,7 +8,7 @@
{ {
"name": "Web - Numpad Dot as decimal separator", "name": "Web - Numpad Dot as decimal separator",
"version": "11.0.1.0.2", "version": "11.0.1.0.3",
"license": "AGPL-3", "license": "AGPL-3",
"summary": "Allows using numpad dot to enter period decimal separator", "summary": "Allows using numpad dot to enter period decimal separator",
"depends": [ "depends": [

18
web_decimal_numpad_dot/static/src/js/numpad_dot.js
View File

@ -15,17 +15,19 @@ odoo.define("web_decimal_numpad_dot.FieldFloat", function (require) {
}, },
l10n_decimal_point: function () { l10n_decimal_point: function () {
return this.widget == "float_time" return this.formatType === "float_time"
? ":" : translation._t.database.parameters.decimal_point; ? ":" : translation._t.database.parameters.decimal_point;
}, },
_replaceAt: function (cur_val, index, replacement) {
return cur_val.substr(0, index) + replacement +
cur_val.substr(index + replacement.length);
},
numpad_dot_replace: function (event) { numpad_dot_replace: function (event) {
String.prototype.replaceAt=function(index, replacement) {
return this.substr(0, index) + replacement + this.substr(index + replacement.length);
}
// Only act on numpad dot key // Only act on numpad dot key
event.stopPropagation() event.stopPropagation();
if (event.keyCode != 110) { if (event.keyCode !== 110) {
return; return;
} }
event.preventDefault(); event.preventDefault();
@ -33,10 +35,10 @@ odoo.define("web_decimal_numpad_dot.FieldFloat", function (require) {
to = this.$input.prop("selectionEnd"), to = this.$input.prop("selectionEnd"),
cur_val = this.$input.val(), cur_val = this.$input.val(),
point = this.l10n_decimal_point(); point = this.l10n_decimal_point();
var new_val = cur_val.replaceAt(from-1, point) var new_val = this._replaceAt(cur_val, from-1, point);
this.$input.val(new_val); this.$input.val(new_val);
// Put user caret in place // Put user caret in place
to = from + point.length to = from + point.length;
this.$input.prop("selectionStart", to).prop("selectionEnd", to); this.$input.prop("selectionStart", to).prop("selectionEnd", to);
}, },
}; };