OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix deprecation warning

pull/21833/head
MTRNord 2017-08-13 00:56:37 +00:00
parent 02217c8bd2
commit 4a1ba01f44
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/languageHandler.js
View File

@ -231,35 +231,30 @@ 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) {
deferred.reject({err: err, response: response}); reject({err: err, response: response});
return;
} }
deferred.resolve(JSON.parse(body)); resolve(JSON.parse(body));
} }
); );
return deferred.promise; });
} }
function getLanguage(langPath) { function getLanguage(langPath) {
const deferred = Promise.defer(); return new Promise((resolve, reject) => {
let response_return = {}; let response_return = {};
request( request(
{ method: "GET", url: langPath }, { method: "GET", url: langPath },
(err, response, body) => { (err, response, body) => {
if (err || response.status < 200 || response.status >= 300) { if (err || response.status < 200 || response.status >= 300) {
deferred.reject({err: err, response: response}); reject({err: err, response: response});
return;
} }
resolve(JSON.parse(body));
deferred.resolve(JSON.parse(body));
} }
); );
return deferred.promise; });
} }