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

Remove uneeded blank spaces

Browse Source
This commit is contained in:
Blade Barringer
2015-09-16 19:58:55 -05:00
parent eb0dd636c1
commit 8881dbc034
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,7 +236,7 @@ describe('Inventory Controller', function() {
for (var mount in Content.timeTravelStable.mounts) { for (var mount in Content.timeTravelStable.mounts) {
user.items.mounts[mount] = true; user.items.mounts[mount] = true;
} }
expect(scope.hasAllTimeTravelerItems()).to.eql(true); expect(scope.hasAllTimeTravelerItems()).to.eql(true);
})); }));
}); });
@@ -253,7 +253,7 @@ describe('Inventory Controller', function() {
})); }));
it('returns false for pets if user does not own all pets in the Time Travel Stable', function() { it('returns false for pets if user does not own all pets in the Time Travel Stable', function() {
expect(scope.hasAllTimeTravelerItemsOfType('pets')).to.eql(false); expect(scope.hasAllTimeTravelerItemsOfType('pets')).to.eql(false);
}); });
it('returns true for pets if user owns all pets in the Time Travel Stable', inject(function(Content) { it('returns true for pets if user owns all pets in the Time Travel Stable', inject(function(Content) {
@@ -261,11 +261,11 @@ describe('Inventory Controller', function() {
user.items.pets[pet] = 5; user.items.pets[pet] = 5;
} }
expect(scope.hasAllTimeTravelerItemsOfType('pets')).to.eql(true); expect(scope.hasAllTimeTravelerItemsOfType('pets')).to.eql(true);
})); }));
it('returns false for mounts if user does not own all mounts in the Time Travel Stable', function() { it('returns false for mounts if user does not own all mounts in the Time Travel Stable', function() {
expect(scope.hasAllTimeTravelerItemsOfType('mounts')).to.eql(false); expect(scope.hasAllTimeTravelerItemsOfType('mounts')).to.eql(false);
}); });
it('returns true for mounts if user owns all mounts in the Time Travel Stable', inject(function(Content) { it('returns true for mounts if user owns all mounts in the Time Travel Stable', inject(function(Content) {
@@ -273,7 +273,7 @@ describe('Inventory Controller', function() {
user.items.mounts[mount] = true; user.items.mounts[mount] = true;
} }
expect(scope.hasAllTimeTravelerItemsOfType('mounts')).to.eql(true); expect(scope.hasAllTimeTravelerItemsOfType('mounts')).to.eql(true);
})); }));
}); });
}); });

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

@@ -251,8 +251,8 @@ habitrpg.controller("InventoryCtrl",
}; };
$scope.hasAllTimeTravelerItems = function() { $scope.hasAllTimeTravelerItems = function() {
return ($scope.hasAllTimeTravelerItemsOfType('mystery') && return ($scope.hasAllTimeTravelerItemsOfType('mystery') &&
$scope.hasAllTimeTravelerItemsOfType('pets') && $scope.hasAllTimeTravelerItemsOfType('pets') &&
$scope.hasAllTimeTravelerItemsOfType('mounts')); $scope.hasAllTimeTravelerItemsOfType('mounts'));
}; };
@@ -262,7 +262,8 @@ habitrpg.controller("InventoryCtrl",
var keys = Object.keys(itemsLeftInTimeTravelerStore); var keys = Object.keys(itemsLeftInTimeTravelerStore);
return keys.length === 0; return keys.length === 0;
} }
if (type === 'pets' || type === 'mounts') { if (type === 'pets' || type === 'mounts') {
for (var key in Content.timeTravelStable[type]) { for (var key in Content.timeTravelStable[type]) {
if (!user.items[type][key]) return false; if (!user.items[type][key]) return false;