Merge pull request #361 from scouttyg/no-scrollbar-message-fix

Fixed container so that it would load extra messages if it detected that...
kandanapp · May 15, 2014 · 7a6fee7 · 7a6fee7
2 parents a32900d + b227c8a
commit 7a6fee7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/app/assets/javascripts/backbone/views/channel_pane.js.coffee b/app/assets/javascripts/backbone/views/channel_pane.js.coffee
@@ -8,6 +8,10 @@ class Kandan.Views.ChannelPane extends Backbone.View
     # Flag to avoid pulling new messages when we already requested new messages from the server
     @loading_new_messages = false
 
+    if !$container.hasScrollBar()
+      @loading_new_messages = true;
+      @loadMoreActivities($container)
+
     $container.bind 'scroll', =>
       if $container.scrollTop() <= 100 && !@loading_new_messages
         @loading_new_messages = true

diff --git a/app/assets/javascripts/layout.js.coffee b/app/assets/javascripts/layout.js.coffee
@@ -21,3 +21,6 @@ $(document).ready ->
       $(this).closest('.nav').addClass('search-focus')
     .on 'blur', ->
       $(this).closest('.nav').removeClass('search-focus')
+
+  $.fn.hasScrollBar = ->
+    (if @get(0) then @get(0).scrollHeight > @innerHeight() else false)