jenkins-bot has submitted this change and it was merged.
Change subject: Fix crasher introduced by cee6e738
......................................................................
Fix crasher introduced by cee6e738
The following page now parses without crashing:
en:Philippine_House_of_Representatives_elections_in_the_Zamboanga_Peninsula,_2013
Change-Id: Ieb530456ca87fdecce8a5f1f2dbf6be83528cd67
---
M js/lib/dom.t.TDFixups.js
M js/lib/mediawiki.DOMPostProcessor.js
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/dom.t.TDFixups.js b/js/lib/dom.t.TDFixups.js
index 5a09b44..1555094 100644
--- a/js/lib/dom.t.TDFixups.js
+++ b/js/lib/dom.t.TDFixups.js
@@ -35,6 +35,7 @@
// XXX: use data.mw for data-mw as well!
var dataMW = DU.getJSONAttribute(nextNode, 'data-mw'),
nodeSrc = DU.getWTSource(env, node);
+
if (!dataMW.parts) {
dataMW.parts = [
nodeSrc,
@@ -52,7 +53,7 @@
dataMW.target = undefined;
dataMW.params = undefined;
} else {
- dataMW.unshift(nodeSrc);
+ dataMW.parts.unshift(nodeSrc);
}
DU.setJSONAttribute(nextNode, 'data-mw', dataMW);
diff --git a/js/lib/mediawiki.DOMPostProcessor.js
b/js/lib/mediawiki.DOMPostProcessor.js
index f3c2ab1..6e50d62 100644
--- a/js/lib/mediawiki.DOMPostProcessor.js
+++ b/js/lib/mediawiki.DOMPostProcessor.js
@@ -20,10 +20,10 @@
markTreeBuilderFixups =
require('./dom.markTreeBuilderFixups.js').markTreeBuilderFixups,
migrateStartMetas =
require('./dom.migrateStartMetas.js').migrateStartMetas,
migrateTrailingNLs =
require('./dom.migrateTrailingNLs.js').migrateTrailingNLs,
+ stripDoubleTDs = require('./dom.t.TDFixups.js').stripDoubleTDs,
stripMarkerMetas = CleanUp.stripMarkerMetas,
unpackDOMFragments =
require('./dom.t.unpackDOMFragments.js').unpackDOMFragments,
- wrapTemplates = require('./dom.wrapTemplates.js').wrapTemplates,
- TDFixups = require('./dom.t.TDFixups.js');
+ wrapTemplates = require('./dom.wrapTemplates.js').wrapTemplates;
// map from mediawiki metadata names to RDFa property names
var metadataMap = {
@@ -143,7 +143,7 @@
var domVisitor2 = new DOMTraverser();
domVisitor2.addHandler( 'meta', stripMarkerMetas.bind(null,
env.conf.parsoid.editMode) );
domVisitor2.addHandler( 'li', handleLIHack.bind( null, env ) );
- domVisitor2.addHandler( 'td', TDFixups.stripDoubleTDs.bind( null, env )
);
+ domVisitor2.addHandler( 'td', stripDoubleTDs.bind( null, env ) );
domVisitor2.addHandler( null, cleanupAndSaveDataParsoid );
this.processors.push(domVisitor2.traverse.bind(domVisitor2));
}
--
To view, visit https://gerrit.wikimedia.org/r/79471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb530456ca87fdecce8a5f1f2dbf6be83528cd67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
