From c0b70af276716dbeec47a30c3e5367b3e133d949 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Sat, 17 May 2014 22:32:33 +0200
Subject: Make the fix for #591 more focused and explain it.

---
 debug_toolbar/templates/debug_toolbar/base.html | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index b8f72a8..d8fb933 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -3,19 +3,14 @@
 @media print { #djDebug {display:none;}}
 </style>
 <link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}" type="text/css" />
-<script>
-	var _define = window.define;
-	window.define = undefined;
-</script>
 {% if toolbar.config.JQUERY_URL %}
+<!-- Prevent our copy of jQuery from registering as an AMD module on sites that use RequireJS. -->
+<script>var _djdt_define_backup = window.define; window.define = undefined;</script>
 <script src="{{ toolbar.config.JQUERY_URL }}"></script>
-<script>var djdt = {jQuery: jQuery.noConflict(true)};</script>
+<script>var djdt = {jQuery: jQuery.noConflict(true)}; window.define = _djdt_define_backup;</script>
 {% else %}
 <script>var djdt = {jQuery: jQuery};</script>
 {% endif %}
-<script>
-	window.define = _define;
-</script>
 <script src="{% static 'debug_toolbar/js/toolbar.js' %}"></script>
 <div id="djDebug" style="display:none;" dir="ltr"
      data-store-id="{{ toolbar.store_id }}" data-render-panel-url="{% url 'djdt:render_panel' %}"
-- 
cgit v1.2.3