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

Merge branch 'winter' into develop

Browse Source
This commit is contained in:
Tyler Renelle
2013-12-20 21:59:54 -07:00
parent 58195d9eeb c511c832bf
commit bf699ca466
10 changed files with 144 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,6 +166,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
$event && ($event.stopPropagation(),$event.preventDefault());
if ($scope.spell.target != type) return Notification.text("Invalid target");
$scope.spell.cast(User.user, target);
User.save();
$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) {