From 9994b27f1e57af12e312d673d8a3e9152c8ed3b2 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 18 Jul 2015 15:44:32 -0500 Subject: [PATCH] Fix member modal on static/front --- website/public/js/static.js | 7 +++---- website/public/manifest.json | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/website/public/js/static.js b/website/public/js/static.js index 6494602e45..7c2853a81a 100644 --- a/website/public/js/static.js +++ b/website/public/js/static.js @@ -6,11 +6,12 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui. .constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings') .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']; if (memberId) { $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; $modal.open({ templateUrl: 'modals/member.html', @@ -18,8 +19,6 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui. }); }) } - - $scope.Math = window.Math; }]) .controller("PlansCtrl", ['$rootScope','Analytics', diff --git a/website/public/manifest.json b/website/public/manifest.json index 3abf41969d..848437642a 100644 --- a/website/public/manifest.json +++ b/website/public/manifest.json @@ -113,6 +113,8 @@ "js/static.js", "js/services/analyticsServices.js", "js/services/notificationServices.js", + "js/services/sharedServices.js", + "js/services/statServices.js", "common/script/public/userServices.js", "js/controllers/authCtrl.js", "js/controllers/footerCtrl.js" @@ -140,6 +142,8 @@ "js/static.js", "js/services/analyticsServices.js", "js/services/notificationServices.js", + "js/services/sharedServices.js", + "js/services/statServices.js", "common/script/public/userServices.js", "js/controllers/authCtrl.js", "js/controllers/footerCtrl.js"