From de0b240dbbe0429133f11b739f25d406d5113def Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Tue, 19 Oct 2010 11:36:33 -0700
Subject: [PATCH 1/3] Remove unused helper method

---
 app/helpers/aspects_helper.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
index c19fb4ac4..d627b3e69 100644
--- a/app/helpers/aspects_helper.rb
+++ b/app/helpers/aspects_helper.rb
@@ -14,12 +14,4 @@ module AspectsHelper
       "<span class='grey' title=#{I18n.t('aspects.helper.aspect_not_empty')}>#{I18n.t('aspects.helper.remove')}</span>"
     end
   end
-
-  def aspect_id(aspect)
-    if aspect.class == Aspect
-      aspect.id
-    else
-      :all
-    end
-  end
 end

From 9f653e39f135dfa68295e60b57f33c2c58a3c080 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Tue, 19 Oct 2010 11:39:52 -0700
Subject: [PATCH 2/3] Fix bug 376

---
 app/helpers/application_helper.rb     | 8 ++++++++
 app/views/shared/_aspect_friends.haml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e6fadfef3..830fe2dff 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -7,6 +7,14 @@ module ApplicationHelper
     !@aspect.is_a?(Symbol) && @aspect.id == aspect.id
   end
 
+  def aspect_or_all_path aspect
+    if @aspect.is_a? Aspect
+      aspect_path @aspect
+    else
+      aspects_path
+    end
+  end
+  
   def object_path(object, opts = {})
     object = object.person if object.is_a? User
     eval("#{object.class.to_s.underscore}_path(object, opts)")
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index 876da05e7..e185dc306 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -28,7 +28,7 @@
   %br
   %br
   %ul
-    %li= link_to 'stream', aspect_path(@aspect)
+    %li= link_to 'stream', aspect_or_all_path(@aspect)
     %li= link_to t('.photos'), albums_path(:aspect => @aspect)
 
   %br

From d68644c3584f92a81c78adf0b6be7b21aecef289 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Tue, 19 Oct 2010 11:47:43 -0700
Subject: [PATCH 3/3] Resolve #387

---
 app/views/js/_websocket_js.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 9bf801e0a..3c88de453 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -4,7 +4,7 @@
 
 = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
 :javascript
-  WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";
+  WebSocket.__swfLocation = "#{javascript_path 'WebSocketMain.swf'}";
   $(document).ready(function(){
     function debug(str){ $("#debug").append("<p>" +  str); };