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

Merge pull request #4870 from svbergerem/activate-hovercards

Browse source 
Activate hovercards in SPV and conversations
This commit is contained in:
Jonne Haß 2014-03-23 11:36:56 +01:00
commit b0a4d5d439
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -34,6 +34,7 @@
* New menu for the mobile version [#4673](https://github.com/diaspora/diaspora/pull/4673) * New menu for the mobile version [#4673](https://github.com/diaspora/diaspora/pull/4673)
* Added comment count to statistic to enable calculations of posts/comments ratios [#4799](https://github.com/diaspora/diaspora/pull/4799) * Added comment count to statistic to enable calculations of posts/comments ratios [#4799](https://github.com/diaspora/diaspora/pull/4799)
* Add filters to notifications controller [#4814](https://github.com/diaspora/diaspora/pull/4814) * Add filters to notifications controller [#4814](https://github.com/diaspora/diaspora/pull/4814)
* Activate hovercards in SPV and conversations [#4870](https://github.com/diaspora/diaspora/pull/4870)
# 0.3.0.3 # 0.3.0.3

1
app/assets/javascripts/app/pages/single-post-viewer.js
View file

@ -34,7 +34,6 @@ app.pages.SinglePostViewer = app.views.Base.extend({
var html_title = app.helpers.textFormatter(this.model.get("title"), this.model); var html_title = app.helpers.textFormatter(this.model.get("title"), this.model);
//... and converts html to plain text //... and converts html to plain text
document.title = $('<div>').html(html_title).text(); document.title = $('<div>').html(html_title).text();
app.hovercard.deactivate() // No hovercards for now.
} }
}, },

4
app/helpers/people_helper.rb
View file

@ -26,6 +26,7 @@ module PeopleHelper
def person_link(person, opts={}) def person_link(person, opts={})
opts[:class] ||= "" opts[:class] ||= ""
opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
opts[:class] << " hovercardable" if defined?(user_signed_in?) && user_signed_in? && current_user.person != person
remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe
"<a data-hovercard='#{remote_or_hovercard_link}' href='#{remote_or_hovercard_link}' class='#{opts[:class]}' #{ ("target=" + opts[:target]) if opts[:target]}>#{h(person.name)}</a>".html_safe "<a data-hovercard='#{remote_or_hovercard_link}' href='#{remote_or_hovercard_link}' class='#{opts[:class]}' #{ ("target=" + opts[:target]) if opts[:target]}>#{h(person.name)}</a>".html_safe
end end
@ -39,6 +40,9 @@ module PeopleHelper
if opts[:to] == :photos if opts[:to] == :photos
link_to person_image_tag(person, opts[:size]), person_photos_path(person) link_to person_image_tag(person, opts[:size]), person_photos_path(person)
else else
opts[:class] ||= ""
opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
opts[:class] << " hovercardable" if defined?(user_signed_in?) && user_signed_in? && current_user.person != person
remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe
"<a href='#{remote_or_hovercard_link}' class='#{opts[:class]}' #{ ("target=" + opts[:target]) if opts[:target]}> "<a href='#{remote_or_hovercard_link}' class='#{opts[:class]}' #{ ("target=" + opts[:target]) if opts[:target]}>
#{person_image_tag(person, opts[:size])} #{person_image_tag(person, opts[:size])}