jenkins-bot has submitted this change and it was merged.
Change subject: Use new attachToolbar method for attaching the toolbar
......................................................................
Use new attachToolbar method for attaching the toolbar
Depends on I53f032e59 in core.
Change-Id: I85cb73a0ead6c73915b25f5be09c898cb5e1ecb4
---
M modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
2 files changed, 21 insertions(+), 9 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
index d43fe9b..5d03a67 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
@@ -88,12 +88,16 @@
// Parent method
ve.init.mw.Target.prototype.setupToolbar.call( this, surface );
- this.toolbar.$element
- // FIXME shouldn't be using viewPageTarget styles
- .addClass( 've-init-mw-viewPageTarget-toolbar' )
- .append( this.surface.context.$element )
- // Move the toolbar to the overlay header
- .appendTo( '.overlay-header > .toolbar' );
+ // Append the context to the toolbar
+ this.toolbar.$element.append( surface.context.$element );
+};
+
+/**
+ * @inheritdoc
+ */
+ve.init.mw.MobileViewTarget.prototype.attachToolbar = function () {
+ // Move the toolbar to the overlay header
+ this.toolbar.$element.appendTo( '.overlay-header > .toolbar' );
};
/**
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 0614b97..a09959a 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -192,9 +192,6 @@
this.getToolbar().$element
.addClass( 've-init-mw-viewPageTarget-toolbar' );
- // Move the toolbar to top of target, before heading etc.
- this.$element.prepend( this.getToolbar().$element );
-
ve.track( 'trace.setupToolbar.exit' );
this.getToolbar().$bar.slideDown( 'fast', function () {
@@ -210,6 +207,17 @@
};
/**
+ * @inheritdoc
+ */
+ve.init.mw.ViewPageTarget.prototype.attachToolbar = function () {
+ // Move the toolbar to top of target, before heading etc.
+ // Avoid re-attaching as it breaks CSS animations
+ if ( !this.getToolbar().$element.parent().is( this.$element ) ) {
+ this.$element.prepend( this.getToolbar().$element );
+ }
+};
+
+/**
* Set up notices for things like unknown browsers.
* Needs to be done on each activation because localNoticeMessages is cleared
in clearState.
*/
--
To view, visit https://gerrit.wikimedia.org/r/191662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85cb73a0ead6c73915b25f5be09c898cb5e1ecb4
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
