Skip to content

Commit de343a8

Browse files
committed
Merge branch 'refactor-js-3' of github.com:xi/django-debug-toolbar
* 'refactor-js-3' of github.com:xi/django-debug-toolbar: rm jquery rm JQUERY_URL setting port ajax port most code port handle movement port applyStyle port event handling split out onKeyDown split onMouseMove port timer more explicit closing do not remove .djdt-active twice do not close debugwindow twice rm djDebugHoverable rm .djDebugToggle use <details> element for template contexts
2 parents 405ca2f + 47483b4 commit de343a8

File tree

16 files changed

+214
-257
lines changed

16 files changed

+214
-257
lines changed

debug_toolbar/panels/sql/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def reformat_sql(sql):
3030
def swap_fields(sql):
3131
expr = r'SELECT</strong> (...........*?) <strong>FROM'
3232
subs = (r'SELECT</strong> '
33-
r'<a class="djDebugUncollapsed djDebugToggle" href="#">&#8226;&#8226;&#8226;</a> '
34-
r'<a class="djDebugCollapsed djDebugToggle" href="#">\1</a> '
33+
r'<span class="djDebugUncollapsed" href="#">&#8226;&#8226;&#8226;</span> '
34+
r'<span class="djDebugCollapsed" href="#">\1</span> '
3535
r'<strong>FROM')
3636
return re.sub(expr, subs, sql)
3737

debug_toolbar/settings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# Toolbar options
1818
'DISABLE_PANELS': {'debug_toolbar.panels.redirects.RedirectsPanel'},
1919
'INSERT_BEFORE': '</body>',
20-
'JQUERY_URL': '//ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js',
2120
'RENDER_PANELS': None,
2221
'RESULTS_CACHE_SIZE': 10,
2322
'ROOT_TAG_EXTRA_ATTRS': '',

debug_toolbar/static/debug_toolbar/css/toolbar.css

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@
314314
padding-right:.5em;
315315
}
316316

317-
#djDebug .djTemplateHideContextDiv {
317+
#djDebug .djTemplateContext {
318318
background-color:#fff;
319319
}
320320

@@ -423,15 +423,6 @@
423423
}
424424

425425

426-
#djDebug a.djTemplateShowContext, #djDebug a.djTemplateShowContext span.toggleArrow {
427-
color:#999;
428-
}
429-
430-
#djDebug a.djTemplateShowContext:hover, #djDebug a.djTemplateShowContext:hover span.toggleArrow {
431-
color:#000;
432-
cursor:pointer;
433-
}
434-
435426
#djDebug .djDebugSqlWrap {
436427
position:relative;
437428
}
@@ -541,13 +532,6 @@
541532
#djDebug .djDebugEndTransaction div.djDebugLineChart strong {
542533
border-right: 1px solid #94b24d;
543534
}
544-
#djDebug .djDebugHover div.djDebugLineChart strong {
545-
background-color: #000;
546-
}
547-
#djDebug .djDebugInTransaction.djDebugHover div.djDebugLineChart strong {
548-
background-color: #94b24d;
549-
}
550-
551535

552536
#djDebug .djdt-panelContent ul.djdt-stats {
553537
position: relative;

debug_toolbar/static/debug_toolbar/js/jquery_existing.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

debug_toolbar/static/debug_toolbar/js/jquery_post.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

debug_toolbar/static/debug_toolbar/js/jquery_pre.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)