diff --git a/debug_toolbar/panels/sql/utils.py b/debug_toolbar/panels/sql/utils.py index c0bd4f4e0..197e4849c 100644 --- a/debug_toolbar/panels/sql/utils.py +++ b/debug_toolbar/panels/sql/utils.py @@ -30,8 +30,8 @@ def reformat_sql(sql): def swap_fields(sql): expr = r'SELECT (...........*?) FROM' subs = (r'SELECT ' - r'••• ' - r'\1 ' + r'••• ' + r'\1 ' r'FROM') return re.sub(expr, subs, sql) diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py index c5e213101..d22bf343e 100644 --- a/debug_toolbar/settings.py +++ b/debug_toolbar/settings.py @@ -17,7 +17,6 @@ # Toolbar options 'DISABLE_PANELS': {'debug_toolbar.panels.redirects.RedirectsPanel'}, 'INSERT_BEFORE': '', - 'JQUERY_URL': '//ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js', 'RENDER_PANELS': None, 'RESULTS_CACHE_SIZE': 10, 'ROOT_TAG_EXTRA_ATTRS': '', diff --git a/debug_toolbar/static/debug_toolbar/css/toolbar.css b/debug_toolbar/static/debug_toolbar/css/toolbar.css index 6aa4f7156..34b143b8a 100644 --- a/debug_toolbar/static/debug_toolbar/css/toolbar.css +++ b/debug_toolbar/static/debug_toolbar/css/toolbar.css @@ -314,7 +314,7 @@ padding-right:.5em; } -#djDebug .djTemplateHideContextDiv { +#djDebug .djTemplateContext { background-color:#fff; } @@ -423,15 +423,6 @@ } -#djDebug a.djTemplateShowContext, #djDebug a.djTemplateShowContext span.toggleArrow { - color:#999; -} - -#djDebug a.djTemplateShowContext:hover, #djDebug a.djTemplateShowContext:hover span.toggleArrow { - color:#000; - cursor:pointer; -} - #djDebug .djDebugSqlWrap { position:relative; } @@ -541,13 +532,6 @@ #djDebug .djDebugEndTransaction div.djDebugLineChart strong { border-right: 1px solid #94b24d; } -#djDebug .djDebugHover div.djDebugLineChart strong { - background-color: #000; -} -#djDebug .djDebugInTransaction.djDebugHover div.djDebugLineChart strong { - background-color: #94b24d; -} - #djDebug .djdt-panelContent ul.djdt-stats { position: relative; diff --git a/debug_toolbar/static/debug_toolbar/js/jquery_existing.js b/debug_toolbar/static/debug_toolbar/js/jquery_existing.js deleted file mode 100644 index 085495a65..000000000 --- a/debug_toolbar/static/debug_toolbar/js/jquery_existing.js +++ /dev/null @@ -1 +0,0 @@ -var djdt = {jQuery: jQuery}; diff --git a/debug_toolbar/static/debug_toolbar/js/jquery_post.js b/debug_toolbar/static/debug_toolbar/js/jquery_post.js deleted file mode 100644 index 9e4c8bc65..000000000 --- a/debug_toolbar/static/debug_toolbar/js/jquery_post.js +++ /dev/null @@ -1,4 +0,0 @@ -var djdt = {jQuery: jQuery.noConflict(true)}; -if (window.define) { - window.define.amd = _djdt_define_amd_backup; -} diff --git a/debug_toolbar/static/debug_toolbar/js/jquery_pre.js b/debug_toolbar/static/debug_toolbar/js/jquery_pre.js deleted file mode 100644 index cca2a0f2b..000000000 --- a/debug_toolbar/static/debug_toolbar/js/jquery_pre.js +++ /dev/null @@ -1,5 +0,0 @@ -var _djdt_define_amd_backup; -if (window.define) { - _djdt_define_amd_backup = window.define.amd; - window.define.amd = undefined; -} diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.js b/debug_toolbar/static/debug_toolbar/js/toolbar.js index 678192f8c..fc3bb5496 100644 --- a/debug_toolbar/static/debug_toolbar/js/toolbar.js +++ b/debug_toolbar/static/debug_toolbar/js/toolbar.js @@ -1,4 +1,59 @@ -(function ($, publicAPI) { +(function () { + var $$ = { + on: function(root, eventName, selector, fn) { + root.addEventListener(eventName, function(event) { + var target = event.target.closest(selector); + if (root.contains(target)) { + fn.call(target, event); + } + }); + }, + show: function(element) { + element.style.display = 'block'; + }, + hide: function(element) { + element.style.display = 'none'; + }, + toggle: function(element, value) { + if (value) { + $$.show(element); + } else { + $$.hide(element); + } + }, + visible: function(element) { + style = getComputedStyle(element); + return style.display !== 'none'; + }, + executeScripts: function(root) { + root.querySelectorAll('script').forEach(function(e) { + var clone = document.createElement('script'); + clone.src = e.src; + root.appendChild(clone); + }); + }, + }; + + var onKeyDown = function(event) { + if (event.keyCode == 27) { + djdt.hide_one_level(); + } + }; + + var ajax = function(url, init) { + init = Object.assign({credentials: 'same-origin'}, init); + return fetch(url, init).then(function(response) { + if (response.ok) { + return response.text(); + } else { + var win = document.querySelector('#djDebugWindow'); + win.innerHTML = '

