From b99be671693d411fe9742e414691aa874eeff177 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 25 Apr 2019 21:58:36 -0400 Subject: [PATCH] When calling an errback from a Promise.catch, pass err.message --- modules/core/context.js | 2 +- modules/renderer/background_source.js | 6 +++--- modules/services/improveOSM.js | 4 ++-- modules/services/keepRight.js | 2 +- modules/services/nominatim.js | 4 ++-- modules/services/osm.js | 4 ++-- modules/services/osm_wikibase.js | 2 +- modules/services/taginfo.js | 2 +- modules/services/wikidata.js | 6 +++--- modules/services/wikipedia.js | 10 +++++----- modules/ui/fields/localized.js | 5 ++++- 11 files changed, 25 insertions(+), 22 deletions(-) diff --git a/modules/core/context.js b/modules/core/context.js index 9022c6351..4a6da757e 100644 --- a/modules/core/context.js +++ b/modules/core/context.js @@ -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) { diff --git a/modules/renderer/background_source.js b/modules/renderer/background_source.js index affbb6c37..883cc76dc 100644 --- a/modules/renderer/background_source.js +++ b/modules/renderer/background_source.js @@ -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); }); } diff --git a/modules/services/improveOSM.js b/modules/services/improveOSM.js index 26cc86a55..50ae62a19 100644 --- a/modules/services/improveOSM.js +++ b/modules/services/improveOSM.js @@ -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); }); } }, diff --git a/modules/services/keepRight.js b/modules/services/keepRight.js index 9c297d7b3..afe644de8 100644 --- a/modules/services/keepRight.js +++ b/modules/services/keepRight.js @@ -455,7 +455,7 @@ export default { }) .catch(function(err) { delete _krCache.inflightPost[d.id]; - if (callback) callback(err); + if (callback) callback(err.message); }); }, diff --git a/modules/services/nominatim.js b/modules/services/nominatim.js index 5d98c9176..053a8ba70 100644 --- a/modules/services/nominatim.js +++ b/modules/services/nominatim.js @@ -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); }); } diff --git a/modules/services/osm.js b/modules/services/osm.js index 0c8c7c5a1..ecef84dc1 100644 --- a/modules/services/osm.js +++ b/modules/services/osm.js @@ -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); } diff --git a/modules/services/osm_wikibase.js b/modules/services/osm_wikibase.js index edcc91df8..47254c2c0 100644 --- a/modules/services/osm_wikibase.js +++ b/modules/services/osm_wikibase.js @@ -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); }); } diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js index a28c405c2..099b864a7 100644 --- a/modules/services/taginfo.js +++ b/modules/services/taginfo.js @@ -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); }); } diff --git a/modules/services/wikidata.js b/modules/services/wikidata.js index 81299a628..e23f2edaf 100644 --- a/modules/services/wikidata.js +++ b/modules/services/wikidata.js @@ -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, {}); }); }, diff --git a/modules/services/wikipedia.js b/modules/services/wikipedia.js index aa33052a8..c373ef922 100644 --- a/modules/services/wikipedia.js +++ b/modules/services/wikipedia.js @@ -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); }); } diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js index 14b2868ea..2d8faa8c1 100644 --- a/modules/ui/fields/localized.js +++ b/modules/ui/fields/localized.js @@ -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; + }); } }