diff --git a/django/contrib/admin/static/admin/js/jquery.init.js b/django/contrib/admin/static/admin/js/jquery.init.js
index 41b1051..85a7973 100644
|
a
|
b
|
|
| 1 | 1 | // Puts the included jQuery into our own namespace |
| 2 | 2 | var django = { |
| 3 | | "jQuery": jQuery.noConflict( |
| | 3 | "jQuery": jQuery.noConflict(true) |
| 4 | 4 | }; |
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index d68197e..3150dab 100644
|
a
|
b
|
conflict with user scripts, Django's jQuery is namespaced as
|
| 1292 | 1292 | JavaScript without including a second copy, you can use the |
| 1293 | 1293 | ``django.jQuery`` object on changelist and add/edit views. |
| 1294 | 1294 | |
| | 1295 | If you require the jQuery library to be in a global namespace, e.g. when |
| | 1296 | using 3rd party jQuery plugins, or need a newer version of jQuery, you |
| | 1297 | will need to include your own version of jQuery. |
| | 1298 | |
| 1295 | 1299 | .. _jQuery: http://jquery.com |
| 1296 | 1300 | |
| 1297 | 1301 | Adding custom validation to the admin |