diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-16 13:07:06 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-16 13:07:06 +0000 |
commit | 8e9f740d0813ddb3d37ba29be90e02d76130ca44 (patch) | |
tree | 176e9ea01e06e4491e0c23bbe1a4d121ff1a9c8c | |
parent | 37a4e4945d0cc944bc34f3ff3396ff7932d4aba0 (diff) | |
parent | 456ddb5eb7f905899bd1a6258617eb505f4dc289 (diff) | |
download | gitlab-ce-8e9f740d0813ddb3d37ba29be90e02d76130ca44.tar.gz |
Merge branch 'rs-timeago' into 'master'
Fix time_ago_with_tooltip for activity feed
Closes #4002
See merge request !2074
-rw-r--r-- | app/helpers/application_helper.rb | 8 | ||||
-rw-r--r-- | spec/helpers/application_helper_spec.rb | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 21f962df206..39d3017162e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -204,12 +204,16 @@ module ApplicationHelper # Returns an HTML-safe String def time_ago_with_tooltip(time, placement: 'top', html_class: 'time_ago', skip_js: false) element = content_tag :time, time.to_s, - class: "#{html_class} js-timeago", + class: "#{html_class} js-timeago js-timeago-pending", datetime: time.getutc.iso8601, title: time.in_time_zone.stamp('Aug 21, 2011 9:23pm'), data: { toggle: 'tooltip', placement: placement, container: 'body' } - element += javascript_tag "$('.js-timeago').last().timeago()" unless skip_js + unless skip_js + element << javascript_tag( + "$('.js-timeago-pending').removeClass('js-timeago-pending').timeago()" + ) + end element end diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 5568f06639c..68527c3a4f8 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -263,11 +263,12 @@ describe ApplicationHelper do end it 'includes a default js-timeago class' do - expect(element.attr('class')).to eq 'time_ago js-timeago' + expect(element.attr('class')).to eq 'time_ago js-timeago js-timeago-pending' end it 'accepts a custom html_class' do - expect(element(html_class: 'custom_class').attr('class')).to eq 'custom_class js-timeago' + expect(element(html_class: 'custom_class').attr('class')). + to eq 'custom_class js-timeago js-timeago-pending' end it 'accepts a custom tooltip placement' do @@ -278,7 +279,7 @@ describe ApplicationHelper do el = element.next_element expect(el.name).to eq 'script' - expect(el.text).to include "$('.js-timeago').last().timeago()" + expect(el.text).to include "$('.js-timeago-pending').removeClass('js-timeago-pending').timeago()" end it 'allows the script tag to be excluded' do |