jenkins-bot has submitted this change and it was merged.
Change subject: Document the inTemplate pipeline option as separate from
wrapTemplates
......................................................................
Document the inTemplate pipeline option as separate from wrapTemplates
Also remove unnecessary require('entities') from TemplateHandler.
Change-Id: I09ec875a4fe402b4cb791f481fcde3798e04ba94
---
M lib/ext.core.TemplateHandler.js
M lib/mediawiki.parser.js
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ext.core.TemplateHandler.js b/lib/ext.core.TemplateHandler.js
index c080369..8348a44 100644
--- a/lib/ext.core.TemplateHandler.js
+++ b/lib/ext.core.TemplateHandler.js
@@ -20,7 +20,6 @@
PreprocessorRequest = api.PreprocessorRequest,
Util = require('./mediawiki.Util.js').Util,
DU = require('./mediawiki.DOMUtils.js').DOMUtils,
- entities = require('entities'),
async = require('async'),
// define some constructor shortcuts
KV = defines.KV,
diff --git a/lib/mediawiki.parser.js b/lib/mediawiki.parser.js
index 917639f..1b96d4a 100644
--- a/lib/mediawiki.parser.js
+++ b/lib/mediawiki.parser.js
@@ -306,8 +306,10 @@
* Supported options:
*
* wrapTemplates : if true, templates found in content will be encapsulated
- * inTemplate : if true, indicates pipeline is processing content of a
template
- * (in current usage, wrapTemplates === !inTemplate)
+ * with data (target, arguments, etc.) and its contents
+ * expanded
+ * inTemplate : if true, indicates pipeline is processing the expanded
+ * content of a template or its arguments
* isInclude : if true, indicates that we are in a <includeonly> context
* (in current usage, isInclude === inTemplate)
* extTag : the extension tag that is being processed (Ex: ref,
references)
--
To view, visit https://gerrit.wikimedia.org/r/135042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09ec875a4fe402b4cb791f481fcde3798e04ba94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Marcoil <marc...@wikimedia.org>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
