[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 7b7a76ad4bbdeda8e0fdc030dd98a040087925ae
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Jan 30 21:56:55 2018 +0530

    No context menu on dialog's floating window canvas
    
    Change-Id: Ia6c8cc5d8d198862cf674d43de2937e4a72fdfbb
    (cherry picked from commit 497319834e68784490feaf83192b3052a5ff8d66)
    Reviewed-on: https://gerrit.libreoffice.org/48916
    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 06d6a527..ae9b712c 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -346,6 +346,8 @@ L.Control.LokDialog = L.Control.extend({
 		L.DomUtil.setStyle(floatingCanvas, 'left', left + 'px'); // yes, it's necessary to append 'px'
 		L.DomUtil.setStyle(floatingCanvas, 'top', top + 'px');
 
+		L.DomEvent.on(floatingCanvas, 'contextmenu', L.DomEvent.preventDefault);
+
 		// attach events
 		L.DomEvent.on(floatingCanvas, 'mousedown mouseup', function(e) {
 			var buttons = 0;