pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] web_editor: validate input entry with ENTER in editor left panel

Browse Source 
Especially useful with a no-preview input.

Part of https://github.com/odoo/odoo/pull/41402
This commit is contained in:
qsm-odoo
2019-12-06 09:45:30 +00:00
parent 65262c5e3e
commit e4d4aab042
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/editor/snippets.options.js
+19 -20
View File
@@ -318,6 +318,7 @@ const UserValueWidget = Widget.extend({
if (this._canUpdateUI()) {
await this._updateUI();
}
this._validating = false;
},
//--------------------------------------------------------------------------
@@ -334,7 +335,8 @@ const UserValueWidget = Widget.extend({
_canUpdateUI: function () {
const focusEl = document.activeElement;
if (focusEl && focusEl.tagName === 'INPUT'
&& (this.el === focusEl || this.el.contains(focusEl))) {
&& (this.el === focusEl || this.el.contains(focusEl))
&& !this._validating) {
return false;
}
return true;
@@ -790,32 +792,29 @@ const InputUserValueWidget = UserValueWidget.extend({
* @param {Event} ev
*/
_onInputKeydown: function (ev) {
const input = ev.currentTarget;
let value = parseFloat(input.value || input.placeholder);
if (isNaN(value)) {
return;
}
let step = parseFloat(input.parentNode.dataset.step);
if (isNaN(step)) {
step = 1.0;
}
switch (ev.which) {
case $.ui.keyCode.UP: {
value += step;
case $.ui.keyCode.ENTER: {
this._validating = true;
this._onUserValueChange(ev);
break;
}
case $.ui.keyCode.UP:
case $.ui.keyCode.DOWN: {
value -= step;
const input = ev.currentTarget;
let value = parseFloat(input.value || input.placeholder);
if (isNaN(value)) {
return;
}
let step = parseFloat(input.parentNode.dataset.step);
if (isNaN(step)) {
step = 1.0;
}
value += (ev.which === $.ui.keyCode.UP ? step : -step);
input.value = `${parseFloat(value.toFixed(3))}`;
$(input).trigger('input');
break;
}
default: {
return;
}
}
input.value = `${parseFloat(value.toFixed(3))}`;
$(input).trigger('input');
},
});