Commit 3440c0e6 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Update datetime in .timeago elements

This should be done before .timeago() is called on the element
parent b19ccdee
......@@ -41,6 +41,7 @@
#= require shortcuts_issuable
#= require shortcuts_network
#= require jquery.nicescroll
#= require date.format
#= require_tree .
#= require fuzzaldrin-plus
#= require cropper
......@@ -163,7 +164,9 @@ $ ->
$('.trigger-submit').on 'change', ->
$(@).parents('form').submit()
$('abbr.timeago, .js-timeago').timeago()
$timeago = $('abbr.timeago, .js-timeago')
gl.utils.updateFormatDate($timeago)
$timeago.timeago()
# Flash
if (flash = $(".flash-container")).length > 0
......
......@@ -141,7 +141,9 @@ class @MergeRequestTabs
url: "#{source}.json"
success: (data) =>
document.querySelector("div#commits").innerHTML = data.html
$('.js-timeago').timeago()
$timeago = $('.js-timeago', 'div#commits')
gl.utils.updateFormatDate($timeago)
$timeago.timeago()
@commitsLoaded = true
@scrollToElement("#commits")
......@@ -152,7 +154,9 @@ class @MergeRequestTabs
url: "#{source}.json" + @_location.search
success: (data) =>
document.querySelector("div#diffs").innerHTML = data.html
$('.js-timeago').timeago()
$timeago = $('.js-timeago', 'div#diffs')
gl.utils.updateFormatDate($timeago)
$timeago.timeago()
$('div#diffs .js-syntax-highlight').syntaxHighlight()
@expandViewContainer() if @diffViewType() is 'parallel'
@diffsLoaded = true
......@@ -165,7 +169,9 @@ class @MergeRequestTabs
url: "#{source}.json"
success: (data) =>
document.querySelector("div#builds").innerHTML = data.html
$('.js-timeago').timeago()
$timeago = $('.js-timeago', 'div#builds')
gl.utils.updateFormatDate($timeago)
$timeago.timeago()
@buildsLoaded = true
@scrollToElement("#builds")
......
......@@ -163,9 +163,16 @@ class @Notes
else if @isNewNote(note)
@note_ids.push(note.id)
$('ul.main-notes-list')
$notesList = $('ul.main-notes-list')
$notesList
.append(note.html)
.syntaxHighlight()
# Update datetime format on the recent note
$timeago = $notesList.find("#note_#{note.id} .js-timeago")
gl.utils.updateFormatDate($timeago)
@initTaskList()
@updateNotesCount(1)
......@@ -217,6 +224,8 @@ class @Notes
# append new note to all matching discussions
discussionContainer.append note_html
gl.utils.updateFormatDate($('.js-timeago', note_html))
@updateNotesCount(1)
###
......@@ -345,7 +354,11 @@ class @Notes
updateNote: (_xhr, note, _status) =>
# Convert returned HTML to a jQuery object so we can modify it further
$html = $(note.html)
$('.js-timeago', $html).timeago()
$timeago = $('.js-timeago', $html)
gl.utils.updateFormatDate($timeago)
$timeago.timeago()
$html.syntaxHighlight()
$html.find('.js-task-list-container').taskList('enable')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment