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:
parent
44b03484ec
commit
aa40dc6252
|
@ -1,4 +1,4 @@
|
||||||
// Puts the included jQuery into our own namespace
|
// Puts the included jQuery into our own namespace
|
||||||
var django = {
|
var django = {
|
||||||
"jQuery": jQuery.noConflict(true)
|
"jQuery": jQuery.noConflict()
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue