Download as
Browse Code »

Commit 7f75499b8de277afc76e3ce8fee09fbe41583250

Authored by Victor Costa
Committed by Rodrigo Souto
1 parent cd68aebb
Exists in staging and in 32 other branches all_pending_tasks_api, api-articles-period, api_roles, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention, webfinger_server

Improve expandable text area 

Expandable text area when you leave a big scrap in profile's wall

Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Signed-off-by: Macártur Sousa <macartur.sc@gmail.com>
Showing 3 changed files with 7 additions and 3 deletions   Show diff stats
app/controllers/public/profile_controller.rb
  Diff comments   View file @7f75499
@@ -218,7 +218,10 @@ class ProfileController &lt; PublicController @@ -218,7 +218,10 @@ class ProfileController &lt; PublicController
218 218
219 def more_comments 219 def more_comments
220 profile_filter = @profile.person? ? {:user_id => @profile} : {:target_id => @profile} 220 profile_filter = @profile.person? ? {:user_id => @profile} : {:target_id => @profile}
221 - activity = ActionTracker::Record.where({:id => params[:activity]}.merge profile_filter).first 221 + activity = ActionTracker::Record.where(:id => params[:activity])
  222 + activity = activity.where(profile_filter) if !logged_in? || !current_person.follows?(@profile)
  223 + activity = activity.first
  224 +
222 comments_count = activity.comments.count 225 comments_count = activity.comments.count
223 comment_page = (params[:comment_page] || 1).to_i 226 comment_page = (params[:comment_page] || 1).to_i
224 comments_per_page = 5 227 comments_per_page = 5
app/helpers/application_helper.rb
  Diff comments   View file @7f75499
@@ -940,7 +940,8 @@ module ApplicationHelper @@ -940,7 +940,8 @@ module ApplicationHelper
940 end 940 end
941 941
942 def expandable_text_area(object_name, method, text_area_id, options = {}) 942 def expandable_text_area(object_name, method, text_area_id, options = {})
943 - text_area(object_name, method, { :id => text_area_id, :onkeyup => "grow_text_area('#{text_area_id}')" }.merge(options)) 943 + options[:class] = (options[:class] || '') + ' autogrow'
  944 + text_area(object_name, method, { :id => text_area_id }.merge(options))
944 end 945 end
945 946
946 def pluralize_without_count(count, singular, plural = nil) 947 def pluralize_without_count(count, singular, plural = nil)
app/views/profile/_profile_scrap_reply_form.html.erb
  Diff comments   View file @7f75499
1 <div id='profile-wall-reply-<%= scrap.id%>' style='display:none'> 1 <div id='profile-wall-reply-<%= scrap.id%>' style='display:none'>
2 <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none'> 2 <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none'>
3 <p class='profile-wall-reply'> 3 <p class='profile-wall-reply'>
4 - <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :html => { :class => 'profile-wall-reply-form'} do %> 4 + <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :html => { :class => 'profile-wall-reply-form', 'data-update' => 'profile_activities'} do %>
5 <%= expandable_text_area :scrap, 5 <%= expandable_text_area :scrap,
6 :content, 6 :content,
7 "reply_content_#{scrap.id}", 7 "reply_content_#{scrap.id}",