diff options
| author | Jannis Leidel <jannis@leidel.info> | 2011-06-16 16:34:28 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2011-06-16 16:34:28 +0000 |
| commit | aa40dc6252b00af15973a9075de48f9462fabdcd (patch) | |
| tree | 69baa19fd4fb33042e359f0f98feef86768bad4e | |
| parent | 44b03484ec0ec8843d34becbce1d4f0649066627 (diff) | |
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
| -rw-r--r-- | django/contrib/admin/media/js/jquery.init.js | 2 |
1 files changed, 1 insertions, 1 deletions
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() }; |