Cleaner prod/dev libs loading

docs/developers/settings.rst

@@ -246,6 +246,12 @@ MISAGO_HOURL_POST_LIMIT
 Hourly limit of posts that may be posted from single account. Fail-safe for situations when forum is flooded by spam bot. Change to 0 to lift this restriction.
 
 
+MISAGO_JS_DEBUG
+---------------
+
+Switches between production and debug versions of Ember and Handlebars.
+
+
 MISAGO_MAILER_BATCH_SIZE
 ------------------------
 

misago/conf/defaults.py

@@ -31,6 +31,10 @@ import os
 MISAGO_BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 
+# Default JS debug to false
+MISAGO_JS_DEBUG = False
+
+
 # Assets Pipeline
 # See http://django-pipeline.readthedocs.org/en/latest/configuration.html
 PIPELINE_CSS = {
@@ -51,10 +55,22 @@ PIPELINE_CSS = {
 PIPELINE_JS = {
     'misago_lib': {
         'source_filenames': (
-            # leave this part empty, its overrided by deployment's settings.py
+            'misago/ember/jquery-1.11.1.min.js',
+            'misago/ember/handlebars.runtime-v2.0.0.js',
+            'misago/ember/ember.prod-1.9.1.js',
+            'misago/ember/ember-data.prod-1.0.0.b14.js',
         ),
         'output_filename': 'misago_lib.js',
     },
+    'misago_lib_debug': {
+        'source_filenames': (
+            'misago/ember/jquery-1.11.1.min.js',
+            'misago/ember/handlebars-v2.0.0.js',
+            'misago/ember/ember-1.9.1.js',
+            'misago/ember/ember-data-1.0.0.b14.js',
+        ),
+        'output_filename': 'misago_lib_debug.js',
+    },
     'misago': {
         'source_filenames': (
             'misago/js/templates/*.hbs',
@@ -86,20 +102,6 @@ PIPELINE_JS = {
     },
 }
 
-MISAGO_JS_LIB_DEV = (
-    'misago/ember/jquery-1.11.1.min.js',
-    'misago/ember/handlebars-v2.0.0.js',
-    'misago/ember/ember-1.9.1.js',
-    'misago/ember/ember-data-1.0.0.b14.js',
-)
-
-MISAGO_JS_LIB_PROD = (
-    'misago/ember/jquery-1.11.1.min.js',
-    'misago/ember/handlebars.runtime-v2.0.0.js',
-    'misago/ember/ember.prod-1.9.1.js',
-    'misago/ember/ember-data.prod-1.0.0.b14.js',
-)
-
 PIPELINE_COMPILERS = (
     'pipeline.compilers.less.LessCompiler',
 )
@@ -178,6 +180,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.static',
     'django.core.context_processors.tz',
     'django.contrib.messages.context_processors.messages',
+    'misago.core.context_processors.js_debug',
     'misago.core.context_processors.site_address',
     'misago.conf.context_processors.settings',
     'misago.users.context_processors.sites_links',

misago/core/context_processors.py

@@ -1,3 +1,12 @@
+from django.conf import settings
+
+
+def js_debug(request):
+    return {
+        'MISAGO_JS_DEBUG': settings.MISAGO_JS_DEBUG
+    }
+
+
 def site_address(request):
     if request.is_secure():
         site_protocol = 'https'

misago/project_template/project_name/settings.py

@@ -23,7 +23,11 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+MISAGO_JS_DEBUG = DEBUG
+
+# Hosts allowed to reach your site
 
 ALLOWED_HOSTS = []
 
@@ -107,14 +111,6 @@ MISAGO_SENDFILE_HEADER = ''
 MISAGO_SENDFILE_LOCATIONS_PATH = ''
 
 
-# JS Application library definition
-# Don't edit this unless you really have to change Ember/Handlebars/jQuery
-if TEMPLATE_DEBUG:
-    PIPELINE_JS['misago_lib']['source_filenames'] = MISAGO_JS_LIB_DEV
-else:
-    PIPELINE_JS['misago_lib']['source_filenames'] = MISAGO_JS_LIB_PROD
-
-
 # Application definition
 # Don't edit those settings unless you know what you are doing
 ROOT_URLCONF = '{{ project_name }}.urls'

misago/templates/misago/base.html

@@ -12,7 +12,6 @@
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-    {% stylesheet 'misago_lib' %}
     {% stylesheet 'misago' %}
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% static 'apple-touch-icon-144-precomposed.png' %}">
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% static 'apple-touch-icon-114-precomposed.png' %}">
@@ -32,7 +31,11 @@
 
     <section id="main"></section>
 
-    {% javascript "misago_lib" %}
+    {% if MISAGO_JS_DEBUG %}
+      {% javascript "misago_lib_debug" %}
+    {% else %}
+      {% javascript "misago_lib" %}
+    {% endif %}
     {% javascript "misago" %}
 
   </body>