mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 07:37:25 +01:00
[#1832] remove relative-date, use moment instead
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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')
|
||||
|
||||
Reference in New Issue
Block a user