Commit f755c6a2 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68420 954022d7-b5bf-4e40-9824-e11837661b57
parent cfca7811
...@@ -57,7 +57,7 @@ AscBrowser.isMobile = /android|avantgo|blackberry|blazer|compal|elaine|fennec|hi ...@@ -57,7 +57,7 @@ AscBrowser.isMobile = /android|avantgo|blackberry|blazer|compal|elaine|fennec|hi
AscBrowser.isGecko = (AscBrowser.userAgent.indexOf("gecko/") > -1); AscBrowser.isGecko = (AscBrowser.userAgent.indexOf("gecko/") > -1);
// opera detect // opera detect
AscBrowser.isOpera = !!window.opera; AscBrowser.isOpera = (!!window.opera || AscBrowser.userAgent.indexOf("opr/") > -1);
// webkit detect // webkit detect
AscBrowser.isWebkit = !AscBrowser.isIE && (AscBrowser.userAgent.indexOf("webkit") > -1); AscBrowser.isWebkit = !AscBrowser.isIE && (AscBrowser.userAgent.indexOf("webkit") > -1);
...@@ -71,7 +71,7 @@ AscBrowser.zoom = 1; ...@@ -71,7 +71,7 @@ AscBrowser.zoom = 1;
AscBrowser.checkZoom = function() AscBrowser.checkZoom = function()
{ {
if (AscBrowser.isChrome && document && document.firstElementChild && document.body) if (AscBrowser.isChrome && !AscBrowser.isOpera && document && document.firstElementChild && document.body)
{ {
document.firstElementChild.style.zoom = "reset"; document.firstElementChild.style.zoom = "reset";
AscBrowser.zoom = document.body.clientWidth / window.innerWidth; AscBrowser.zoom = document.body.clientWidth / window.innerWidth;
......
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