merged develop into care-portal and fixed conflict in .gitignore

dev4good · Aug 16, 2014 · 7c69da4 · 7c69da4
2 parents b2ad697 + ba4f341
commit 7c69da4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ my.env
 *.env
 static/bower_components/
 .*.sw?
+.DS_Store
 
 .vagrant
 /iisnode

diff --git a/static/js/client.js b/static/js/client.js
@@ -271,7 +271,7 @@
             if (errorCode) {
                 var errorDisplay;
 
-                switch (errorCode) {
+                switch (parseInt(errorCode)) {
                     case 0:  errorDisplay = '??0'; break; //None
                     case 1:  errorDisplay = '?SN'; break; //SENSOR_NOT_ACTIVE
                     case 2:  errorDisplay = '??2'; break; //MINIMAL_DEVIATION