Insert ++resource++plone.app.widgets.js resource at the beginning…

…, before ``++resource++plone.app.jquery.js`` (but after ``++resource++plone.app.widgets-requirejs-unset.js``). This makes other installations more predictable when they install resources directly after ``++resource++plone.app.jquery.js``.
plone · Jun 28, 2017 · b0c4b85 · b0c4b85
1 parent 4d4baca
commit b0c4b85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,9 +4,11 @@ Changelog
 1.10 (unreleased)
 -----------------
 
-- failsafe Unset and reset ``define`` and ``require``
-  [petschki]
+- Insert ``++resource++plone.app.widgets.js`` resource at the beginning, before ``++resource++plone.app.jquery.js`` (but after ``++resource++plone.app.widgets-requirejs-unset.js``).
+  This makes other installations more predictable when they install resources directly after ``++resource++plone.app.jquery.js``.
+  [thet]
 
+
 - PEP 8.
   [thet]
 
@@ -17,7 +19,7 @@ Changelog
 - Unset and reset ``define`` and ``require`` before and after the plone.app.widgets JavaScript bundle.
   This avoids the infamous ``Mismatched anonymous define`` error with unbundled JavaScript supporting RequireJS.
   See: http://requirejs.org/docs/errors.html#mismatch
-  [thet]
+  [thet, petschki]
 
 - Remove Plone 5 specific zcml conditions
   [petschki]

diff --git a/plone/app/widgets/profiles/default/jsregistry.xml b/plone/app/widgets/profiles/default/jsregistry.xml
@@ -17,7 +17,7 @@
 
     <javascript
         id="++resource++plone.app.widgets.js"
-        insert-after="++resource++plone.app.jquery.js"
+        insert-before="*"
         cacheable="True"
         compression="none"
         cookable="True"