diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js index c145f8187..396e01918 100644 --- a/app/assets/javascripts/app/router.js +++ b/app/assets/javascripts/app/router.js @@ -134,8 +134,8 @@ app.Router = Backbone.Router.extend({ }, aspects: function() { - app.aspects = new app.collections.Aspects(app.currentUser.get("aspects")); - this.aspectsList = new app.views.AspectsList({ collection: app.aspects }); + app.aspects = app.aspects || new app.collections.Aspects(app.currentUser.get("aspects")); + this.aspectsList = this.aspectsList || new app.views.AspectsList({ collection: app.aspects }); this.aspectsList.render(); this.aspects_stream(); }, diff --git a/app/assets/javascripts/app/views/infinite_stream_view.js b/app/assets/javascripts/app/views/infinite_stream_view.js index 4c245bdd0..b8585672a 100644 --- a/app/assets/javascripts/app/views/infinite_stream_view.js +++ b/app/assets/javascripts/app/views/infinite_stream_view.js @@ -97,7 +97,8 @@ app.views.InfScroll = app.views.Base.extend({ infScroll : function() { var $window = $(window), distFromBottom = $(document).height() - $window.height() - $window.scrollTop(), - elementDistance = this.$el.children().last().offset().top - $window.scrollTop() - 500; + lastElOffset = this.$el.children().last().offset(), + elementDistance = lastElOffset ? lastElOffset.top - $window.scrollTop() - 500 : 1; if(elementDistance <= 0 || distFromBottom < 500) { this.trigger("loadMore");