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/settings.py                                  |  1 +
 debug_toolbar/static/debug_toolbar/js/toolbar.js           | 13 ++-----------
 debug_toolbar/static/debug_toolbar/js/toolbar.profiling.js | 11 ++---------
 debug_toolbar/static/debug_toolbar/js/toolbar.sql.js       | 10 ++--------
 debug_toolbar/static/debug_toolbar/js/toolbar.template.js  | 10 ++--------
 debug_toolbar/static/debug_toolbar/js/toolbar.timer.js     | 10 ++--------
 debug_toolbar/templates/debug_toolbar/base.html            |  9 ++++++---
 7 files changed, 17 insertions(+), 47 deletions(-)

(limited to 'debug_toolbar')

diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py
index 5c2919c..7ba7012 100644
--- a/debug_toolbar/settings.py
+++ b/debug_toolbar/settings.py
@@ -18,6 +18,7 @@ CONFIG_DEFAULTS = {
     # Toolbar options
     'DISABLE_PANELS': set(['debug_toolbar.panels.redirects.RedirectsPanel']),
     'INSERT_BEFORE': '</body>',
+    'JQUERY_URL': '//ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js',
     'RENDER_PANELS': None,
     'RESULTS_STORE_SIZE': 10,
     'ROOT_TAG_EXTRA_ATTRS': '',
diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.js b/debug_toolbar/static/debug_toolbar/js/toolbar.js
index cb40205..45bea59 100644
--- a/debug_toolbar/static/debug_toolbar/js/toolbar.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.js
@@ -1,12 +1,4 @@
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        // AMD. Register as anonymous module.
-        define(['jquery'], factory);
-    } else {
-        // Browser globals.
-        window.djdt = factory(jQuery);
-    }
-}(function ($) {
+(function ($) {
     var djdt = {
         handleDragged: false,
         events: {
@@ -283,5 +275,4 @@
         }
     };
     $(document).ready(djdt.init);
-    return djdt;
-}));
+})(djdt.jQuery);
diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.profiling.js b/debug_toolbar/static/debug_toolbar/js/toolbar.profiling.js
index 172c2a6..1018e9b 100644
--- a/debug_toolbar/static/debug_toolbar/js/toolbar.profiling.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.profiling.js
@@ -1,10 +1,4 @@
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        define(['jquery'], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+(function ($) {
     function getSubcalls(row) {
         var id = row.attr('id');
         return $('.djDebugProfileRow[id^="'+id+'_"]');
@@ -23,5 +17,4 @@
             subcalls.hide();
         }
     });
-
-}));
+})(djdt.jQuery);
diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.sql.js b/debug_toolbar/static/debug_toolbar/js/toolbar.sql.js
index c554bce..e470ac8 100644
--- a/debug_toolbar/static/debug_toolbar/js/toolbar.sql.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.sql.js
@@ -1,13 +1,7 @@
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        define(['jquery'], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+(function ($) {
     $('#djDebug a.djDebugToggle').on('click', function(e) {
         e.preventDefault();
         $(this).parent().find('.djDebugCollapsed').toggle();
         $(this).parent().find('.djDebugUncollapsed').toggle();
     });
-}));
+})(djdt.jQuery);
diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.template.js b/debug_toolbar/static/debug_toolbar/js/toolbar.template.js
index 6240898..01ac8a4 100644
--- a/debug_toolbar/static/debug_toolbar/js/toolbar.template.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.template.js
@@ -1,10 +1,4 @@
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        define(['jquery'], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+(function ($) {
     var uarr = String.fromCharCode(0x25b6),
         darr = String.fromCharCode(0x25bc);
 
@@ -14,4 +8,4 @@
         $(this).parent().next().toggle();
         return false;
     });
-}));
+})(djdt.jQuery);
diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.timer.js b/debug_toolbar/static/debug_toolbar/js/toolbar.timer.js
index 514fda7..cc9d6ae 100644
--- a/debug_toolbar/static/debug_toolbar/js/toolbar.timer.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.timer.js
@@ -1,10 +1,4 @@
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        define(['jquery'], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+(function ($) {
     // Browser timing remains hidden unless we can successfully access the performance object
     var perf = window.performance || window.msPerformance ||
                window.webkitPerformance || window.mozPerformance;
@@ -51,4 +45,4 @@
     addRow('domContentLoadedEventStart', 'domContentLoadedEventEnd');
     addRow('loadEventStart', 'loadEventEnd');
     $('#djDebugBrowserTiming').css("display", "block");
-}));
+})(djdt.jQuery);
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