jenkins-bot has submitted this change and it was merged.
Change subject: ve.ui.Toolbar: Do not remove window event listeners in #setup
......................................................................
ve.ui.Toolbar: Do not remove window event listeners in #setup
Added in "cf1e1678 Multiple surface support and demo". The
events are added in #initialize, so they should be removed
in #destroy.
The life cycle is (#initialize → (#setup → #detach) → #destroy),
where parts between parentheses can be repeated any number of
times. The methods could have been named better.
Change-Id: Ib9471bc01132e738c661acc1baf06003e81f69d8
---
M src/ui/ve.ui.Toolbar.js
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ui/ve.ui.Toolbar.js b/src/ui/ve.ui.Toolbar.js
index 28986d4..c10c69e 100644
--- a/src/ui/ve.ui.Toolbar.js
+++ b/src/ui/ve.ui.Toolbar.js
@@ -280,9 +280,6 @@
this.unfloat();
// Events
- if ( this.$window ) {
- this.$window.off( this.windowEvents );
- }
if ( this.getSurface() ) {
this.getSurface().getModel().disconnect( this );
this.getSurface().getToolbarDialogs().disconnect( this );
@@ -300,6 +297,11 @@
// Parent method
OO.ui.Toolbar.prototype.destroy.call( this );
+ // Events
+ if ( this.$window ) {
+ this.$window.off( this.windowEvents );
+ }
+
// Detach surface last, because tool destructors need getSurface()
this.detach();
};
--
To view, visit https://gerrit.wikimedia.org/r/195046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9471bc01132e738c661acc1baf06003e81f69d8
Gerrit-PatchSet: 5
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
