krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

[#1832] remove relative-date, use moment instead

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-11-17 13:21:21 +01:00
parent 20c976d1dc
commit 34d5eda736
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -19,7 +19,6 @@
"superagent": "~0.12.4", "superagent": "~0.12.4",
"resolve": "~0.2.3", "resolve": "~0.2.3",
"expect.js": "~0.2.0", "expect.js": "~0.2.0",
"relative-date": "~1.1.1",
"lodash": "~2.2.1", "lodash": "~2.2.1",
"async": "~0.2.9", "async": "~0.2.9",
"optimist": "~0.5.2", "optimist": "~0.5.2",

1
public/js/controllers/rootCtrl.js
View File

@@ -41,6 +41,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
*/ */
_.defaults($rootScope, window.habitrpgShared.algos); _.defaults($rootScope, window.habitrpgShared.algos);
_.defaults($rootScope, window.habitrpgShared.helpers); _.defaults($rootScope, window.habitrpgShared.helpers);
$rootScope.moment = window.moment;
$rootScope.set = User.set; $rootScope.set = User.set;
$rootScope.authenticated = User.authenticated; $rootScope.authenticated = User.authenticated;

2
views/options/social/chat-message.jade
View File

@@ -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(ng-bind-html="message.text | linky:'_blank'")
|  -  |  - 
span.muted.time 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)') a(ng-show='user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)')
i.icon-remove(tooltip='Delete') i.icon-remove(tooltip='Delete')