yes

3 files changed, 14 insertions, 19 deletions

diff --git a/public/assets/js/lib/sdk/auth.js b/public/assets/js/lib/sdk/auth.js
index 983cc99..c720292 100644
--- a/public/assets/js/lib/sdk/auth.js
+++ b/public/assets/js/lib/sdk/auth.js
@@ -11,29 +11,23 @@ var auth = (function(){
   
   auth.init = function(fn){
     // if we're on an authentication page, ignore the current user
-    console.log('auth')
     if (window.location.pathname === '/login' || window.location.pathname === '/signup') {
-      console.log('authenticating..')
       fn && fn( false )
       return
     }
-    console.log('loading user..')
     auth.load_user(function(user){
       var logged_in = auth.logged_in()
-      console.log('logged in?', logged_in)
       if (logged_in) {
         fn && fn()
         return
       }
       auth.checkin({
         success: function(user){
-          console.log('check in :)', user)
           if (user) {
             auth.set_user(user, fn)
           }
         },
         error: function(){
-          console.log('no check in :(', user)
           window.location.href = "/login"
         }
       })
@@ -50,7 +44,6 @@ var auth = (function(){
   auth.load_user = function(cb){
     var user
     var user_str = localStorage.getItem("bucky.user")
-    console.log("check localStorage", user_str)
     if (user_str && user_str.length) {
       try {
         user = JSON.parse(user_str)
diff --git a/public/assets/js/lib/views/details/settings.js b/public/assets/js/lib/views/details/settings.js
index 777a9ba..b702908 100644
--- a/public/assets/js/lib/views/details/settings.js
+++ b/public/assets/js/lib/views/details/settings.js
@@ -45,7 +45,7 @@ var ThreadSettingsForm = FormView.extend({
       option.innerHTML = color
       $color.append(option)
     })
-    $color.val(thread.color || keyword.color)
+    $color.val(thread.color || keyword ? keyword.color : "")
     
     $.get('/api/keywords', function(data){
       var $keyword = this.$('[name=keyword]')
diff --git a/public/assets/js/lib/views/mail/mailbox.js b/public/assets/js/lib/views/mail/mailbox.js
index b7877f2..22a49c5 100644
--- a/public/assets/js/lib/views/mail/mailbox.js
+++ b/public/assets/js/lib/views/mail/mailbox.js
@@ -20,19 +20,21 @@ var MailboxView = View.extend({
   },
   
   populate: function(data){
-    this.boxlist.load(data.boxes)
+    if (data.boxes) {
+      this.boxlist.load(data.boxes)
 
-    var user = data.user
-    var max = data.messages.length-1
-    if (data.messages.length) {
-      $("#no_messages").hide()
+      var user = data.user
+      var max = data.messages.length-1
+      if (data.messages.length) {
+        $("#no_messages").hide()
+      }
+      data.messages.forEach(function(message, i){
+        var $row = this.parse(message, user)
+        if (i === 0) $row.addClass("first")
+        if (i === max) $row.addClass("last")
+        this.$el.append($row)
+      }.bind(this))
     }
-    data.messages.forEach(function(message, i){
-      var $row = this.parse(message, user)
-      if (i === 0) $row.addClass("first")
-      if (i === max) $row.addClass("last")
-      this.$el.append($row)
-    }.bind(this))
     $("body").removeClass('loading')
   },