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 #2040 - $rootScope.moment = window.moment. Fixes to applying spell

Browse Source
This commit is contained in:
Tyler Renelle
2013-12-17 23:08:18 -07:00
parent 7b219c18c7
commit 06ee34c09b
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/js/controllers/rootCtrl.js
View File

@@ -18,7 +18,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
$rootScope.User = User;
$rootScope.user = user;
$rootScope.moment = window.moment;
$rootScope.moment = window._;
$rootScope._ = window._;
$rootScope.settings = User.settings;
$rootScope.Shared = window.habitrpgShared;
$rootScope.Content = window.habitrpgShared.content;
@@ -165,8 +165,6 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
$scope.castEnd = function(target, type, $event){
if ($scope.spell.target != type) return Notification.text("Invalid target");
$scope.spell.cast(User.user, target);
$rootScope.applyingAction = false;
$scope.spell = null;
$http.post('/api/v2/user/class/cast/' + $scope.spell.name, {target:target, type:type}).success(function(){
var msg = "You cast " + $scope.spell.text;
switch (type) {
@@ -175,7 +173,9 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
case 'party': msg += ' on the Party';break;
}
Notification.text(msg);
})
$scope.spell = null;
});
$rootScope.applyingAction = false;
$event && $event.stopPropagation();
}