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

Henry Castro hcastro at collabora.com
Wed May 24 19:23:08 UTC 2017


 loleaflet/src/control/Control.Menubar.js |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6b1d29578937c6c5b9edf120643f7331d19540e
Author: Henry Castro <hcastro at collabora.com>
Date:   Wed May 24 15:25:36 2017 -0400

    loleaflet: simplify disable about dialog
    
    CreateMenu is a recursive function
    
    Change-Id: Ied1b076c1ff04a1d471af2360aa8f9fbbe3289ff

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 33d2e1e1..29c64bbb 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -541,8 +541,8 @@ L.Control.Menubar = L.Control.extend({
 	_createMenu: function(menu) {
 		var itemList = [];
 		for (var i in menu) {
-			if (menu[i].id === 'help' && disableAbout) {
-				menu[i].menu.pop();
+			if (menu[i].id === 'about' && disableAbout) {
+				continue;
 			}
 
 			if (map._permission === 'readonly' && menu[i].type === 'menu') {


More information about the Libreoffice-commits mailing list