sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-21 11:14:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4978 from Alys/develop

Browse source 
revert b0bf033 to see if Travis build then stops failing
This commit is contained in:
Alys 2015-04-06 00:55:13 +10:00
commit 7f5c1e5c2c
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
website/public/js/app.js
View file

@ -138,16 +138,11 @@ window.habitrpg = angular.module('habitrpg',
.state('options.social.challenges.detail', {
url: '/:cid',
templateUrl: 'partials/options.social.challenges.detail.html',
controller: ['$scope', 'Challenges', '$stateParams', '$rootScope',
function($scope, Challenges, $stateParams, $rootScope){
controller: ['$scope', 'Challenges', '$stateParams',
function($scope, Challenges, $stateParams){
$scope.obj = $scope.challenge = Challenges.Challenge.get({cid:$stateParams.cid}, function(){
$scope.challenge._locked = true;
//If the user came from a guild page, then we want to filter challenges by the user's guild
if ( $rootScope.$state.previousState.url == "/:gid" ) {
$scope.search.group = [];
$scope.search.group[$scope.challenge.group] = true;
}
});
}]
})
@ -231,9 +226,3 @@ window.habitrpg = angular.module('habitrpg',
$httpProvider.defaults.headers.common['x-api-key'] = settings.auth.apiToken;
}
}])
.run(function ($rootScope, $state) {
$rootScope.$state = $state;
$rootScope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState) {
$state.previousState = fromState;
});
});