p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Jannis Leidel 2011-06-16 16:34:28 +00:00
parent 44b03484ec
commit aa40dc6252
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/media/js/jquery.init.js
View File

@ -1,4 +1,4 @@
// Puts the included jQuery into our own namespace
var django = {
"jQuery": jQuery.noConflict(true)
"jQuery": jQuery.noConflict()
};