Commit 788071e2 authored by Trey Hunner's avatar Trey Hunner Committed by Aymeric Augustin
Browse files

Moved jQuery to a vendor/jquery subdirectory.

parent 1daae25b

django/contrib/admin/helpers.py

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ class Fieldset(object): 
    def _media(self):

        if 'collapse' in self.classes:

            extra = '' if settings.DEBUG else '.min'

            js = ['jquery%s.js' % extra,

            js = ['vendor/jquery/jquery%s.js' % extra,

                  'jquery.init.js',

                  'collapse%s.js' % extra]

            return forms.Media(js=[static('admin/js/%s' % url) for url in js])

django/contrib/admin/options.py

+3 −2
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ class ModelAdmin(BaseModelAdmin): 
        js = [

            'core.js',

            'admin/RelatedObjectLookups.js',

            'jquery%s.js' % extra,

            'vendor/jquery/jquery%s.js' % extra,

            'jquery.init.js',

            'actions%s.js' % extra,

            'urlify.js',
@@ -1759,7 +1759,8 @@ class InlineModelAdmin(BaseModelAdmin): 
    @property

    def media(self):

        extra = '' if settings.DEBUG else '.min'

        js = ['jquery%s.js' % extra, 'jquery.init.js', 'inlines%s.js' % extra]

        js = ['vendor/jquery/jquery%s.js' % extra, 'jquery.init.js',

              'inlines%s.js' % extra]

        if self.filter_vertical or self.filter_horizontal:

            js.extend(['SelectBox.js', 'SelectFilter2.js'])

        return forms.Media(js=[static('admin/js/%s' % url) for url in js])