git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68272 954022d7-b5bf-4e40-9824-e11837661b57

457be833 · Oleg.Korshul · Alexander.Trofimov · 1e367713 · 457be833
Commit 457be833 authored Feb 18, 2016 by Oleg.Korshul Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Common/browser.js Common/browser.js +4 -1

No files found.
--- a/Common/browser.js
+++ b/Common/browser.js
@@ -27,6 +27,9 @@ AscBrowser.isIE =  (AscBrowser.userAgent.indexOf("msie") > -1 ||
                    AscBrowser.userAgent.indexOf("trident") > -1 ||
 					AscBrowser.userAgent.indexOf("edge") > -1);

+AscBrowser.isIE9 =  (AscBrowser.userAgent.indexOf("msie9") > -1 || AscBrowser.userAgent.indexOf("msie 9") > -1);
+AscBrowser.isIE10 =  (AscBrowser.userAgent.indexOf("msie10") > -1 || AscBrowser.userAgent.indexOf("msie 10") > -1);
+
 // macOs detect
 AscBrowser.isMacOs = (AscBrowser.userAgent.indexOf('mac') > -1);

@@ -68,7 +71,7 @@ AscBrowser.zoom = 1;

 AscBrowser.checkZoom = function()
 {
-    if (AscBrowser.isChrome && document && document.firstElementChild)
+    if (AscBrowser.isChrome && document && document.firstElementChild && document.body)
    {
        document.firstElementChild.style.zoom = "reset";
        AscBrowser.zoom = document.body.clientWidth / window.innerWidth;