Fixed a bug when toolbar js is rendered before toolbar (#6270)

vxsx · vxsx · commit 7d7d4336ba23 · 2018-02-07T16:24:58.000+01:00
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,7 +1,9 @@
 === 3.5.1 (unreleased) ===
 
-* Fixed a ``MultipleObjectsReturned`` exception raised on the page types migration 
+* Fixed a ``MultipleObjectsReturned`` exception raised on the page types migration
   with multiple page types per site.
+* Fixed a bug which prevented toolbar js from working correctly when rendered
+  before toolbar.
 
 
 === 3.5.0 (2018-01-31) ===
diff --git a/cms/static/cms/js/dist/3.5.0/bundle.toolbar.min.js b/cms/static/cms/js/dist/3.5.0/bundle.toolbar.min.js
diff --git a/cms/static/cms/js/toolbar.js b/cms/static/cms/js/toolbar.js
@@ -24,7 +24,11 @@ import StructureBoard from './modules/cms.structureboard';
 import Toolbar from './modules/cms.toolbar';
 import Tooltip from './modules/cms.tooltip';
 
-// CMS by this time is a global that has `_plugins` property
+// CMS by this time should be a global that has `_plugins` property
+const CMS = window.CMS || {};
+
+CMS._plugins = CMS._plugins || [];
+
 CMS.Messages = Messages;
 CMS.ChangeTracker = ChangeTracker;
 CMS.Modal = Modal;
diff --git a/cms/templates/cms/toolbar/toolbar_with_structure.html b/cms/templates/cms/toolbar/toolbar_with_structure.html
@@ -85,6 +85,6 @@ <h1>{% trans "This page has no preview!" %}</h1>
     {% endif %}
     <script type="text/javascript" data-cms>
         var CMS = CMS || {};
-        CMS._plugins = [];
+        CMS._plugins = CMS._plugins || [];
     </script>
 {% endblock toolbar_bottom %}
