From 2c6a5fe81a72efefbcbfcd5369d0075058b62ed9 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Fri, 15 May 2015 16:01:39 -0500
Subject: [PATCH] * fix facebook signup issues VRFS-3253

---
 web/app/assets/javascripts/everywhere/everywhere.js      | 4 ++--
 web/app/assets/javascripts/redeem_signup.js              | 9 ++++-----
 .../assets/stylesheets/client/redeem_complete.css.scss   | 5 ++++-
 web/app/controllers/sessions_controller.rb               | 3 +++
 web/app/views/clients/_redeem_complete.html.slim         | 2 --
 web/app/views/landings/product_jamblaster.html.slim      | 2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/web/app/assets/javascripts/everywhere/everywhere.js b/web/app/assets/javascripts/everywhere/everywhere.js
index 8186b3b58..1b27ba754 100644
--- a/web/app/assets/javascripts/everywhere/everywhere.js
+++ b/web/app/assets/javascripts/everywhere/everywhere.js
@@ -230,8 +230,8 @@
       try {
         cookie = JSON.parse(cookie)
 
-        context.JK.signup = {}
-        context.JK.signup = cookie
+        context.JK.signupData = {}
+        context.JK.signupData = cookie
 
         $(function() {
           // ga() object isn't ready until the page is loaded
diff --git a/web/app/assets/javascripts/redeem_signup.js b/web/app/assets/javascripts/redeem_signup.js
index bc7a13641..3c50dd965 100644
--- a/web/app/assets/javascripts/redeem_signup.js
+++ b/web/app/assets/javascripts/redeem_signup.js
@@ -98,11 +98,10 @@
         }
       })
     }
-    function onClickSignupFacebook() {
+    function onClickSignupFacebook(e) {
       // tos must already be clicked
 
-      var $btn = $(e.target)
-      $btn.addClass('disabled')
+      $btnFacebook.addClass('disabled')
 
       var $field = $termsOfServiceL.closest('.field')
       $field.find('.error-text').remove()
@@ -113,13 +112,13 @@
         rest.createSignupHint({redirect_location: '/client#/redeemComplete'})
           .done(function() {
             // send the user on to facebook signin
-            window.location = $btn.attr('href');
+            window.location = $btnFacebook.attr('href');
           })
           .fail(function() {
             app.notify({text:"Facebook Signup is not working properly"});
           })
           .always(function() {
-            $btn.removeClass('disabled')
+            $btnFacebook.removeClass('disabled')
           })
       }
       else {
diff --git a/web/app/assets/stylesheets/client/redeem_complete.css.scss b/web/app/assets/stylesheets/client/redeem_complete.css.scss
index ece08d208..617e1a01f 100644
--- a/web/app/assets/stylesheets/client/redeem_complete.css.scss
+++ b/web/app/assets/stylesheets/client/redeem_complete.css.scss
@@ -13,7 +13,6 @@
 
   h2 {
     color:white;
-    background-color:#4d4d4d;
     font-weight:normal;
     margin: 0 0 10px 0;
     font-size:14px;
@@ -22,6 +21,10 @@
     line-height: 14px;
     vertical-align: middle;
     text-align:left;
+
+    &.purchased-jam-track-header {
+      background-color:#4d4d4d;
+    }
   }
 
   .action-bar {
diff --git a/web/app/controllers/sessions_controller.rb b/web/app/controllers/sessions_controller.rb
index 4962d93a8..36c54e58c 100644
--- a/web/app/controllers/sessions_controller.rb
+++ b/web/app/controllers/sessions_controller.rb
@@ -147,6 +147,9 @@ class SessionsController < ApplicationController
           new_user(user, signup_hint)
           redirect_to signup_hint.redirect_location
           return
+        else
+          redirect_to "#{signup_path}?facebook_signup=#{fb_signup.lookup_id}"
+          return
         end
       else
         redirect_to "#{signup_path}?facebook_signup=#{fb_signup.lookup_id}"
diff --git a/web/app/views/clients/_redeem_complete.html.slim b/web/app/views/clients/_redeem_complete.html.slim
index ec0c06154..223ba2c82 100644
--- a/web/app/views/clients/_redeem_complete.html.slim
+++ b/web/app/views/clients/_redeem_complete.html.slim
@@ -35,8 +35,6 @@ div layout="screen" layout-id="redeemComplete" id="redeemCompleteScreen" class="
                   h2.purchased-jam-track-header status="in-progress"
                     span.in-progress-msg Downloading Your JamTrack
                     span.done-msg All purchased JamTracks have been downloaded successfully!  You can now play them in a session.
-                  span Each JamTrack will be downloaded sequentially.
-                  br
                   span.notice Note that you do not have to wait for this to complete in order to use your JamTrack later.
                   br.clear
                   ul.purchased-list
diff --git a/web/app/views/landings/product_jamblaster.html.slim b/web/app/views/landings/product_jamblaster.html.slim
index 1b9e65d06..8fd33fd5d 100644
--- a/web/app/views/landings/product_jamblaster.html.slim
+++ b/web/app/views/landings/product_jamblaster.html.slim
@@ -69,7 +69,7 @@ javascript:
           confirmOrder(data.app);
         })
     }
-    else if(window.JK.signup && window.JK.signup.want_jamblaster) {
+    else if(window.JK.signupData  && window.JK.signupData.want_jamblaster) {
       // if the user has come here as a result of a signup attempt, and if they indicated that they want the jamblaster, tell em it's done
        promptConfirmed(data.app)
     }