2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix toggle control initialOn logic

Browse source
This commit is contained in:
Gwendolyn 2024-12-29 19:21:40 +01:00
parent 4e730b9708
commit caa2918be8
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/c3nav/site/static/site/js/c3nav.js
View file

@ -1799,6 +1799,7 @@ c3nav = {
c3nav._labelControl = new ToggleControl({ c3nav._labelControl = new ToggleControl({
storageId: 'labels', storageId: 'labels',
initialOn: true,
enabledIcon: c3nav._map_material_icon('label'), enabledIcon: c3nav._map_material_icon('label'),
disabledIcon: c3nav._map_material_icon('label_off'), disabledIcon: c3nav._map_material_icon('label_off'),
onEnable: () => { onEnable: () => {
@ -1828,6 +1829,7 @@ c3nav = {
c3nav._gridLayer = new L.SquareGridLayer(JSON.parse($map.attr('data-grid'))); c3nav._gridLayer = new L.SquareGridLayer(JSON.parse($map.attr('data-grid')));
c3nav._gridControl = new ToggleControl({ c3nav._gridControl = new ToggleControl({
storageId: 'grid', storageId: 'grid',
initialOn: true,
enabledIcon: c3nav._map_material_icon('grid_on'), enabledIcon: c3nav._map_material_icon('grid_on'),
disabledIcon: c3nav._map_material_icon('grid_off'), disabledIcon: c3nav._map_material_icon('grid_off'),
onEnable: () => { onEnable: () => {
@ -2878,9 +2880,15 @@ ToggleControl = L.Control.extend({
this._button.innerText = this.options.enabledIcon; this._button.innerText = this.options.enabledIcon;
this._button.href = '#'; this._button.href = '#';
this._button.classList.toggle('control-disabled', false); this._button.classList.toggle('control-disabled', false);
let initialOn = this.options.initialOn; let initialOn = this.options.initialOn;
if (this.options.storageId) { if (this.options.storageId) {
initialOn = !localStorageWrapper.getItem(`c3nav.toggle-control.${this.options.storageId}.hide`); const onValue = localStorageWrapper.getItem(`c3nav.toggle-control.${this.options.storageId}.on`);
if (onValue === '1') {
initialOn = true;
} else if (onValue === '0') {
initialOn = false;
}
} }
window.setTimeout(() => { window.setTimeout(() => {
@ -2912,7 +2920,7 @@ ToggleControl = L.Control.extend({
} }
this._button.innerText = this.options.enabledIcon; this._button.innerText = this.options.enabledIcon;
this._button.classList.toggle('control-disabled', false); this._button.classList.toggle('control-disabled', false);
localStorageWrapper.removeItem(`c3nav.toggle-control.${this.options.storageId}.hide`); localStorageWrapper.setItem(`c3nav.toggle-control.${this.options.storageId}.on`, '1');
}, },
toggleOff: function () { toggleOff: function () {
@ -2923,7 +2931,7 @@ ToggleControl = L.Control.extend({
} }
this._button.innerText = this.options.disabledIcon; this._button.innerText = this.options.disabledIcon;
this._button.classList.toggle('control-disabled', true); this._button.classList.toggle('control-disabled', true);
localStorageWrapper.setItem(`c3nav.toggle-control.${this.options.storageId}.hide`, '1'); localStorageWrapper.setItem(`c3nav.toggle-control.${this.options.storageId}.on`, '0');
} }
}); });