From c864a112ce2ff6392ebae85199e3f610dbaef008 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sun, 15 May 2016 13:51:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D1=83=20zoom-=D0=B0=20?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D1=83=D0=B7=D0=B5=D1=80=D0=B0=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/documenteditor/main/app/controller/Main.js | 15 --------------- .../main/app/controller/Main.js | 15 --------------- .../main/app/controller/Main.js | 16 ---------------- 3 files changed, 46 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 10f4d11e41..796d60a2c3 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -766,7 +766,6 @@ define([ if (!window['AscDesktopEditor']) { var tips = []; Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); - !Common.Utils.isGecko && (Math.abs(me.getBrowseZoomLevel() - 1) > 0.1) && tips.push(Common.Utils.String.platformKey(me.warnBrowserZoom, '{0}')); if (tips.length) me.showTips(tips); } @@ -1246,20 +1245,6 @@ define([ this._state.isDisconnected = true; }, - getBrowseZoomLevel: function() { - if (Common.Utils.isIE) { - return screen.logicalXDPI/screen.deviceXDPI; - } else { - var zoom = window.outerWidth / document.documentElement.clientWidth; - - if (Common.Utils.isSafari) { - zoom = Math.floor(zoom * 10) / 10; - } - - return zoom; - } - }, - showTips: function(strings) { var me = this; if (!strings.length) return; diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index d7ff6caa7e..a60df5b539 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -565,7 +565,6 @@ define([ if (!window['AscDesktopEditor']) { var tips = []; Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); - !Common.Utils.isGecko && (Math.abs(me.getBrowseZoomLevel() - 1) > 0.1) && tips.push(Common.Utils.String.platformKey(me.warnBrowserZoom, '{0}')); if (tips.length) me.showTips(tips); } @@ -1015,20 +1014,6 @@ define([ // this.getFileMenu().setMode({isDisconnected:true}); }, - getBrowseZoomLevel: function() { - if (Common.Utils.isIE) { - return screen.logicalXDPI/screen.deviceXDPI; - } else { - var zoom = window.outerWidth / document.documentElement.clientWidth; - - if (Common.Utils.isSafari) { - zoom = Math.floor(zoom * 10) / 10; - } - - return zoom; - } - }, - showTips: function(strings) { var me = this; if (!strings.length) return; diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 69f3b62a43..fe14b2f9a6 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -674,8 +674,6 @@ define([ if (!window['AscDesktopEditor']) { var tips = []; Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); - !Common.Utils.isGecko && !me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram && !me.appOptions.nativeApp && - (Math.abs(me.getBrowseZoomLevel() - 1) > 0.1) && tips.push(Common.Utils.String.platformKey(me.warnBrowserZoom, '{0}')); if (tips.length) me.showTips(tips); } @@ -1152,20 +1150,6 @@ define([ this._state.isDisconnected = true; }, - getBrowseZoomLevel: function() { - if (Common.Utils.isIE) { - return screen.logicalXDPI/screen.deviceXDPI; - } else { - var zoom = window.outerWidth / document.documentElement.clientWidth; - - if (Common.Utils.isSafari) { - zoom = Math.floor(zoom * 10) / 10; - } - - return zoom; - } - }, - showTips: function(strings) { var me = this; if (!strings.length) return;