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

Fix member modal on static/front

Browse Source
This commit is contained in:
Blade Barringer
2015-07-18 15:44:32 -05:00
parent d44dbef859
commit 9994b27f1e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/public/js/static.js
View File

@@ -6,11 +6,12 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui.
.constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings') .constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings')
.constant("MOBILE_APP", false) .constant("MOBILE_APP", false)
.controller("RootCtrl", ['$scope', '$location', '$modal', '$http', function($scope, $location, $modal, $http){ .controller("RootCtrl", ['$scope', '$location', '$modal', '$http', 'Stats', function($scope, $location, $modal, $http, Stats){
var memberId = $location.search()['memberId']; var memberId = $location.search()['memberId'];
if (memberId) { if (memberId) {
$http.get('/api/v2/members/'+memberId).success(function(data, status, headers, config){ $http.get('/api/v2/members/'+memberId).success(function(data, status, headers, config){
$scope.profile = data; $scope.profile = window.habitrpgShared.wrap(data, false);
$scope.statCalc = Stats;
$scope.Content = window.habitrpgShared.content; $scope.Content = window.habitrpgShared.content;
$modal.open({ $modal.open({
templateUrl: 'modals/member.html', templateUrl: 'modals/member.html',
@@ -18,8 +19,6 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui.
}); });
}) })
} }
$scope.Math = window.Math;
}]) }])
.controller("PlansCtrl", ['$rootScope','Analytics', .controller("PlansCtrl", ['$rootScope','Analytics',

4
website/public/manifest.json
View File

@@ -113,6 +113,8 @@
"js/static.js", "js/static.js",
"js/services/analyticsServices.js", "js/services/analyticsServices.js",
"js/services/notificationServices.js", "js/services/notificationServices.js",
"js/services/sharedServices.js",
"js/services/statServices.js",
"common/script/public/userServices.js", "common/script/public/userServices.js",
"js/controllers/authCtrl.js", "js/controllers/authCtrl.js",
"js/controllers/footerCtrl.js" "js/controllers/footerCtrl.js"
@@ -140,6 +142,8 @@
"js/static.js", "js/static.js",
"js/services/analyticsServices.js", "js/services/analyticsServices.js",
"js/services/notificationServices.js", "js/services/notificationServices.js",
"js/services/sharedServices.js",
"js/services/statServices.js",
"common/script/public/userServices.js", "common/script/public/userServices.js",
"js/controllers/authCtrl.js", "js/controllers/authCtrl.js",
"js/controllers/footerCtrl.js" "js/controllers/footerCtrl.js"