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

Use d3_json Promise directly for Osmose requests

Browse Source
This commit is contained in:
SilentSpike
2020-02-07 11:26:02 +00:00
parent 8bb2dc7fa6
commit f8a4a0b3ad
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/services/osmose.js
View File

@@ -171,7 +171,7 @@ export default {
this.replaceItem(issue);
};
return jsonPromise(url, cacheDetails).then(() => issue);
return d3_json(url).then(cacheDetails).then(() => issue);
},
loadStrings(locale=currentLocale) {
@@ -239,7 +239,7 @@ export default {
// Osmose API falls back to English strings where untranslated or if locale doesn't exist
const url = `${_osmoseUrlRoot}/items/${item}/class/${cl}?langs=${locale}`;
return jsonPromise(url, cacheData);
return d3_json(url).then(cacheData);
});
return Promise.all(allRequests).then(() => _cache.strings[locale]);
@@ -324,16 +324,3 @@ export default {
return _cache.closed;
}
};
function jsonPromise(url, then) {
return new Promise((resolve, reject) => {
d3_json(url)
.then(data => {
then(data);
resolve();
})
.catch(err => {
reject(err);
});
});
}