Browse files

Documented jQuery upgrade

Refs #14571.
  • Loading branch information...
1 parent f13bfbe commit 60fff6fc9496c7c851182dd6ebac10bb011be2ba @claudep claudep committed Feb 22, 2013
Showing with 6 additions and 1 deletion.
  1. +4 −1 docs/ref/contrib/admin/index.txt
  2. +2 −0 docs/releases/1.6.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
@@ -88,6 +88,8 @@ Minor features
* Added the :attr:`django.db.models.ForeignKey.db_constraint`
+* The jQuery library embedded in the admin has been upgraded to version 1.9.1.
Backwards incompatible changes in 1.6

0 comments on commit 60fff6f

Please sign in to comment.