Commit 854628f6 authored by Oleg Korshul's avatar Oleg Korshul

Fix bug 35775 (linux & vivaldi)

parent 048ac6de
...@@ -54,7 +54,8 @@ var AscBrowser = { ...@@ -54,7 +54,8 @@ var AscBrowser = {
isMozilla : false, isMozilla : false,
isRetina : false, isRetina : false,
isLinuxOS : false, isLinuxOS : false,
retinaPixelRatio : 1 retinaPixelRatio : 1,
isVivaldiLinux : false
}; };
// user agent lower case // user agent lower case
...@@ -109,6 +110,8 @@ AscBrowser.isMozilla = !AscBrowser.isIE && (AscBrowser.userAgent.indexOf("firefo ...@@ -109,6 +110,8 @@ AscBrowser.isMozilla = !AscBrowser.isIE && (AscBrowser.userAgent.indexOf("firefo
AscBrowser.isLinuxOS = (AscBrowser.userAgent.indexOf(" linux ") > -1); AscBrowser.isLinuxOS = (AscBrowser.userAgent.indexOf(" linux ") > -1);
AscBrowser.isVivaldiLinux = AscBrowser.isLinuxOS && (AscBrowser.userAgent.indexOf("vivaldi") > -1);
AscBrowser.zoom = 1; AscBrowser.zoom = 1;
AscBrowser.checkZoom = function() AscBrowser.checkZoom = function()
......
...@@ -879,6 +879,16 @@ function CEditorPage(api) ...@@ -879,6 +879,16 @@ function CEditorPage(api)
window.editor.EndDemonstration(); window.editor.EndDemonstration();
}); });
} }
this.m_oBody.HtmlElement.oncontextmenu = function(e)
{
if (AscCommon.AscBrowser.isVivaldiLinux)
{
AscCommon.Window_OnMouseUp(e);
}
AscCommon.stopEvent(e);
return false;
};
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
......
...@@ -561,8 +561,13 @@ function CEditorPage(api) ...@@ -561,8 +561,13 @@ function CEditorPage(api)
window.onkeyup = this.onKeyUp; window.onkeyup = this.onKeyUp;
*/ */
this.m_oBody.HtmlElement.oncontextmenu = function() this.m_oBody.HtmlElement.oncontextmenu = function(e)
{ {
if (AscCommon.AscBrowser.isVivaldiLinux)
{
AscCommon.Window_OnMouseUp(e);
}
AscCommon.stopEvent(e);
return false; return false;
}; };
//window.oncontextmenu = function() { return false; }; //window.oncontextmenu = function() { return false; };
......
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