Quick best practice cleanup of views/helpers (#1546)
* Remove trailing whitespace * Use query methods instead of explicit .blank? checks
This commit is contained in:
		
							parent
							
								
									aa90798386
								
							
						
					
					
						commit
						c44a700252
					
				
					 10 changed files with 16 additions and 19 deletions
				
			
		|  | @ -21,9 +21,9 @@ | |||
|             %i.fa.fa-check | ||||
|         %td= distance_of_time_in_words(Time.now, subscription.expires_at) | ||||
|         %td | ||||
|           - if subscription.last_successful_delivery_at.nil? | ||||
|             %i.fa.fa-times | ||||
|           - else | ||||
|           - if subscription.last_successful_delivery_at? | ||||
|             = l subscription.last_successful_delivery_at | ||||
|           - else | ||||
|             %i.fa.fa-times | ||||
| 
 | ||||
| = paginate @subscriptions | ||||
|  |  | |||
|  | @ -12,10 +12,7 @@ | |||
| %p | ||||
|   %strong= t('reports.comment.label') | ||||
|   \: | ||||
|   - if @report.comment.blank? | ||||
|     = t('reports.comment.none') | ||||
|   - else | ||||
|     = @report.comment | ||||
|   = @report.comment.presence || t('reports.comment.none') | ||||
| 
 | ||||
| - unless @statuses.empty? | ||||
|   %hr/ | ||||
|  |  | |||
|  | @ -7,5 +7,5 @@ | |||
|       %strong.emojify= display_name(account) | ||||
|       %span= "@#{account.acct}" | ||||
| 
 | ||||
|   - unless account.note.blank? | ||||
|   - if account.note? | ||||
|     .account__header__content.emojify= Formatter.instance.simplified_format(account) | ||||
|  |  | |||
|  | @ -8,11 +8,11 @@ | |||
|       %span.p-nickname= acct(status.account) | ||||
| 
 | ||||
|   .status__content.e-content.p-name.emojify< | ||||
|     - unless status.spoiler_text.blank? | ||||
|     - if status.spoiler_text? | ||||
|       %p{ style: 'margin-bottom: 0' }< | ||||
|         %span>= "#{status.spoiler_text} " | ||||
|         %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') | ||||
|     %div{ style: "display: #{status.spoiler_text.blank? ? 'block' : 'none'}; direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) | ||||
|     %div{ style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) | ||||
| 
 | ||||
|   - unless status.media_attachments.empty? | ||||
|     - if status.media_attachments.first.video? | ||||
|  |  | |||
|  | @ -13,11 +13,11 @@ | |||
|         %span.p-nickname= acct(status.account) | ||||
| 
 | ||||
|   .status__content.e-content.p-name.emojify< | ||||
|     - unless status.spoiler_text.blank? | ||||
|     - if status.spoiler_text? | ||||
|       %p{ style: 'margin-bottom: 0' }< | ||||
|         %span>= "#{status.spoiler_text} " | ||||
|         %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') | ||||
|     %div{ style: "display: #{status.spoiler_text.blank? ? 'block' : 'none'}; direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) | ||||
|     %div{ style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) | ||||
| 
 | ||||
|   - unless status.media_attachments.empty? | ||||
|     .status__attachments | ||||
|  |  | |||
		Reference in a new issue