Marcoil has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133250
Change subject: Move data-mw-arginfo to dataAttribs
......................................................................
Move data-mw-arginfo to dataAttribs
Change-Id: I1f26222a933341b2746008a8f1f23282c478cb7d
---
M lib/dom.wrapTemplates.js
M lib/ext.core.TemplateHandler.js
2 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/50/133250/1
diff --git a/lib/dom.wrapTemplates.js b/lib/dom.wrapTemplates.js
index 52bd25e..d92a255 100644
--- a/lib/dom.wrapTemplates.js
+++ b/lib/dom.wrapTemplates.js
@@ -455,10 +455,9 @@
r = tplRanges[i];
// Extract argInfo and clear it
- var argInfo = r.startElem.getAttribute("data-mw-arginfo");
+ var argInfo = DU.getDataParsoid(r.startElem)['data-mw-arginfo'];
if (argInfo) {
argInfo = JSON.parse(argInfo);
- r.startElem.removeAttribute("data-mw-arginfo");
}
env.log("trace/tplwrap/merge", function() {
diff --git a/lib/ext.core.TemplateHandler.js b/lib/ext.core.TemplateHandler.js
index e98481e..07fddbb 100644
--- a/lib/ext.core.TemplateHandler.js
+++ b/lib/ext.core.TemplateHandler.js
@@ -797,7 +797,7 @@
async.each(params, getParamHTML.bind(this),
function (err) {
// Use a data-attribute to prevent the
sanitizer from stripping this
// attribute before it reaches the DOM
pass where it is needed.
- chunk[0].attribs.push(new
KV("data-mw-arginfo", JSON.stringify(argInfo)));
+ chunk[0].dataAttribs['data-mw-arginfo']
= JSON.stringify(argInfo);
env.dp(
'TemplateHandler._encapsulateTemplate', chunk );
cb({tokens: chunk});
}.bind(this));
@@ -805,11 +805,11 @@
cb({tokens: [], async: true});
return;
} else {
- chunk[0].attribs.push(new KV("data-mw-arginfo",
JSON.stringify(argInfo)));
+ chunk[0].dataAttribs['data-mw-arginfo'] =
JSON.stringify(argInfo);
}
} else {
// Don't add the HTML template parameters, just use
their wikitext
- chunk[0].attribs.push(new KV("data-mw-arginfo",
JSON.stringify(argInfo)));
+ chunk[0].dataAttribs['data-mw-arginfo'] =
JSON.stringify(argInfo);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/133250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f26222a933341b2746008a8f1f23282c478cb7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: dom_tpl_params_4
Gerrit-Owner: Marcoil <marc...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
