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

scroll to post on page if you can see it (via notification popup)

Browse source
This commit is contained in:
danielgrippi 2011-03-23 17:16:19 -07:00
parent 18c7c467c7
commit b6d5165f2d
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/notifications_helper.rb
View file

@ -15,14 +15,14 @@ module NotificationsHelper
elsif note.instance_of?(Notifications::CommentOnPost) elsif note.instance_of?(Notifications::CommentOnPost)
post = Post.where(:id => note.target_id).first post = Post.where(:id => note.target_id).first
if post if post
"#{translation(target_type)} #{link_to t('notifications.post'), object_path(post)}".html_safe "#{translation(target_type)} #{link_to t('notifications.post'), object_path(post), 'data-ref' => post.id, :class => 'hard_object_link'}".html_safe
else else
"#{translation(target_type)} #{t('notifications.deleted')} #{t('notifications.post')}" "#{translation(target_type)} #{t('notifications.deleted')} #{t('notifications.post')}"
end end
elsif note.instance_of?(Notifications::AlsoCommented) elsif note.instance_of?(Notifications::AlsoCommented)
post = Post.where(:id => note.target_id).first post = Post.where(:id => note.target_id).first
if post if post
"#{translation(target_type, post.author.name)} #{link_to t('notifications.post'), object_path(post)}".html_safe "#{translation(target_type, post.author.name)} #{link_to t('notifications.post'), object_path(post), 'data-ref' => post.id, :class => 'hard_object_link'}".html_safe
else else
t('notifications.also_commented_deleted') t('notifications.also_commented_deleted')
end end

2
app/views/comments/_comment.html.haml
View file

@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%li.comment{:data=>{:guid => comment.id}, :class => ("hidden" if(defined? hidden))} %li.comment.posted{:data=>{:guid => comment.id}, :class => ("hidden" if(defined? hidden))}
= person_image_link(comment.author) = person_image_link(comment.author)
.content .content
.from .from

11
public/javascripts/view.js
View file

@ -61,6 +61,17 @@ var View = {
/* facebox 'done' buttons */ /* facebox 'done' buttons */
$("a[rel*=close]").live('click', function(){ $.facebox.close() }); $("a[rel*=close]").live('click', function(){ $.facebox.close() });
/* notification routing */
$("#notification").delegate('.hard_object_link', 'click', function(evt){
var post = $("*[data-guid='"+ $(this).attr('data-ref') +"']"),
lastComment = post.find('.comment.posted').last();
if(post.length > 0){
evt.preventDefault();
$('html, body').animate({scrollTop: parseInt(lastComment.offset().top)-80 }, 'fast');
}
});
}, },
addAspectButton: { addAspectButton: {