Unverified Commit 1c4c1284 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3257504 by tstoeckler, nod_, Gábor Hojtsy: Empty toolbar tray displays... 

Issue #3257504 by tstoeckler, nod_, Gábor Hojtsy: Empty toolbar tray displays a stray orientation toggle
parent abff27cc

core/modules/toolbar/js/views/ToolbarVisualView.es6.js

+2 −1
Original line number Diff line number Diff line
@@ -56,9 +56,10 @@ 
          this.updateToolbarHeight,

        );



        // Add the tray orientation toggles.

        // Add the tray orientation toggles, but only if there is a menu.

        this.$el

          .find('.toolbar-tray .toolbar-lining')

          .has('.toolbar-menu')

          .append(Drupal.theme('toolbarOrientationToggle'));



        // Trigger an activeTab change so that listening scripts can respond on

core/modules/toolbar/js/views/ToolbarVisualView.js

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
      this.listenTo(this.model, 'change:mqMatches', this.onMediaQueryChange);

      this.listenTo(this.model, 'change:offsets', this.adjustPlacement);

      this.listenTo(this.model, 'change:activeTab change:orientation change:isOriented', this.updateToolbarHeight);

      this.$el.find('.toolbar-tray .toolbar-lining').append(Drupal.theme('toolbarOrientationToggle'));

      this.$el.find('.toolbar-tray .toolbar-lining').has('.toolbar-menu').append(Drupal.theme('toolbarOrientationToggle'));

      this.model.trigger('change:activeTab');

    },

    updateToolbarHeight: function updateToolbarHeight() {

core/modules/toolbar/tests/src/FunctionalJavascript/ToolbarIntegrationTest.php

+27 −0
Original line number Diff line number Diff line
@@ -58,4 +58,31 @@ public function testToolbarToggling() { 
    $this->assertTrue($tray->hasClass('toolbar-tray-horizontal'), 'After toggling the orientation a second time the toolbar tray is displayed horizontally again.');

  }



  /**

   * Tests that the orientation toggle is not shown for empty toolbar items.

   */

  public function testEmptyTray() {

    // Granting access to the toolbar but not any administrative menu links will

    // result in an empty toolbar tray for the "Manage" toolbar item.

    $admin_user = $this->drupalCreateUser([

      'access toolbar',

    ]);

    $this->drupalLogin($admin_user);



    // Set size for horizontal toolbar.

    $this->getSession()->resizeWindow(1200, 600);

    $this->drupalGet('<front>');

    $this->assertNotEmpty($this->assertSession()->waitForElement('css', 'body.toolbar-horizontal'));

    $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', '.toolbar-tray'));



    // Test that the orientation toggle does not appear.

    $page = $this->getSession()->getPage();

    $tray = $page->findById('toolbar-item-administration-tray');

    $this->assertTrue($tray->hasClass('toolbar-tray-horizontal'), 'Toolbar tray is horizontally oriented by default.');

    $this->assertSession()->elementNotExists('css', '#toolbar-item-administration-tray .toolbar-menu');

    $this->assertSession()->elementNotExists('css', '#toolbar-item-administration-tray .toolbar-toggle-orientation');

    $button = $page->findButton('Vertical orientation');

    $this->assertFalse($button->isVisible(), 'Orientation toggle from other tray is not visible');

  }



}