Merged master

app/assets/javascripts/app/services/authManager.js

@@ -101,7 +101,10 @@ angular.module('app.frontend')
           callback(response);
         }, function(response){
           console.error("Error getting auth params", response);
-          callback(null);
+          if(typeof response !== 'object') {
+            response = {error: {message: "A server error occurred while trying to sign in. Please try again."}};
+          }
+          callback(response);
         })
       }
 
@@ -120,6 +123,11 @@ angular.module('app.frontend')
       this.login = function(url, email, password, ephemeral, extraParams, callback) {
         this.getAuthParamsForEmail(url, email, function(authParams){
 
+          if(authParams.error) {
+            callback(authParams);
+            return;
+          }
+
           if(!authParams || !authParams.pw_cost) {
             callback({error : {message: "Invalid email or password."}});
             return;
@@ -158,6 +166,9 @@ angular.module('app.frontend')
               callback(response);
             }.bind(this), function(response){
               console.error("Error logging in", response);
+              if(typeof response !== 'object') {
+                response = {error: {message: "A server error occurred while trying to sign in. Please try again."}};
+              }
               callback(response);
             })
 
@@ -199,10 +210,12 @@ angular.module('app.frontend')
           httpManager.postAbsolute(requestUrl, params, function(response){
             this.setEphemeral(ephemeral);
             this.handleAuthResponse(response, email, url, authParams, keys);
-
             callback(response);
           }.bind(this), function(response){
             console.error("Registration error", response);
+            if(typeof response !== 'object') {
+              response = {error: {message: "A server error occurred while trying to register. Please try again."}};
+            }
             callback(response);
           }.bind(this))
         }.bind(this));

app/assets/templates/frontend/editor.html.haml

@@ -59,4 +59,4 @@
   #editor-pane-component-stack
     .component.component-stack-border{"ng-repeat" => "component in ctrl.componentStack", "ng-if" => "component.active", "ng-show" => "!component.ignoreEvents", "id" => "{{'component-' + component.uuid}}", "ng-mouseover" => "component.showExit = true", "ng-mouseleave" => "component.showExit = false"}
       .exit-button.body-text-color{"ng-if" => "component.showExit", "ng-click" => "ctrl.disableComponentForCurrentItem(component, true)"} ×
-      %iframe#note-tags-iframe{"ng-src" => "{{ctrl.componentManager.urlForComponent(component) | trusted}}", "frameBorder" => "0", "sandbox" => "allow-scripts allow-top-navigation-by-user-activation allow-popups allow-popups-to-escape-sandbox allow-modals", "data-component-id" => "{{component.uuid}}"}
+      %iframe{"ng-src" => "{{ctrl.componentManager.urlForComponent(component) | trusted}}", "frameBorder" => "0", "sandbox" => "allow-scripts allow-top-navigation-by-user-activation allow-popups allow-popups-to-escape-sandbox allow-modals", "data-component-id" => "{{component.uuid}}"}