Merge lp:~benji/juju-gui/potpourri into lp:juju-gui/experimental

[Benji York]

Potpourri, see below.

- elide some of the unnecessary commentary from the linter
- add a bug number to a XXX
- change a Y.Object.each to Y.Array.each

https://codereview.appspot.com/8770044/

[Jeff Pihach (hatch)]

LGTM Thanks for the cleanup!

https://codereview.appspot.com/8770044/

[Gary Poster (gary)]

LGTM. Thank you!

I did not QA; if you would like me to, let me know.

Gary

https://codereview.appspot.com/8770044/

=== modified file 'Makefile'
--- Makefile	2013-04-08 21:03:12 +0000
+++ Makefile	2013-04-15 14:59:16 +0000
@@ -245,7 +245,8 @@
 gjslint: virtualenv/bin/gjslint
 	virtualenv/bin/gjslint --unix --strict --nojsdoc --jslint_error=all \
 	    --custom_jsdoc_tags module,main,class,method,event,property,attribute,submodule,namespace,extends,config,constructor,static,final,readOnly,writeOnce,optional,required,param,return,for,type,private,protected,requires,default,uses,example,chainable,deprecated,since,async,beta,bubbles,extension,extensionfor,extension_for \
-		-x $(LINT_IGNORE) $(JSFILES)
+		-x $(LINT_IGNORE) $(JSFILES) \
+	    | sed -n '0,/^Found /p'| sed '/^Found /q1' # less garbage output
 
 jshint: node_modules/jshint
 	node_modules/jshint/bin/hint $(JSFILES)
@@ -257,10 +258,11 @@
 	bin/lint-yuidoc
 
 recess: node_modules/recess
-	# We need to grep for "Perfect" because recess does not set a non-zero
-	# exit code if it rejects a file.  If this fails, run the recess command
-	# below without the grep to get recess' report.
-	node_modules/recess/bin/recess lib/views/stylesheet.less --config recess.json | grep -q Perfect
+	@# We need to grep for "Perfect" because recess does not set a
+	@# non-zero exit code if it rejects a file.  If this fails, run the
+	@# recess command below without the grep to get recess' report.
+	node_modules/recess/bin/recess lib/views/stylesheet.less \
+	    --config recess.json | grep -q Perfect
 
 lint: test-prep gjslint jshint recess yuidoc-lint test-filtering
 

=== modified file 'app/models/handlers.js'
--- app/models/handlers.js	2013-04-11 11:06:05 +0000
+++ app/models/handlers.js	2013-04-15 14:59:16 +0000
@@ -166,7 +166,8 @@
         id: change.Name,
         charm: change.CharmURL,
         exposed: change.Exposed
-        // XXX 2013-04-05 frankban: missing config and constraints.
+        // XXX 2013-04-05 (bug 1169167) frankban: missing config and
+        // constraints.
       };
       db.services.process_delta(action, data);
     },

=== modified file 'app/views/service.js'
--- app/views/service.js	2013-04-12 20:47:28 +0000
+++ app/views/service.js	2013-04-15 14:59:16 +0000
@@ -639,7 +639,7 @@
             }
           });
 
-          Y.Object.each(env.genericConstraints, function(gkey) {
+          Y.Array.each(env.genericConstraints, function(gkey) {
             if (!(gkey in constraints)) {
               display_constraints.push({name: gkey, value: ''});
             }