Commit c9c40bc6 authored by Julien Phalip's avatar Julien Phalip
Browse files

Fixed #19333 -- Moved compress.py outside of the admin static folder. Thanks... 

Fixed #19333 -- Moved compress.py outside of the admin static folder. Thanks to camilonova, Russell Keith-Magee, Aymeric Augustin and Ramiro Morales for the feedback.
parent 0694d219

django/contrib/admin/static/admin/js/compress.py→django/contrib/admin/bin/compress.py

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import optparse 
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 @@ Compiler library and Java version 6 or later.""" 
    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:

docs/internals/contributing/writing-code/submitting-patches.txt

+4 −2
Original line number Diff line number Diff line
@@ -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/compress.py``.

includes a handy python script which should be used to create a "minified"

version. To run it::



    python django/contrib/admin/bin/compress.py



Behind the scenes, ``compress.py`` is a front-end for Google's

`Closure Compiler`_ which is written in Java. However, the Closure Compiler