'+response.status+': '+response.statusText+'

'; + $$.show(win); + return Promise.reject(); + } + }); + }; + var djdt = { handleDragged: false, events: { @@ -6,157 +61,150 @@ }, isReady: false, init: function() { - $('#djDebug').show(); - $('#djDebugPanelList').on('click', 'li a', function(event) { + var djDebug = document.querySelector('#djDebug'); + $$.show(djDebug); + $$.on(djDebug.querySelector('#djDebugPanelList'), 'click', 'li a', function(event) { event.preventDefault(); if (!this.className) { return; } - var current = $('#djDebug #' + this.className); - if (current.is(':visible')) { - $(document).trigger('close.djDebug'); - $(this).parent().removeClass('djdt-active'); + var current = djDebug.querySelector('#' + this.className); + if ($$.visible(current)) { + djdt.hide_panels(); } else { - $('.djdt-panelContent').hide(); // Hide any that are already open - var inner = current.find('.djDebugPanelContent .djdt-scroll'), - store_id = $('#djDebug').data('store-id'); - if (store_id && inner.children().length === 0) { - var ajax_data = { - data: { - store_id: store_id, - panel_id: this.className - }, - type: 'GET', - url: $('#djDebug').data('render-panel-url') - }; - $.ajax(ajax_data).done(function(data){ - inner.prev().remove(); // Remove AJAX loader - inner.html(data); - }).fail(function(xhr){ - var message = '

'+xhr.status+': '+xhr.statusText+'

'; - $('#djDebugWindow').html(message).show(); + djdt.hide_panels(); + + $$.show(current); + this.parentElement.classList.add('djdt-active'); + + var inner = current.querySelector('.djDebugPanelContent .djdt-scroll'), + store_id = djDebug.getAttribute('data-store-id'); + if (store_id && inner.children.length === 0) { + var url = djDebug.getAttribute('data-render-panel-url'); + url += '?' + new URLSearchParams({ + store_id: store_id, + panel_id: this.className + }) + ajax(url).then(function(body) { + inner.previousElementSibling.remove(); // Remove AJAX loader + inner.innerHTML = body; + $$.executeScripts(inner); }); } - current.show(); - $('#djDebugToolbar li').removeClass('djdt-active'); - $(this).parent().addClass('djdt-active'); } }); - $('#djDebug').on('click', 'a.djDebugClose', function(event) { + $$.on(djDebug, 'click', 'a.djDebugClose', function(event) { event.preventDefault(); - $(document).trigger('close.djDebug'); - $('#djDebugToolbar li').removeClass('djdt-active'); + djdt.hide_one_level(); }); - $('#djDebug').on('click', '.djDebugPanelButton input[type=checkbox]', function() { - djdt.cookie.set($(this).attr('data-cookie'), $(this).prop('checked') ? 'on' : 'off', { + $$.on(djDebug, 'click', '.djDebugPanelButton input[type=checkbox]', function() { + djdt.cookie.set(this.getAttribute('data-cookie'), this.checked ? 'on' : 'off', { path: '/', expires: 10 }); }); // Used by the SQL and template panels - $('#djDebug').on('click', '.remoteCall', function(event) { + $$.on(djDebug, 'click', '.remoteCall', function(event) { event.preventDefault(); - var self = $(this); - var name = self[0].tagName.toLowerCase(); + var name = this.tagName.toLowerCase(); var ajax_data = {}; if (name == 'button') { - var form = self.parents('form:eq(0)'); - ajax_data.url = self.attr('formaction'); + var form = this.closest('form'); + ajax_data.url = this.getAttribute('formaction'); - if (form.length) { - ajax_data.data = form.serialize(); - ajax_data.type = form.attr('method') || 'POST'; + if (form) { + ajax_data.body = new FormData(form); + ajax_data.method = form.getAttribute('method') || 'POST'; } } if (name == 'a') { - ajax_data.url = self.attr('href'); + ajax_data.url = this.getAttribute('href'); } - $.ajax(ajax_data).done(function(data){ - $('#djDebugWindow').html(data).show(); - }).fail(function(xhr){ - var message = '

