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

Clean up code

Browse Source
This commit is contained in:
Alexander Lin
2016-12-10 02:14:30 -08:00
parent 3e92bb22fa
commit 4e303cc592
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
website/client-old/js/controllers/inventoryCtrl.js
View File

@@ -8,7 +8,7 @@ habitrpg.controller("InventoryCtrl",
$scope.selectedEgg = null; // {index: 1, name: "Tiger", value: 5}
$scope.selectedPotion = null; // {index: 5, name: "Red", value: 3}
$scope.equipmentFilterQuery = {'query': ''};
$scope.equipmentQuery = {'query': ''};
_updateDropAnimalCount(user.items);
@@ -120,15 +120,15 @@ habitrpg.controller("InventoryCtrl",
}
$scope.$watch(function(){
return ['gearByClass', 'gearByType', 'equipmentFilterQuery'].map(angular.bind($scope, $scope.$eval));
return ['gearByClass', 'gearByType', 'equipmentQuery'].map(angular.bind($scope, $scope.$eval));
}, function(updatedVals) {
var gearByClass = updatedVals[0];
var gearByType = updatedVals[1];
var equipmentFilterQuery = updatedVals[2];
$scope.updateEquipment(gearByClass, gearByType, equipmentFilterQuery.query);
var equipmentQuery = updatedVals[2];
$scope.updateEquipment(gearByClass, gearByType, equipmentQuery.query);
}, true);
$scope.updateEquipment($scope.gearByClass, $scope.gearByType, $scope.equipmentFilterQuery.query);
$scope.updateEquipment($scope.gearByClass, $scope.gearByType, $scope.equipmentQuery.query);
$scope.chooseEgg = function(egg){
if ($scope.selectedEgg && $scope.selectedEgg.key == egg) {
@@ -465,12 +465,3 @@ habitrpg.controller("InventoryCtrl",
}
}
]);
habitrpg.controller("InventorySearchCtrl",
['$scope',
function($scope) {
$scope.equipmentFilterQuery.query = '';
$scope.updateEquipmentQuery = function() {
$scope.equipmentFilterQuery.query = $scope.equipmentQuery;
}
}
]);