Merge pull request #67 from SpencerCooley/master

took out the rb-readline gem
kandanapp · Feb 11, 2013 · 688b52a · 688b52a
2 parents a0b07b5 + 30d8fd3
commit 688b52a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -21,7 +21,7 @@ gem 'aws-sdk'
 gem 'paperclip'
 gem 'remotipart'
 gem 'jquery-rails'
-gem 'rb-readline'
+
 # Making the world a better, more stable place
 gem 'airbrake'
 

diff --git a/app/assets/javascripts/backbone/views/chatbox.js.coffee b/app/assets/javascripts/backbone/views/chatbox.js.coffee
@@ -37,7 +37,7 @@ class Kandan.Views.Chatbox extends Backbone.View
       )
 
       $("#activity-c#{model.cid}").attr("id", "activity-#{model.get('id')}")
-      $scrollbox = $(event.target).parent().find(".paginated-activities")
+      $scrollbox = $('.channels-pane')
       $scrollbox.prop("scrollTop", $scrollbox.prop('scrollHeight'))
     })