jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386419 )
Change subject: ce.ContentBranchNode: Move setNotUnicorning into detach
......................................................................
ce.ContentBranchNode: Move setNotUnicorning into detach
We can be more confident that the root will exist during detach, and it's also
reasonable to de-unicorn any node which is detached even if it's not
immediately destroyed.
Change-Id: I6ab27fe19fceddb7284e22b6f763cb272fdb8946
---
M src/ce/ve.ce.ContentBranchNode.js
1 file changed, 9 insertions(+), 8 deletions(-)
Approvals:
Divec: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/ve.ce.ContentBranchNode.js
b/src/ce/ve.ce.ContentBranchNode.js
index cd3a292..821c4dd 100644
--- a/src/ce/ve.ce.ContentBranchNode.js
+++ b/src/ce/ve.ce.ContentBranchNode.js
@@ -475,17 +475,18 @@
};
/**
- * Handle teardown event.
- *
- * @method
+ * @inheritdoc
*/
-ve.ce.ContentBranchNode.prototype.onTeardown = function () {
- var ceSurface = this.getRoot().getSurface();
+ve.ce.ContentBranchNode.prototype.detach = function () {
+ if ( this.getRoot() ) {
+ // This should be true, as the root is removed in the parent
detach
+ // method which hasn't run yet. However, just in case a node
gets
+ // double-detached...
+ this.getRoot().getSurface().setNotUnicorning( this );
+ }
// Parent method
- ve.ce.ContentBranchNode.super.prototype.onTeardown.call( this );
-
- ceSurface.setNotUnicorning( this );
+ ve.ce.ContentBranchNode.super.prototype.detach.call( this );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/386419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ab27fe19fceddb7284e22b6f763cb272fdb8946
Gerrit-PatchSet: 5
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch <dly...@wikimedia.org>
Gerrit-Reviewer: DLynch <dly...@wikimedia.org>
Gerrit-Reviewer: Divec <da...@troi.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
