bug fix

2015-06-25 11:27:08 +03:00
parent dbf21ee32f
commit a10605c91f
174 changed files with 24121 additions and 8908 deletions
--- a/OfficeWeb/sdk/Word/Drawing/HtmlPage.js
+++ b/OfficeWeb/sdk/Word/Drawing/HtmlPage.js
@@ -1403,6 +1403,11 @@ function CEditorPage(api) {
        if (false === oThis.m_oApi.bInit_word_control) {
            return;
        }
+        if (undefined !== window["AscDesktopEditor"]) {
+            if (false === window["AscDesktopEditor"]["CheckNeedWheel"]()) {
+                return;
+            }
+        }
        var _ctrl = false;
        if (e.metaKey !== undefined) {
            _ctrl = e.ctrlKey || e.metaKey;