Skip to content

Commit

Permalink
Merge pull request jazzband#678 from nailgun/master
Browse files Browse the repository at this point in the history
Fix jQuery events priority
  • Loading branch information
tim-schilling committed May 27, 2015
2 parents 9d49009 + cbbc000 commit 44dbbbd
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions debug_toolbar/static/debug_toolbar/js/toolbar.js
Expand Up @@ -8,7 +8,7 @@
init: function() {
$('#djDebug').show();
var current = null;
$(document).on('click', '#djDebugPanelList li a', function() {
$('#djDebugPanelList').on('click', 'li a', function() {
if (!this.className) {
return false;
}
Expand Down Expand Up @@ -44,20 +44,20 @@
}
return false;
});
$(document).on('click', '#djDebug a.djDebugClose', function() {
$('#djDebug').on('click', 'a.djDebugClose', function() {
$(document).trigger('close.djDebug');
$('#djDebugToolbar li').removeClass('djdt-active');
return false;
});
$(document).on('click', '#djDebug .djDebugPanelButton input[type=checkbox]', function() {
$('#djDebug').on('click', '.djDebugPanelButton input[type=checkbox]', function() {
djdt.cookie.set($(this).attr('data-cookie'), $(this).prop('checked') ? 'on' : 'off', {
path: '/',
expires: 10
});
});

// Used by the SQL and template panels
$(document).on('click', '#djDebug .remoteCall', function() {
$('#djDebug').on('click', '.remoteCall', function() {
var self = $(this);
var name = self[0].tagName.toLowerCase();
var ajax_data = {};
Expand All @@ -83,7 +83,7 @@
$('#djDebugWindow').html(message).show();
});

$(document).on('click', '#djDebugWindow a.djDebugBack', function() {
$('#djDebugWindow').on('click', 'a.djDebugBack', function() {
$(this).parent().parent().hide();
return false;
});
Expand All @@ -92,7 +92,7 @@
});

// Used by the cache, profiling and SQL panels
$(document).on('click', '#djDebug a.djToggleSwitch', function(e) {
$('#djDebug').on('click', 'a.djToggleSwitch', function(e) {
e.preventDefault();
var btn = $(this);
var id = btn.attr('data-toggle-id');
Expand Down

0 comments on commit 44dbbbd

Please sign in to comment.