Browse files

[1.5.x] Fixed #19333 -- Moved outside of the admin static…

… folder. Thanks to camilonova, Russell Keith-Magee, Aymeric Augustin and Ramiro Morales for the feedback.

Backport of c9c40bc
  • Loading branch information...
1 parent e18bd68 commit be5369fd24adfc788e59eaf0363d4d137ded6ef8 @jphalip jphalip committed Feb 2, 2013
@@ -4,7 +4,7 @@
import subprocess
import sys
-here = os.path.dirname(__file__)
+js_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'static', 'admin', 'js')
def main():
usage = "usage: %prog [file1..fileN]"
@@ -27,7 +27,7 @@ def main():
if not args:
if options.verbose:
sys.stdout.write("No filenames given; defaulting to admin scripts\n")
- args = [os.path.join(here, f) for f in [
+ args = [os.path.join(js_path, f) for f in [
"actions.js", "collapse.js", "inlines.js", "prepopulate.js"]]
for arg in args:
@@ -176,8 +176,10 @@ Compressing JavaScript
To simplify the process of providing optimized javascript code, Django
-includes a handy script which should be used to create a "minified" version.
-This script is located at ``django/contrib/admin/static/admin/js/``.
+includes a handy python script which should be used to create a "minified"
+version. To run it::
+ python django/contrib/admin/bin/
Behind the scenes, ```` is a front-end for Google's
`Closure Compiler`_ which is written in Java. However, the Closure Compiler

0 comments on commit be5369f

Please sign in to comment.