[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T163549: Only lint pages that have wikitext contentmodel

2017-05-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352634 )

Change subject: T163549: Only lint pages that have wikitext contentmodel
..


T163549: Only lint pages that have wikitext contentmodel

Change-Id: I540429cd110e69c4cbf451b918c1f64931caa213
---
M lib/logger/LintLogger.js
M lib/wt2html/pp/handlers/linter.js
2 files changed, 12 insertions(+), 0 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/logger/LintLogger.js b/lib/logger/LintLogger.js
index dc59775..158653d 100644
--- a/lib/logger/LintLogger.js
+++ b/lib/logger/LintLogger.js
@@ -33,6 +33,12 @@
return;
}
 
+   // Skip linting if we know we aren't working with wikitext
+   if (env.page.meta.revision.contentmodel &&
+   env.page.meta.revision.contentmodel !== 'wikitext') {
+   return;
+   }
+
if (!env.conf.parsoid.linterSendAPI) {
enabledBuffer.forEach(function(item) {
// Call this async, since recursive sync calls 
to the logger
diff --git a/lib/wt2html/pp/handlers/linter.js 
b/lib/wt2html/pp/handlers/linter.js
index 2827727..8536ede 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -431,6 +431,12 @@
return true;
}
 
+   // Skip linting if we know we aren't working with wikitext
+   if (env.page.meta.revision.contentmodel &&
+   env.page.meta.revision.contentmodel !== 'wikitext') {
+   return true;
+   }
+
var dp = DU.getDataParsoid(node);
 
if (tplInfo && tplInfo.first === node) {

-- 
To view, visit https://gerrit.wikimedia.org/r/352634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I540429cd110e69c4cbf451b918c1f64931caa213
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T163549: Only lint pages that have wikitext contentmodel

2017-05-08 Thread Arlolra (Code Review) 
Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352634 )

Change subject: T163549: Only lint pages that have wikitext contentmodel
..

T163549: Only lint pages that have wikitext contentmodel

Change-Id: I540429cd110e69c4cbf451b918c1f64931caa213
---
M lib/logger/LintLogger.js
M lib/wt2html/pp/handlers/linter.js
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/34/352634/1

diff --git a/lib/logger/LintLogger.js b/lib/logger/LintLogger.js
index dc59775..158653d 100644
--- a/lib/logger/LintLogger.js
+++ b/lib/logger/LintLogger.js
@@ -33,6 +33,12 @@
return;
}
 
+   // Skip linting if we know we aren't working with wikitext
+   if (env.page.meta.revision.contentmodel &&
+   env.page.meta.revision.contentmodel !== 'wikitext') {
+   return;
+   }
+
if (!env.conf.parsoid.linterSendAPI) {
enabledBuffer.forEach(function(item) {
// Call this async, since recursive sync calls 
to the logger
diff --git a/lib/wt2html/pp/handlers/linter.js 
b/lib/wt2html/pp/handlers/linter.js
index 2827727..8536ede 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -431,6 +431,12 @@
return true;
}
 
+   // Skip linting if we know we aren't working with wikitext
+   if (env.page.meta.revision.contentmodel &&
+   env.page.meta.revision.contentmodel !== 'wikitext') {
+   return true;
+   }
+
var dp = DU.getDataParsoid(node);
 
if (tplInfo && tplInfo.first === node) {

-- 
To view, visit https://gerrit.wikimedia.org/r/352634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I540429cd110e69c4cbf451b918c1f64931caa213
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits