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

[Pranav Kant]

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

New commits:
commit 0e89087418c0a2424c158f6d52f502cdc8d57dea
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Jun 24 23:32:46 2016 +0530

    loleaflet: Allow 'about', 'keyboard-shortcuts' in non-edit modes
    
    Change-Id: I2def7a17d05ec7834290b94a51edfd589f6187ed
    (cherry picked from commit ce6866b0e5e494e81887704a5d1b13f59aa6f1b9)

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 8b34cac..5f3629e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -140,7 +140,8 @@ L.Control.Menubar = L.Control.extend({
 		allowedViewModeActions: ['downloadas-pdf', 'downloadas-odt', 'downloadas-doc', 'downloadas-docx',
 								 'downloadas-odp', 'downloadas-ppt', 'downloadas-pptx',
 								 'downloadas-ods', 'downloadas-xls', 'downloadas-xlsx',
-								 'fullscreen', 'zoomin', 'zoomout', 'zoomreset']
+								 'fullscreen', 'zoomin', 'zoomout', 'zoomreset',
+								 'about', 'keyboard-shortcuts']
 	},
 
 	onAdd: function (map) {