Commit c864a112 authored by Julia Radzhabova's avatar Julia Radzhabova

Убрала проверку zoom-а браузера при загрузке редакторов.

parent 6f955b31
...@@ -766,7 +766,6 @@ define([ ...@@ -766,7 +766,6 @@ define([
if (!window['AscDesktopEditor']) { if (!window['AscDesktopEditor']) {
var tips = []; var tips = [];
Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); 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); if (tips.length) me.showTips(tips);
} }
...@@ -1246,20 +1245,6 @@ define([ ...@@ -1246,20 +1245,6 @@ define([
this._state.isDisconnected = true; 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) { showTips: function(strings) {
var me = this; var me = this;
if (!strings.length) return; if (!strings.length) return;
......
...@@ -565,7 +565,6 @@ define([ ...@@ -565,7 +565,6 @@ define([
if (!window['AscDesktopEditor']) { if (!window['AscDesktopEditor']) {
var tips = []; var tips = [];
Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); 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); if (tips.length) me.showTips(tips);
} }
...@@ -1015,20 +1014,6 @@ define([ ...@@ -1015,20 +1014,6 @@ define([
// this.getFileMenu().setMode({isDisconnected:true}); // 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) { showTips: function(strings) {
var me = this; var me = this;
if (!strings.length) return; if (!strings.length) return;
......
...@@ -674,8 +674,6 @@ define([ ...@@ -674,8 +674,6 @@ define([
if (!window['AscDesktopEditor']) { if (!window['AscDesktopEditor']) {
var tips = []; var tips = [];
Common.Utils.isIE9m && tips.push(me.warnBrowserIE9); 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); if (tips.length) me.showTips(tips);
} }
...@@ -1152,20 +1150,6 @@ define([ ...@@ -1152,20 +1150,6 @@ define([
this._state.isDisconnected = true; 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) { showTips: function(strings) {
var me = this; var me = this;
if (!strings.length) return; if (!strings.length) return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment