Rename method and initialize .timeago inside

4 files changed, 10 insertions, 19 deletions

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 922a28b4ef5..b05138ac1ac 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -164,9 +164,7 @@ $ ->
   $('.trigger-submit').on 'change', ->
     $(@).parents('form').submit()
 
-  $timeago = $('abbr.timeago, .js-timeago')
-  gl.utils.updateFormatDate($timeago)
-  $timeago.timeago()
+  gl.utils.localTimeAgo($('abbr.timeago, .js-timeago'), false)
 
   # Flash
   if (flash = $(".flash-container")).length > 0
diff --git a/app/assets/javascripts/lib/datetime_utility.js.coffee b/app/assets/javascripts/lib/datetime_utility.js.coffee
index ef9406fc331..ad1d1c70481 100644
--- a/app/assets/javascripts/lib/datetime_utility.js.coffee
+++ b/app/assets/javascripts/lib/datetime_utility.js.coffee
@@ -6,10 +6,12 @@
   w.gl.utils.formatDate = (datetime) ->
     dateFormat(datetime, 'mmm d, yyyy h:MMtt Z')
 
-  w.gl.utils.updateFormatDate = ($timeagoEls) ->
+  w.gl.utils.localTimeAgo = ($timeagoEls, setTimeago = true) ->
     $timeagoEls.each( ->
           $el = $(@)
           $el.attr('title', gl.utils.formatDate($el.attr('datetime')))
     )
 
+    $timeagoEls.timeago() if setTimeago
+
 ) window
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index fdf084a8a82..0ae6e244602 100644
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -141,9 +141,7 @@ class @MergeRequestTabs
       url: "#{source}.json"
       success: (data) =>
         document.querySelector("div#commits").innerHTML = data.html
-        $timeago = $('.js-timeago', 'div#commits')
-        gl.utils.updateFormatDate($timeago)
-        $timeago.timeago()
+        gl.utils.localTimeAgo($('.js-timeago', 'div#commits'))
         @commitsLoaded = true
         @scrollToElement("#commits")
 
@@ -154,9 +152,7 @@ class @MergeRequestTabs
       url: "#{source}.json" + @_location.search
       success: (data) =>
         document.querySelector("div#diffs").innerHTML = data.html
-        $timeago = $('.js-timeago', 'div#diffs')
-        gl.utils.updateFormatDate($timeago)
-        $timeago.timeago()
+        gl.utils.localTimeAgo($('.js-timeago', 'div#diffs'))
         $('div#diffs .js-syntax-highlight').syntaxHighlight()
         @expandViewContainer() if @diffViewType() is 'parallel'
         @diffsLoaded = true
@@ -169,9 +165,7 @@ class @MergeRequestTabs
       url: "#{source}.json"
       success: (data) =>
         document.querySelector("div#builds").innerHTML = data.html
-        $timeago = $('.js-timeago', 'div#builds')
-        gl.utils.updateFormatDate($timeago)
-        $timeago.timeago()
+        gl.utils.localTimeAgo($('.js-timeago', 'div#builds'))
         @buildsLoaded = true
         @scrollToElement("#builds")
 
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 02e52040e3c..a67890200dd 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -170,8 +170,7 @@ class @Notes
         .syntaxHighlight()
 
       # Update datetime format on the recent note
-      $timeago = $notesList.find("#note_#{note.id} .js-timeago")
-      gl.utils.updateFormatDate($timeago)
+      gl.utils.localTimeAgo($notesList.find("#note_#{note.id} .js-timeago"), false)
 
       @initTaskList()
       @updateNotesCount(1)
@@ -224,7 +223,7 @@ class @Notes
       # append new note to all matching discussions
       discussionContainer.append note_html
 
-    gl.utils.updateFormatDate($('.js-timeago', note_html))
+    gl.utils.localTimeAgo($('.js-timeago', note_html), false)
 
     @updateNotesCount(1)
 
@@ -355,9 +354,7 @@ class @Notes
     # Convert returned HTML to a jQuery object so we can modify it further
     $html = $(note.html)
 
-    $timeago = $('.js-timeago', $html)
-    gl.utils.updateFormatDate($timeago)
-    $timeago.timeago()
+    gl.utils.localTimeAgo($('.js-timeago', $html))
 
     $html.syntaxHighlight()
     $html.find('.js-task-list-container').taskList('enable')