yellow team mailing list archive

[Matthew Scott <matthew.scott@xxxxxxxxxxxxx>]

Reviewers: mp+139033_code.launchpad.net,

Message:
Please take a look.

Description:
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://code.launchpad.net/~makyo/juju-gui/config-separate/+merge/139033

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/6905059/

Affected files:
   A [revision details]
   M bin/merge-files


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: benji.york@xxxxxxxxxxxxx-20121210143858-jcgkhuypin9yyuen
+New revision: matthew.scott@xxxxxxxxxxxxx-20121210164316-o6oix1s99cnark8c

Index: bin/merge-files
=== modified file 'bin/merge-files'
--- bin/merge-files	2012-12-06 17:54:45 +0000
+++ bin/merge-files	2012-12-10 16:42:28 +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'));





-- 
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.