Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340273 )
Change subject: Automatically detect whether Linter extension is installed
......................................................................
Automatically detect whether Linter extension is installed
If the Linter extension is installed and shows up via the MediaWiki API,
then run the linter-related code. Sending results to the API and the
rate limit are still global settings for now.
Change-Id: I0c829edb222e14883aa102cf674cbe3459799edb
---
M lib/config/ParsoidConfig.js
M lib/config/WikiConfig.js
M lib/logger/linter.js
M lib/wt2html/DOMPostProcessor.js
4 files changed, 5 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/73/340273/1
diff --git a/lib/config/ParsoidConfig.js b/lib/config/ParsoidConfig.js
index 5b8fe6b..2eadf84 100644
--- a/lib/config/ParsoidConfig.js
+++ b/lib/config/ParsoidConfig.js
@@ -222,12 +222,6 @@
ParsoidConfig.prototype.addHTMLTemplateParameters = false;
/**
- * @property {boolean|Array} linting Whether to enable linter Backend.
- * Or an array of enabled lint types
- */
-ParsoidConfig.prototype.linting = false;
-
-/**
* @property {boolean} linterSendAPI
* Whether to send lint errors to the MW API
* Requires the MW Linter extension to be installed
diff --git a/lib/config/WikiConfig.js b/lib/config/WikiConfig.js
index 2e3e254..2512cc9 100644
--- a/lib/config/WikiConfig.js
+++ b/lib/config/WikiConfig.js
@@ -175,6 +175,9 @@
// See https://www.mediawiki.org/wiki/Manual:$wgInterwikiMagic
this.interwikimagic = general.interwikimagic !== undefined;
+ // Whether the Linter MediaWiki extension is installed
+ this.linterEnabled = general.linter !== undefined;
+
// The interwikiMap maps prefixes to the corresponding information
// gathered from the api query (prefix, language, url, local)
this.interwikiMap = new Map();
diff --git a/lib/logger/linter.js b/lib/logger/linter.js
index 64cc2d3..96c7070 100644
--- a/lib/logger/linter.js
+++ b/lib/logger/linter.js
@@ -17,12 +17,8 @@
var env = this._env;
var enabledBuffer;
try {
- if (env.conf.parsoid.linting === true) {
+ if (env.conf.wiki.linterEnabled === true) {
enabledBuffer = this.buffer; // Everything is enabled
- } else if (Array.isArray(env.conf.parsoid.linting)) {
- enabledBuffer = this.buffer.filter(function(item) {
- return
env.conf.parsoid.linting.indexOf(item.type) !== -1;
- });
} else {
console.assert(false, 'Why are we here? Linting is
disabled.');
}
diff --git a/lib/wt2html/DOMPostProcessor.js b/lib/wt2html/DOMPostProcessor.js
index e796b9e..0d433dc 100644
--- a/lib/wt2html/DOMPostProcessor.js
+++ b/lib/wt2html/DOMPostProcessor.js
@@ -145,7 +145,7 @@
domVisitor.addHandler(null, CleanUp.stripEmptyElements);
addPP('stripEmptyElts', domVisitor.traverse.bind(domVisitor));
- if (env.conf.parsoid.linting) {
+ if (env.conf.wiki.linterEnabled) {
domVisitor = new DOMTraverser(env);
domVisitor.addHandler(null, logWikitextFixup);
addPP('linter', domVisitor.traverse.bind(domVisitor));
--
To view, visit https://gerrit.wikimedia.org/r/340273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c829edb222e14883aa102cf674cbe3459799edb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
