diff options
| -rw-r--r-- | loleaflet/src/control/Control.JSDialogBuilder.js | 14 | ||||
| -rw-r--r-- | loleaflet/src/control/Control.Menubar.js | 1 | ||||
| -rw-r--r-- | loleaflet/src/control/Control.MobileWizard.js | 24 |
3 files changed, 31 insertions, 8 deletions
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index 607735d910..b56b9d13b6 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -470,10 +470,12 @@ L.Control.JSDialogBuilder = L.Control.extend({ }, _explorableEntry: function(parentContainer, data, content, builder, valueNode, iconURL, updateCallback) { - var sectionTitle = L.DomUtil.create('div', 'ui-header level-' + builder._currentDepth + ' ' + builder.options.cssClass + ' ui-widget', parentContainer); - $(sectionTitle).css('justify-content', 'space-between'); + var mainConatiner = L.DomUtil.create('div', 'ui-explorable-entry level-' + builder._currentDepth + ' ' + builder.options.cssClass, parentContainer); if (data && data.id) - sectionTitle.id = data.id; + mainConatiner.id = data.id; + + var sectionTitle = L.DomUtil.create('div', 'ui-header level-' + builder._currentDepth + ' ' + builder.options.cssClass + ' ui-widget', mainConatiner); + $(sectionTitle).css('justify-content', 'space-between'); if (data.enabled === 'false' || data.enabled === false) $(sectionTitle).addClass('disabled'); @@ -544,7 +546,7 @@ L.Control.JSDialogBuilder = L.Control.extend({ }, this); - var contentDiv = L.DomUtil.create('div', 'ui-content level-' + builder._currentDepth + ' ' + builder.options.cssClass, parentContainer); + var contentDiv = L.DomUtil.create('div', 'ui-content level-' + builder._currentDepth + ' ' + builder.options.cssClass, mainConatiner); contentDiv.title = data.text; var contentData = content.length ? content : [content]; @@ -560,7 +562,7 @@ L.Control.JSDialogBuilder = L.Control.extend({ if (builder.wizard) { if (data.enabled !== 'false' && data.enabled !== false) { $(sectionTitle).click(function(event, data) { - builder.wizard.goLevelDown(contentDiv, data); + builder.wizard.goLevelDown(mainConatiner, data); if (contentNode && contentNode.onshow) contentNode.onshow(); }); @@ -1920,6 +1922,8 @@ L.Control.JSDialogBuilder = L.Control.extend({ $(fixedtext).click(function () { builder.refreshSidebar = true; builder.callback('combobox', 'selected', fixedtext.parent, data.pos + ';' + fixedtext.innerHTML, builder); + if (builder.wizard) + builder.wizard.goLevelUp(); }); }, diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index d4b6acccbc..63d3f76536 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -805,6 +805,7 @@ L.Control.Menubar = L.Control.extend({ ], mobilespreadsheet: [ + {uno:'.uno:DataDataPilotRun'}, {name: _UNO('.uno:PickList', 'spreadsheet'), id: 'file', type: 'menu', menu: [ {name: _UNO('.uno:Save', 'spreadsheet'), id: 'save', type: 'action'}, {name: _UNO('.uno:SaveAs', 'spreadsheet'), id: 'saveas', type: 'action'}, diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js index 04fb909663..f0fa376050 100644 --- a/loleaflet/src/control/Control.MobileWizard.js +++ b/loleaflet/src/control/Control.MobileWizard.js @@ -220,13 +220,15 @@ L.Control.MobileWizard = L.Control.extend({ else nodesToHide.hide(); + $(contentToShow).children('.ui-header').hide(); + $('#mobile-wizard.funcwizard div#mobile-wizard-content').removeClass('hideHelpBG'); $('#mobile-wizard.funcwizard div#mobile-wizard-content').addClass('showHelpBG'); if (animate) - $(contentToShow).show('slide', { direction: 'right' }, 'fast'); + $(contentToShow).children('.ui-content').show('slide', { direction: 'right' }, 'fast'); else - $(contentToShow).show(); + $(contentToShow).children('.ui-content').show(); this._currentDepth++; if (!this._inBuilding) @@ -267,14 +269,17 @@ L.Control.MobileWizard = L.Control.extend({ if (this._currentDepth === 0) { headers = $('.ui-header.level-' + this._currentDepth + '.mobile-wizard'); } else { - headers = $('.ui-content.level-' + this._currentDepth + '.mobile-wizard:visible').siblings() + headers = $('.ui-explorable-entry.level-' + this._currentDepth + '.mobile-wizard:visible').siblings() .not('.ui-content.level-' + this._currentDepth + '.mobile-wizard'); } + var myHeader = $('.ui-explorable-entry.level-' + this._currentDepth + '.mobile-wizard:visible').children('.ui-header'); + $('.ui-content.level-' + this._currentDepth + '.mobile-wizard:visible').hide(); $('#mobile-wizard.funcwizard div#mobile-wizard-content').removeClass('showHelpBG'); $('#mobile-wizard.funcwizard div#mobile-wizard-content').addClass('hideHelpBG'); headers.show('slide', { direction: 'left' }, 'fast'); + myHeader.show(); if (this._currentDepth == 0 || (this._isTabMode && this._currentDepth == 1)) { this._inMainMenu = true; @@ -577,6 +582,19 @@ L.Control.MobileWizard = L.Control.extend({ map: this.map, cssClass: 'mobile-wizard'}); + // preserve the same level for control + var classList = control.className.split(' '); + var currentLevel = null; + for (var i in classList) { + if (classList[i].indexOf('level-') >= 0) + currentLevel = classList[i]; + } + + if (currentLevel) { + currentLevel = currentLevel.substring('level-'.length); + builder._currentDepth = currentLevel; + } + var temporaryParent = L.DomUtil.create('div'); builder.build(temporaryParent, [data.control], false); parent.insertBefore(temporaryParent.firstChild, control.nextSibling); |