Merge pull request #95 from gabceb/master-70

Added error handling for rooms. Updated Backbone and Underscore
kandanapp · Feb 20, 2013 · 1b1ec67 · 1b1ec67
2 parents 9c07e55 + 459acb9
commit 1b1ec67
Show file tree

Hide file tree

Showing 5 changed files with 1,230 additions and 788 deletions.
diff --git a/app/assets/javascripts/backbone/kandan.js.coffee.erb b/app/assets/javascripts/backbone/kandan.js.coffee.erb
@@ -72,6 +72,8 @@ window.Kandan =
   initTabs: ()->
     $('#kandan').tabs({
       select: (event, ui)->
+        if ui.tab.id == "create_channel" then return false
+
         $(document).data('active-channel-id',
           Kandan.Helpers.Channels.getChannelIdByTabIndex(ui.index))
 

diff --git a/app/assets/javascripts/backbone/views/channel_tabs.js.coffee b/app/assets/javascripts/backbone/views/channel_tabs.js.coffee
@@ -32,6 +32,9 @@ class Kandan.Views.ChannelTabs extends Backbone.View
       channel.save({}, {
         success: (model)->
           Kandan.Helpers.Channels.createChannelArea(model)
+
+        error: (model)->
+          alert("Something went wrong while creating a new Room.\n\nMaybe the room name is already taken?")
       })
       console.log "create channel: #{channelName}"
     return false