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

[Henry Castro]

 loleaflet/debug/document/loleaflet.html  |    1 +
 loleaflet/main.js                        |    3 +++
 loleaflet/src/control/Control.Menubar.js |    6 +++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 76cc33b5f42c4649475b44fce614d82818f8f8ab
Author: Henry Castro <hcastro at collabora.com>
Date:   Wed May 24 10:28:14 2017 -0400

    loleaflet: add parameter to disable 'About' menu
    
    Change-Id: I07fa655b8318f78d7e479a3dc34830ebe5f81a2e
    Reviewed-on: https://gerrit.libreoffice.org/37991
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/debug/document/loleaflet.html b/loleaflet/debug/document/loleaflet.html
index 33364cea..f5462f84 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -106,6 +106,7 @@
     var permission = getParameterByName('permission') || 'edit';
     var timestamp = getParameterByName('timestamp');
     var closebutton = getParameterByName('closebutton');
+    var disableAbout = getParameterByName('disableabout');
     if (wopiSrc === '' && filePath === '') {
         vex.dialog.alert(wrongwopisrc);
     }
diff --git a/loleaflet/main.js b/loleaflet/main.js
index 48200cd9..2fb44b3d 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -75,6 +75,8 @@ var closebutton = getParameterByName('closebutton');
 var revHistoryEnabled = getParameterByName('revisionhistory');
 // Should the document go inactive or not
 var alwaysActive = getParameterByName('alwaysactive');
+// Disable the about dialog
+var disableAbout = getParameterByName('disableabout');
 // Loleaflet Debug mode
 var debugMode = getParameterByName('debug');
 if (wopiSrc === '' && filePath === '') {
@@ -88,6 +90,7 @@ if (host === '') {
 // TODO: Get rid of these globals
 global.closebutton = closebutton;
 global.revHistoryEnabled = revHistoryEnabled;
+global.disableAbout = disableAbout;
 global.title = title;
 global.errorMessages = errorMessages;
 var docURL, docParams;
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 8206ab5c..29c64bbb 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -2,7 +2,7 @@
 * Control.Menubar
 */
 
-/* global $ _ map title vex revHistoryEnabled closebutton */
+/* global $ _ map title vex revHistoryEnabled closebutton disableAbout*/
 L.Control.Menubar = L.Control.extend({
 	// TODO: Some mechanism to stop the need to copy duplicate menus (eg. Help)
 	options: {
@@ -541,6 +541,10 @@ L.Control.Menubar = L.Control.extend({
 	_createMenu: function(menu) {
 		var itemList = [];
 		for (var i in menu) {
+			if (menu[i].id === 'about' && disableAbout) {
+				continue;
+			}
+
 			if (map._permission === 'readonly' && menu[i].type === 'menu') {
 				var found = false;
 				for (var j in this.options.allowedReadonlyMenus) {