Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/191662

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.ViewPageTarget.js
1 file changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/62/191662/1

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 0529dee..175ddd3 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -192,8 +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' );
 
@@ -210,6 +208,17 @@
 };
 
 /**
+ * @inhertidoc
+ */
+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: newchange
Gerrit-Change-Id: I85cb73a0ead6c73915b25f5be09c898cb5e1ecb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>

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

Reply via email to