Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/381121 )
Change subject: Utils need s/parsoidConfig/parsoidOptions/ ...................................................................... Utils need s/parsoidConfig/parsoidOptions/ * This should have been part of 976b8950. Change-Id: I9a4d60713ba84ec80f21d0eb83d70b7990870b99 --- M lib/utils/Util.js 1 file changed, 24 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/21/381121/1 diff --git a/lib/utils/Util.js b/lib/utils/Util.js index efba925..72e3508 100644 --- a/lib/utils/Util.js +++ b/lib/utils/Util.js @@ -38,11 +38,11 @@ * * Set debugging flags on an object, based on an options object. * - * @param {Object} parsoidConfig The config to modify. + * @param {Object} parsoidOptions Object to be assigned to the ParsoidConfig. * @param {Object} opts The options object to use for setting the debug flags. * @return {Object} The modified object. */ - setDebuggingFlags: function(parsoidConfig, opts) { + setDebuggingFlags: function(parsoidOptions, opts) { // Handle the --help options var exit = false; if (opts.trace === 'help') { @@ -66,11 +66,11 @@ // Continue to support generic debugging. if (opts.debug === true) { console.warn("Warning: Generic debugging, not handler-specific."); - parsoidConfig.debug = Util.booleanOption(opts.debug); + parsoidOptions.debug = Util.booleanOption(opts.debug); } else { // Setting --debug automatically enables --trace - parsoidConfig.debugFlags = this.splitFlags(opts.debug); - parsoidConfig.traceFlags = parsoidConfig.debugFlags; + parsoidOptions.debugFlags = this.splitFlags(opts.debug); + parsoidOptions.traceFlags = parsoidOptions.debugFlags; } } @@ -80,7 +80,7 @@ } else { // Add any new trace flags to the list of existing trace flags (if // any were inherited from debug); otherwise, create a new list. - parsoidConfig.traceFlags = (parsoidConfig.traceFlags || []).concat(this.splitFlags(opts.trace)); + parsoidOptions.traceFlags = (parsoidOptions.traceFlags || []).concat(this.splitFlags(opts.trace)); } } @@ -88,11 +88,11 @@ if (opts.dump === true) { console.warn("Warning: Generic dumping not enabled. Please set a flag."); } else { - parsoidConfig.dumpFlags = this.splitFlags(opts.dump); + parsoidOptions.dumpFlags = this.splitFlags(opts.dump); } } - return parsoidConfig; + return parsoidOptions; }, @@ -205,11 +205,11 @@ * Sets templating and processing flags on an object, * based on an options object. * - * @param {Object} parsoidConfig The config to modify. + * @param {Object} parsoidOptions Object to be assigned to the ParsoidConfig. * @param {Object} opts The options object to use for setting the debug flags. * @return {Object} The modified object. */ - setTemplatingAndProcessingFlags: function(parsoidConfig, opts) { + setTemplatingAndProcessingFlags: function(parsoidOptions, opts) { [ 'fetchConfig', 'fetchTemplates', @@ -219,38 +219,38 @@ 'addHTMLTemplateParameters', ].forEach(function(c) { if (opts[c] !== undefined) { - parsoidConfig[c] = Util.booleanOption(opts[c]); + parsoidOptions[c] = Util.booleanOption(opts[c]); } }); if (opts.usePHPPreProcessor !== undefined) { - parsoidConfig.usePHPPreProcessor = parsoidConfig.fetchTemplates && + parsoidOptions.usePHPPreProcessor = parsoidOptions.fetchTemplates && Util.booleanOption(opts.usePHPPreProcessor); } if (opts.maxDepth !== undefined) { - parsoidConfig.maxDepth = typeof (opts.maxdepth) === 'number' ? - opts.maxdepth : parsoidConfig.maxDepth; + parsoidOptions.maxDepth = typeof (opts.maxdepth) === 'number' ? + opts.maxdepth : parsoidOptions.maxDepth; } if (opts.apiURL) { - if (!Array.isArray(parsoidConfig.mwApi)) { - parsoidConfig.mwApi = []; + if (!Array.isArray(parsoidOptions.mwApi)) { + parsoidOptions.mwApi = []; } - parsoidConfig.mwApi.push({ prefix: 'customwiki', uri: opts.apiURL }); + parsoidOptions.mwApi.push({ prefix: 'customwiki', uri: opts.apiURL }); } if (opts.addHTMLTemplateParameters !== undefined) { - parsoidConfig.addHTMLTemplateParameters = + parsoidOptions.addHTMLTemplateParameters = Util.booleanOption(opts.addHTMLTemplateParameters); } if (opts.lint) { - parsoidConfig.linting = true; - if (!parsoidConfig.linter) { - parsoidConfig.linter = {}; + parsoidOptions.linting = true; + if (!parsoidOptions.linter) { + parsoidOptions.linter = {}; } - parsoidConfig.linter.sendAPI = false; + parsoidOptions.linter.sendAPI = false; } if (opts.useBatchAPI !== null) { - parsoidConfig.useBatchAPI = Util.booleanOption(opts.useBatchAPI); + parsoidOptions.useBatchAPI = Util.booleanOption(opts.useBatchAPI); } - return parsoidConfig; + return parsoidOptions; }, /** -- To view, visit https://gerrit.wikimedia.org/r/381121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a4d60713ba84ec80f21d0eb83d70b7990870b99 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