From a57083bd09c3ccc87fad479b7b85a2cb925f1d9d Mon Sep 17 00:00:00 2001
From: Jonathon Wilson <Jonathon.Wilson@demandmedia.com>
Date: Tue, 1 Oct 2013 21:27:53 -0600
Subject: [PATCH] VRFS-721. Syntax error fixes in ga.js

---
 web/app/assets/javascripts/ftue.js   |  4 +--
 web/app/assets/javascripts/ga.js     | 38 ++++++++++++++--------------
 web/app/views/clients/_ftue.html.erb |  2 --
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/web/app/assets/javascripts/ftue.js b/web/app/assets/javascripts/ftue.js
index c5567d6eb..ec812a6a4 100644
--- a/web/app/assets/javascripts/ftue.js
+++ b/web/app/assets/javascripts/ftue.js
@@ -352,8 +352,8 @@
                 $('[layout-wizard-step="2"] .settings-asio select').removeAttr("disabled");
                 // Set selects to lowest possible values to start:
                 $('#asio-framesize').val('2.5').change();
-                $('#asio-input-latency').val('-1').change();
-                $('#asio-output-latency').val('-1').change();
+                $('#asio-input-latency').val('0').change();
+                $('#asio-output-latency').val('0').change();
             }
         }
 
diff --git a/web/app/assets/javascripts/ga.js b/web/app/assets/javascripts/ga.js
index dae8d26bb..deb5fdb5e 100644
--- a/web/app/assets/javascripts/ga.js
+++ b/web/app/assets/javascripts/ga.js
@@ -12,23 +12,23 @@
     var registrationTypes = {
         native : "Native",
         facebook : "Facebook"
-    }
+    };
 
     var sessionCreationTypes = {
         create : "Create",
         join : "Join"
-    }
+    };
 
     var invitationTypes = {
         email : "Email",
         facebook : "Facebook",
         google : "Google"
-    }
+    };
 
     var friendConnectTypes = {
         request : "Request",
         accept : "Accept"
-    }
+    };
 
     var categories = {
         register : "Register",
@@ -40,7 +40,7 @@
         findSession : "FindSession",
         friendConnect : "Connect"
 
-    }
+    };
 
     function translatePlatformForGA(platform) {
         assertOneOf(platform, context.JK.OS);
@@ -87,19 +87,19 @@
 
         var action = asMusician ? "Musician" : "Fan";
 
-        ga('send', 'event', categories.register, action, registrationType);
+        context.ga('send', 'event', categories.register, action, registrationType);
     }
 
     function trackDownload(platform) {
        var normalizedPlatform = translatePlatformForGA(platform);
 
-       ga('send', 'event', categories.download, normalizedPlatform);
+       context.ga('send', 'event', categories.download, normalizedPlatform);
     }
 
     function trackFTUECompletion(state, platform) {
         var normalizedPlatform = translatePlatformForGA(platform);
 
-        ga('send', 'event', categories.audioTest, state, normalizedPlatform);
+        context.ga('send', 'event', categories.audioTest, state, normalizedPlatform);
     }
 
     function trackSessionCount(musicianAccess, fanAccess, invitationCount) {
@@ -110,46 +110,46 @@
         var gaMusicianAccess = musicianAccess ? "MusicianPublic" : "MusicianPrivate";
         var gaFanAccess = fanAccess ? "FanPublic" : "FanPrivate";
 
-        ga('send', 'event', categories.sessionCount, gaMusicianAccess, gaFanAccess, invitationCount);
+        context.ga('send', 'event', categories.sessionCount, gaMusicianAccess, gaFanAccess, invitationCount);
     }
 
     function trackSessionMusicians(joinOrCreate) {
         assertOneOf(joinOrCreate, sessionCreationTypes);
 
-        ga('send', 'event', categories.sessionMusicians, joinOrCreate);
+        context.ga('send', 'event', categories.sessionMusicians, joinOrCreate);
     }
 
     function trackServiceInvitations(invitationType, numInvited) {
         assertOneOf(invitationType, invitationTypes);
         assertNumber(numInvited);
 
-        ga('send', 'event', categories.invite, invitationType, numInvited);
+        context.ga('send', 'event', categories.invite, invitationType, numInvited);
     }
 
     function trackFindSessions(numSessionsFound) {
         assertNumber(numSessionsFound);
 
         var sessionCountRollup = "n/a";
-        if(numSessionsFound == 0) {
-            sessionCountRollup = "0"
+        if(numSessionsFound === 0) {
+            sessionCountRollup = "0";
         }
         else if(numSessionsFound >= 1 && numSessionsFound <= 5) {
-            sessionCountRollup = "1-5"
+            sessionCountRollup = "1-5";
         }
         else if(numSessionsFound >= 6 && numSessionsFound <= 10) {
-            sessionCountRollup = "6-10"
+            sessionCountRollup = "6-10";
         }
         else {
-            sessionCountRollup = "10+"
+            sessionCountRollup = "10+";
         }
 
-        ga('send', 'event', categories.findSession, sessionCountRollup, numSessionsFound);
+        context.ga('send', 'event', categories.findSession, sessionCountRollup, numSessionsFound);
     }
 
     // if you want to pass in no title, either omit it from the arg list when u invoke virtualPageView, or pass in undefined, NOT null
     function virtualPageView(page, title) {
 
-        ga('send', 'pageview', {
+        context.ga('send', 'pageview', {
             'page': page,
             'title': title
         });
@@ -158,7 +158,7 @@
     function trackFriendConnect(friendConnectType) {
         assertOneOf(friendConnectType, friendConnectTypes);
 
-        ga('send', 'event', categories.friendConnect, friendConnectType);
+        context.ga('send', 'event', categories.friendConnect, friendConnectType);
     }
 
     var GA = {};
diff --git a/web/app/views/clients/_ftue.html.erb b/web/app/views/clients/_ftue.html.erb
index c8623c96a..ddb4d244b 100644
--- a/web/app/views/clients/_ftue.html.erb
+++ b/web/app/views/clients/_ftue.html.erb
@@ -84,7 +84,6 @@
                     <div class="subcolumn second">
                         Buffer/In:<br />
                         <select disabled="disabled" id="asio-input-latency">
-                            <option value="-1">Default</option>
                             <option value="0">0</option>
                             <option value="1">1</option>
                             <option value="2">2</option>
@@ -101,7 +100,6 @@
                     <div class="subcolumn third">
                         Buffer/Out:<br />
                         <select disabled="disabled" id="asio-output-latency">
-                            <option value="-1">Default</option>
                             <option value="0">0</option>
                             <option value="1">1</option>
                             <option value="2">2</option>