Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / toolbar / js / toolbar.js

diff --git a/web/core/modules/toolbar/js/toolbar.js b/web/core/modules/toolbar/js/toolbar.js
index 4f4ff5943f998789780ea95e58cb019dd21c09b8..7246420f8888ddc6cbe7407f1b39a890629d3bc2 100644 (file)
--- a/web/core/modules/toolbar/js/toolbar.js
+++ b/web/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,