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

microsoft edge copy/paste

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64930 954022d7-b5bf-4e40-9824-e11837661b57
parent afb92891
...@@ -24,16 +24,17 @@ AscBrowser.userAgent = navigator.userAgent.toLowerCase(); ...@@ -24,16 +24,17 @@ AscBrowser.userAgent = navigator.userAgent.toLowerCase();
// ie detect // ie detect
AscBrowser.isIE = (AscBrowser.userAgent.indexOf("msie") > -1 || AscBrowser.isIE = (AscBrowser.userAgent.indexOf("msie") > -1 ||
AscBrowser.userAgent.indexOf("trident") > -1); AscBrowser.userAgent.indexOf("trident") > -1 ||
AscBrowser.userAgent.indexOf("edge") > -1);
// macOs detect // macOs detect
AscBrowser.isMacOs = (AscBrowser.userAgent.indexOf('mac') > -1); AscBrowser.isMacOs = (AscBrowser.userAgent.indexOf('mac') > -1);
// chrome detect // chrome detect
AscBrowser.isChrome = (AscBrowser.userAgent.indexOf("chrome") > -1); AscBrowser.isChrome = !AscBrowser.isIE && (AscBrowser.userAgent.indexOf("chrome") > -1);
// safari detect // safari detect
AscBrowser.isSafari = !AscBrowser.isChrome && (AscBrowser.userAgent.indexOf("safari") > -1); AscBrowser.isSafari = !AscBrowser.isIE && !AscBrowser.isChrome && (AscBrowser.userAgent.indexOf("safari") > -1);
// macOs safari detect // macOs safari detect
AscBrowser.isSafariMacOs = (AscBrowser.isSafari && AscBrowser.isMacOs); AscBrowser.isSafariMacOs = (AscBrowser.isSafari && AscBrowser.isMacOs);
...@@ -56,7 +57,7 @@ AscBrowser.isGecko = (AscBrowser.userAgent.indexOf("gecko/") > -1); ...@@ -56,7 +57,7 @@ AscBrowser.isGecko = (AscBrowser.userAgent.indexOf("gecko/") > -1);
AscBrowser.isOpera = !!window.opera; AscBrowser.isOpera = !!window.opera;
// webkit detect // webkit detect
AscBrowser.isWebkit = (AscBrowser.userAgent.indexOf("webkit") > -1); AscBrowser.isWebkit = !AscBrowser.isIE && (AscBrowser.userAgent.indexOf("webkit") > -1);
// arm detect // arm detect
AscBrowser.isArm = (AscBrowser.userAgent.indexOf("arm") > -1); AscBrowser.isArm = (AscBrowser.userAgent.indexOf("arm") > -1);
......
...@@ -2037,7 +2037,7 @@ function Editor_Paste_GetElem(api, bClean) ...@@ -2037,7 +2037,7 @@ function Editor_Paste_GetElem(api, bClean)
} }
} }
if (!window.USER_AGENT_SAFARI_MACOS) if (!window.USER_AGENT_SAFARI_MACOS && !AscBrowser.isIE)
{ {
pastebin.onpaste = function(e){ pastebin.onpaste = function(e){
if (!window.GlobalPasteFlag) if (!window.GlobalPasteFlag)
......
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