jenkins-bot has submitted this change and it was merged.
Change subject: Init surface after toolbar is setup vs. before.
......................................................................
Init surface after toolbar is setup vs. before.
This fixes all tools being loaded with proper state on mw integration.
Bug: 50141
Change-Id: I501b1efec2a2eedbf16a191a8be6b96b02290e09
---
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
index c5430d3..8bdf07f 100644
--- a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
@@ -851,7 +851,6 @@
this.surface.getModel().connect( this, { 'transact':
'onSurfaceModelTransact' } );
this.surface.getModel().connect( this, { 'history':
'onSurfaceModelHistory' } );
this.$.append( this.surface.$ );
- this.surface.initialize();
this.setUpToolbar();
this.transformPageTitle();
this.changeDocumentTitle();
@@ -867,6 +866,7 @@
// Add appropriately mw-content-ltr or mw-content-rtl class
this.surface.$.addClass( 'mw-content-' + mw.config.get(
'wgVisualEditor' ).pageLanguageDir );
+ this.surface.initialize();
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/70936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I501b1efec2a2eedbf16a191a8be6b96b02290e09
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Robmoen <[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
