krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +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

6
test/client-old/spec/controllers/inventoryCtrlSpec.js
View File

@@ -471,11 +471,11 @@ describe('Inventory Controller', function() {
'not': [wrap('chicken'), wrap('sashimi')]}; 'not': [wrap('chicken'), wrap('sashimi')]};
scope.gearByClass = gearByClass; scope.gearByClass = gearByClass;
scope.gearByType = gearByType; scope.gearByType = gearByType;
scope.equipmentFilterQuery.query = 'a'; scope.equipmentQuery.query = 'a';
}); });
it('filters nothing if equipmentQuery is nothing', function() { it('filters nothing if equipmentQuery is nothing', function() {
scope.equipmentFilterQuery.query = ''; scope.equipmentQuery.query = '';
scope.$digest(); scope.$digest();
expect(toText(scope.filteredGearByClass['raw'])).to.eql(['kale', 'sashimi']); expect(toText(scope.filteredGearByClass['raw'])).to.eql(['kale', 'sashimi']);
expect(toText(scope.filteredGearByClass['cooked'])).to.eql(['chicken', 'potato']); expect(toText(scope.filteredGearByClass['cooked'])).to.eql(['chicken', 'potato']);
@@ -509,7 +509,7 @@ describe('Inventory Controller', function() {
}); });
it('filters out gear if filter query changes', function() { it('filters out gear if filter query changes', function() {
scope.equipmentFilterQuery.query = 'c'; scope.equipmentQuery.query = 'c';
scope.$digest(); scope.$digest();
expect(toText(scope.filteredGearByClass['raw'])).to.eql([]); expect(toText(scope.filteredGearByClass['raw'])).to.eql([]);

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.selectedEgg = null; // {index: 1, name: "Tiger", value: 5}
$scope.selectedPotion = null; // {index: 5, name: "Red", value: 3} $scope.selectedPotion = null; // {index: 5, name: "Red", value: 3}
$scope.equipmentFilterQuery = {'query': ''}; $scope.equipmentQuery = {'query': ''};
_updateDropAnimalCount(user.items); _updateDropAnimalCount(user.items);
@@ -120,15 +120,15 @@ habitrpg.controller("InventoryCtrl",
} }
$scope.$watch(function(){ $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) { }, function(updatedVals) {
var gearByClass = updatedVals[0]; var gearByClass = updatedVals[0];
var gearByType = updatedVals[1]; var gearByType = updatedVals[1];
var equipmentFilterQuery = updatedVals[2]; var equipmentQuery = updatedVals[2];
$scope.updateEquipment(gearByClass, gearByType, equipmentFilterQuery.query); $scope.updateEquipment(gearByClass, gearByType, equipmentQuery.query);
}, true); }, true);
$scope.updateEquipment($scope.gearByClass, $scope.gearByType, $scope.equipmentFilterQuery.query); $scope.updateEquipment($scope.gearByClass, $scope.gearByType, $scope.equipmentQuery.query);
$scope.chooseEgg = function(egg){ $scope.chooseEgg = function(egg){
if ($scope.selectedEgg && $scope.selectedEgg.key == 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;
}
}
]);

4
website/views/options/inventory/equipment.jade
View File

@@ -43,10 +43,10 @@ mixin equipmentList(equipmentType)
.container-fluid .container-fluid
.row .row
.col-md-6 .col-md-6
.input-group.equipment-search(ng-controller="InventorySearchCtrl") .input-group.equipment-search
.input-group-addon .input-group-addon
.glyphicon.glyphicon-search .glyphicon.glyphicon-search
input.form-control(type='text', placeholder=env.t('search'), ng-model='equipmentQuery', ng-change='updateEquipmentQuery()', ng-model-options='{ debounce: 250 }') input.form-control(type='text', placeholder=env.t('search'), ng-model='equipmentQuery.query', ng-model-options='{ debounce: 250 }')
.row .row
.col-md-6.border-right(ng-controller="SortableInventoryController") .col-md-6.border-right(ng-controller="SortableInventoryController")
h3.equipment-title.hint(popover-trigger='mouseenter', h3.equipment-title.hint(popover-trigger='mouseenter',