Merge branch 'master' of ssh://dump.fm/home/dumpfmprod/prod

2 files changed, 10 insertions, 2 deletions

diff --git a/static/js/pichat.js b/static/js/pichat.js
index 5784dcf..4c91a35 100755
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -196,12 +196,20 @@ function updateUI(msgs, users) {
     if (users !== null) {
         var flattened = flattenUserJson(users);
         if (!('userlist' in cache) || flattened != cache.userlist) {
-            $("#userList").html($.map(users, buildUserDiv).join(''));
+            $("#userList").html($.map(users.sort(sortUsersByAlpha), buildUserDiv).join(''));
         }
         cache.userlist = flattened
     }
 }
 
+function sortUsersByAlpha(a, b){
+  var nickA = a.nick.toLowerCase()
+  var nickB = b.nick.toLowerCase()
+  if (nickA > nickB) return 1
+  else if (nickA < nickB) return -1
+  return 0
+}
+
 function isDuplicateMessage(m) {
     if (m.nick == Nick && m.content in PendingMessages) {
         delete PendingMessages[m.content];
diff --git a/static/js/register.js b/static/js/register.js
index af7529b..d479aab 100755
--- a/static/js/register.js
+++ b/static/js/register.js
@@ -6,7 +6,7 @@ function validateNick(n) {
 
 // HOPE NO HACKERS ARE READING THIS :o
 var ValidCodes = ['WAXWANYE23',
-		    'HOTDUMPING5000','RHIZOME',];
+		    'HOTDUMPING5000','RHIZOME','VIP666','HEATNAP',];
 
 function submitRegistration() {
     var nick = $('#nickInput').val();