Commit 0e2edac7 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@49688 954022d7-b5bf-4e40-9824-e11837661b57
parent 886add42
...@@ -29,7 +29,7 @@ if (window.USER_AGENT_SAFARI_MACOS) ...@@ -29,7 +29,7 @@ if (window.USER_AGENT_SAFARI_MACOS)
if (navigator.userAgent.toLowerCase().indexOf('chrome') > -1) if (navigator.userAgent.toLowerCase().indexOf('chrome') > -1)
window.USER_AGENT_SAFARI_MACOS = false; window.USER_AGENT_SAFARI_MACOS = false;
} }
window.USER_AGENT_IE = (/MSIE/g.test(navigator.userAgent)) ? true : false; window.USER_AGENT_IE = ((/MSIE/g.test(navigator.userAgent)) || window.opera) ? true : false;
window.GlobalPasteFlagCounter = 0; window.GlobalPasteFlagCounter = 0;
......
...@@ -36,10 +36,11 @@ var orientation_Landscape = 0x01; ...@@ -36,10 +36,11 @@ var orientation_Landscape = 0x01;
var tableSpacingMinValue = 0.02;//0.02мм var tableSpacingMinValue = 0.02;//0.02мм
if (/MSIE/g.test(navigator.userAgent)) if ((/MSIE/g.test(navigator.userAgent)) || window.opera)
{ {
// не убирать!!! это для ие. чтобы не селектились элементы // не убирать!!! это для ие. чтобы не селектились элементы
document.onselectstart= function() { document.onselectstart= function() {
return false;
} }
} }
...@@ -69,7 +70,7 @@ function CEditorPage(api) ...@@ -69,7 +70,7 @@ function CEditorPage(api)
this.ReaderModeDiv = null; this.ReaderModeDiv = null;
this.m_oOverlayApi = new COverlay(); this.m_oOverlayApi = new COverlay();
this.m_bIsIE = (/MSIE/g.test(navigator.userAgent)) ? true : false; this.m_bIsIE = ((/MSIE/g.test(navigator.userAgent)) || window.opera) ? true : false;
this.m_oPanelRight_buttonRulers = null; this.m_oPanelRight_buttonRulers = null;
this.m_oPanelRight_vertScroll = null; this.m_oPanelRight_vertScroll = null;
......
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