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

Inject RootCtrl into MemberModalCtrl to expose shared methods

Browse Source
This commit is contained in:
Kevin Gisi
2015-04-21 05:17:15 -04:00
parent ee7ba19ed1
commit a05714405a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/public/js/controllers/groupsCtrl.js
View File

@@ -153,8 +153,11 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
}; };
}]) }])
.controller("MemberModalCtrl", ['$scope', '$rootScope', 'Members', 'Shared', '$http', 'Notification', 'Groups', .controller("MemberModalCtrl", ['$scope', '$rootScope', 'Members', 'Shared', '$http', 'Notification', 'Groups', '$controller',
function($scope, $rootScope, Members, Shared, $http, Notification, Groups) { function($scope, $rootScope, Members, Shared, $http, Notification, Groups, $controller) {
$controller('RootCtrl', {$scope: $scope});
$scope.timestamp = function(timestamp){ $scope.timestamp = function(timestamp){
return moment(timestamp).format($rootScope.User.user.preferences.dateFormat.toUpperCase()); return moment(timestamp).format($rootScope.User.user.preferences.dateFormat.toUpperCase());
} }