[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/src

[Pranav Kant]

 loleaflet/src/control/Control.LokDialog.js |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 525ab5c6c0c72b8a7fcd159e129c41d4adfb2579
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Jan 18 12:27:52 2018 +0530

    loleaflet: No native contextmenu options on dialog canvas
    
    Dialogs can have their own context menu invoked upon right click. And
    they already works (i.e. are tunneled properly); so, let's use them.
    
    Change-Id: I7d504923c272227dca94058995456d89e1079c29
    (cherry picked from commit 63e089ec22150524d040f544538f8455e62a1887)
    Reviewed-on: https://gerrit.libreoffice.org/48087
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 21d8a6e5..95cb64d8 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -190,6 +190,8 @@ L.Control.LokDialog = L.Control.extend({
 		dialogCanvas.contentEditable = true;
 		dialogCanvas.id = strDlgId + '-canvas';
 
+		L.DomEvent.on(dialogCanvas, 'contextmenu', L.DomEvent.preventDefault);
+
 		var that = this;
 		$(dialogContainer).dialog({
 			width: width,