matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge pull request #1292 from MTRNord/promiseDeprecationWarnings

Browse Source 
Fix deprecation warning about promise.defer()
This commit is contained in:
Luke Barnard
2017-08-24 16:20:48 +01:00
committed by GitHub
parent 5cfec247f0 d34ba57adb
commit 006919cb44
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/languageHandler.js
View File

@@ -231,35 +231,31 @@ export function getCurrentLanguage() {
} }
function getLangsJson() { function getLangsJson() {
const deferred = Promise.defer(); return new Promise((resolve, reject) => {
request(
request( { method: "GET", url: i18nFolder + 'languages.json' },
{ method: "GET", url: i18nFolder + 'languages.json' }, (err, response, body) => {
(err, response, body) => { if (err || response.status < 200 || response.status >= 300) {
if (err || response.status < 200 || response.status >= 300) { reject({err: err, response: response});
deferred.reject({err: err, response: response}); return;
return; }
resolve(JSON.parse(body));
} }
deferred.resolve(JSON.parse(body)); );
} });
);
return deferred.promise;
} }
function getLanguage(langPath) { function getLanguage(langPath) {
const deferred = Promise.defer(); return new Promise((resolve, reject) => {
request(
let response_return = {}; { method: "GET", url: langPath },
request( (err, response, body) => {
{ method: "GET", url: langPath }, if (err || response.status < 200 || response.status >= 300) {
(err, response, body) => { reject({err: err, response: response});
if (err || response.status < 200 || response.status >= 300) { return;
deferred.reject({err: err, response: response}); }
return; resolve(JSON.parse(body));
} }
);
deferred.resolve(JSON.parse(body)); });
}
);
return deferred.promise;
} }