Permalink
Browse files

Merge pull request #7 from foobarbecue/master

Load jquery before the progressbar javascript, not after.
  • Loading branch information...
2 parents 2378842 + b795b92 commit 50431ab632b8ee15382d394e6cddf3d69638d83a @ouhouhsami committed Sep 26, 2013
Showing with 5 additions and 2 deletions.
  1. +5 −2 progressbarupload/templatetags/progress_bar.py
@@ -34,8 +34,11 @@ def progress_bar_media():
return rendered script tag for javascript used by progress_bar
"""
- js = ["js/progress_bar.js",]
if PROGRESSBARUPLOAD_INCLUDE_JQUERY:
- js.append("http://code.jquery.com/jquery-1.8.3.min.js")
+ js = ["http://code.jquery.com/jquery-1.8.3.min.js",]
+ else:
+ js = []
+ js.append("js/progress_bar.js")
+
m = Media(js=js)
return m.render()

0 comments on commit 50431ab

Please sign in to comment.