IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-02 05:29:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Tweak logic for showing times in topic entrance popup

Browse Source
This commit is contained in:
Robin Ward 2014-08-18 17:14:30 -04:00
parent 13891292d3
commit 14c765ef11
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/assets/javascripts/discourse/controllers/topic-entrance.js.es6
View File

@ -1,29 +1,46 @@
function entranceDate(dt) { function entranceDate(bumpedAt, showTime) {
var bumpedAt = new Date(dt), var today = new Date();
today = new Date();
if (bumpedAt.getDate() === today.getDate()) { if (bumpedAt.getDate() === today.getDate()) {
return moment(bumpedAt).format(I18n.t("dates.time")); return moment(bumpedAt).format(I18n.t("dates.time"));
} }
if (bumpedAt.getYear() === today.getYear()) { if (bumpedAt.getYear() === today.getYear()) {
return moment(bumpedAt).format(I18n.t("dates.long_no_year")); // No year
return moment(bumpedAt).format(
showTime ? I18n.t("dates.long_no_year") : I18n.t("dates.long_no_year_no_time")
);
} }
return moment(bumpedAt).format(I18n.t('dates.long_with_year')); return moment(bumpedAt).format(
showTime ? I18n.t('dates.long_with_year') : I18n.t('dates.long_with_year_no_time')
);
} }
export default Ember.ObjectController.extend({ export default Ember.ObjectController.extend({
position: null, position: null,
topDate: function() { createdDate: function() {
return entranceDate(this.get('created_at')); return new Date(this.get('model.created_at'));
}.property('model.created_at'), }.property('model.created_at'),
bottomDate: function() { bumpedDate: function() {
return entranceDate(this.get('bumped_at')); return new Date(this.get('model.bumped_at'));
}.property('model.bumped_at'), }.property('model.bumped_at'),
showTime: function() {
var diffMs = this.get('bumpedDate').getTime() - this.get('createdDate').getTime();
return diffMs < (1000 * 60 * 60 * 24 * 2);
}.property('createdDate', 'bumpedDate'),
topDate: function() {
return entranceDate(this.get('createdDate'), this.get('showTime'));
}.property('createdDate'),
bottomDate: function() {
return entranceDate(this.get('bumpedDate'), this.get('showTime'));
}.property('bumpedDate'),
actions: { actions: {
show: function(data) { show: function(data) {
// Show the chooser but only if the model changes // Show the chooser but only if the model changes

2
config/locales/client.en.yml
View File

@ -32,7 +32,9 @@ en:
dates: dates:
time: "h:mm a" time: "h:mm a"
long_no_year: "MMM DD h:mm a" long_no_year: "MMM DD h:mm a"
long_no_year_no_time: "MMM DD"
long_with_year: "MMM DD, YYYY h:mm a" long_with_year: "MMM DD, YYYY h:mm a"
long_with_year_no_time: "MMM DD, YYYY"
tiny: tiny:
half_a_minute: "< 1m" half_a_minute: "< 1m"
less_than_x_seconds: less_than_x_seconds: