From c2d9d952379c4fdb4bee1bf4c8e82b501ea4af2a Mon Sep 17 00:00:00 2001 From: Robin Ward <robin.ward@gmail.com> Date: Mon, 17 Jun 2013 11:56:50 -0400 Subject: [PATCH] FIX: Dates in the history window shouldn't wrap in spans --- .../discourse/controllers/history_controller.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/history_controller.js b/app/assets/javascripts/discourse/controllers/history_controller.js index 8f4d686f4..b016b0789 100644 --- a/app/assets/javascripts/discourse/controllers/history_controller.js +++ b/app/assets/javascripts/discourse/controllers/history_controller.js @@ -66,8 +66,13 @@ Discourse.HistoryController = Discourse.ObjectController.extend(Discourse.ModalF var historyController = this; this.get('model').loadVersions().then(function(result) { _.each(result,function(item) { - item.description = "v" + item.number + " - " + Discourse.Formatter.relativeAge(new Date(item.created_at), {format: 'medium', leaveAgo: true}) + " - " + - Em.String.i18n("changed_by", { author: item.display_username }); + + var age = Discourse.Formatter.relativeAge(new Date(item.created_at), { + format: 'medium', + leaveAgo: true, + wrapInSpan: false}); + + item.description = "v" + item.number + " - " + age + " - " + Em.String.i18n("changed_by", { author: item.display_username }); }); historyController.setProperties({