updated core from 8.4 to 8.5 : bug with login_destination

core/modules/toolbar/css/toolbar.menu.css

@@ -61,38 +61,38 @@
  */
 .toolbar .level-2 > ul {
   background-color: #fafafa;
-  border-bottom-color: #cccccc;
+  border-bottom-color: #ccc;
   border-top-color: #e5e5e5;
 }
 .toolbar .level-3 > ul {
   background-color: #f5f5f5;
   border-bottom-color: #c5c5c5;
-  border-top-color: #dddddd;
+  border-top-color: #ddd;
 }
 .toolbar .level-4 > ul {
-  background-color: #eeeeee;
-  border-bottom-color: #bbbbbb;
+  background-color: #eee;
+  border-bottom-color: #bbb;
   border-top-color: #d5d5d5;
 }
 .toolbar .level-5 > ul {
   background-color: #e5e5e5;
   border-bottom-color: #b5b5b5;
-  border-top-color: #cccccc;
+  border-top-color: #ccc;
 }
 .toolbar .level-6 > ul {
-  background-color: #eeeeee;
-  border-bottom-color: #aaaaaa;
+  background-color: #eee;
+  border-bottom-color: #aaa;
   border-top-color: #c5c5c5;
 }
 .toolbar .level-7 > ul {
   background-color: #fafafa;
   border-bottom-color: #b5b5b5;
-  border-top-color: #cccccc;
+  border-top-color: #ccc;
 }
 .toolbar .level-8 > ul {
-  background-color: #dddddd;
-  border-bottom-color: #cccccc;
-  border-top-color: #dddddd;
+  background-color: #ddd;
+  border-bottom-color: #ccc;
+  border-top-color: #ddd;
 }
 
 /**

core/modules/toolbar/css/toolbar.module.css

@@ -16,6 +16,7 @@
   padding: 0;
   vertical-align: baseline;
 }
+
 @media print {
   #toolbar-administration {
     display: none;
@@ -238,17 +239,18 @@ body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
   margin-left: 240px; /* LTR */
   margin-left: 15rem; /* LTR */
 }
+
 @media print {
   body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
     margin-left: 0;
   }
 }
 [dir="rtl"] body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
-  margin-left: auto;
   margin-left: auto;
   margin-right: 240px;
   margin-right: 15rem;
 }
