jenkins-bot has submitted this change and it was merged.
Change subject: Do not call Toolbar#initialize twice during editor setup
......................................................................
Do not call Toolbar#initialize twice during editor setup
Depends on Ib9471bc0 in VisualEditor core. Without that patch
this is actually necessary, because we were removing some event
handlers in the meantime.
Change-Id: I145f1891efd1c91eeb6154e11e96e3fc160e2be3
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 12 insertions(+), 12 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 0ff758e..7679519 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -199,19 +199,19 @@
target.toolbarSetupDeferred.resolve();
} );
} );
- }
- this.toolbarSetupDeferred.done( function () {
- var surface = target.getSurface();
- // Check the surface wasn't torn down while the toolbar was
animating
- if ( surface ) {
- ve.track( 'trace.initializeToolbar.enter' );
- target.getToolbar().initialize();
- surface.getView().emit( 'position' );
- surface.getContext().updateDimensions();
- ve.track( 'trace.initializeToolbar.exit' );
- }
- } );
+ this.toolbarSetupDeferred.done( function () {
+ var surface = target.getSurface();
+ // Check the surface wasn't torn down while the toolbar
was animating
+ if ( surface ) {
+ ve.track( 'trace.initializeToolbar.enter' );
+ target.getToolbar().initialize();
+ surface.getView().emit( 'position' );
+ surface.getContext().updateDimensions();
+ ve.track( 'trace.initializeToolbar.exit' );
+ }
+ } );
+ }
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/195048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I145f1891efd1c91eeb6154e11e96e3fc160e2be3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: 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
