diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-21 11:04:48 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-21 11:04:48 +0100 |
| commit | b51f2d38c247dce9afc04c29774a77d773e3f393 (patch) | |
| tree | 1133e0dd4c082543d1f361fb7ec160ac0b2cccc6 /addons/web/static/lib/ace | |
| parent | c7dff653d56910fd46e4dcf745c2c6088ce9fc58 (diff) | |
| parent | 500e3f497057c5d00ae5cc34da7012c6f31f81d4 (diff) | |
[MERGE] forward port branch saas-11.2 up to 500e3f49705
Diffstat (limited to 'addons/web/static/lib/ace')
| -rw-r--r-- | addons/web/static/lib/ace/ace.odoo-custom.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/addons/web/static/lib/ace/ace.odoo-custom.js b/addons/web/static/lib/ace/ace.odoo-custom.js index d8f84294316..49af24f5074 100644 --- a/addons/web/static/lib/ace/ace.odoo-custom.js +++ b/addons/web/static/lib/ace/ace.odoo-custom.js @@ -1173,15 +1173,16 @@ define("ace/lib/regexp", ["require", "exports", "module"], function(e, t, n) { if (!t.onCompositionEnd || t.$readOnly) return; var r = h; h = !1; - var i = setTimeout(function() { - i = null; + var i2 = setTimeout(function() { + i2 = null; var e = n.value.replace(/\x01/g, ""); if (h) return; e == r.lastValue ? w() : !r.lastValue && e && (w(), A(e)) }); k = function(n) { - return i && clearTimeout(i), n = n.replace(/\x01/g, ""), n == r.lastValue ? "" : (r.lastValue && i && t.undo(), n) - }, t.onCompositionEnd(), t.removeListener("mousedown", F), e.type == "compositionend" && r.range && t.selection.setRange(r.range) + return i2 && clearTimeout(i2), n = n.replace(/\x01/g, ""), n == r.lastValue ? "" : (r.lastValue && i2 && t.undo(), n) + }, t.onCompositionEnd(), t.removeListener("mousedown", F), e.type == "compositionend" && r.range && t.selection.setRange(r.range), + i.isChrome && i.isChrome >= 53 && O() }, I = o.delayedCall(j, 50); r.addListener(n, "compositionstart", B), i.isGecko ? r.addListener(n, "text", function() { |