resolved merge

1 files changed, 3 insertions, 5 deletions

diff --git a/static/js/home.js b/static/js/home.js
index 107486c..e9be833 100755
--- a/static/js/home.js
+++ b/static/js/home.js
@@ -5,7 +5,6 @@ function ifEnter(fn) {
 }
 
 function initLoginForm() {
-
   var nick = "#nickInput", nickFiller = "username"
   var pass = "#passwordInput", passLabel = "#passwordInputLabel", passFiller = "password"
   var submit = "#signin-submit"
@@ -145,17 +144,16 @@ function initBigHand(id){
 }
 
 function login() {
-    //$('#passwordInput, #loginSubmit').blur();
     var nick = $('#nickInput').val();
     var password = $('#passwordInput').val();
     var rememberme = $('#remembermeInput').attr('checked') ? 'yes' : '';
     var hash = hex_sha1(nick + '$' + password + '$dumpfm');
 
     var onSuccess = function(json) {
+        location.href = location.href;
 	 if (typeof pageTracker !== 'undefined') {
-	   pageTracker._setCustomVar(1, "logged-in", nick, 1);
-        }
-        location.href = "/chat";
+	     pageTracker._setCustomVar(1, "logged-in", nick);
+         }
     };
 
     var onError = function(resp, textStatus, errorThrown) {