CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-02 21:21:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't call async callbacks after connection resets/switches

Browse Source 
(closes #4288)
This commit is contained in:
Bryan Housel
2017-11-14 21:30:01 -05:00
parent 91f9da0f06
commit 9b705a6375
6 changed files with 139 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/source_switch.js
+12 -6
View File
@@ -13,22 +13,28 @@ export function uiSourceSwitch(context) {
function click() {
d3_event.preventDefault();
var osm = context.connection();
if (!osm) return;
if (context.inIntro()) return;
if (context.history().hasChanges() &&
!window.confirm(t('source_switch.lose_changes'))) return;
var live = d3_select(this)
var isLive = d3_select(this)
.classed('live');
context.history().clearSaved();
context.connection().switch(live ? keys[1] : keys[0]);
isLive = !isLive;
context.enter(modeBrowse(context));
context.flush();
context.history().clearSaved(); // remove saved history
context.flush(); // remove stored data
d3_select(this)
.text(live ? t('source_switch.dev') : t('source_switch.live'))
.classed('live', !live);
.text(isLive ? t('source_switch.live') : t('source_switch.dev'))
.classed('live', isLive);
osm.switch(isLive ? keys[0] : keys[1]); // switch connection (warning: dispatches 'change' event)
}
var sourceSwitch = function(selection) {