1 files changed, 42 insertions, 42 deletions

diff --git a/static/pichat.js b/static/pichat.js
index d665e2b..56dbd36 100755
--- a/static/pichat.js
+++ b/static/pichat.js
@@ -1,7 +1,6 @@
 // pichat.js
 
 var Nick = null;
-var LoggedIn = false;
 
 function handleMsgError(resp) {
     var respText = resp.responseText ? resp.responseText.trim() : false;
@@ -54,6 +53,9 @@ function setNick(nick) {
     Nick = nick;
     $('#nickspan').text(nick);
     $('#welcomebar').show();
+    $('#msgInput, #msgSubmit').removeAttr('disabled');
+    $('#msgInput').keyup(ifEnter(submitMessage));
+    $('#msgSubmit').click(submitMessage);
 }
 
 function submitMessage() {
@@ -100,7 +102,6 @@ function login() {
 
     var onSuccess = function(json) {
         $('#loginbar').hide();
-        LoggedIn = true;
         setNick(nick);
     };
 
@@ -128,25 +129,37 @@ function scrollToBottom(div) {
     div.scrollTop = div.scrollHeight;
 }
 
-function refresh() {
-    var onSuccess = function(json) {        
-        if (json.messages.length > 0) {
-            var shouldScroll = isScrolledToBottom($('#messageList')[0]);
-
-            // Ignore our own messages
+function updateUI(json, initialUpdate) {
+    if (json.messages.length > 0) {        
+        if (initialUpdate) {
+            var messages = json.messages;            
+        } else {
+            // Our own messages have already been displayed.
             var filterFunc = function(m) { return m.nick != Nick };
-            var msgStr = $.map($.grep(json.messages, filterFunc),
-                               buildMessageDiv).join('');
-            $('#messageList').append(msgStr);
-
-            if (shouldScroll) {
-                scrollToBottom($('#messageList')[0]);
-            }
+            var messages = $.grep(json.messages, filterFunc);            
         }
-        $("#userList").html($.map(json.users, buildUserDiv).join(''));
-    };
+                
+        var msgStr = $.map(messages,
+                           buildMessageDiv).join('');
+        var wasScrolledToBottom = isScrolledToBottom($('#messageList')[0]);
+        $('#messageList').append(msgStr);
+        
+        if (initialUpdate || wasScrolledToBottom) {
+            // Delay scrolling by .5 seconds so images can start loading.
+            setTimeout(scrollToBottom, 500, $('#messageList')[0]);
+        }
+    }
+    $("#userList").html($.map(json.users, buildUserDiv).join(''));
+}
 
-    var onError = function(resp, textStatus, errorThrown) {};
+function refresh() {
+    var onSuccess = function(json) {
+        updateUI(json, false);
+        setTimeout(refresh, 1000);
+    };
+    var onError = function(resp, textStatus, errorThrown) {
+        setTimeout(refresh, 1000);
+    };
 
     $.ajax({
         type: 'GET',
@@ -159,34 +172,22 @@ function refresh() {
     });
 }
 
-function init() {
+function init() {    
     var onSuccess = function(json) {
-        $('#loadingbox').hide();
-        Nick = json.nick;
-
-        setNick(Nick);
-        if (json.loggedin) {
-            LoggedIn = true;
+        if (json.nick) {
+            setNick(json.nick);
         } else {
             $('#loginbar').show();
-            $('#loginSubmit').click(login);
             $('#passwordInput').keyup(ifEnter(login));
+            $('#loginSubmit').click(login);
         }
-        
-        var msgStr = $.map(json.messages, buildMessageDiv).join('');
-        $('#messageList').append(msgStr);        
-        $("#userList").html($.map(json.users, buildUserDiv).join(''));
-        $('#nickInput, #nickSubmit, #msgInput, #msgSubmit').removeAttr('disabled');
-        
-        // Delay scrolling by .5 seconds so images can start loading.
-        setTimeout(scrollToBottom, 500, $('#messageList')[0]);
-        setInterval(refresh, 1000);
+        updateUI(json, true);
+        setTimeout(refresh, 1000);
     };
-
     var onError = function(resp, textStatus, errorThrown) {
-        alert("Error connecting to chat server!");
-    };    
-    
+        alert("Error initializing!");
+    };
+
     $.ajax({
         type: 'GET',
         timeout: 5000,
@@ -194,9 +195,8 @@ function init() {
         cache: false,
         dataType: 'json',
         success: onSuccess,
-        error: onError
+        error: onError       
     });
 
-    $('#msgInput').keyup(ifEnter(submitMessage));
-    $('#msgSubmit').click(submitMessage);
+
 }