yellow team mailing list archive

[Matthew Scott <matthew.scott@xxxxxxxxxxxxx>]

Matthew Scott has proposed merging lp:~makyo/juju-gui/config-separate into lp:juju-gui.

Requested reviews:
  Juju GUI Hackers (juju-gui)

For more details, see:
https://code.launchpad.net/~makyo/juju-gui/config-separate/+merge/139033

Exclude config.js from minification

config(-debug).js should not be included in minification because it is already included in index.html, and needs to be modified in the charm start hook after the build process.

https://codereview.appspot.com/6905059/

-- 
https://code.launchpad.net/~makyo/juju-gui/config-separate/+merge/139033
Your team Juju GUI Hackers is requested to review the proposed merge of lp:~makyo/juju-gui/config-separate into lp:juju-gui.

=== modified file 'bin/merge-files'
--- bin/merge-files	2012-12-06 17:54:45 +0000
+++ bin/merge-files	2012-12-10 16:46:56 +0000
@@ -38,7 +38,9 @@
   // module 'app/config.js'" from node's internal module.js file.
   var paths = merge.readdir(syspath.join(process.cwd(), 'app'),
     [syspath.join(process.cwd(), 'app/assets'),
-     syspath.join(process.cwd(), 'app/modules-debug.js')]);
+     syspath.join(process.cwd(), 'app/modules-debug.js'),
+     syspath.join(process.cwd(), 'app/config.js'),
+     syspath.join(process.cwd(), 'app/config-debug.js')]);
 
   // templates.js is a generated file. It is not part of the app directory.
   paths.push(syspath.join(process.cwd(), 'build/juju-ui/templates.js'));