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

Return Promise for Osmose string requests

Browse Source
This commit is contained in:
SilentSpike
2020-02-07 11:21:33 +00:00
parent 7d76e0ac5c
commit 8bb2dc7fa6
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/services/osmose.js
+3 -6
View File
@@ -174,15 +174,14 @@ export default {
return jsonPromise(url, cacheDetails).then(() => issue);
},
loadStrings(callback, locale=currentLocale) {
loadStrings(locale=currentLocale) {
const items = Object.keys(qaServices.osmose.icons);
if (
locale in _cache.strings
&& Object.keys(_cache.strings[locale]).length === items.length
) {
if (callback) callback(null, _cache.strings[locale]);
return;
return Promise.resolve(_cache.strings[locale]);
}
// May be partially populated already if some requests were successful
@@ -243,9 +242,7 @@ export default {
return jsonPromise(url, cacheData);
});
Promise.all(allRequests)
.then(() => { if (callback) callback(null, _cache.strings[locale]); })
.catch(err => { if (callback) callback(err); });
return Promise.all(allRequests).then(() => _cache.strings[locale]);
},
getStrings(itemType, locale=currentLocale) {