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/Excel/view/EventsController.js
+++ b/OfficeWeb/sdk/Excel/view/EventsController.js
@@ -1303,6 +1303,11 @@
        if (this.isFillHandleMode || this.isMoveRangeMode || this.isMoveResizeRange) {
            return true;
        }
+        if (undefined !== window["AscDesktopEditor"]) {
+            if (false === window["AscDesktopEditor"]["CheckNeedWheel"]()) {
+                return true;
+            }
+        }
        var delta = 0;
        if (undefined !== event.wheelDelta && 0 !== event.wheelDelta) {
            delta = -1 * event.wheelDelta / 40;