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

Henry Castro hcastro at collabora.com
Tue May 23 12:47:07 UTC 2017


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

New commits:
commit 24ea20f7e3403bbb90bd79e1916d4dde56ef2c85
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
    Reviewed-on: https://gerrit.libreoffice.org/37928
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

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) {


More information about the Libreoffice-commits mailing list