From 54491e0de2ab18d6acf66f8a7b7464b48ccbb242 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 27 Mar 2014 16:17:51 +1100
Subject: [PATCH] Syncing up the email addresses between the SpreeUser tabs

---
 .../controllers/forgot_sidebar_controller.js.coffee         | 6 ++----
 .../controllers/login_sidebar_controller.js.coffee          | 6 ++----
 .../controllers/signup_sidebar_controller.js.coffee         | 4 ++--
 .../javascripts/darkswarm/services/spree_user.js.coffee     | 6 ++++++
 app/views/shared/_forgot_sidebar.html.haml                  | 1 -
 5 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/services/spree_user.js.coffee

diff --git a/app/assets/javascripts/darkswarm/controllers/forgot_sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/forgot_sidebar_controller.js.coffee
index f740e5aaf8..0ebe1d72e9 100644
--- a/app/assets/javascripts/darkswarm/controllers/forgot_sidebar_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/forgot_sidebar_controller.js.coffee
@@ -1,7 +1,5 @@
-window.ForgotSidebarCtrl = Darkswarm.controller "ForgotSidebarCtrl", ($scope, $http, $location) ->
-  $scope.spree_user = {
-    email: null
-  }
+window.ForgotSidebarCtrl = Darkswarm.controller "ForgotSidebarCtrl", ($scope, $http, $location, SpreeUser) ->
+  $scope.spree_user = SpreeUser.spree_user
 
   $scope.active = ->
     $location.path() == '/forgot'
diff --git a/app/assets/javascripts/darkswarm/controllers/login_sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/login_sidebar_controller.js.coffee
index a514348aba..e3d0d20d25 100644
--- a/app/assets/javascripts/darkswarm/controllers/login_sidebar_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/login_sidebar_controller.js.coffee
@@ -1,7 +1,5 @@
-window.LoginSidebarCtrl = Darkswarm.controller "LoginSidebarCtrl", ($scope, $http, $location) ->
-  $scope.spree_user = {
-    remember_me: 0
-  }
+window.LoginSidebarCtrl = Darkswarm.controller "LoginSidebarCtrl", ($scope, $http, $location, SpreeUser) ->
+  $scope.spree_user = SpreeUser.spree_user
 
   $scope.active = ->
     $location.path() == '/login'
diff --git a/app/assets/javascripts/darkswarm/controllers/signup_sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/signup_sidebar_controller.js.coffee
index 5e4c3327e1..5c1c80ce23 100644
--- a/app/assets/javascripts/darkswarm/controllers/signup_sidebar_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/signup_sidebar_controller.js.coffee
@@ -1,5 +1,5 @@
-window.SignupSidebarCtrl = Darkswarm.controller "SignupSidebarCtrl", ($scope, $http, $location) ->
-  $scope.spree_user = {}
+window.SignupSidebarCtrl = Darkswarm.controller "SignupSidebarCtrl", ($scope, $http, $location, SpreeUser) ->
+  $scope.spree_user = SpreeUser.spree_user
   $scope.errors =
     email: null
     password: null
diff --git a/app/assets/javascripts/darkswarm/services/spree_user.js.coffee b/app/assets/javascripts/darkswarm/services/spree_user.js.coffee
new file mode 100644
index 0000000000..f57a6e183b
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/services/spree_user.js.coffee
@@ -0,0 +1,6 @@
+Darkswarm.factory 'SpreeUser', ($resource) ->
+  new class SpreeUser
+    spree_user: {
+      remember_me: 0
+      email: null
+    }
diff --git a/app/views/shared/_forgot_sidebar.html.haml b/app/views/shared/_forgot_sidebar.html.haml
index 84b0540f1a..e2e018ff23 100644
--- a/app/views/shared/_forgot_sidebar.html.haml
+++ b/app/views/shared/_forgot_sidebar.html.haml
@@ -3,7 +3,6 @@
   active: "active()",
   select: "select()"}
 
-  {{ spree_user.email }}
   %form{"ng-submit" => "submit()"}
     .alert-box.alert{"ng-show" => "errors != null"}
       {{ errors }}