jenkins-bot has submitted this change and it was merged.
Change subject: Promisify Util.processTokensToDOM.
......................................................................
Promisify Util.processTokensToDOM.
Change-Id: I7095f37eab57a20a6ce49e4a2b3be84fd6593864
---
M lib/ext.core.LinkHandler.js
M lib/mediawiki.Util.js
2 files changed, 13 insertions(+), 8 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ext.core.LinkHandler.js b/lib/ext.core.LinkHandler.js
index 9514889..03b4464 100644
--- a/lib/ext.core.LinkHandler.js
+++ b/lib/ext.core.LinkHandler.js
@@ -478,7 +478,7 @@
this.manager.frame,
content,
null /* default options */,
- function(dom) {
+ function(_, dom) {
var sortKeyInfo = [ {"txt": "mw:sortKey"},
{"html": dom.body.innerHTML} ],
dataMW = newTk.getAttribute("data-mw");
if (dataMW) {
diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js
index e4a71cb..51fc20c 100644
--- a/lib/mediawiki.Util.js
+++ b/lib/mediawiki.Util.js
@@ -10,7 +10,8 @@
request = require( 'request' ),
entities = require( 'entities' ),
TemplateRequest = require( './mediawiki.ApiRequest.js'
).TemplateRequest,
- Consts = require('./mediawiki.wikitext.constants.js').WikitextConstants;
+ Consts = require('./mediawiki.wikitext.constants.js').WikitextConstants,
+ JSUtils = require('./jsutils.js').JSUtils;
// This is a circular dependency. Don't use anything from defines at module
@@ -1141,9 +1142,11 @@
* The callback to pass back the DOM to.
*/
processTokensToDOM: function(env, frame, tokens, opts, cb) {
+ cb = JSUtils.mkPromised(cb);
if (!Array.isArray(tokens)) {
- cb(tokens);
- return;
+ // XXX: is this code path used any more? [CSA]
+ cb(null, tokens);
+ return cb.promise;
}
var pipelineOpts = opts && opts.pipelineOpts;
if (!pipelineOpts) {
@@ -1161,9 +1164,11 @@
pipelineType: "tokens/x-mediawiki/expanded",
pipelineOpts: pipelineOpts,
srcOffsets: opts ? opts.srcOffsets : undefined,
- documentCB: cb
+ // processContentInPipeline has no error
callback :(
+ documentCB: function(dom) { cb(null, dom); }
}
);
+ return cb.promise;
},
/**
@@ -1199,9 +1204,9 @@
frame,
v.html,
null /* default options */,
- function(dom) {
- v.html =
dom.body.innerHTML;
- cb(null, v);
+ function(err, dom) {
+ if (!err) { v.html =
dom.body.innerHTML; }
+ cb(err, v);
}
);
} else {
--
To view, visit https://gerrit.wikimedia.org/r/186405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7095f37eab57a20a6ce49e4a2b3be84fd6593864
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
