Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Баг с открытием меню автофигур (закрывалось подменю).

Browse source
This commit is contained in:
Julia Radzhabova 2016-06-21 12:10:37 +03:00
parent 2840a7fe28
commit 1085d62805
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -150,15 +150,18 @@ define([
// NOTE: fix double click mozilla copy-paste // NOTE: fix double click mozilla copy-paste
if (e && e.target && e.target.id && (e.target.id === 'clipboard-helper-text' || e.target.id === 'area_id')) { if (e && e.target && (e.target.id === 'clipboard-helper-text')) {
me.api.asc_enableKeyEvents(true); me.api.asc_enableKeyEvents(true);
return; return;
} }
if (this.isAppDisabled === true) return; if (this.isAppDisabled === true) return;
me.api.asc_enableKeyEvents(false);
if (/msg-reply/.test(e.target.className)) if (e && e.target && !/area_id/.test(e.target.id)) {
me.dontCloseDummyComment = true; me.api.asc_enableKeyEvents(false);
if (/msg-reply/.test(e.target.className))
me.dontCloseDummyComment = true;
}
}); });
$("#editor_sdk").focus(function (e) { $("#editor_sdk").focus(function (e) {
@ -169,7 +172,7 @@ define([
$(document.body).on('blur', 'input, textarea', function(e) { $(document.body).on('blur', 'input, textarea', function(e) {
if (this.isAppDisabled === true) return; if (this.isAppDisabled === true) return;
if (!me.isModalShowed && !(me.loadMask && me.loadMask.isVisible())) { if (!me.isModalShowed && !(me.loadMask && me.loadMask.isVisible()) && !/area_id/.test(e.target.id)) {
me.api.asc_enableKeyEvents(true); me.api.asc_enableKeyEvents(true);
if (/msg-reply/.test(e.target.className)) if (/msg-reply/.test(e.target.className))
me.dontCloseDummyComment = false; me.dontCloseDummyComment = false;