jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352613 )
Change subject: Move linter helper out of DOMUtils into linter.js
......................................................................
Move linter helper out of DOMUtils into linter.js
Change-Id: I18e8a853df46c824219753afeef05ab820f9d7c5
---
M lib/utils/DOMUtils.js
M lib/wt2html/pp/handlers/linter.js
2 files changed, 22 insertions(+), 23 deletions(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/lib/utils/DOMUtils.js b/lib/utils/DOMUtils.js
index a2bebd4..d27777d 100644
--- a/lib/utils/DOMUtils.js
+++ b/lib/utils/DOMUtils.js
@@ -2754,22 +2754,6 @@
}).nodify(cb);
};
-/**
- * @method
- *
- * @param {Object} tplInfo Template info
- * @return {string}
- */
-DOMUtils.findEnclosingTemplateName = function(tplInfo) {
- var dmw = DU.getDataMw(tplInfo.first);
- if (dmw.parts && dmw.parts.length === 1) {
- var p0 = dmw.parts[0];
- return (p0.template || p0.templatearg).target.wt.trim();
- } else {
- return 'Multi-part-template: ' + JSON.stringify(dmw);
- }
-};
-
if (typeof module === "object") {
module.exports.DOMUtils = DOMUtils;
}
diff --git a/lib/wt2html/pp/handlers/linter.js
b/lib/wt2html/pp/handlers/linter.js
index ead9022..2827727 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -82,6 +82,21 @@
return getNextMatchingNode(node.parentNode, match);
};
+/**
+ * @method
+ *
+ * @param {Object} tplInfo Template info
+ * @return {string}
+ */
+function findEnclosingTemplateName(tplInfo) {
+ var dmw = DU.getDataMw(tplInfo.first);
+ if (dmw.parts && dmw.parts.length === 1) {
+ var p0 = dmw.parts[0];
+ return (p0.template || p0.templatearg).target.wt.trim();
+ } else {
+ return 'Multi-part-template: ' + JSON.stringify(dmw);
+ }
+}
/*
* Log Treebuilder fixups marked by dom.markTreeBuilderFixup.js
@@ -106,7 +121,7 @@
if (tplInfo) {
dsr = tplInfo.dsr;
templateInfo = {
- name: DU.findEnclosingTemplateName(tplInfo),
+ name: findEnclosingTemplateName(tplInfo),
};
} else if (dp.tmp.origDSR) {
// During DSR computation, stripped meta tags
@@ -214,7 +229,7 @@
if (wc) {
if (tplInfo) {
dsr =
tplInfo.dsr;
-
templateInfo = { name: DU.findEnclosingTemplateName(tplInfo) };
+
templateInfo = { name: findEnclosingTemplateName(tplInfo) };
} else {
dsr =
dp.dsr;
}
@@ -255,7 +270,7 @@
var templateInfo;
if (tplInfo) {
dsr = tplInfo.dsr;
- templateInfo = { name: DU.findEnclosingTemplateName(tplInfo) };
+ templateInfo = { name: findEnclosingTemplateName(tplInfo) };
} else {
dsr = DU.getDataParsoid(nextSibling).dsr;
}
@@ -283,7 +298,7 @@
if (!(dp.autoInsertedStart && dp.autoInsertedEnd) &&
obsoleteTagsRE.test(c.nodeName)) {
var templateInfo;
if (tplInfo) {
- templateInfo = { name:
DU.findEnclosingTemplateName(tplInfo) };
+ templateInfo = { name:
findEnclosingTemplateName(tplInfo) };
}
var lintObj = {
dsr: tplInfo ? tplInfo.dsr : dp.dsr,
@@ -309,7 +324,7 @@
if (items.length) {
var templateInfo;
if (tplInfo) {
- templateInfo = { name:
DU.findEnclosingTemplateName(tplInfo) };
+ templateInfo = { name:
findEnclosingTemplateName(tplInfo) };
}
env.log('lint/bogus-image-options', {
dsr: tplInfo ? tplInfo.dsr : dp.dsr,
@@ -345,7 +360,7 @@
if (prev && prev.nodeName === 'TABLE' &&
DU.getDataParsoid(prev).autoInsertedEnd) {
var dsr;
if (tplInfo) {
- templateInfo = { name:
DU.findEnclosingTemplateName(tplInfo) };
+ templateInfo = { name:
findEnclosingTemplateName(tplInfo) };
dsr = tplInfo.dsr;
} else {
// Identify the dsr-span of the opening tag
@@ -393,7 +408,7 @@
if (p) {
var dsr, templateInfo;
if (tplInfo) {
- templateInfo = { name:
DU.findEnclosingTemplateName(tplInfo) };
+ templateInfo = { name:
findEnclosingTemplateName(tplInfo) };
dsr = tplInfo.dsr;
} else {
dsr = dp.dsr;
--
To view, visit https://gerrit.wikimedia.org/r/352613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18e8a853df46c824219753afeef05ab820f9d7c5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
