From 4e5d09e6c51d6cb437161e686eeec6b8a678551f Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Fri, 9 Oct 2015 21:55:44 +0200
Subject: [PATCH 1/2] Fix 'post to single aspect' cukes

---
 app/assets/javascripts/app/router.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js
index 5d3b3ff2a..2fefe63a8 100644
--- a/app/assets/javascripts/app/router.js
+++ b/app/assets/javascripts/app/router.js
@@ -119,8 +119,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();
   },

From 2fc7caf0bd501e8fcc9201ea4afd45a7d16b04ae Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Fri, 9 Oct 2015 21:57:58 +0200
Subject: [PATCH 2/2] Fix infinite scroll console error

closes #6478
---
 app/assets/javascripts/app/views/infinite_stream_view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/views/infinite_stream_view.js b/app/assets/javascripts/app/views/infinite_stream_view.js
index e4a5a791b..1716eefb7 100644
--- a/app/assets/javascripts/app/views/infinite_stream_view.js
+++ b/app/assets/javascripts/app/views/infinite_stream_view.js
@@ -100,7 +100,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");