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

challenges: get Challenges (mostly) working along the same ui-router

Browse Source 
principles as groups. Having some $scope variable resolution timing issues
This commit is contained in:
Tyler Renelle
2013-10-29 17:49:49 -07:00
parent 77fee06fdb
commit 02ebc536ca
8 changed files with 110 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
public/js/app.js
View File

@@ -110,16 +110,23 @@ window.habitrpg = angular.module('habitrpg',
.state('options.challenges', {
url: "/challenges",
controller: 'ChallengesCtrl',
templateUrl: "partials/options.challenges.html",
resolve: {
groups: ['$http', 'API_URL', function($http, API_URL){
// TODO come up with more unified ngResource-style approach
return $http.get(API_URL + '/api/v1/groups?minimal=true');
}],
challenges: ['Challenges', function(Challenges){
return Challenges.Challenge.query();
}]
}
templateUrl: "partials/options.challenges.html"
})
.state('options.challenges.detail', {
url: '/:cid',
templateUrl: 'partials/options.challenges.detail.html',
// resolve: {
// challenge: ['$scope', 'Challenges', '$stateParams', '$q',
// function($scope, Challenges, $stateParams, $q){
// // FIXME does ui-router not work with ng-resource by default?
// var challenge = $q.defer();
// Challenges.Challenge.get({cid:$stateParams.cid}, function(_challenge){
// challenge._locked = true;
// challenge.resolve(_challenge);
// });
// return challenge.promise;
// }]
// }
})
// Options > Settings