aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar
diff options
context:
space:
mode:
authorSimon Willison2008-09-20 20:18:41 +0100
committerSimon Willison2008-09-20 20:18:41 +0100
commitaf4f7a99dc346bb6b844564370fd6d479d6c36e7 (patch)
treea72ecdd32f7bb8a51c0edfd297b6881e81826711 /debug_toolbar
parent0c2c0ab82d6f848b6083a176f301d72d8bb798d8 (diff)
downloaddjango-debug-toolbar-af4f7a99dc346bb6b844564370fd6d479d6c36e7.tar.bz2
Use $ shortcut for jQuery without conflicting with other libraries
Diffstat (limited to 'debug_toolbar')
-rw-r--r--debug_toolbar/media/toolbar.js43
1 files changed, 22 insertions, 21 deletions
diff --git a/debug_toolbar/media/toolbar.js b/debug_toolbar/media/toolbar.js
index 3da65d2..b163000 100644
--- a/debug_toolbar/media/toolbar.js
+++ b/debug_toolbar/media/toolbar.js
@@ -1,34 +1,36 @@
jQuery.noConflict();
-jQuery(function() {
- jQuery.djDebug = function(data, klass) {
- jQuery.djDebug.init();
+jQuery(function($) {
+ $.djDebug = function(data, klass) {
+ $.djDebug.init();
}
- jQuery.extend(jQuery.djDebug, {
+ $.extend($.djDebug, {
init: function() {
var current = null;
- jQuery('#djDebugPanelList li a').click(function() {
- current = jQuery('#djDebug #' + this.className);
+ $('#djDebugPanelList li a').click(function() {
+ current = $('#djDebug #' + this.className);
if (current.is(':visible')) {
- jQuery(document).trigger('close.djDebug');
+ $(document).trigger('close.djDebug');
} else {
- jQuery('.panelContent').hide();
+ $('.panelContent').hide();
current.show();
- jQuery.djDebug.open();
+ $.djDebug.open();
}
return false;
});
- jQuery('#djDebugTemplatePanel a.djTemplateShowContext').click(function() {
- jQuery.djDebug.toggle_content(jQuery(this).parent().next());
- });
- jQuery('#djDebug a.close').click(function() {
- jQuery(document).trigger('close.djDebug');
+ $('#djDebugTemplatePanel a.djTemplateShowContext').click(
+ function() {
+ $.djDebug.toggle_content($(this).parent().next());
+ }
+ );
+ $('#djDebug a.close').click(function() {
+ $(document).trigger('close.djDebug');
return false;
});
},
open: function() {
- jQuery(document).bind('keydown.djDebug', function(e) {
+ $(document).bind('keydown.djDebug', function(e) {
if (e.keyCode == 27) {
- jQuery.djDebug.close();
+ $.djDebug.close();
}
});
},
@@ -40,16 +42,15 @@ jQuery(function() {
}
},
close: function() {
- jQuery(document).trigger('close.djDebug');
+ $(document).trigger('close.djDebug');
return false;
}
});
- jQuery(document).bind('close.djDebug', function() {
- jQuery(document).unbind('keydown.djDebug');
- jQuery('.panelContent').hide();
+ $(document).bind('close.djDebug', function() {
+ $(document).unbind('keydown.djDebug');
+ $('.panelContent').hide();
});
});
-
jQuery(function() {
jQuery.djDebug();
});