From 727b4e05f59c15904f7b08388220b7bfc76d59b2 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Fri, 25 Apr 2014 18:53:00 +0200
Subject: Make the pain go away.

Fix #581, #544, #541, #535 and a few others.
---
 debug_toolbar/templates/debug_toolbar/base.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 8ce7a0e..6bc017a 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -3,9 +3,12 @@
 @media print { #djDebug {display:none;}}
 </style>
 <link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}" type="text/css" />
-<script>//<![CDATA[
-if(!window.jQuery) document.write('<scr'+'ipt src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></scr'+'ipt>');
-//]]></script>
+{% if toolbar.config.JQUERY_URL %}
+<script src="{{ toolbar.config.JQUERY_URL }}"></script>
+<script>var djdt = {jQuery: jQuery.noConflict(true)};</script>
+{% else %}
+<script>var djdt = {jQuery: jQuery};</script>
+{% endif %}
 <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