Merge lp:~stephen-stewart/snapweb/handle-missing-response-in-parse into lp:~snappy-dev/snapweb/trunk

[Stephen Stewart]

the api doesn't always return what we expect, so fail by returning to last known state

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'www/src/css/alert.css'
--- www/src/css/alert.css	2015-05-05 11:20:39 +0000
+++ www/src/css/alert.css	2015-05-07 15:42:32 +0000
@@ -2,27 +2,25 @@
   position: relative;
   width: 600px;
   margin: 0 auto;
-  background-color: rgb(255, 255, 255);
-  border-radius: 0px;
+  background-color: #fff;
   border: 4px solid #DADADA;
   padding: 1em 2em;
-  border-top: none;
-  color: #dd4814;
-  border-bottom-left-radius: 6px;
-  border-bottom-right-radius: 6px;
+  color: #333;
+  font-weight:400;
+  border-radius:6px;
 }
 
 .b-alert__close {
   position: absolute;
   top: 0;
-  right: 0;
+  right: -3px;
   font-size: 14px;
   line-height: 1;
 }
 
 .b-alert__close a {
   text-decoration:none;
-  color: #ccc;
+  color: #333;
   display:block;
   width:40px;
   height:40px;

=== modified file 'www/src/css/layout.css'
--- www/src/css/layout.css	2015-05-05 11:20:39 +0000
+++ www/src/css/layout.css	2015-05-07 15:42:32 +0000
@@ -30,7 +30,7 @@
 
 .b-layout__alerts {
   position: absolute;
-  top: 60px;
+  top: 30px;
   width: 100%;
   z-index: 10000;
 }

=== modified file 'www/src/js/behaviors/install.js'
--- www/src/js/behaviors/install.js	2015-05-06 18:57:26 +0000
+++ www/src/js/behaviors/install.js	2015-05-07 15:42:32 +0000
@@ -36,7 +36,7 @@
     var installer = this.ui.installer;
     var installerButton = this.ui.installerButton;
 
-    // reset progress 
+    // reset progress
     this.ui.installerProgress.css('right', '100%');
 
     if (_.contains(CONF.INSTALL_STATE, state)) {

=== modified file 'www/src/js/models/snap.js'
--- www/src/js/models/snap.js	2015-05-06 18:57:26 +0000
+++ www/src/js/models/snap.js	2015-05-07 15:42:32 +0000
@@ -46,7 +46,16 @@
     });
 
     this.on('error', function(model, response, opts) {
-      this.set(this.parse(response.responseJSON));
+      var json = JSON.parse(response.responseText);
+      var previous = model.previousAttributes();
+      var message;
+      if (json && json.message) {
+        message = json.message;
+      } else {
+        message = 'Sorry, something went wrong :(';
+      }
+      previous.message = message;
+      model.set(previous);
       chan.command('alert:error', model);
     });