loleaflet/src/control/Control.ContextMenu.js | 49 ------- loleaflet/src/control/Control.JSDialogBuilder.js | 2 loleaflet/src/control/Control.Tabs.js | 142 +++++++++++++---------- loleaflet/src/map/Map.js | 52 ++++++++ 4 files changed, 141 insertions(+), 104 deletions(-)
New commits: commit e7f527b0700e0288e3534d67dad5ab4975bdc03f Author: Pranam Lashkari <[email protected]> AuthorDate: Fri Jan 10 02:10:39 2020 +0530 Commit: Jan Holesovsky <[email protected]> CommitDate: Mon Jan 20 17:54:44 2020 +0100 Mobile wizard: Sheet tab context menu conversion Sheet tab context menu converted to mobile wizard for mobile devices bugfix: prevented mobile wizard to appear in readonly mode which allowed sheets editing in readonly mode Change-Id: I64c9437d2171b0518aa3c08f06d8d65fb3d302af Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86507 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Jan Holesovsky <[email protected]> diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js index 954dab877..692bd8a41 100644 --- a/loleaflet/src/control/Control.ContextMenu.js +++ b/loleaflet/src/control/Control.ContextMenu.js @@ -114,7 +114,7 @@ L.Control.ContextMenu = L.Control.extend({ } if (window.mode.isMobile()) { window.contextMenuWizard = true; - var menuData = this.getMenuStructureForMobileWizard(contextMenu, true, ''); + var menuData = this._map.getMenuStructureForMobileWizard(contextMenu, true, ''); if (spellingContextMenu === true) { vex.timer = setInterval(function() { map.fire('mobilewizard', menuData); @@ -257,53 +257,6 @@ L.Control.ContextMenu = L.Control.extend({ } return contextMenu; - }, - - getMenuStructureForMobileWizard: function(menu, mainMenu, itemCommand) { - if (itemCommand.includes('sep')) - return null; - - var itemText = '' - if (menu.name) - itemText = menu.name; - - var itemType = 'submenu'; - var executionType = 'menu'; - if (mainMenu) { - itemType = 'mainmenu'; - executionType = 'menu'; - } else if (!menu.items) { - itemType = 'menuitem'; - executionType = 'command'; - } - - var menuStructure = { - type : itemType, - enabled : true, - text : itemText, - executionType : executionType, - children : [] - }; - if (itemCommand) - menuStructure['command'] = itemCommand; - if (menu.icon) - menuStructure['checked'] = true; - - if (mainMenu) { - for (var menuItem in menu) { - var element = this.getMenuStructureForMobileWizard(menu[menuItem], false, menuItem); - if (element) - menuStructure['children'].push(element); - } - } else if (itemType == 'submenu') { - for (menuItem in menu.items) { - element = this.getMenuStructureForMobileWizard(menu.items[menuItem], false, menuItem); - if (element) - menuStructure['children'].push(element); - } - } - - return menuStructure; } }); diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index eaa414018..dcf9517e6 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -1453,6 +1453,8 @@ L.Control.JSDialogBuilder = L.Control.extend({ // before close the wizard then execute the action if (data.executionType === 'action') { builder.map.menubar._executeAction(undefined, data.id); + } else if (data.executionType === 'callback') { + data.callback(); } else if (!builder.map._clip || !builder.map._clip.filterExecCopyPaste(data.command)) { // Header / footer is already inserted. if ((data.command.startsWith('.uno:InsertPageHeader') || diff --git a/loleaflet/src/control/Control.Tabs.js b/loleaflet/src/control/Control.Tabs.js index eac204c3b..ac4b0f40b 100644 --- a/loleaflet/src/control/Control.Tabs.js +++ b/loleaflet/src/control/Control.Tabs.js @@ -43,60 +43,37 @@ L.Control.Tabs = L.Control.extend({ var docContainer = map.options.documentContainer; this._tabsCont = L.DomUtil.create('div', 'spreadsheet-tabs-container', docContainer.parentElement); - L.installContextMenu({ - selector: '.spreadsheet-tab', - className: 'loleaflet-font', - callback: (function(key) { - if (key === 'insertsheetbefore') { - map.insertPage(this._tabForContextMenu); - } - if (key === 'insertsheetafter') { - map.insertPage(this._tabForContextMenu + 1); - } - }).bind(this), - items: { - 'insertsheetbefore': {name: _('Insert sheet before this')}, - 'insertsheetafter': {name: _('Insert sheet after this')}, - 'deletesheet': {name: _UNO('.uno:Remove', 'spreadsheet', true), - callback: (function(key, options) { - var nPos = this._tabForContextMenu; - vex.dialog.confirm({ - message: _('Are you sure you want to delete sheet, %sheet% ?').replace('%sheet%', options.$trigger.text()), - callback: function(data) { - if (data) { - map.deletePage(nPos); - } - } - }); - }).bind(this) - }, - 'renamesheet': {name: _UNO('.uno:RenameTable', 'spreadsheet', true), - callback: (function(key, options) { - var nPos = this._tabForContextMenu; - vex.dialog.open({ - message: _('Enter new sheet name'), - input: '<input name="sheetname" type="text" value="' + options.$trigger.text() + '" required />', - callback: function(data) { - map.renamePage(data.sheetname, nPos); - } - }); - }).bind(this) - } , - 'showsheets': { - name: _UNO('.uno:Show', 'spreadsheet', true), - callback: (function() { - map.showPage(); - }).bind(this) - }, - 'hiddensheets': { - name: _UNO('.uno:Hide', 'spreadsheet', true), - callback: (function() { - map.hidePage(); - }).bind(this) - } + this._menuItem = { + 'insertsheetbefore': {name: _('Insert sheet before this'), + callback: (this._insertSheetBefore).bind(this) }, - zIndex: 1000 - }); + 'insertsheetafter': {name: _('Insert sheet after this'), + callback: (this._insertSheetAfter).bind(this) + }, + 'deletesheet': {name: _UNO('.uno:Remove', 'spreadsheet', true), + callback: (this._deleteSheet).bind(this) + }, + 'renamesheet': {name: _UNO('.uno:RenameTable', 'spreadsheet', true), + callback: (this._renameSheet).bind(this) + } , + 'showsheets': { + name: _UNO('.uno:Show', 'spreadsheet', true), + callback: (this._showSheet).bind(this), + }, + 'hiddensheets': { + name: _UNO('.uno:Hide', 'spreadsheet', true), + callback: (this._hideSheet).bind(this) + } + }; + + if (!window.mode.isMobile()) { + L.installContextMenu({ + selector: '.spreadsheet-tab', + className: 'loleaflet-font', + items: this._menuItem, + zIndex: 1000 + }); + } map.on('updateparts', this._updateDisabled, this); }, @@ -105,6 +82,8 @@ L.Control.Tabs = L.Control.extend({ var parts = e.parts; var selectedPart = e.selectedPart; var docType = e.docType; + var map = this._map; + if (docType === 'text') { return; } @@ -127,20 +106,29 @@ L.Control.Tabs = L.Control.extend({ var ssTabScroll = L.DomUtil.create('div', 'spreadsheet-tab-scroll', this._tabsCont); ssTabScroll.id = 'spreadsheet-tab-scroll'; + if (window.mode.isMobile()) { + var menuData = map.getMenuStructureForMobileWizard(this._menuItem, true, ''); + } + for (var i = 0; i < parts; i++) { if (e.hiddenParts.indexOf(i) !== -1) continue; var id = 'spreadsheet-tab' + i; var tab = L.DomUtil.create('button', 'spreadsheet-tab', ssTabScroll); L.DomEvent.enableLongTap(tab); - + L.DomEvent.on(tab, 'contextmenu', function(j) { return function() { this._tabForContextMenu = j; - $('spreadsheet-tab' + j).contextMenu(); + if (window.mode.isMobile()) { + window.contextMenuWizard = true; + if (this._map._permission != 'readonly') this._map.fire('mobilewizard', menuData); + } else { + $('spreadsheet-tab' + j).contextMenu(); + } } }(i).bind(this)); - + tab.textContent = e.partNames[i]; tab.id = id; @@ -168,7 +156,49 @@ L.Control.Tabs = L.Control.extend({ this._map._docLayer._clearReferences(); this._map.setPart(parseInt(part), /*external:*/ false, /*calledFromSetPartHandler:*/ true); } + }, + + _insertSheetBefore: function() { + this._map.insertPage(this._tabForContextMenu); + }, + + _insertSheetAfter: function() { + this._map.insertPage(this._tabForContextMenu + 1); + }, + + _deleteSheet: function() { + var map = this._map; + var nPos = this._tabForContextMenu; + vex.dialog.confirm({ + message: _('Are you sure you want to delete sheet, %sheet% ?').replace('%sheet%', $('#spreadsheet-tab' + this._tabForContextMenu).text()), + callback: function(data) { + if (data) { + map.deletePage(nPos); + } + } + }); + }, + + _renameSheet: function() { + var map = this._map; + var nPos = this._tabForContextMenu; + vex.dialog.open({ + message: _('Enter new sheet name'), + input: '<input name="sheetname" type="text" value="' + $('#spreadsheet-tab' + this._tabForContextMenu).text() + '" required />', + callback: function(data) { + map.renamePage(data.sheetname, nPos); + } + }); + }, + + _showSheet: function() { + this._map.showPage(); + }, + + _hideSheet: function() { + this._map.hidePage(); } + }); L.control.tabs = function (options) { diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js index eab0f9668..99d555b08 100644 --- a/loleaflet/src/map/Map.js +++ b/loleaflet/src/map/Map.js @@ -1756,6 +1756,58 @@ L.Map = L.Evented.extend({ this.focusLayer = null; } }, + + getMenuStructureForMobileWizard: function(menu, mainMenu, itemCommand) { + if (itemCommand.includes('sep')) + return null; + + var itemText = '' + if (menu.name) + itemText = menu.name; + + var itemType = 'submenu'; + var executionType = 'menu'; + if (mainMenu) { + itemType = 'mainmenu'; + executionType = 'menu'; + } else if (menu.callback) { + itemType = 'menuitem'; + executionType = 'callback'; + } else if (!menu.items) { + itemType = 'menuitem'; + executionType = 'command'; + } + + var menuStructure = { + type : itemType, + enabled : true, + text : itemText, + executionType : executionType, + children : [] + }; + if (itemCommand) + menuStructure['command'] = itemCommand; + if (menu.icon) + menuStructure['checked'] = true; + if (menu.callback) + menuStructure['callback'] = menu.callback; + + if (mainMenu) { + for (var menuItem in menu) { + var element = this.getMenuStructureForMobileWizard(menu[menuItem], false, menuItem); + if (element) + menuStructure['children'].push(element); + } + } else if (itemType == 'submenu') { + for (menuItem in menu.items) { + element = this.getMenuStructureForMobileWizard(menu.items[menuItem], false, menuItem); + if (element) + menuStructure['children'].push(element); + } + } + + return menuStructure; + } }); L.map = function (id, options) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
