[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src

[Pranav Kant]

 loleaflet/dist/loleaflet.css                 |    9 +++++++++
 loleaflet/src/control/Control.ContextMenu.js |    4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 33ce6f38e4d2711f9a5a57e8e09a4ac957c16f97
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Dec 8 21:58:22 2016 +0530

    loleaflet: Check boxes against checked items in context menu
    
    Change-Id: I1a51fec67ba79dc2e82cccb54731bfabb9731470

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index fe40839..a0f3ef7 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -57,3 +57,12 @@ body {
 .loleaflet-scrolled {
 	overflow: auto;
 }
+
+/* Important to override context-menu-icon's font-family here otherwise, jquery-contextmenu.css
+ * will try to load its own font file which is not available in dist/ */
+.context-menu-icon::before {
+	font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif !important;
+}
+.context-menu-icon-lo-checkmark:before {
+	content: '\2713';
+}
diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index 60c4a32..1780060 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -134,11 +134,11 @@ L.Control.ContextMenu = L.Control.extend({
 
 				if (item.checktype === 'checkmark') {
 					if (item.checked === 'true') {
-						contextMenu[item.command.icon] = 'checkmark';
+						contextMenu[item.command]['icon'] = 'lo-checkmark';
 					}
 				} else if (item.checktype === 'radio') {
 					if (item.checked === 'true') {
-						contextMenu[item.command.icon] = 'radio';
+						contextMenu[item.command]['icon'] = 'radio';
 					}
 				}