[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - loleaflet/src

[Henry Castro]

 loleaflet/src/layer/marker/DivIcon.js |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit ed8214d92733754728721fc1f91e9e64f5dc7624
Author: Henry Castro <hcastro at collabora.com>
Date:   Mon May 22 21:08:30 2017 -0400

    loleaflet: prevent default context menu of the grab handles
    
    Change-Id: I12ede87cb8207257470720c130913e3ab7e967dd
    (cherry picked from commit 41c561233d60bbb32b084c8ced9345c82737f305)
    Reviewed-on: https://gerrit.libreoffice.org/48667
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/loleaflet/src/layer/marker/DivIcon.js b/loleaflet/src/layer/marker/DivIcon.js
index c1e1cdd3..c2c7cb74 100644
--- a/loleaflet/src/layer/marker/DivIcon.js
+++ b/loleaflet/src/layer/marker/DivIcon.js
@@ -20,6 +20,7 @@ L.DivIcon = L.Icon.extend({
 		var div = (oldIcon && oldIcon.tagName === 'DIV') ? oldIcon : document.createElement('div'),
 		    options = this.options;
 
+		L.DomEvent.on(div, 'contextmenu', L.DomEvent.preventDefault);
 		div.innerHTML = options.html !== false ? options.html : '';
 
 		if (options.bgPos) {