diff options
| author | Claude Paroz <claude@2xlibre.net> | 2013-02-22 21:52:20 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-02-22 22:02:53 +0100 |
| commit | 60fff6fc9496c7c851182dd6ebac10bb011be2ba (patch) | |
| tree | 9ba839ae73d52174197bdea2f495aaad25e8a0dd /docs | |
| parent | f13bfbec70e096f230e3dcda88a2cb215e7f8899 (diff) | |
Documented jQuery upgrade
Refs #14571.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/contrib/admin/index.txt | 5 | ||||
| -rw-r--r-- | docs/releases/1.6.txt | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index cbf7d4215b..c93c974a49 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -1420,10 +1420,13 @@ jQuery Django admin Javascript makes use of the `jQuery`_ library. To avoid conflicts with user-supplied scripts or libraries, Django's jQuery -(version 1.4.2) is namespaced as ``django.jQuery``. If you want to use jQuery +(version 1.9.1) is namespaced as ``django.jQuery``. If you want to use jQuery in your own admin JavaScript without including a second copy, you can use the ``django.jQuery`` object on changelist and add/edit views. +.. versionchanged:: 1.6 + The embedded jQuery has been upgraded from 1.4.2 to 1.9.1. + The :class:`ModelAdmin` class requires jQuery by default, so there is no need to add jQuery to your ``ModelAdmin``'s list of media resources unless you have a specifc need. For example, if you require the jQuery library to be in the diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt index 8f1a4f375e..d7b1547a91 100644 --- a/docs/releases/1.6.txt +++ b/docs/releases/1.6.txt @@ -88,6 +88,8 @@ Minor features * Added the :attr:`django.db.models.ForeignKey.db_constraint` option. +* The jQuery library embedded in the admin has been upgraded to version 1.9.1. + Backwards incompatible changes in 1.6 ===================================== |