jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/366021 )

Change subject: Unset surface active node if destroyed
......................................................................


Unset surface active node if destroyed

Change-Id: I6967c9c2b99449e1a4ac003db8213586eda7fbbd
---
M src/ce/nodes/ve.ce.ActiveNode.js
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  DLynch: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ce/nodes/ve.ce.ActiveNode.js b/src/ce/nodes/ve.ce.ActiveNode.js
index 1041aae..56d7b50 100644
--- a/src/ce/nodes/ve.ce.ActiveNode.js
+++ b/src/ce/nodes/ve.ce.ActiveNode.js
@@ -59,8 +59,14 @@
  * Handle node teardown
  */
 ve.ce.ActiveNode.prototype.onActiveNodeTeardown = function () {
+       var surface = this.activeNodeSurface;
+
        // Events
-       this.activeNodeSurface.getModel().disconnect( this );
+       surface.getModel().disconnect( this );
+
+       if ( surface.getActiveNode() === this ) {
+               surface.setActiveNode( null );
+       }
 
        this.isActiveNodeSetup = false;
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/366021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6967c9c2b99449e1a4ac003db8213586eda7fbbd
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: DLynch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to