diff --git a/public/javascripts/app/views/stream_view.js b/public/javascripts/app/views/stream_view.js index 7dbd08c14898622d64e0c5b00b866a34ca8a9fbf..837dacffeffe28698dbc8e8aafbb1d037a616bd7 100644 --- a/public/javascripts/app/views/stream_view.js +++ b/public/javascripts/app/views/stream_view.js @@ -31,7 +31,7 @@ app.views.Stream = Backbone.View.extend({ }, unbindInfScroll : function() { - $("window").unbind("scroll"); + $(window).unbind("scroll"); }, render : function(evt) { @@ -63,11 +63,11 @@ app.views.Stream = Backbone.View.extend({ setupInfiniteScroll : function() { var throttledScroll = _.throttle($.proxy(this.infScroll, this), 200); - $("window").scroll(throttledScroll); + $(window).scroll(throttledScroll); }, infScroll : function() { - var $window = $("window"); + var $window = $(window); var distFromTop = $window.height() + $window.scrollTop(); var distFromBottom = $(document).height() - distFromTop; var bufferPx = 500; diff --git a/spec/javascripts/app/views/stream_view_spec.js b/spec/javascripts/app/views/stream_view_spec.js index 5f3b1d3714a80dfef31d3896040ce42f4269775b..f7b5aa96874a4201c72b16f0a449e167dbc231c0 100644 --- a/spec/javascripts/app/views/stream_view_spec.js +++ b/spec/javascripts/app/views/stream_view_spec.js @@ -65,7 +65,6 @@ describe("app.views.Stream", function(){ it("unbinds scroll", function() { spyOn($.fn, "unbind") this.view.unbindInfScroll() - expect($.fn.unbind.mostRecentCall.object.selector).toBe("window") expect($.fn.unbind).toHaveBeenCalledWith("scroll") }) })