nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-10-09 23:11:05 +02:00
commit 858bdb0808
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/router.js
View file

@ -134,8 +134,8 @@ app.Router = Backbone.Router.extend({
}, },
aspects: function() { aspects: function() {
app.aspects = new app.collections.Aspects(app.currentUser.get("aspects")); app.aspects = app.aspects || new app.collections.Aspects(app.currentUser.get("aspects"));
this.aspectsList = new app.views.AspectsList({ collection: app.aspects }); this.aspectsList = this.aspectsList || new app.views.AspectsList({ collection: app.aspects });
this.aspectsList.render(); this.aspectsList.render();
this.aspects_stream(); this.aspects_stream();
}, },

3
app/assets/javascripts/app/views/infinite_stream_view.js
View file

@ -97,7 +97,8 @@ app.views.InfScroll = app.views.Base.extend({
infScroll : function() { infScroll : function() {
var $window = $(window), var $window = $(window),
distFromBottom = $(document).height() - $window.height() - $window.scrollTop(), 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) { if(elementDistance <= 0 || distFromBottom < 500) {
this.trigger("loadMore"); this.trigger("loadMore");