mirror of
https://github.com/umap-project/umap.git
synced 2025-05-06 06:21:49 +02:00
Resolve conflicts with master
This commit is contained in:
parent
0ac7eb60bc
commit
773546d57c
1 changed files with 3 additions and 2 deletions
|
@ -1,4 +1,4 @@
|
||||||
L.U.Importer = L.Class.extend({
|
U.Importer = L.Class.extend({
|
||||||
initialize: function (map) {
|
initialize: function (map) {
|
||||||
this.map = map
|
this.map = map
|
||||||
this.presets = map.options.importPresets
|
this.presets = map.options.importPresets
|
||||||
|
@ -27,7 +27,7 @@ L.U.Importer = L.Class.extend({
|
||||||
const noPreset = L.DomUtil.create('option', '', element)
|
const noPreset = L.DomUtil.create('option', '', element)
|
||||||
noPreset.value = noPreset.textContent = L._('Choose a preset')
|
noPreset.value = noPreset.textContent = L._('Choose a preset')
|
||||||
for (const preset of this.presets) {
|
for (const preset of this.presets) {
|
||||||
option = L.DomUtil.create('option', '', presetSelect)
|
option = L.DomUtil.create('option', '', this.presetSelect)
|
||||||
option.value = preset.url
|
option.value = preset.url
|
||||||
option.textContent = preset.label
|
option.textContent = preset.label
|
||||||
}
|
}
|
||||||
|
@ -39,6 +39,7 @@ L.U.Importer = L.Class.extend({
|
||||||
this.form = template.content.firstElementChild.cloneNode(true)
|
this.form = template.content.firstElementChild.cloneNode(true)
|
||||||
this.presetSelect = this.form.querySelector('[name="preset-select"]')
|
this.presetSelect = this.form.querySelector('[name="preset-select"]')
|
||||||
this.fileInput = this.form.querySelector('[name="file-input"]')
|
this.fileInput = this.form.querySelector('[name="file-input"]')
|
||||||
|
this.map.ui.once('panel:closed', () => (this.fileInput.value = null))
|
||||||
this.typeLabel = this.form.querySelector('#type-label')
|
this.typeLabel = this.form.querySelector('#type-label')
|
||||||
const helpButton = this.typeLabel.querySelector('button')
|
const helpButton = this.typeLabel.querySelector('button')
|
||||||
this.map.help.button(this.typeLabel, 'importFormats', '', helpButton)
|
this.map.help.button(this.typeLabel, 'importFormats', '', helpButton)
|
||||||
|
|
Loading…
Reference in a new issue