+
 @media print {
   [dir="rtl"] body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
     margin-right: 0;

core/modules/toolbar/css/toolbar.theme.css

@@ -5,10 +5,10 @@
   font-family: "Source Sans Pro", "Lucida Grande", Verdana, sans-serif;
   /* Set base font size to 13px based on root ems. */
   font-size: 0.8125rem;
-  -moz-tap-highlight-color: rgba(0,0,0,0);
-  -o-tap-highlight-color: rgba(0,0,0,0);
-  -webkit-tap-highlight-color: rgba(0,0,0,0);
-  tap-highlight-color: rgba(0,0,0,0);
+  -moz-tap-highlight-color: rgba(0, 0, 0, 0);
+  -o-tap-highlight-color: rgba(0, 0, 0, 0);
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  tap-highlight-color: rgba(0, 0, 0, 0);
   -moz-touch-callout: none;
   -o-touch-callout: none;
   -webkit-touch-callout: none;
@@ -31,13 +31,13 @@
 .toolbar .toolbar-bar {
   background-color: #0f0f0f;
   box-shadow: -1px 0 3px 1px rgba(0, 0, 0, 0.3333); /* LTR */
-  color: #dddddd;
+  color: #ddd;
 }
 [dir="rtl"] .toolbar .toolbar-bar {
   box-shadow: 1px 0 3px 1px rgba(0, 0, 0, 0.3333);
 }
 .toolbar .toolbar-bar .toolbar-item {
-  color: #ffffff;
+  color: #fff;
 }
 .toolbar .toolbar-bar .toolbar-tab > .toolbar-item {
   font-weight: bold;
@@ -56,7 +56,7 @@
  * Toolbar tray.
  */
 .toolbar .toolbar-tray {
-  background-color: #ffffff;
+  background-color: #fff;
 }
 .toolbar-horizontal .toolbar-tray > .toolbar-lining {
   padding-right: 5em; /* LTR */
@@ -67,16 +67,16 @@
 }
 .toolbar .toolbar-tray-vertical {
   background-color: #f5f5f5;
-  border-right: 1px solid #aaaaaa; /* LTR */
+  border-right: 1px solid #aaa; /* LTR */
   box-shadow: -1px 0 5px 2px rgba(0, 0, 0, 0.3333); /* LTR */
 }
 [dir="rtl"] .toolbar .toolbar-tray-vertical {
-  border-left: 1px solid #aaaaaa;
+  border-left: 1px solid #aaa;
   border-right: 0 none;
   box-shadow: 1px 0 5px 2px rgba(0, 0, 0, 0.3333);
 }
 .toolbar-horizontal .toolbar-tray {
-  border-bottom: 1px solid #aaaaaa;
+  border-bottom: 1px solid #aaa;
   box-shadow: -2px 1px 3px 1px rgba(0, 0, 0, 0.3333); /* LTR */
 }
 [dir="rtl"] .toolbar-horizontal .toolbar-tray {
@@ -99,33 +99,33 @@
   text-decoration: underline;
 }
 .toolbar .toolbar-menu {
-  background-color: #ffffff;
+  background-color: #fff;
 }
 .toolbar-horizontal .toolbar-tray .menu-item + .menu-item {
-  border-left: 1px solid #dddddd; /* LTR */
+  border-left: 1px solid #ddd; /* LTR */
 }
 [dir="rtl"] .toolbar-horizontal .toolbar-tray .menu-item + .menu-item {
   border-left: 0 none;
-  border-right: 1px solid #dddddd;
+  border-right: 1px solid #ddd;
 }
 .toolbar-horizontal .toolbar-tray .menu-item:last-child {
-  border-right: 1px solid #dddddd; /* LTR */
+  border-right: 1px solid #ddd; /* LTR */
 }
 [dir="rtl"] .toolbar-horizontal .toolbar-tray .menu-item:last-child {
-  border-left: 1px solid #dddddd;
+  border-left: 1px solid #ddd;
 }
 .toolbar .toolbar-tray-vertical .menu-item + .menu-item {
-  border-top: 1px solid #dddddd;
+  border-top: 1px solid #ddd;
 }
 .toolbar .toolbar-tray-vertical .menu-item:last-child {
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid #ddd;
 }
 .toolbar .toolbar-tray-vertical .menu-item .menu-item {
   border: 0 none;
 }
 .toolbar .toolbar-tray-vertical .toolbar-menu ul ul {
-  border-bottom: 1px solid #dddddd;
-  border-top: 1px solid #dddddd;
+  border-bottom: 1px solid #ddd;
+  border-top: 1px solid #ddd;
 }
 .toolbar .toolbar-tray-vertical .menu-item:last-child > ul {
   border-bottom: 0;

core/modules/toolbar/js/toolbar.es6.js

@@ -46,26 +46,27 @@
       // Process the administrative toolbar.
       $(context).find('#toolbar-administration').once('toolbar').each(function () {
         // Establish the toolbar models and views.
-        const model = Drupal.toolbar.models.toolbarModel = new Drupal.toolbar.ToolbarModel({
+        const model = new Drupal.toolbar.ToolbarModel({
           locked: JSON.parse(localStorage.getItem('Drupal.toolbar.trayVerticalLocked')),
           activeTab: document.getElementById(JSON.parse(localStorage.getItem('Drupal.toolbar.activeTabID'))),
           height: $('#toolbar-administration').outerHeight(),
         });
 
+        Drupal.toolbar.models.toolbarModel = model;
+
         // Attach a listener to the configured media query breakpoints.
         // Executes it before Drupal.toolbar.views to avoid extra rendering.
-        for (const label in options.breakpoints) {
-          if (options.breakpoints.hasOwnProperty(label)) {
-            const mq = options.breakpoints[label];
-            const mql = Drupal.toolbar.mql[label] = window.matchMedia(mq);
-            // Curry the model and the label of the media query breakpoint to
-            // the mediaQueryChangeHandler function.
-            mql.addListener(Drupal.toolbar.mediaQueryChangeHandler.bind(null, model, label));
-            // Fire the mediaQueryChangeHandler for each configured breakpoint
-            // so that they process once.
-            Drupal.toolbar.mediaQueryChangeHandler.call(null, model, label, mql);
-          }
-        }
+        Object.keys(options.breakpoints).forEach((label) => {
+          const mq = options.breakpoints[label];
+          const mql = window.matchMedia(mq);
+          Drupal.toolbar.mql[label] = mql;
+          // Curry the model and the label of the media query breakpoint to
+          // the mediaQueryChangeHandler function.
+          mql.addListener(Drupal.toolbar.mediaQueryChangeHandler.bind(null, model, label));
+          // Fire the mediaQueryChangeHandler for each configured breakpoint
+          // so that they process once.
+          Drupal.toolbar.mediaQueryChangeHandler.call(null, model, label, mql);
+        });
 
         Drupal.toolbar.views.toolbarVisualView = new Drupal.toolbar.ToolbarVisualView({
           el: this,
@@ -88,7 +89,8 @@
         model.trigger('change:activeTray', model, model.get('activeTray'));
 
         // Render collapsible menus.
-        const menuModel = Drupal.toolbar.models.menuModel = new Drupal.toolbar.MenuModel();
+        const menuModel = new Drupal.toolbar.MenuModel();
+        Drupal.toolbar.models.menuModel = menuModel;
         Drupal.toolbar.views.menuVisualView = new Drupal.toolbar.MenuVisualView({
           el: $(this).find('.toolbar-menu-administration').get(0),
           model: menuModel,

core/modules/toolbar/js/toolbar.js

@@ -26,22 +26,23 @@
       }
 
       $(context).find('#toolbar-administration').once('toolbar').each(function () {
-        var model = Drupal.toolbar.models.toolbarModel = new Drupal.toolbar.ToolbarModel({
+        var model = new Drupal.toolbar.ToolbarModel({
           locked: JSON.parse(localStorage.getItem('Drupal.toolbar.trayVerticalLocked')),
           activeTab: document.getElementById(JSON.parse(localStorage.getItem('Drupal.toolbar.activeTabID'))),
           height: $('#toolbar-administration').outerHeight()
         });
 
-        for (var label in options.breakpoints) {
-          if (options.breakpoints.hasOwnProperty(label)) {
-            var mq = options.breakpoints[label];
-            var mql = Drupal.toolbar.mql[label] = window.matchMedia(mq);
+        Drupal.toolbar.models.toolbarModel = model;
 
-            mql.addListener(Drupal.toolbar.mediaQueryChangeHandler.bind(null, model, label));
+        Object.keys(options.breakpoints).forEach(function (label) {
+          var mq = options.breakpoints[label];
+          var mql = window.matchMedia(mq);
+          Drupal.toolbar.mql[label] = mql;
 
-            Drupal.toolbar.mediaQueryChangeHandler.call(null, model, label, mql);
-          }
-        }
+          mql.addListener(Drupal.toolbar.mediaQueryChangeHandler.bind(null, model, label));
+
+          Drupal.toolbar.mediaQueryChangeHandler.call(null, model, label, mql);
+        });
 
         Drupal.toolbar.views.toolbarVisualView = new Drupal.toolbar.ToolbarVisualView({
           el: this,
@@ -61,7 +62,8 @@
         model.trigger('change:isFixed', model, model.get('isFixed'));
         model.trigger('change:activeTray', model, model.get('activeTray'));
 
-        var menuModel = Drupal.toolbar.models.menuModel = new Drupal.toolbar.MenuModel();
+        var menuModel = new Drupal.toolbar.MenuModel();
+        Drupal.toolbar.models.menuModel = menuModel;
         Drupal.toolbar.views.menuVisualView = new Drupal.toolbar.MenuVisualView({
           el: $(this).find('.toolbar-menu-administration').get(0),
           model: menuModel,

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

@@ -23,14 +23,12 @@
     render() {
       const subtrees = this.model.get('subtrees');
       // Add subtrees.
-      for (const id in subtrees) {
-        if (subtrees.hasOwnProperty(id)) {
-          this.$el
-            .find(`#toolbar-link-${id}`)
-            .once('toolbar-subtrees')
-            .after(subtrees[id]);
-        }
-      }
+      Object.keys(subtrees || {}).forEach((id) => {
+        this.$el
+          .find(`#toolbar-link-${id}`)
+          .once('toolbar-subtrees')
+          .after(subtrees[id]);
+      });
       // Render the main menu as a nested, collapsible accordion.
       if ('drupalToolbarMenu' in $.fn) {
         this.$el

core/modules/toolbar/js/views/MenuVisualView.js

@@ -11,13 +11,13 @@
       this.listenTo(this.model, 'change:subtrees', this.render);
     },
     render: function render() {
+      var _this = this;
+
       var subtrees = this.model.get('subtrees');
 
-      for (var id in subtrees) {
-        if (subtrees.hasOwnProperty(id)) {
-          this.$el.find('#toolbar-link-' + id).once('toolbar-subtrees').after(subtrees[id]);
-        }
-      }
+      Object.keys(subtrees || {}).forEach(function (id) {
+        _this.$el.find('#toolbar-link-' + id).once('toolbar-subtrees').after(subtrees[id]);
+      });
 
       if ('drupalToolbarMenu' in $.fn) {
         this.$el.children('.toolbar-menu').drupalToolbarMenu();

core/modules/toolbar/tests/modules/toolbar_disable_user_toolbar/toolbar_disable_user_toolbar.info.yml

@@ -5,8 +5,8 @@ package: Testing
 # version: VERSION
 # core: 8.x
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457825

core/modules/toolbar/tests/modules/toolbar_test/toolbar_test.info.yml

@@ -5,8 +5,8 @@ package: Testing
 # version: VERSION
 # core: 8.x
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457825

core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php

@@ -58,6 +58,18 @@ class ToolbarCacheContextsTest extends BrowserTestBase {
     $this->adminUser2 = $this->drupalCreateUser($this->perms);
   }
 
+  /**
+   * Tests toolbar cache integration.
+   */
+  public function testCacheIntegration() {
+    $this->installExtraModules(['dynamic_page_cache']);
+    $this->drupalLogin($this->adminUser);
+    $this->drupalGet('test-page');
+    $this->assertSame('MISS', $this->getSession()->getResponseHeader('X-Drupal-Dynamic-Cache'));
+    $this->drupalGet('test-page');
+    $this->assertSame('HIT', $this->getSession()->getResponseHeader('X-Drupal-Dynamic-Cache'));
+  }
+
   /**
    * Tests toolbar cache contexts.
    */

core/modules/toolbar/toolbar.info.yml

@@ -7,8 +7,8 @@ package: Core
 dependencies:
   - breakpoint
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457825