From fb5788d8643320724a65890ce3df86d5e2bf591b Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 23 Sep 2008 10:27:23 -0700 Subject: Possible fix for jQuery.noConflict() removing '$' from scope and breaking other scripts that depend on it. --- debug_toolbar/media/toolbar.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/toolbar.js b/debug_toolbar/media/toolbar.js index 19a6abf..455a2fc 100644 --- a/debug_toolbar/media/toolbar.js +++ b/debug_toolbar/media/toolbar.js @@ -1,3 +1,4 @@ +var _$ = window.$; jQuery.noConflict(); jQuery(function($) { $.djDebug = function(data, klass) { @@ -62,3 +63,4 @@ jQuery(function($) { jQuery(function() { jQuery.djDebug(); }); +$ = _$; -- cgit v1.2.3