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

Load right stream with Show More on mobile

Browse source 
- Load aspects stream if user is on this stream instead of loading the
    activity stream
This commit is contained in:
Erwan Guyader 2014-06-16 18:13:05 +02:00
parent f23fb6b6cb
commit 499eb6a9bb
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/stream_helper.rb
View file

@ -10,9 +10,12 @@ module StreamHelper
local_or_remote_person_path(@person, :max_time => time_for_scroll(@stream)) local_or_remote_person_path(@person, :max_time => time_for_scroll(@stream))
elsif controller.instance_of?(PostsController) elsif controller.instance_of?(PostsController)
public_stream_path(:max_time => time_for_scroll(@stream)) public_stream_path(:max_time => time_for_scroll(@stream))
elsif controller.instance_of?(StreamsController) elsif controller.instance_of?(StreamsController)
if current_page?(:stream) if current_page?(:stream)
stream_path(:max_time => time_for_scroll(@stream)) stream_path(:max_time => time_for_scroll(@stream))
elsif current_page?(:aspects_stream)
aspect_ids = (session[:a_ids] || [])
aspects_stream_path(:max_time => time_for_scroll(@stream), a_ids: aspect_ids)
else else
activity_stream_path(:max_time => time_for_scroll(@stream)) activity_stream_path(:max_time => time_for_scroll(@stream))
end end