Merge pull request #746 from peap/requirejs_backup_patch

Undefine "define.amd" instead of "define", to allow other RequireJS modules to be loaded

Author: aaugustin

debug_toolbar/static/debug_toolbar/js/jquery_post.js

@@ -1 +1,4 @@
-var djdt = {jQuery: jQuery.noConflict(true)}; window.define = _djdt_define_backup;
+var djdt = {jQuery: jQuery.noConflict(true)};
+if (window.define) {
+    window.define.amd = _djdt_define_amd_backup;
+}

debug_toolbar/static/debug_toolbar/js/jquery_pre.js

@@ -1 +1,5 @@
-var _djdt_define_backup = window.define; window.define = undefined;
+var _djdt_define_amd_backup;
+if (window.define) {
+    _djdt_define_amd_backup = window.define.amd;
+    window.define.amd = undefined;
+}