jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349226 )
Change subject: Only remove from internal list if unroot from correct document
......................................................................
Only remove from internal list if unroot from correct document
Bug: T163267
Change-Id: I11ff56fbd437e46aab516a50235f8077eea0af5b
---
M modules/ve-cite/tests/ve.ui.MWWikitextStringTransferHandler.test.js
M modules/ve-cite/ve.dm.MWReferenceNode.js
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
DLynch: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git
a/modules/ve-cite/tests/ve.ui.MWWikitextStringTransferHandler.test.js
b/modules/ve-cite/tests/ve.ui.MWWikitextStringTransferHandler.test.js
index 329fddf..7c9430b 100644
--- a/modules/ve-cite/tests/ve.ui.MWWikitextStringTransferHandler.test.js
+++ b/modules/ve-cite/tests/ve.ui.MWWikitextStringTransferHandler.test.js
@@ -29,7 +29,6 @@
'</ol>',
annotations: [],
expectedData: [
- { type: 'paragraph' },
{
type: 'mwReference',
attributes: {
@@ -50,7 +49,6 @@
}
},
{ type: '/mwReference' },
- { type: '/paragraph' },
{ type: 'internalList' },
{ type: 'internalItem' },
{ type: 'paragraph', internal: {
generated: 'wrapper' } },
diff --git a/modules/ve-cite/ve.dm.MWReferenceNode.js
b/modules/ve-cite/ve.dm.MWReferenceNode.js
index 4da71c9..172573b 100644
--- a/modules/ve-cite/ve.dm.MWReferenceNode.js
+++ b/modules/ve-cite/ve.dm.MWReferenceNode.js
@@ -365,9 +365,13 @@
/**
* Handle the node being detached from the root
+ *
+ * @param {ve.dm.DocumentNode} oldRoot Old document root
*/
-ve.dm.MWReferenceNode.prototype.onUnroot = function () {
- this.removeFromInternalList();
+ve.dm.MWReferenceNode.prototype.onUnroot = function ( oldRoot ) {
+ if ( this.getDocument().getDocumentNode() === oldRoot ) {
+ this.removeFromInternalList();
+ }
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/349226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I11ff56fbd437e46aab516a50235f8077eea0af5b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: DLynch <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