'+xhr.status+': '+xhr.statusText+'

'; - $('#djDebugWindow').html(message).show(); - }); - - $('#djDebugWindow').on('click', 'a.djDebugBack', function(event) { - event.preventDefault(); - $(this).parent().parent().hide(); + ajax(ajax_data.url, ajax_data).then(function(body) { + var win = djDebug.querySelector('#djDebugWindow'); + win.innerHTML = body; + $$.executeScripts(win); + $$.show(win); }); }); // Used by the cache, profiling and SQL panels - $('#djDebug').on('click', 'a.djToggleSwitch', function(event) { + $$.on(djDebug, 'click', 'a.djToggleSwitch', function(event) { event.preventDefault(); - var btn = $(this); - var id = btn.attr('data-toggle-id'); - var open_me = btn.text() == btn.attr('data-toggle-open'); + var self = this; + var id = this.getAttribute('data-toggle-id'); + var open_me = this.textContent == this.getAttribute('data-toggle-open'); if (id === '' || !id) { return; } - var name = btn.attr('data-toggle-name'); - btn.parents('.djDebugPanelContent').find('#' + name + '_' + id).find('.djDebugCollapsed').toggle(open_me); - btn.parents('.djDebugPanelContent').find('#' + name + '_' + id).find('.djDebugUncollapsed').toggle(!open_me); - $(this).parents('.djDebugPanelContent').find('.djToggleDetails_' + id).each(function(){ - var $this = $(this); + var name = this.getAttribute('data-toggle-name'); + var container = this.closest('.djDebugPanelContent').querySelector('#' + name + '_' + id); + container.querySelectorAll('.djDebugCollapsed').forEach(function(e) { + $$.toggle(e, open_me); + }); + container.querySelectorAll('.djDebugUncollapsed').forEach(function(e) { + $$.toggle(e, !open_me); + }); + this.closest('.djDebugPanelContent').querySelectorAll('.djToggleDetails_' + id).forEach(function(e) { if (open_me) { - $this.addClass('djSelected'); - $this.removeClass('djUnselected'); - btn.text(btn.attr('data-toggle-close')); - $this.find('.djToggleSwitch').text(btn.text()); + e.classList.add('djSelected'); + e.classList.remove('djUnselected'); + self.textContent = self.getAttribute('data-toggle-close'); + e.querySelector('.djToggleSwitch').textContent = self.textContent; } else { - $this.removeClass('djSelected'); - $this.addClass('djUnselected'); - btn.text(btn.attr('data-toggle-open')); - $this.find('.djToggleSwitch').text(btn.text()); + e.classList.remove('djSelected'); + e.classList.add('djUnselected'); + self.textContent = self.getAttribute('data-toggle-open'); + e.querySelector('.djToggleSwitch').textContent = self.textContent; } }); }); - $('#djHideToolBarButton').on('click', function(event) { + djDebug.querySelector('#djHideToolBarButton').addEventListener('click', function(event) { event.preventDefault(); djdt.hide_toolbar(true); }); - $('#djShowToolBarButton').on('click', function(event) { + djDebug.querySelector('#djShowToolBarButton').addEventListener('click', function(event) { event.preventDefault(); if (!djdt.handleDragged) { djdt.show_toolbar(); } }); - var handle = $('#djDebugToolbarHandle'); - $('#djShowToolBarButton').on('mousedown', function (event) { - event.preventDefault(); - var startPageY = event.pageY; - var baseY = handle.offset().top - startPageY; - var windowHeight = $(window).height(); - $(document).on('mousemove.djDebug', function (event) { - // Chrome can send spurious mousemove events, so don't do anything unless the - // cursor really moved. Otherwise, it will be impossible to expand the toolbar - // due to djdt.handleDragged being set to true. - if (djdt.handleDragged || event.pageY != startPageY) { - var top = baseY + event.clientY; + var startPageY, baseY; + var handle = document.querySelector('#djDebugToolbarHandle'); + var onHandleMove = function(event) { + // Chrome can send spurious mousemove events, so don't do anything unless the + // cursor really moved. Otherwise, it will be impossible to expand the toolbar + // due to djdt.handleDragged being set to true. + if (djdt.handleDragged || event.pageY != startPageY) { + var top = baseY + event.pageY; - if (top < 0) { - top = 0; - } else if (top + handle.height() > windowHeight) { - top = windowHeight - handle.height(); - } - - handle.css({top: top}); - djdt.handleDragged = true; + if (top < 0) { + top = 0; + } else if (top + handle.offsetHeight > window.innerHeight) { + top = window.innerHeight - handle.offsetHeight; } - }); + + handle.style.top = top + 'px'; + djdt.handleDragged = true; + } + }; + djDebug.querySelector('#djShowToolBarButton').addEventListener('mousedown', function(event) { + event.preventDefault(); + startPageY = event.pageY; + baseY = handle.offsetTop - startPageY; + document.addEventListener('mousemove', onHandleMove); }); - $(document).on('mouseup', function (event) { - $(document).off('mousemove.djDebug'); + document.addEventListener('mouseup', function (event) { + document.removeEventListener('mousemove', onHandleMove); if (djdt.handleDragged) { event.preventDefault(); - var top = handle.offset().top - window.pageYOffset; - djdt.cookie.set('djdttop', top, { + djdt.cookie.set('djdttop', handle.offsetTop, { path: '/', expires: 10 }); @@ -165,61 +213,40 @@ }, 10); } }); - $(document).on('close.djDebug', function() { - // If a sub-panel is open, close that - if ($('#djDebugWindow').is(':visible')) { - $('#djDebugWindow').hide(); - return; - } - // If a panel is open, close that - if ($('.djdt-panelContent').is(':visible')) { - $('.djdt-panelContent').hide(); - $('#djDebugToolbar li').removeClass('djdt-active'); - return; - } - // Otherwise, just minimize the toolbar - if ($('#djDebugToolbar').is(':visible')) { - djdt.hide_toolbar(true); - return; - } - }); if (djdt.cookie.get('djdt') == 'hide') { djdt.hide_toolbar(false); } else { - djdt.show_toolbar(false); + djdt.show_toolbar(); } - $('#djDebug .djDebugHoverable').on('hover', function(){ - $(this).addClass('djDebugHover'); - }, function(){ - $(this).removeClass('djDebugHover'); - }); djdt.isReady = true; - $.each(djdt.events.ready, function(_, callback){ + djdt.events.ready.forEach(function(callback) { callback(djdt); }); }, - close: function() { - $(document).trigger('close.djDebug'); - return false; + hide_panels: function() { + $$.hide(djDebug.querySelector('#djDebugWindow')); + djDebug.querySelectorAll('.djdt-panelContent').forEach(function(e) { + $$.hide(e); + }); + djDebug.querySelectorAll('#djDebugToolbar li').forEach(function(e) { + e.classList.remove('djdt-active'); + }); }, hide_toolbar: function(setCookie) { - // close any sub panels - $('#djDebugWindow').hide(); - // close all panels - $('.djdt-panelContent').hide(); - $('#djDebugToolbar li').removeClass('djdt-active'); - // finally close toolbar - $('#djDebugToolbar').hide('fast'); - var handle = $('#djDebugToolbarHandle'); - handle.show(); + djdt.hide_panels(); + $$.hide(djDebug.querySelector('#djDebugToolbar')); + + var handle = document.querySelector('#djDebugToolbarHandle'); + $$.show(handle); // set handle position var handleTop = djdt.cookie.get('djdttop'); if (handleTop) { - handleTop = Math.min(handleTop, window.innerHeight - handle.outerHeight() - 10); - handle.css({top: handleTop + 'px'}); + handleTop = Math.min(handleTop, window.innerHeight - handle.offsetHeight); + handle.style.top = handleTop + 'px'; } - // Unbind keydown - $(document).off('keydown.djDebug'); + + document.removeEventListener('keydown', onKeyDown); + if (setCookie) { djdt.cookie.set('djdt', 'hide', { path: '/', @@ -227,19 +254,19 @@ }); } }, - show_toolbar: function(animate) { - // Set up keybindings - $(document).on('keydown.djDebug', function(e) { - if (e.keyCode == 27) { - djdt.close(); - } - }); - $('#djDebugToolbarHandle').hide(); - if (animate) { - $('#djDebugToolbar').show('fast'); + hide_one_level: function(skipDebugWindow) { + if ($$.visible(djDebug.querySelector('#djDebugWindow'))) { + $$.hide(djDebug.querySelector('#djDebugWindow')); + } else if (djDebug.querySelector('#djDebugToolbar li.djdt-active')) { + djdt.hide_panels(); } else { - $('#djDebugToolbar').show(); + djdt.hide_toolbar(true); } + }, + show_toolbar: function() { + document.addEventListener('keydown', onKeyDown); + $$.hide(djDebug.querySelector('#djDebugToolbarHandle')); + $$.show(djDebug.querySelector('#djDebugToolbar')); djdt.cookie.set('djdt', 'show', { path: '/', expires: 10 @@ -286,19 +313,18 @@ } }, applyStyle: function(name) { - $('#djDebug [data-' + name + ']').each(function() { - var css = {}; - css[name] = $(this).data(name); - $(this).css(css); + var selector = '#djDebug [data-' + name + ']'; + document.querySelectorAll(selector).forEach(function(element) { + element.style[name] = element.getAttribute('data-' + name); }); } }; - $.extend(publicAPI, { + window.djdt = { show_toolbar: djdt.show_toolbar, hide_toolbar: djdt.hide_toolbar, - close: djdt.close, + close: djdt.hide_one_level, cookie: djdt.cookie, applyStyle: djdt.applyStyle - }); - $(document).ready(djdt.init); -})(djdt.jQuery, djdt); + }; + document.addEventListener('DOMContentLoaded', djdt.init); +})(); diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.sql.js b/debug_toolbar/static/debug_toolbar/js/toolbar.sql.js index aec16d510..65093c8ee 100644 --- a/debug_toolbar/static/debug_toolbar/js/toolbar.sql.js +++ b/debug_toolbar/static/debug_toolbar/js/toolbar.sql.js @@ -1,10 +1,5 @@ -(function ($) { - $('#djDebug a.djDebugToggle').on('click', function(event) { - event.preventDefault(); - $(this).parent().find('.djDebugCollapsed').toggle(); - $(this).parent().find('.djDebugUncollapsed').toggle(); - }); +(function () { djdt.applyStyle('background-color'); djdt.applyStyle('left'); djdt.applyStyle('width'); -})(djdt.jQuery); +})(); diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.template.js b/debug_toolbar/static/debug_toolbar/js/toolbar.template.js deleted file mode 100644 index fcddc9307..000000000 --- a/debug_toolbar/static/debug_toolbar/js/toolbar.template.js +++ /dev/null @@ -1,11 +0,0 @@ -(function ($) { - var uarr = String.fromCharCode(0x25b6), - darr = String.fromCharCode(0x25bc); - - $('a.djTemplateShowContext').on('click', function(event) { - event.preventDefault(); - var arrow = $(this).children('.toggleArrow'); - arrow.html(arrow.html() == uarr ? darr : uarr); - $(this).parent().next().toggle(); - }); -})(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 4b8428a79..b6959948e 100644 --- a/debug_toolbar/static/debug_toolbar/js/toolbar.timer.js +++ b/debug_toolbar/static/debug_toolbar/js/toolbar.timer.js @@ -1,4 +1,4 @@ -(function ($) { +(function () { // Browser timing remains hidden unless we can successfully access the performance object var perf = window.performance || window.msPerformance || window.webkitPerformance || window.mozPerformance; @@ -20,22 +20,23 @@ } function addRow(stat, endStat) { rowCount++; - var $row = $(''); + var row = document.createElement('tr'); + row.className = (rowCount % 2) ? 'djDebugOdd' : 'djDebugEven'; if (endStat) { // Render a start through end bar - $row.html('' + stat.replace('Start', '') + '' + - '
 
