CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-07 11:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4720 from bagage/master

Browse Source 
Restore last imageries used and disable features from local storage
This commit is contained in:
Bryan Housel
2018-01-23 11:03:52 -05:00
committed by GitHub
parent 7d4f81ef67 b3da51b032
commit ffc68d1cd6
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/renderer/background.js
View File

@@ -386,6 +386,7 @@ export function rendererBackground(context) {
background.baseLayerSource(
background.findSource(requested) ||
best ||
background.findSource(context.storage('background-last-used')) ||
background.findSource('Bing') ||
first ||
background.findSource('none')

15
modules/renderer/features.js
View File

@@ -72,13 +72,13 @@ export function rendererFeatures(context) {
var q = utilStringQs(window.location.hash.substring(1));
var disabled = features.disabled();
if (disabled.length) {
q.disable_features = features.disabled().join(',');
q.disable_features = disabled.join(',');
} else {
delete q.disable_features;
}
window.location.replace('#' + utilQsString(q, true));
context.storage('disabled-features', disabled.join(','));
}
_hidden = features.hidden();
dispatch.call('change');
dispatch.call('redraw');
@@ -478,11 +478,16 @@ export function rendererFeatures(context) {
features.init = function() {
var storage = context.storage('disabled-features');
if (storage) {
var storageDisabled = storage.replace(/;/g, ',').split(',');
storageDisabled.forEach(features.disable);
}
var q = utilStringQs(window.location.hash.substring(1));
if (q.disable_features) {
var disabled = q.disable_features.replace(/;/g, ',').split(',');
disabled.forEach(features.disable);
var hashDisabled = q.disable_features.replace(/;/g, ',').split(',');
hashDisabled.forEach(features.disable);
}
};

4
modules/ui/background.js
View File

@@ -30,7 +30,7 @@ export function uiBackground(context) {
var key = t('background.key');
var _customSource = context.background().findSource('custom');
var _previousBackground;
var _previousBackground = context.background().findSource(context.storage('background-previous-last-used'));
var _shown = false;
var _backgroundList = d3_select(null);
@@ -92,6 +92,8 @@ export function uiBackground(context) {
d3_event.preventDefault();
_previousBackground = context.background().baseLayerSource();
context.storage('background-previous-last-used', _previousBackground.id);
context.storage('background-last-used', d.id);
context.background().baseLayerSource(d);
_backgroundList.call(updateLayerSelections);
document.activeElement.blur();