Ticket #16776: 16776.diff

File 16776.diff, 1.1 KB (added by Rob Hudson, 8 years ago)
  • django/contrib/admin/static/admin/js/jquery.init.js

    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  
    11// Puts the included jQuery into our own namespace
    22var django = {
    3     "jQuery": jQuery.noConflict()
     3    "jQuery": jQuery.noConflict(true)
  • docs/ref/contrib/admin/index.txt

    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 
    12921292JavaScript without including a second copy, you can use the
    12931293``django.jQuery`` object on changelist and add/edit views.
     1295If you require the jQuery library to be in a global namespace, e.g. when
     1296using 3rd party jQuery plugins, or need a newer version of jQuery, you
     1297will need to include your own version of jQuery.
    12951299.. _jQuery: http://jquery.com
    12971301Adding custom validation to the admin
Back to Top