Skip to content

Commit 72d2d43

Browse files
xicamilonova
xi
authored and
camilonova
committed
normalize jQuery usage (#1077)
1 parent 2d21af1 commit 72d2d43

File tree

5 files changed

+32
-51
lines changed

5 files changed

+32
-51
lines changed

‎debug_toolbar/static/debug_toolbar/js/toolbar.js

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
isReady: false,
88
init: function() {
99
$('#djDebug').show();
10-
$('#djDebugPanelList').on('click', 'li a', function() {
10+
$('#djDebugPanelList').on('click', 'li a', function(event) {
11+
event.preventDefault();
1112
if (!this.className) {
12-
return false;
13+
return;
1314
}
1415
var current = $('#djDebug #' + this.className);
1516
if (current.is(':visible')) {
@@ -40,12 +41,11 @@
4041
$('#djDebugToolbar li').removeClass('djdt-active');
4142
$(this).parent().addClass('djdt-active');
4243
}
43-
return false;
4444
});
45-
$('#djDebug').on('click', 'a.djDebugClose', function() {
45+
$('#djDebug').on('click', 'a.djDebugClose', function(event) {
46+
event.preventDefault();
4647
$(document).trigger('close.djDebug');
4748
$('#djDebugToolbar li').removeClass('djdt-active');
48-
return false;
4949
});
5050
$('#djDebug').on('click', '.djDebugPanelButton input[type=checkbox]', function() {
5151
djdt.cookie.set($(this).attr('data-cookie'), $(this).prop('checked') ? 'on' : 'off', {
@@ -55,7 +55,9 @@
5555
});
5656

5757
// Used by the SQL and template panels
58-
$('#djDebug').on('click', '.remoteCall', function() {
58+
$('#djDebug').on('click', '.remoteCall', function(event) {
59+
event.preventDefault();
60+
5961
var self = $(this);
6062
var name = self[0].tagName.toLowerCase();
6163
var ajax_data = {};
@@ -81,17 +83,15 @@
8183
$('#djDebugWindow').html(message).show();
8284
});
8385

84-
$('#djDebugWindow').on('click', 'a.djDebugBack', function() {
86+
$('#djDebugWindow').on('click', 'a.djDebugBack', function(event) {
87+
event.preventDefault();
8588
$(this).parent().parent().hide();
86-
return false;
8789
});
88-
89-
return false;
9090
});
9191

9292
// Used by the cache, profiling and SQL panels
93-
$('#djDebug').on('click', 'a.djToggleSwitch', function(e) {
94-
e.preventDefault();
93+
$('#djDebug').on('click', 'a.djToggleSwitch', function(event) {
94+
event.preventDefault();
9595
var btn = $(this);
9696
var id = btn.attr('data-toggle-id');
9797
var open_me = btn.text() == btn.attr('data-toggle-open');
@@ -115,21 +115,21 @@
115115
$this.find('.djToggleSwitch').text(btn.text());
116116
}
117117
});
118-
return;
119118
});
120119

121-
$('#djHideToolBarButton').click(function() {
120+
$('#djHideToolBarButton').on('click', function(event) {
121+
event.preventDefault();
122122
djdt.hide_toolbar(true);
123-
return false;
124123
});
125-
$('#djShowToolBarButton').click(function() {
124+
$('#djShowToolBarButton').on('click', function(event) {
125+
event.preventDefault();
126126
if (!djdt.handleDragged) {
127127
djdt.show_toolbar();
128128
}
129-
return false;
130129
});
131130
var handle = $('#djDebugToolbarHandle');
132131
$('#djShowToolBarButton').on('mousedown', function (event) {
132+
event.preventDefault();
133133
var startPageY = event.pageY;
134134
var baseY = handle.offset().top - startPageY;
135135
var windowHeight = $(window).height();
@@ -150,11 +150,11 @@
150150
djdt.handleDragged = true;
151151
}
152152
});
153-
return false;
154153
});
155-
$(document).on('mouseup', function () {
154+
$(document).on('mouseup', function (event) {
156155
$(document).off('mousemove.djDebug');
157156
if (djdt.handleDragged) {
157+
event.preventDefault();
158158
var top = handle.offset().top - window.pageYOffset;
159159
djdt.cookie.set('djdttop', top, {
160160
path: '/',
@@ -163,10 +163,9 @@
163163
setTimeout(function () {
164164
djdt.handleDragged = false;
165165
}, 10);
166-
return false;
167166
}
168167
});
169-
$(document).bind('close.djDebug', function() {
168+
$(document).on('close.djDebug', function() {
170169
// If a sub-panel is open, close that
171170
if ($('#djDebugWindow').is(':visible')) {
172171
$('#djDebugWindow').hide();
@@ -189,7 +188,7 @@
189188
} else {
190189
djdt.show_toolbar(false);
191190
}
192-
$('#djDebug .djDebugHoverable').hover(function(){
191+
$('#djDebug .djDebugHoverable').on('hover', function(){
193192
$(this).addClass('djDebugHover');
194193
}, function(){
195194
$(this).removeClass('djDebugHover');
@@ -220,7 +219,7 @@
220219
handle.css({top: handleTop + 'px'});
221220
}
222221
// Unbind keydown
223-
$(document).unbind('keydown.djDebug');
222+
$(document).off('keydown.djDebug');
224223
if (setCookie) {
225224
djdt.cookie.set('djdt', 'hide', {
226225
path: '/',
@@ -230,7 +229,7 @@
230229
},
231230
show_toolbar: function(animate) {
232231
// Set up keybindings
233-
$(document).bind('keydown.djDebug', function(e) {
232+
$(document).on('keydown.djDebug', function(e) {
234233
if (e.keyCode == 27) {
235234
djdt.close();
236235
}

‎debug_toolbar/static/debug_toolbar/js/toolbar.profiling.js

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
(function ($) {
2-
function getSubcalls(row) {
3-
var id = row.attr('id');
4-
return $('.djDebugProfileRow[id^="'+id+'_"]');
5-
}
6-
function getDirectSubcalls(row) {
7-
var subcalls = getSubcalls(row);
8-
var depth = parseInt(row.attr('depth'), 10) + 1;
9-
return subcalls.filter('[depth='+depth+']');
10-
}
11-
$('.djDebugProfileRow .djDebugProfileToggle').on('click', function(){
12-
var row = $(this).closest('.djDebugProfileRow');
13-
var subcalls = getSubcalls(row);
14-
if (subcalls.css('display') == 'none') {
15-
getDirectSubcalls(row).show();
16-
} else {
17-
subcalls.hide();
18-
}
19-
});
1+
(function () {
202
djdt.applyStyle('padding-left');
21-
})(djdt.jQuery);
3+
})();

‎debug_toolbar/static/debug_toolbar/js/toolbar.sql.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(function ($) {
2-
$('#djDebug a.djDebugToggle').on('click', function(e) {
3-
e.preventDefault();
2+
$('#djDebug a.djDebugToggle').on('click', function(event) {
3+
event.preventDefault();
44
$(this).parent().find('.djDebugCollapsed').toggle();
55
$(this).parent().find('.djDebugUncollapsed').toggle();
66
});

‎debug_toolbar/static/debug_toolbar/js/toolbar.template.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
var uarr = String.fromCharCode(0x25b6),
33
darr = String.fromCharCode(0x25bc);
44

5-
$('a.djTemplateShowContext').on('click', function() {
5+
$('a.djTemplateShowContext').on('click', function(event) {
6+
event.preventDefault();
67
var arrow = $(this).children('.toggleArrow');
78
arrow.html(arrow.html() == uarr ? darr : uarr);
89
$(this).parent().next().toggle();
9-
return false;
1010
});
1111
})(djdt.jQuery);

‎debug_toolbar/static/debug_toolbar/js/toolbar.timer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
var $row = $('<tr class="' + ((rowCount % 2) ? 'djDebugOdd' : 'djDebugEven') + '"></tr>');
2424
if (endStat) {
2525
// Render a start through end bar
26-
$row.html('<td>' + stat.replace('Start', '') + '</td>' +
26+
$row.html('<td>' + stat.replace('Start', '') + '</td>' +
2727
'<td class="djdt-timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
2828
'<td>' + (perf.timing[stat] - timingOffset) + ' (+' + (perf.timing[endStat] - perf.timing[stat]) + ')</td>');
2929
$row.find('strong').css({width: getCSSWidth(stat, endStat)});
@@ -34,7 +34,7 @@
3434
'<td>' + (perf.timing[stat] - timingOffset) + '</td>');
3535
$row.find('strong').css({width: 2});
3636
}
37-
$row.find('djDebugLineChart').css({left: getLeft(stat) + '%'});
37+
$row.find('.djDebugLineChart').css({left: getLeft(stat) + '%'});
3838
$('#djDebugBrowserTimingTableBody').append($row);
3939
}
4040

@@ -47,5 +47,5 @@
4747
addRow('domInteractive');
4848
addRow('domContentLoadedEventStart', 'domContentLoadedEventEnd');
4949
addRow('loadEventStart', 'loadEventEnd');
50-
$('#djDebugBrowserTiming').css("display", "block");
50+
$('#djDebugBrowserTiming').show();
5151
})(djdt.jQuery);

0 commit comments

Comments
 (0)