From f2df515fe35f1db20de6383e3757680b746c793b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 28 Mar 2016 14:34:42 +0300 Subject: [PATCH] [DE][PE] Bug 32008 --- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/documenteditor/main/app/view/DocumentHolder.js | 3 +++ apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/view/DocumentHolder.js | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index cba088500..ea859c532 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -141,7 +141,7 @@ define([ /* * TODO: Workaround bug #25004. Clipboard feature processing in sdk. */ - if (!(Common.Utils.isSafari && Common.Utils.isMac)) { + if (!(Common.Utils.isSafari && Common.Utils.isMac) && !/area_id/.test(e.target.id)) { me.api.asc_enableKeyEvents(true); if (/msg-reply/.test(e.target.className)) me.dontCloseDummyComment = false; diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 53cfc49b8..957f7018e 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -78,6 +78,9 @@ define([ menu.alignPosition(); } _.delay(function() { + var value = Common.localStorage.getItem("de-settings-inputmode"); // only for hieroglyphs mode + if (value!==null && parseInt(value) == 1) + me.api.asc_enableKeyEvents(false); menu.cmpEl.focus(); }, 10); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 2a2444bd4..25eadaf93 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -124,7 +124,7 @@ define([ /* * TODO: Workaround bug #25004. Clipboard feature processing in sdk. */ - if (!(Common.Utils.isSafari && Common.Utils.isMac)) { + if (!(Common.Utils.isSafari && Common.Utils.isMac) && !/area_id/.test(e.target.id)) { me.api.asc_enableKeyEvents(true); if (/msg-reply/.test(e.target.className)) me.dontCloseDummyComment = false; diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index c0a6bb679..521f0edf1 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -69,6 +69,9 @@ define([ menu.alignPosition(); } _.delay(function() { + var value = Common.localStorage.getItem("pe-settings-inputmode"); // only for hieroglyphs mode + if (value!==null && parseInt(value) == 1) + me.api.asc_enableKeyEvents(false); menu.cmpEl.focus(); }, 10);