' + - '' + (perf.timing[stat] - timingOffset) + ' (+' + (perf.timing[endStat] - perf.timing[stat]) + ')'); - $row.find('strong').css({width: getCSSWidth(stat, endStat)}); + row.innerHTML = '' + stat.replace('Start', '') + '' + + '
 
' + + '' + (perf.timing[stat] - timingOffset) + ' (+' + (perf.timing[endStat] - perf.timing[stat]) + ')'; + row.querySelector('strong').style.width = getCSSWidth(stat, endStat); } else { // Render a point in time - $row.html('' + stat + '' + - '
 
' + - '' + (perf.timing[stat] - timingOffset) + ''); - $row.find('strong').css({width: 2}); + row.innerHTML = '' + stat + '' + + '
 
' + + '' + (perf.timing[stat] - timingOffset) + ''; + row.querySelector('strong').style.width = '2px'; } - $row.find('.djDebugLineChart').css({left: getLeft(stat) + '%'}); - $('#djDebugBrowserTimingTableBody').append($row); + row.querySelector('.djDebugLineChart').style.left = getLeft(stat) + '%'; + document.querySelector('#djDebugBrowserTimingTableBody').appendChild(row); } // This is a reasonably complete and ordered set of timing periods (2 params) and events (1 param) @@ -47,5 +48,5 @@ addRow('domInteractive'); addRow('domContentLoadedEventStart', 'domContentLoadedEventEnd'); addRow('loadEventStart', 'loadEventEnd'); - $('#djDebugBrowserTiming').show(); -})(djdt.jQuery); + document.querySelector('#djDebugBrowserTiming').classList.remove('djdt-hidden'); +})(); diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index 5d4b24aa3..3d4740c60 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -1,14 +1,6 @@ {% load i18n %}{% load static %} -{% if toolbar.config.JQUERY_URL %} - - - - -{% else %} - -{% endif %}

