Merge b0c4b85 into 22e6e15

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]

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"

plone/app/widgets/static/requirejs-reset.js

@@ -1,2 +1,2 @@
-if(typeof _old_define !== 'undefined') { var define = _old_define; }
-if(typeof _old_require !== 'undefined') { var require = _old_require; }
+define = typeof(_old_define) !== 'undefined' ? _old_define : undefined;
+require = typeof(_old_require) !== 'undefined' ? _old_require : undefined;

plone/app/widgets/static/requirejs-unset.js

@@ -1,4 +1,4 @@
-if(typeof define !== 'undefined') { var _old_define = define; }
-if(typeof require !== 'undefined') { var _old_require = require; }
+if(typeof define !== 'undefined') { var _old_define = define; } else { var define; }
+if(typeof require !== 'undefined') { var _old_require = require; } else { var require; }
 define = undefined;
 require = undefined;