automatically updating times for posts on topic
moved moment.js into localization file (we need to localize it) added helpers for date formatting use, moment().shortDate() moment().longDate() moment().shortDateNoYear()
This commit is contained in:
@@ -85,12 +85,22 @@ describe("Discourse.Formatter", function() {
|
||||
|
||||
describe("autoUpdatingRelativeAge", function(){
|
||||
it("can format dates", function(){
|
||||
var d = new Date();
|
||||
var d = moment().subtract('days',1).toDate();
|
||||
|
||||
var $elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d));
|
||||
|
||||
expect($elem.data('format')).toBe("tiny");
|
||||
expect($elem.data('time')).toBe(d.getTime());
|
||||
|
||||
$elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d,{format: 'medium', leaveAgo: true}));
|
||||
expect($elem.data('format')).toBe("medium-with-ago");
|
||||
expect($elem.data('time')).toBe(d.getTime());
|
||||
expect($elem.attr('title')).toBe(moment(d).longDate());
|
||||
expect($elem.html()).toBe('1 day ago');
|
||||
|
||||
$elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d,{format: 'medium'}));
|
||||
expect($elem.data('format')).toBe("medium");
|
||||
expect($elem.data('time')).toBe(d.getTime());
|
||||
expect($elem.html()).toBe('1 day');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -105,6 +115,14 @@ describe("Discourse.Formatter", function() {
|
||||
|
||||
expect($elem.html()).toBe("2m");
|
||||
|
||||
|
||||
d = new Date();
|
||||
$elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d, {format: 'medium', leaveAgo: true}));
|
||||
$elem.data('time', d.getTime() - 2 * 60 * 1000);
|
||||
|
||||
Discourse.Formatter.updateRelativeAge($elem);
|
||||
|
||||
expect($elem.html()).toBe("2 minutes ago");
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
|
||||
//= require env
|
||||
|
||||
//= require ../../app/assets/javascripts/preload_store.js
|
||||
@@ -13,16 +14,17 @@
|
||||
//= require ../../app/assets/javascripts/external_production/ember.js
|
||||
//= require ../../app/assets/javascripts/external_production/group-helper.js
|
||||
|
||||
//= require ../../app/assets/javascripts/locales/i18n
|
||||
//= require ../../app/assets/javascripts/locales/date_locales.js
|
||||
//= require ../../app/assets/javascripts/discourse/helpers/i18n_helpers
|
||||
//= require ../../app/assets/javascripts/locales/en
|
||||
//
|
||||
// Pagedown customizations
|
||||
//= require ../../app/assets/javascripts/pagedown_custom.js
|
||||
|
||||
// The rest of the externals
|
||||
//= require_tree ../../app/assets/javascripts/external
|
||||
|
||||
//= require ../../app/assets/javascripts/locales/i18n
|
||||
//= require ../../app/assets/javascripts/locales/date_locales.js
|
||||
//= require ../../app/assets/javascripts/discourse/helpers/i18n_helpers
|
||||
//= require ../../app/assets/javascripts/locales/en
|
||||
//= require ../../app/assets/javascripts/discourse
|
||||
|
||||
// Stuff we need to load first
|
||||
|
||||
Reference in New Issue
Block a user