innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Also minify the JavaScript file for pre-populated form fields in the admin. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2010-04-13 10:28:44 +00:00
parent 1fcf747b13
commit c3d1267c15
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/admin/media/js/compress.py
View File

@ -21,12 +21,13 @@ compress all jQuery based files of the admin app."""
compiler = os.path.expanduser(options.compiler) compiler = os.path.expanduser(options.compiler)
if not os.path.exists(compiler): if not os.path.exists(compiler):
sys.exit("Compiler jar file %s not found. Please use the -c option to specify the path." % compiler) sys.exit("Closure compiler jar file %s not found. Please use the -c option to specify the path." % compiler)
if not args: if not args:
if options.verbose: if options.verbose:
sys.stdout.write("No filenames given; defaulting to admin scripts\n") sys.stdout.write("No filenames given; defaulting to admin scripts\n")
args = [os.path.join(here, f) for f in ["actions.js", "collapse.js", "inlines.js"]] args = [os.path.join(here, f) for f in [
"actions.js", "collapse.js", "inlines.js", "prepopulate.js"]]
for arg in args: for arg in args:
if not arg.endswith(".js"): if not arg.endswith(".js"):

1
django/contrib/admin/media/js/prepopulate.min.js vendored Normal file
View File

@ -0,0 +1 @@
(function(b){b.fn.prepopulate=function(d,f){return this.each(function(){var a=b(this);a.data("_changed",false);a.change(function(){a.data("_changed",true)});var c=function(){if(a.data("_changed")!=true){var e=[];d.each(function(){b(this).val().length>0&&e.push(b(this).val())});a.val(URLify(e.join(" "),f))}};d.keyup(c).change(c).focus(c)})}})(django.jQuery);

4
django/contrib/admin/options.py
View File

@ -274,7 +274,7 @@ class ModelAdmin(BaseModelAdmin):
js.extend(['js/jquery.min.js', 'js/jquery.init.js', 'js/actions.min.js']) js.extend(['js/jquery.min.js', 'js/jquery.init.js', 'js/actions.min.js'])
if self.prepopulated_fields: if self.prepopulated_fields:
js.append('js/urlify.js') js.append('js/urlify.js')
js.append('js/prepopulate.js') js.append('js/prepopulate.min.js')
if self.opts.get_ordered_objects(): if self.opts.get_ordered_objects():
js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js']) js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js'])
@ -1202,7 +1202,7 @@ class InlineModelAdmin(BaseModelAdmin):
js = ['js/jquery.min.js', 'js/jquery.init.js', 'js/inlines.min.js'] js = ['js/jquery.min.js', 'js/jquery.init.js', 'js/inlines.min.js']
if self.prepopulated_fields: if self.prepopulated_fields:
js.append('js/urlify.js') js.append('js/urlify.js')
js.append('js/prepopulate.js') js.append('js/prepopulate.min.js')
if self.filter_vertical or self.filter_horizontal: if self.filter_vertical or self.filter_horizontal:
js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js']) js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js'])
return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js]) return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js])