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

fix #2030, immediately "fulfill" spell cast, don't wait for server response

Browse Source
This commit is contained in:
Tyler Renelle
2013-12-17 19:33:36 -07:00
parent 41cc6ff3bc
commit 04df61fb53
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,6 +165,8 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
$scope.castEnd = function(target, type, $event){ $scope.castEnd = function(target, type, $event){
if ($scope.spell.target != type) return Notification.text("Invalid target"); if ($scope.spell.target != type) return Notification.text("Invalid target");
$scope.spell.cast(User.user, 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(){ $http.post('/api/v2/user/class/cast/' + $scope.spell.name, {target:target, type:type}).success(function(){
var msg = "You cast " + $scope.spell.text; var msg = "You cast " + $scope.spell.text;
switch (type) { switch (type) {
@@ -173,9 +175,6 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
case 'party': msg += ' on the Party';break; case 'party': msg += ' on the Party';break;
} }
Notification.text(msg); Notification.text(msg);
$rootScope.applyingAction = false;
$scope.spell = null;
//User.sync(); // FIXME push a lot of the server code to also in client, so we can run updates in browser without requiring sync
}) })
$event && $event.stopPropagation(); $event && $event.stopPropagation();
} }