Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59671
Change subject: Bugfix to SelectiveSerializer.
......................................................................
Bugfix to SelectiveSerializer.
Commit 6d704298f8953950beb3c0aee81e3e9803e36149 introduced a few bugs
because I didn't realize that the callbacks took two parameters; the
first was supposed to be an 'error' object. (I also missed a 'this.'
in one instance.) Squash the bugs.
Change-Id: I45f9874d2000e8d8bc5c64cec08e9fbd90e77668
---
M js/lib/ext.core.TemplateHandler.js
M js/lib/mediawiki.SelectiveSerializer.js
M js/lib/mediawiki.Util.js
3 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/71/59671/1
diff --git a/js/lib/ext.core.TemplateHandler.js
b/js/lib/ext.core.TemplateHandler.js
index 56f273f..31156f2 100644
--- a/js/lib/ext.core.TemplateHandler.js
+++ b/js/lib/ext.core.TemplateHandler.js
@@ -557,8 +557,8 @@
//} else {
// append request, process in document order
- env.requestQueue[title].listeners( 'src' ).push( function(page)
{
- cb(page.revision['*']);
+ env.requestQueue[title].listeners( 'src' ).push( function(err,
page) {
+ cb(err, page ? page.revision['*'] : null);
});
//}
diff --git a/js/lib/mediawiki.SelectiveSerializer.js
b/js/lib/mediawiki.SelectiveSerializer.js
index c5e8553..18e19e2 100644
--- a/js/lib/mediawiki.SelectiveSerializer.js
+++ b/js/lib/mediawiki.SelectiveSerializer.js
@@ -155,7 +155,7 @@
//console.log(body.outerHTML);
self.doSerializeDOM(null, doc, cb, finalcb);
} );
- parserPipeline.process(env.page.src);
+ parserPipeline.process(this.env.page.src);
};
diff --git a/js/lib/mediawiki.Util.js b/js/lib/mediawiki.Util.js
index 5dc1fe5..f401304 100644
--- a/js/lib/mediawiki.Util.js
+++ b/js/lib/mediawiki.Util.js
@@ -1268,7 +1268,9 @@
Util.getPageSrc = function ( env, title, cb, oldid ) {
title = env.resolveTitle( title, '' );
var pageRequest = new TemplateRequest( env, title, oldid );
- pageRequest.once( 'src', function(page) { cb(page.revision['*']); });
+ pageRequest.once( 'src', function(err, page) {
+ cb(err, page ? page.revision['*'] : null);
+ });
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/59671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45f9874d2000e8d8bc5c64cec08e9fbd90e77668
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
