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

When calling an errback from a Promise.catch, pass err.message

Browse Source
This commit is contained in:
Bryan Housel
2019-04-25 21:58:36 -04:00
parent 3e363fed8b
commit b99be67169
11 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/context.js
View File

@@ -442,7 +442,7 @@ export function coreContext() {
if (callback) callback();
})
.catch(function(err) {
if (callback) callback(err);
if (callback) callback(err.message);
});
} else {
if (locale) {

6
modules/renderer/background_source.js
View File

@@ -288,7 +288,7 @@ rendererBackgroundSource.Bing = function(data, dispatch) {
})
.catch(function(err) {
delete inflight[tileID];
if (callback) callback(err);
if (callback) callback(err.message);
});
};
@@ -457,9 +457,9 @@ rendererBackgroundSource.Esri = function(data) {
cache[tileID].metadata = metadata;
if (callback) callback(null, metadata);
})
.catch(function(error) {
.catch(function(err) {
delete inflight[tileID];
if (callback) callback(error);
if (callback) callback(err.message);
});
}

4
modules/services/improveOSM.js
View File

@@ -367,7 +367,7 @@ export default {
if (callback) callback(null, d);
})
.catch(function(err) {
if (callback) callback(err);
if (callback) callback(err.message);
});
},
@@ -452,7 +452,7 @@ export default {
})
.catch(function(err) {
delete _erCache.inflightPost[d.id];
if (callback) callback(err);
if (callback) callback(err.message);
});
}
},

2
modules/services/keepRight.js
View File

@@ -455,7 +455,7 @@ export default {
})
.catch(function(err) {
delete _krCache.inflightPost[d.id];
if (callback) callback(err);
if (callback) callback(err.message);
});
},

4
modules/services/nominatim.js
View File

@@ -67,7 +67,7 @@ export default {
.catch(function(err) {
delete _inflight[url];
if (err.name === 'AbortError') return;
if (callback) callback(err);
if (callback) callback(err.message);
});
},
@@ -91,7 +91,7 @@ export default {
.catch(function(err) {
delete _inflight[url];
if (err.name === 'AbortError') return;
if (callback) callback(err);
if (callback) callback(err.message);
});
}

4
modules/services/osm.js
View File

@@ -475,7 +475,7 @@ export default {
})
.catch(function(err) {
if (err.name === 'AbortError') return;
done(err);
done(err.message);
});
return controller;
}
@@ -756,7 +756,7 @@ export default {
var errback = wrapcb(this, done, _connectionID);
d3_xml(url)
.then(function(data) { errback(null, data); })
.catch(function(err) { errback(err); });
.catch(function(err) { errback(err.message); });
function done(err, xml) {
if (err) { return callback(err); }

2
modules/services/osm_wikibase.js
View File

@@ -27,7 +27,7 @@ function request(url, callback) {
.catch(function(err) {
delete _inflight[url];
if (err.name === 'AbortError') return;
if (callback) callback(err);
if (callback) callback(err.message);
});
}

2
modules/services/taginfo.js
View File

@@ -153,7 +153,7 @@ function request(url, params, exactMatch, callback, loaded) {
.catch(function(err) {
delete _inflight[url];
if (err.name === 'AbortError') return;
if (loaded) loaded(err);
if (loaded) loaded(err.message);
});
}

6
modules/services/wikidata.js
View File

@@ -42,7 +42,7 @@ export default {
if (callback) callback(null, result.search || {});
})
.catch(function(err) {
if (callback) callback(err, {});
if (callback) callback(err.message, {});
});
},
@@ -74,7 +74,7 @@ export default {
if (callback) callback(null, result.entities || {});
})
.catch(function(err) {
if (callback) callback(err, {});
if (callback) callback(err.message, {});
});
},
@@ -119,7 +119,7 @@ export default {
if (callback) callback(null, result.entities[qid] || {});
})
.catch(function(err) {
if (callback) callback(err, {});
if (callback) callback(err.message, {});
});
},

10
modules/services/wikipedia.js
View File

@@ -74,14 +74,14 @@ export default {
if (callback) callback(null, result[1] || []);
})
.catch(function(err) {
if (callback) callback(err, []);
if (callback) callback(err.message, []);
});
},
translations: function(lang, title, callback) {
if (!title) {
if (callback) callback({});
if (callback) callback('No Title');
return;
}
@@ -108,11 +108,11 @@ export default {
if (list && list.langlinks) {
list.langlinks.forEach(function(d) { translations[d.lang] = d['*']; });
}
callback(translations);
callback(null, translations);
}
})
.catch(function() {
if (callback) callback({});
.catch(function(err) {
if (callback) callback(err.message);
});
}

5
modules/ui/fields/localized.js
View File

@@ -480,7 +480,10 @@ export function uiFieldLocalized(field, context) {
_wikiTitles = {};
var wm = tags.wikipedia.match(/([^:]+):(.+)/);
if (wm && wm[0] && wm[1]) {
wikipedia.translations(wm[1], wm[2], function(d) { _wikiTitles = d; });
wikipedia.translations(wm[1], wm[2], function(err, d) {
if (err || !d) return;
_wikiTitles = d;
});
}
}