From 4ded52e3fc4bcc72de6d7edbc2fe462e2790f70c Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Thu, 18 Apr 2024 17:45:24 +0200 Subject: [PATCH] chore: change Panel.open signature --- umap/static/umap/js/modules/browser.js | 2 +- umap/static/umap/js/modules/panel.js | 14 +++++--------- umap/static/umap/js/umap.controls.js | 12 ++++++------ umap/static/umap/js/umap.features.js | 2 +- umap/static/umap/js/umap.importer.js | 2 +- umap/static/umap/js/umap.js | 4 ++-- umap/static/umap/js/umap.layer.js | 2 +- umap/static/umap/js/umap.permissions.js | 2 +- umap/static/umap/js/umap.popup.js | 2 +- umap/static/umap/js/umap.share.js | 2 +- umap/static/umap/js/umap.tableeditor.js | 2 +- 11 files changed, 21 insertions(+), 25 deletions(-) diff --git a/umap/static/umap/js/modules/browser.js b/umap/static/umap/js/modules/browser.js index a916c997..ac0293da 100644 --- a/umap/static/umap/js/modules/browser.js +++ b/umap/static/umap/js/modules/browser.js @@ -149,7 +149,7 @@ export default class Browser { formContainer.appendChild(builder.build()) this.map.panel.open({ - data: { html: container }, + content: container, className: 'umap-browser', }) diff --git a/umap/static/umap/js/modules/panel.js b/umap/static/umap/js/modules/panel.js index 8d95fcda..6bbc5262 100644 --- a/umap/static/umap/js/modules/panel.js +++ b/umap/static/umap/js/modules/panel.js @@ -14,26 +14,22 @@ export class Panel { DomEvent.on(this.container, 'MozMousePixelScroll', DomEvent.stopPropagation) } - open(e) { + open({ content, className, actions = [] } = {}) { this.container.className = `with-transition panel ${this.classname} ${this.mode}` this.container.innerHTML = '' const actionsContainer = DomUtil.create('ul', 'toolbox', this.container) const body = DomUtil.create('div', 'body', this.container) - if (e.data.html.nodeType && e.data.html.nodeType === 1) - body.appendChild(e.data.html) - else body.innerHTML = e.data.html + body.appendChild(content) const closeLink = DomUtil.create('li', 'umap-close-link', actionsContainer) DomUtil.add('i', 'icon icon-16 icon-close', closeLink) closeLink.title = translate('Close') const resizeLink = DomUtil.create('li', 'umap-resize-link', actionsContainer) DomUtil.add('i', 'icon icon-16 icon-resize', resizeLink) resizeLink.title = translate('Toggle size') - if (e.actions) { - for (let i = 0; i < e.actions.length; i++) { - actionsContainer.appendChild(e.actions[i]) - } + for (let action of actions) { + actionsContainer.appendChild(action) } - if (e.className) DomUtil.addClass(body, e.className) + if (className) DomUtil.addClass(body, className) const promise = new Promise((resolve, reject) => { DomUtil.addClass(this.container, 'on') resolve() diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js index 405c32ef..6f9a853b 100644 --- a/umap/static/umap/js/umap.controls.js +++ b/umap/static/umap/js/umap.controls.js @@ -709,7 +709,7 @@ const ControlsMixin = { }) container.appendChild(builder.build()) - this.panel.open({ data: { html: container } }) + this.panel.open({ content: container }) }, displayCaption: function () { @@ -789,7 +789,7 @@ const ControlsMixin = { `, urls ) - this.panel.open({ data: { html: container } }) + this.panel.open({ content: container }) }, renderEditToolbar: function () { @@ -976,7 +976,7 @@ const ControlsMixin = { this ) - this.editPanel.open({ data: { html: container } }) + this.editPanel.open({ content: container }) }, } @@ -1051,7 +1051,7 @@ U.TileLayerChooser = L.Control.extend({ this._tilelayers_container = L.DomUtil.create('ul', '', container) this.buildList(options) this.map.editPanel.open({ - data: { html: container }, + content: container, className: options.className, }) }, @@ -1159,7 +1159,7 @@ U.Locate = L.Control.Locate.extend({ this._map = this.map L.Control.Locate.prototype._activate.call(this) this._map = null - } + }, }) U.Search = L.PhotonSearch.extend({ @@ -1298,7 +1298,7 @@ U.SearchControl = L.Control.extend({ this.map.fire('dataload', { id: id }) }) this.search.resultsContainer = resultsContainer - this.map.panel.open({ data: { html: container } }).then(input.focus) + this.map.panel.open({ content: container }).then(input.focus) }, }) diff --git a/umap/static/umap/js/umap.features.js b/umap/static/umap/js/umap.features.js index d7d9f4e9..60814720 100644 --- a/umap/static/umap/js/umap.features.js +++ b/umap/static/umap/js/umap.features.js @@ -129,7 +129,7 @@ U.FeatureMixin = { this.appendEditFieldsets(container) const advancedActions = L.DomUtil.createFieldset(container, L._('Advanced actions')) this.getAdvancedEditActions(advancedActions) - const onLoad = this.map.editPanel.open({ data: { html: container } }) + const onLoad = this.map.editPanel.open({ content: container }) onLoad.then(() => { builder.helpers['properties.name'].input.focus() }) diff --git a/umap/static/umap/js/umap.importer.js b/umap/static/umap/js/umap.importer.js index 386e45da..f6b32a2e 100644 --- a/umap/static/umap/js/umap.importer.js +++ b/umap/static/umap/js/umap.importer.js @@ -107,7 +107,7 @@ U.Importer = L.Class.extend({ open: function () { if (!this.container) this.build() - const onLoad = this.map.editPanel.open({ data: { html: this.container } }) + const onLoad = this.map.editPanel.open({ content: this.container }) onLoad.then(() => { this.fileInput.value = null this.layerInput.innerHTML = '' diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js index 38f6ff5a..2c247447 100644 --- a/umap/static/umap/js/umap.js +++ b/umap/static/umap/js/umap.js @@ -1532,7 +1532,7 @@ U.Map = L.Map.extend({ ] const creditsBuilder = new U.FormBuilder(this, creditsFields) credits.appendChild(creditsBuilder.build()) - this.editPanel.open({ data: { html: container } }) + this.editPanel.open({ content: container }) }, edit: function () { @@ -1550,7 +1550,7 @@ U.Map = L.Map.extend({ this._editSlideshow(container) this._advancedActions(container) - this.editPanel.open({ data: { html: container }, className: 'dark' }) + this.editPanel.open({ content: container, className: 'dark' }) }, enableEdit: function () { diff --git a/umap/static/umap/js/umap.layer.js b/umap/static/umap/js/umap.layer.js index c62f9650..68e67999 100644 --- a/umap/static/umap/js/umap.layer.js +++ b/umap/static/umap/js/umap.layer.js @@ -1385,7 +1385,7 @@ U.DataLayer = L.Evented.extend({ ) } this.map.editPanel.open({ - data: { html: container }, + content: container, actions: [U.Browser.backButton(this.map)], }) }, diff --git a/umap/static/umap/js/umap.permissions.js b/umap/static/umap/js/umap.permissions.js index cd6aa214..dcdd2bfd 100644 --- a/umap/static/umap/js/umap.permissions.js +++ b/umap/static/umap/js/umap.permissions.js @@ -126,7 +126,7 @@ U.MapPermissions = L.Class.extend({ this.map.eachDataLayer((datalayer) => { datalayer.permissions.edit(container) }) - this.map.editPanel.open({ data: { html: container }, className: 'dark' }) + this.map.editPanel.open({ content: container, className: 'dark' }) }, attach: async function () { diff --git a/umap/static/umap/js/umap.popup.js b/umap/static/umap/js/umap.popup.js index 5416a7ea..2421c954 100644 --- a/umap/static/umap/js/umap.popup.js +++ b/umap/static/umap/js/umap.popup.js @@ -56,7 +56,7 @@ U.Popup.Panel = U.Popup.extend({ onAdd: function (map) { map.panel.open({ - data: { html: this._content }, + content: this._content, actions: [U.Browser.backButton(map)], }) diff --git a/umap/static/umap/js/umap.share.js b/umap/static/umap/js/umap.share.js index 54befdb8..1c8650ec 100644 --- a/umap/static/umap/js/umap.share.js +++ b/umap/static/umap/js/umap.share.js @@ -159,7 +159,7 @@ U.Share = L.Class.extend({ open: function () { if (!this.container) this.build() - this.map.panel.open({ data: { html: this.container } }) + this.map.panel.open({ content: this.container }) }, format: function (mode) { diff --git a/umap/static/umap/js/umap.tableeditor.js b/umap/static/umap/js/umap.tableeditor.js index c5bbaa6c..4863a988 100644 --- a/umap/static/umap/js/umap.tableeditor.js +++ b/umap/static/umap/js/umap.tableeditor.js @@ -110,7 +110,7 @@ U.TableEditor = L.Class.extend({ } L.DomEvent.on(addButton, 'click', addProperty, this) this.datalayer.map.fullPanel.open({ - data: { html: this.table }, + content: this.table, className: 'umap-table-editor', actions: [addButton], })