From aa40dc6252b00af15973a9075de48f9462fabdcd Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Thu, 16 Jun 2011 16:34:28 +0000 Subject: [PATCH] Stopped the admin JavaScript code from completely removing the `jQuery` object from the global namespace to ease the use of jQuery plugins. The `django.jQuery` object is still supposed to be used by Django's own JavaScript files. Refs #12882. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16415 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/media/js/jquery.init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/contrib/admin/media/js/jquery.init.js b/django/contrib/admin/media/js/jquery.init.js index 85a7973cf7..41b1051769 100644 --- a/django/contrib/admin/media/js/jquery.init.js +++ b/django/contrib/admin/media/js/jquery.init.js @@ -1,4 +1,4 @@ // Puts the included jQuery into our own namespace var django = { - "jQuery": jQuery.noConflict(true) + "jQuery": jQuery.noConflict() };