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

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

diff --git a/web/core/modules/toolbar/js/views/MenuVisualView.js b/web/core/modules/toolbar/js/views/MenuVisualView.js
index a9cd1a30f6a4b11bd2d7395c617f45fd8af84fb7..8156a8b11d9e23fead112830d03d4f9feb1c4c3d 100644 (file)
--- a/web/core/modules/toolbar/js/views/MenuVisualView.js
+++ b/web/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();