Skip to content

Commit

Permalink
Stopped the admin JavaScript code from completely removing the `jQuer…
Browse files Browse the repository at this point in the history
…y` 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
  • Loading branch information
jezdez committed Jun 16, 2011
1 parent 44b0348 commit aa40dc6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion django/contrib/admin/media/js/jquery.init.js
Original file line number Original file line Diff line number Diff line change
@@ -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()
}; };

0 comments on commit aa40dc6

Please sign in to comment.