about summary refs log tree commit diff
path: root/app/views/stream_entries/_status.html.haml
diff options
context:
space:
mode:
authoryhirano <yhirano@me.com>2017-05-08 10:35:25 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-05-08 03:35:25 +0200
commit48594b18e6285d87ee2f58daa08d356b571c8aa6 (patch)
tree58401bb04d522822b1463dd754a9555f1de3d755 /app/views/stream_entries/_status.html.haml
parentb18504adfefe521ab1486e1fa04662e9084fbe32 (diff)
Added haml-lint and fix warnings (#2773)
* add haml_lint to Gemfile

* add .haml-lint.yml

* fix warnings of haml_lint
Diffstat (limited to 'app/views/stream_entries/_status.html.haml')
-rw-r--r--app/views/stream_entries/_status.html.haml32
1 files changed, 16 insertions, 16 deletions
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml
index 6c763bde2..50a373743 100644
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@@ -1,25 +1,25 @@
-- include_threads ||= false
-- is_predecessor  ||= false
-- is_successor    ||= false
-- direct_reply_id ||= false
-- parent_id       ||= false
-- is_direct_parent  = direct_reply_id == status.id
-- is_direct_child  = parent_id == status.in_reply_to_id
-- parent_id       ||= false
-- centered        ||= include_threads && !is_predecessor && !is_successor
-- h_class         = microformats_h_class(status, is_predecessor, is_successor, include_threads)
-- style_classes   = style_classes(status, is_predecessor, is_successor, include_threads)
-- mf_classes      = microformats_classes(status, is_direct_parent, is_direct_child)
-- entry_classes   = h_class + ' ' + mf_classes + ' ' + style_classes
+:ruby
+  include_threads ||= false
+  is_predecessor  ||= false
+  is_successor    ||= false
+  direct_reply_id ||= false
+  parent_id       ||= false
+  is_direct_parent = direct_reply_id == status.id
+  is_direct_child  = parent_id == status.in_reply_to_id
+  centered ||= include_threads && !is_predecessor && !is_successor
+  h_class       = microformats_h_class(status, is_predecessor, is_successor, include_threads)
+  style_classes = style_classes(status, is_predecessor, is_successor, include_threads)
+  mf_classes    = microformats_classes(status, is_direct_parent, is_direct_child)
+  entry_classes = h_class + ' ' + mf_classes + ' ' + style_classes
 
 - if status.reply? && include_threads
-  = render partial: 'stream_entries/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id}
+  = render partial: 'stream_entries/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id }
 
 .entry{ class: entry_classes }
 
   - if status.reblog?
     .pre-header
-      %div.pre-header__icon
+      .pre-header__icon
         = fa_icon('retweet fw')
       %span
         = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
@@ -29,4 +29,4 @@
   = render (centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status'), status: status.proper
 
 - if include_threads
-  = render partial: 'stream_entries/status', collection: @descendants, as: :status, locals: { is_successor: true, parent_id: status.id}
+  = render partial: 'stream_entries/status', collection: @descendants, as: :status, locals: { is_successor: true, parent_id: status.id }