{% trans "Calls" %}

{{ call.kwargs|escape }} {{ call.backend }} - + 
{{ call.trace }}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html index c8e93f0a6..37074a4c6 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html @@ -33,7 +33,7 @@ {% for query in queries %} - +   + @@ -79,7 +79,7 @@ {% endif %} - +
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html index a39cede00..fcfa2d6f8 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/templates.html +++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html @@ -18,8 +18,10 @@

{% blocktrans count templates|length as template_count %}Template{% plural %
{{ template.template.origin_name|addslashes }}
{% if template.context %}
-
▶ {% trans "Toggle context" %}
-
{{ template.context }}
+
+ {% trans "Toggle context" %} + {{ template.context }} +
{% endif %} {% endfor %} @@ -34,13 +36,13 @@

{% blocktrans count context_processors|length as context_processors_count %} {% for key, value in context_processors.items %}
{{ key|escape }}
-
▶ {% trans "Toggle context" %}
-
{{ value|escape }}
+
+ {% trans "Toggle context" %} + {{ value|escape }} +
{% endfor %} {% else %}

{% trans "None" %}

{% endif %} - - diff --git a/docs/configuration.rst b/docs/configuration.rst index 670ca1134..a933dac55 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -64,14 +64,6 @@ Toolbar options The toolbar searches for this string in the HTML and inserts itself just before. -* ``JQUERY_URL`` - - Default: ``'//ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js'`` - - URL of the copy of jQuery that will be used by the toolbar. Set it to a - locally-hosted version of jQuery for offline development. Make it empty to - rely on a version of jQuery that already exists on every page of your site. - * ``RENDER_PANELS`` Default: ``None`` diff --git a/docs/tips.rst b/docs/tips.rst index a4a18eb35..b639cfa5f 100644 --- a/docs/tips.rst +++ b/docs/tips.rst @@ -25,19 +25,6 @@ panel or moving the ``DebugToolbarMiddleware`` to the end of ``MIDDLEWARE_CLASSES``. Read more about it at :ref:`ProfilingPanel ` -Using the toolbar offline -------------------------- - -The Debug Toolbar loads the jQuery_ library from the Google Hosted Libraries -CDN. Your browser will keep it in cache, allowing you to use the toolbar even -if you disconnect from the Internet temporarily. - -If you want to use the Debug Toolbar without an Internet connection at all, or -if you refuse to depend on Google's services, look at the ``JQUERY_URL`` -configuration option. - -.. _jQuery: https://jquery.com/ - Performance considerations --------------------------