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: move options/challenges to options/social/challenges

Browse Source
This commit is contained in:
Tyler Renelle
2013-10-31 14:37:04 -07:00
parent 012dabf8b6
commit 39821752fa
10 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/controllers/challengesCtrl.js
View File

@@ -90,7 +90,7 @@ habitrpg.controller("ChallengesCtrl", ['$scope', 'User', 'Challenges', 'Notifica
*/
function backToChallenges(){
$scope.popoverEl.popover('destroy');
$state.go('options.challenges');
$state.go('options.social.challenges');
$scope.challenges = Challenges.Challenge.query();
User.log({});
}
@@ -116,7 +116,7 @@ habitrpg.controller("ChallengesCtrl", ['$scope', 'User', 'Challenges', 'Notifica
$scope.close = function(challenge, $event) {
$scope.closingChal = challenge;
$scope.popoverEl = $($event.target);
var html = $compile('<div><div ng-include="\'partials/options.challenges.detail.close.html\'" /></div></div>')($scope);
var html = $compile('<div><div ng-include="\'partials/options.social.challenges.detail.close.html\'" /></div></div>')($scope);
$scope.popoverEl.popover('destroy').popover({
html: true,
placement: 'right',