jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334710 )
Change subject: Bump to domino@1.0.28
......................................................................
Bump to domino@1.0.28
* And remove some old workarounds.
Change-Id: I9acfac8454ed381fd2459889a47d89761d2dcafc
---
M lib/html2wt/LinkHandler.js
M lib/utils/DOMUtils.js
M npm-shrinkwrap.json
M package.json
4 files changed, 5 insertions(+), 21 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index 5551051..b0ebec8 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -862,9 +862,6 @@
var extra = []; // 'extra' classes
var val;
- // work around a bug in domino <= 1.0.13
- if (!outerElt.hasAttribute('class')) { classes = []; }
-
for (var ix = 0; ix < classes.length; ix++) {
switch (classes[ix]) {
case 'mw-halign-none':
diff --git a/lib/utils/DOMUtils.js b/lib/utils/DOMUtils.js
index 8309fc3..4ea1322 100644
--- a/lib/utils/DOMUtils.js
+++ b/lib/utils/DOMUtils.js
@@ -1470,26 +1470,13 @@
* If 'beforeNode' is null, the nodes are appended at the end.
*/
migrateChildrenBetweenDocs: function(from, to, beforeNode) {
- // FIXME: For some reason, the 'deep' equivalent of this
function
- // is optional and domino does not support it.
- function importNode(destDoc, n) {
- var newN = destDoc.importNode(n);
- n = n.firstChild;
- while (n) {
- newN.appendChild(importNode(destDoc, n));
- n = n.nextSibling;
- }
- return newN;
- }
-
if (beforeNode === undefined) {
beforeNode = null;
}
-
var n = from.firstChild;
var destDoc = to.ownerDocument;
while (n) {
- to.insertBefore(importNode(destDoc, n), beforeNode);
+ to.insertBefore(destDoc.importNode(n, true),
beforeNode);
n = n.nextSibling;
}
},
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 5f4b985..7aaee6b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -548,9 +548,9 @@
"dev": true
},
"domino": {
- "version": "1.0.27",
- "from": "domino@>=1.0.27 <2.0.0",
- "resolved": "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz";
+ "version": "1.0.28",
+ "from": "domino@1.0.28",
+ "resolved": "https://registry.npmjs.org/domino/-/domino-1.0.28.tgz";
},
"domutils": {
"version": "1.5.1",
diff --git a/package.json b/package.json
index 8f84424..1567d4f 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"content-type": "git+https://github.com/wikimedia/content-type#master";,
"core-js": "^2.4.1",
"diff": "^1.0.7",
- "domino": "^1.0.27",
+ "domino": "^1.0.28",
"entities": "^1.1.1",
"express": "^4.14.0",
"express-handlebars": "^3.0.0",
--
To view, visit https://gerrit.wikimedia.org/r/334710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9acfac8454ed381fd2459889a47d89761d2dcafc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: C. Scott Ananian <canan...@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
