IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

edit date to use formatter, compensate for invalid local time (at least don't blow up)

Browse Source
This commit is contained in:
Sam 2013-06-10 10:13:30 +10:00
parent 850123dce8
commit a92bb46966
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/components/formatter.js
View File

@ -98,11 +98,12 @@ Discourse.Formatter = (function(){
break; break;
} }
return formatted; return formatted || '&mdash';
}; };
relativeAgeMedium = function(date, options){ relativeAgeMedium = function(date, options){
var displayDate, fiveDaysAgo, oneMinuteAgo, fullReadable, leaveAgo, val; var displayDate, fiveDaysAgo, oneMinuteAgo, fullReadable, leaveAgo, val;
var wrapInSpan = options.wrapInSpan ? true : false;
leaveAgo = options.leaveAgo; leaveAgo = options.leaveAgo;
var distance = Math.round((new Date() - date) / 1000); var distance = Math.round((new Date() - date) / 1000);
@ -116,7 +117,7 @@ Discourse.Formatter = (function(){
fiveDaysAgo = 432000; fiveDaysAgo = 432000;
oneMinuteAgo = 60; oneMinuteAgo = 60;
if (distance >= 0 && distance < oneMinuteAgo) { if (distance < oneMinuteAgo) {
displayDate = Em.String.i18n("now"); displayDate = Em.String.i18n("now");
} else if (distance > fiveDaysAgo) { } else if (distance > fiveDaysAgo) {
if ((new Date()).getFullYear() !== date.getFullYear()) { if ((new Date()).getFullYear() !== date.getFullYear()) {
@ -127,7 +128,11 @@ Discourse.Formatter = (function(){
} else { } else {
displayDate = relativeAgeMediumSpan(distance, leaveAgo); displayDate = relativeAgeMediumSpan(distance, leaveAgo);
} }
return "<span class='date' title='" + fullReadable + "'>" + displayDate + "</span>"; if(wrapInSpan) {
return "<span class='date' title='" + fullReadable + "'>" + displayDate + "</span>";
} else {
return displayDate;
}
}; };
// mostly lifted from rails with a few amendments // mostly lifted from rails with a few amendments

11
app/assets/javascripts/discourse/helpers/application_helpers.js
View File

@ -210,14 +210,9 @@ Handlebars.registerHelper('unboundAge', function(property, options) {
@for Handlebars @for Handlebars
**/ **/
Handlebars.registerHelper('editDate', function(property, options) { Handlebars.registerHelper('editDate', function(property, options) {
var dt, yesterday; // autoupdating this is going to be painful
dt = Date.create(Ember.Handlebars.get(this, property, options)); var date = new Date(Ember.Handlebars.get(this, property, options));
yesterday = new Date() - (60 * 60 * 24 * 1000); return new Handlebars.SafeString(Discourse.Formatter.relativeAge(date, {format: 'medium', leaveAgo: true, wrapInSpan: false}));
if (yesterday > dt.getTime()) {
return dt.format("long");
} else {
return dt.relative();
}
}); });
/** /**