diff --git a/loleaflet/src/control/Control.UIManager.js b/loleaflet/src/control/Control.UIManager.js index 4a25dde6ab1bb..c0f20dca1e865 100644 --- a/loleaflet/src/control/Control.UIManager.js +++ b/loleaflet/src/control/Control.UIManager.js @@ -299,6 +299,31 @@ L.Control.UIManager = L.Control.extend({ this.notebookbar.insertButtonToShortcuts(button); }, + showButtonInClassicToolbar: function(buttonId, show) { + var toolbars = [w2ui['toolbar-up'], w2ui['actionbar'], w2ui['editbar']]; + var found = false; + + toolbars.forEach(function(toolbar) { + if (toolbar && toolbar.get(buttonId)) { + found = true; + if (show) { + toolbar.show(buttonId); + } else { + toolbar.hide(buttonId); + } + } + }); + + if (!found) { + console.error('Toolbar button with id "' + buttonId + '" not found.'); + return; + } + }, + + showButton: function(buttonId, show) { + this.showButtonInClassicToolbar(buttonId, show); + }, + // Menubar showMenubar: function() { diff --git a/loleaflet/src/map/handler/Map.WOPI.js b/loleaflet/src/map/handler/Map.WOPI.js index 2ff2e20bb005b..b51415ae95bf9 100644 --- a/loleaflet/src/map/handler/Map.WOPI.js +++ b/loleaflet/src/map/handler/Map.WOPI.js @@ -247,25 +247,8 @@ L.Map.WOPI = L.Handler.extend({ console.error('Property "Values.id" not set'); return; } - - var toolbars = [w2ui['toolbar-up'], w2ui['actionbar'], w2ui['editbar']]; - var found = false; - - toolbars.forEach(function(toolbar) { - if (toolbar && toolbar.get(msg.Values.id)) { - found = true; - if (msg.MessageId === 'Show_Button') { - toolbar.show(msg.Values.id); - } else { - toolbar.hide(msg.Values.id); - } - } - }); - - if (!found) { - console.error('Toolbar button with id "' + msg.Values.id + '" not found.'); - return; - } + var show = msg.MessageId === 'Show_Button'; + this._map.uiManager.showButton(msg.Values.id, show); } else if (msg.MessageId === 'Remove_Statusbar_Element') { if (!msg.Values) {