yellow team mailing list archive

[Francesco Banconi <francesco.banconi@xxxxxxxxxxxxx>]

Francesco Banconi has proposed merging lp:~frankban/juju-gui/bug-1090563-merge-files into lp:juju-gui.

Requested reviews:
  Juju GUI Hackers (juju-gui)
Related bugs:
  Bug #1090563 in juju-gui: "lib/merge-files.js:readdir apparently misses some files"
  https://bugs.launchpad.net/juju-gui/+bug/1090563

For more details, see:
https://code.launchpad.net/~frankban/juju-gui/bug-1090563-merge-files/+merge/141923

Removed no longer needed workaround.

The file app/models/charm.js was added explicitly 
in bin/merge-files. Apparently this workaround
is no longer required: the file is correctly
collected by lib/merge-files.js:readdir.

https://codereview.appspot.com/7033053/

-- 
https://code.launchpad.net/~frankban/juju-gui/bug-1090563-merge-files/+merge/141923
Your team Juju GUI Hackers is requested to review the proposed merge of lp:~frankban/juju-gui/bug-1090563-merge-files into lp:juju-gui.

=== modified file 'bin/merge-files'
--- bin/merge-files	2012-12-20 21:59:21 +0000
+++ bin/merge-files	2013-01-04 14:31:21 +0000
@@ -48,8 +48,6 @@
 
   // templates.js is a generated file. It is not part of the app directory.
   paths.push(syspath.join(process.cwd(), 'build-shared/juju-ui/templates.js'));
-  // XXX Why do we have to do this?  (bug 1090563).
-  paths.push(syspath.join(process.cwd(), 'app/models/charm.js'));
 
   merge.combineJs(paths, 'build-shared/juju-ui/assets/app.js');