Arlolra has uploaded a new change for review. https://gerrit.wikimedia.org/r/206475
Change subject: Readability cleanup ...................................................................... Readability cleanup * Suggested while debugging. Change-Id: I2794fe6941ff8be899c732d11d6ee9724270ef36 --- M lib/mediawiki.parser.environment.js 1 file changed, 14 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/75/206475/1 diff --git a/lib/mediawiki.parser.environment.js b/lib/mediawiki.parser.environment.js index 274f71e..c0b4a34 100644 --- a/lib/mediawiki.parser.environment.js +++ b/lib/mediawiki.parser.environment.js @@ -277,11 +277,11 @@ var env = this; var nothingToDo = {}; // unique marker value var parsoid = env.conf.parsoid; - return new Promise(function(resolve, reject) { - if (!prefix) { - return reject(new Error('Wiki prefix not provided')); - } + var getConfigPromise; + if (!prefix) { + getConfigPromise = Promise.reject(new Error('Wiki prefix not provided')); + } else { var uri = parsoid.interwikiMap.get(prefix); if (!uri) { // SSS: Ugh! Looks like parser tests use a prefix @@ -298,23 +298,25 @@ if (env.confCache[prefix]) { env.conf.wiki = env.confCache[prefix]; - return resolve(nothingToDo); + getConfigPromise = Promise.resolve(nothingToDo); } else if (parsoid.fetchConfig) { - ConfigRequest - .promise(uri, env, env.getAPIProxy(prefix)) - .then(resolve, reject); + getConfigPromise = ConfigRequest + .promise(uri, env, env.getAPIProxy(prefix)); } else { // Load the config from cached config on disk var localConfigFile = './baseconfig/' + prefix + '.json'; var localConfig = require(localConfigFile); if (localConfig && localConfig.query) { - return resolve(localConfig.query); + getConfigPromise = Promise.resolve(localConfig.query); } else { - return reject(new Error('Could not read valid config from' + - ' file: ' + localConfigFile)); + getConfigPromise = Promise.reject( + new Error('Could not read valid config from file: ' + + localConfigFile)); } } - }).then(function(resultConf) { + } + + getConfigPromise.then(function(resultConf) { if (resultConf === nothingToDo) { return; } env.conf.wiki = new WikiConfig(env, resultConf, prefix, parsoid.apiURI, env.getAPIProxy(prefix)); -- To view, visit https://gerrit.wikimedia.org/r/206475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2794fe6941ff8be899c732d11d6ee9724270ef36 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra <abrea...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits