krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed if statements and fixed style issues

Browse Source
This commit is contained in:
TheHollidayInn
2015-07-22 15:38:17 -05:00
parent 107e27a2c6
commit c61eccaaba
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/spec/controllers/inventoryCtrlSpec.js
View File

@@ -91,7 +91,6 @@ describe('Inventory Controller', function() {
})); }));
describe('Deselecting Items', function() { describe('Deselecting Items', function() {
it('deselects a food', function(){ it('deselects a food', function(){
scope.chooseFood('Meat'); scope.chooseFood('Meat');
scope.deselectItem(); scope.deselectItem();
@@ -109,7 +108,5 @@ describe('Inventory Controller', function() {
scope.deselectItem(); scope.deselectItem();
expect(scope.selectedEgg).to.eql(null); expect(scope.selectedEgg).to.eql(null);
}); });
}); });
}); });

13
website/public/js/controllers/inventoryCtrl.js
View File

@@ -217,18 +217,11 @@ habitrpg.controller("InventoryCtrl",
$scope.deselectItem(); $scope.deselectItem();
} }
}); });
//$scope.listen(keyEvent)
$scope.deselectItem = function() { $scope.deselectItem = function() {
if ($scope.selectedFood) { $scope.selectedFood = null;
$scope.selectedFood = null; $scope.selectedPotion = null;
} $scope.selectedEgg = null;
if ($scope.selectedPotion) {
$scope.selectedPotion = null
}
if ($scope.selectedEgg) {
$scope.selectedEgg = null;
}
} }
} }