Skip to content

Commit 4c91c73

Browse files
committed
Ensure all events use live and fix a mess of lint errors
1 parent d645072 commit 4c91c73

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

debug_toolbar/media/debug_toolbar/js/toolbar.js

+24-24
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ window.djdt = (function(window, document, jQuery) {
1111
init: function() {
1212
$('#djDebug').show();
1313
var current = null;
14-
$('#djDebugPanelList li a').click(function() {
14+
$('#djDebugPanelList li a').live('click', function() {
1515
if (!this.className) {
1616
return false;
1717
}
@@ -27,44 +27,44 @@ window.djdt = (function(window, document, jQuery) {
2727
}
2828
return false;
2929
});
30-
$('#djDebug a.djDebugClose').click(function() {
30+
$('#djDebug a.djDebugClose').live('click', function() {
3131
$(document).trigger('close.djDebug');
3232
$('#djDebugToolbar li').removeClass('active');
3333
return false;
3434
});
35-
$('#djDebug a.remoteCall').click(function() {
35+
$('#djDebug a.remoteCall').live('click', function() {
3636
$('#djDebugWindow').load(this.href, function(response, status, xhr) {
3737
if (status == "error") {
3838
var message = '<div class="djDebugPanelTitle"><a class="djDebugClose djDebugBack" href="">Back</a><h3>'+xhr.status+': '+xhr.statusText+'</h3></div>';
3939
$('#djDebugWindow').html(message);
4040
}
41-
$('#djDebugWindow a.djDebugBack').click(function() {
41+
$('#djDebugWindow a.djDebugBack').live('click', function() {
4242
$(this).parent().parent().hide();
4343
return false;
4444
});
4545
});
4646
$('#djDebugWindow').show();
4747
return false;
4848
});
49-
$('#djDebugTemplatePanel a.djTemplateShowContext').click(function() {
49+
$('#djDebugTemplatePanel a.djTemplateShowContext').live('click', function() {
5050
djdt.toggle_arrow($(this).children('.toggleArrow'));
5151
djdt.toggle_content($(this).parent().next());
5252
return false;
5353
});
5454
$('#djDebug a.djDebugToggle').live('click', function(e) {
5555
e.preventDefault();
5656
$(this).parent().find('.djDebugCollapsed').toggle();
57-
$(this).parent().find('.djDebugUncollapsed').toggle()
57+
$(this).parent().find('.djDebugUncollapsed').toggle();
5858
});
59-
$('#djDebug a.djToggleSwitch').click(function(e) {
59+
$('#djDebug a.djToggleSwitch').live('click', function(e) {
6060
e.preventDefault();
6161
var btn = $(this);
6262
var id = btn.attr('data-toggle-id');
6363
var open_me = btn.text() == btn.attr('data-toggle-open');
64-
if (id == '' || !id) {
64+
if (id === '' || !id) {
6565
return;
6666
}
67-
67+
6868
btn.parents('.djDebugPanelContent').find('#sqlMain_' + id).find('.djDebugCollapsed').toggle(open_me);
6969
btn.parents('.djDebugPanelContent').find('#sqlMain_' + id).find('.djDebugUncollapsed').toggle(!open_me);
7070
$(this).parents('.djDebugPanelContent').find('.djToggleDetails_' + id).each(function(){
@@ -84,28 +84,28 @@ window.djdt = (function(window, document, jQuery) {
8484
return;
8585
});
8686
function getSubcalls(row) {
87-
id = row.attr('id');
88-
return $('.djDebugProfileRow[id^="'+id+'_"]');
87+
var id = row.attr('id');
88+
return $('.djDebugProfileRow[id^="'+id+'_"]');
8989
}
9090
function getDirectSubcalls(row) {
91-
subcalls = getSubcalls(row);
92-
depth = parseInt(row.attr('depth')) + 1;
93-
return subcalls.filter('[depth='+depth+']');
91+
var subcalls = getSubcalls(row);
92+
var depth = parseInt(row.attr('depth'), 10) + 1;
93+
return subcalls.filter('[depth='+depth+']');
9494
}
95-
$('.djDebugProfileRow .djDebugProfileToggle').click(function(){
96-
row = $(this).closest('.djDebugProfileRow')
97-
subcalls = getSubcalls(row);
98-
if (subcalls.css('display')=='none') {
99-
getDirectSubcalls(row).show();
100-
} else {
101-
subcalls.hide();
102-
}
95+
$('.djDebugProfileRow .djDebugProfileToggle').live('click', function(){
96+
var row = $(this).closest('.djDebugProfileRow');
97+
var subcalls = getSubcalls(row);
98+
if (subcalls.css('display') == 'none') {
99+
getDirectSubcalls(row).show();
100+
} else {
101+
subcalls.hide();
102+
}
103103
});
104-
$('#djHideToolBarButton').click(function() {
104+
$('#djHideToolBarButton').live('click', function() {
105105
djdt.hide_toolbar(true);
106106
return false;
107107
});
108-
$('#djShowToolBarButton').click(function() {
108+
$('#djShowToolBarButton').live('click', function() {
109109
djdt.show_toolbar();
110110
return false;
111111
});

0 commit comments

Comments
 (0)