circle: enable js compressor

also move the disable less compiler attr to local.py

circle/circle/settings/base.py

@@ -170,13 +170,8 @@ STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
 PIPELINE_COMPILERS = (
 PIPELINE_COMPILERS = (
     'pipeline.compilers.less.LessCompiler',
     'pipeline.compilers.less.LessCompiler',
 )
 )
-PIPELINE_DISABLED_COMPILERS = (
-    'pipeline.compilers.less.LessCompiler',
-)
 PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
 PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
-# PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
-# PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
-PIPELINE_JS_COMPRESSOR = None  # js compressors don't really like our deps
+PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.slimit.SlimItCompressor'
 PIPELINE_DISABLE_WRAPPER = True
 PIPELINE_DISABLE_WRAPPER = True
 PIPELINE_LESS_ARGUMENTS = u'--include-path={}'.format(':'.join(STATICFILES_DIRS))
 PIPELINE_LESS_ARGUMENTS = u'--include-path={}'.format(':'.join(STATICFILES_DIRS))
 PIPELINE_CSS = {
 PIPELINE_CSS = {
@@ -242,7 +237,6 @@ PIPELINE_JS = {
         "no-vnc/include/rfb.js",
         "no-vnc/include/rfb.js",
         "dashboard/vm-console.js",
         "dashboard/vm-console.js",
         "dashboard/vm-tour.js",
         "dashboard/vm-tour.js",
-        "dashboard/disk-list.js",
     ),
     ),
         "output_filename": "vm-detail.js",
         "output_filename": "vm-detail.js",
     },
     },

circle/circle/settings/local.py

@@ -102,3 +102,7 @@ CRISPY_FAIL_SILENTLY = not DEBUG
 if DEBUG:
 if DEBUG:
     from django.dispatch import Signal
     from django.dispatch import Signal
     Signal.send_robust = Signal.send
     Signal.send_robust = Signal.send
+
+PIPELINE_DISABLED_COMPILERS = (
+    'pipeline.compilers.less.LessCompiler',
+)

circle/fabfile.py

@@ -61,7 +61,6 @@ def compile_js():
 def collectstatic():
 def collectstatic():
     "Collect static files"
     "Collect static files"
     with _workon("circle"), cd("~/circle/circle"):
     with _workon("circle"), cd("~/circle/circle"):
-        run("./manage.py compileless")
         run("./manage.py collectstatic --noinput")
         run("./manage.py collectstatic --noinput")
 
 
 
 

requirements/base.txt

@@ -37,3 +37,4 @@ Fabric==1.9.0
 lxml==3.3.5
 lxml==3.3.5
 pyinotify==0.9.4
 pyinotify==0.9.4
 git+https://github.com/BME-IK/django-pipeline.git
 git+https://github.com/BME-IK/django-pipeline.git
+slimit==0.8.1