[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Have toolbar append toolbarDialogs container

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338699 )

Change subject: Have toolbar append toolbarDialogs container
......................................................................


Have toolbar append toolbarDialogs container

Append/prepend depending on toolbar position.

Change-Id: I4ae51ec44c53344bda5db4240109cac383b8013f
---
M src/init/ve.init.Target.js
M src/ui/styles/dialogs/ve.ui.ToolbarDialog.css
M src/ui/ve.ui.PositionedTargetToolbar.js
3 files changed, 21 insertions(+), 7 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/src/init/ve.init.Target.js b/src/init/ve.init.Target.js
index 8571a98..970a69d 100644
--- a/src/init/ve.init.Target.js
+++ b/src/init/ve.init.Target.js
@@ -519,7 +519,6 @@
        toolbar.setup( this.constructor.static.toolbarGroups, surface );
        actions.setup( this.constructor.static.actionGroups, surface );
        this.attachToolbar();
-       toolbar.$bar.append( surface.getToolbarDialogs().$element );
        toolbar.$actions.append( actions.$element );
        rAF( this.onContainerScrollHandler );
 };
diff --git a/src/ui/styles/dialogs/ve.ui.ToolbarDialog.css 
b/src/ui/styles/dialogs/ve.ui.ToolbarDialog.css
index 3e81c78..77befac 100644
--- a/src/ui/styles/dialogs/ve.ui.ToolbarDialog.css
+++ b/src/ui/styles/dialogs/ve.ui.ToolbarDialog.css
@@ -11,7 +11,6 @@
 .ve-ui-toolbarDialog-position-above {
        overflow-y: hidden;
        max-height: 0;
-       border-top: 1px solid #ddd;
        /* stylelint-disable no-unsupported-browser-features */
        -webkit-transition: max-height 250ms;
        -moz-transition: max-height 250ms;
@@ -19,6 +18,14 @@
        /* stylelint-enable no-unsupported-browser-features */
 }
 
+.oo-ui-toolbar-position-top .ve-ui-toolbarDialog-position-above {
+       border-top: 1px solid #ddd;
+}
+
+.oo-ui-toolbar-position-bottom .ve-ui-toolbarDialog-position-above {
+       border-bottom: 1px solid #ddd;
+}
+
 .ve-ui-toolbarDialog-position-above.oo-ui-window-ready {
        /* approximate max height for transition */
        max-height: 150px;
diff --git a/src/ui/ve.ui.PositionedTargetToolbar.js 
b/src/ui/ve.ui.PositionedTargetToolbar.js
index 99faf5c..3ecf5f8 100644
--- a/src/ui/ve.ui.PositionedTargetToolbar.js
+++ b/src/ui/ve.ui.PositionedTargetToolbar.js
@@ -41,11 +41,18 @@
 /**
  * @inheritdoc
  */
-ve.ui.PositionedTargetToolbar.prototype.setup = function () {
+ve.ui.PositionedTargetToolbar.prototype.setup = function ( groups, surface ) {
+       var toolbarDialogs = surface.getToolbarDialogs();
+
        // Parent method
        ve.ui.PositionedTargetToolbar.super.prototype.setup.apply( this, 
arguments );
 
-       this.getSurface().getToolbarDialogs().connect( this, {
+       if ( this.position === 'bottom' ) {
+               this.$bar.prepend( toolbarDialogs.$element );
+       } else {
+               this.$bar.append( toolbarDialogs.$element );
+       }
+       toolbarDialogs.connect( this, {
                opening: 'onToolbarDialogsOpeningOrClosing',
                closing: 'onToolbarDialogsOpeningOrClosing'
        } );
@@ -235,18 +242,19 @@
  */
 ve.ui.PositionedTargetToolbar.prototype.onViewportResize = function () {
        var win, viewportDimensions,
-               surface = this.getSurface();
+               surface = this.getSurface(),
+               toolbarDialogs = surface.getToolbarDialogs();
 
        if ( !surface ) {
                return;
        }
 
-       win = surface.getToolbarDialogs().getCurrentWindow();
+       win = toolbarDialogs.getCurrentWindow();
 
        if ( win && win.constructor.static.position === 'side' ) {
                viewportDimensions = surface.getViewportDimensions();
                if ( viewportDimensions ) {
-                       
surface.getToolbarDialogs().getCurrentWindow().$frame.css(
+                       toolbarDialogs.getCurrentWindow().$frame.css(
                                'height', Math.min( 
surface.getBoundingClientRect().height, viewportDimensions.height )
                        );
                }

-- 
To view, visit https://gerrit.wikimedia.org/r/338699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ae51ec44c53344bda5db4240109cac383b8013f
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits