diff --git a/package.json b/package.json index f1f5636c67..a91d8b5289 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "superagent": "~0.12.4", "resolve": "~0.2.3", "expect.js": "~0.2.0", - "relative-date": "~1.1.1", "lodash": "~2.2.1", "async": "~0.2.9", "optimist": "~0.5.2", diff --git a/public/js/controllers/rootCtrl.js b/public/js/controllers/rootCtrl.js index 607bd333e7..a241e83656 100644 --- a/public/js/controllers/rootCtrl.js +++ b/public/js/controllers/rootCtrl.js @@ -41,6 +41,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$ */ _.defaults($rootScope, window.habitrpgShared.algos); _.defaults($rootScope, window.habitrpgShared.helpers); + $rootScope.moment = window.moment; $rootScope.set = User.set; $rootScope.authenticated = User.authenticated; diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade index cb9bde9188..f94d2820ea 100644 --- a/views/options/social/chat-message.jade +++ b/views/options/social/chat-message.jade @@ -5,6 +5,6 @@ li(ng-repeat='message in group.chat', ng-class='{highlight: isUserMentioned(user span(ng-bind-html="message.text | linky:'_blank'") |  -  span.muted.time - | {{relativeDate(message.timestamp, _currentTime) + ' '}} + | {{moment(message.timestamp).fromNow() + ' '}} a(ng-show='user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)') i.icon-remove(tooltip='Delete')