dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

oops: neopia uses query key "biology", but we used "biologies"

Browse source
This commit is contained in:
Emi Matchu 2014-02-19 15:58:39 -06:00
parent 2df0133cff
commit b0fc2df8b6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/outfits/edit.js
View file

@ -211,7 +211,7 @@ View.Hash = function (wardrobe) {
STRING: 2, STRING: 2,
INTEGER_ARRAY: 3 INTEGER_ARRAY: 3
}, KEYS = { }, KEYS = {
biologies: TYPES.INTEGER_ARRAY, biology: TYPES.INTEGER_ARRAY,
closet: TYPES.INTEGER_ARRAY, closet: TYPES.INTEGER_ARRAY,
color: TYPES.INTEGER, color: TYPES.INTEGER,
name: TYPES.STRING, name: TYPES.STRING,
@ -253,8 +253,8 @@ View.Hash = function (wardrobe) {
} }
} }
if(new_data.biologies) { if(new_data.biology) {
wardrobe.outfits.setPetStateAssetsByIds(new_data.biologies); wardrobe.outfits.setPetStateAssetsByIds(new_data.biology);
} }
if(new_data.color !== data.color || new_data.species !== data.species) { if(new_data.color !== data.color || new_data.species !== data.species) {
wardrobe.outfits.setPetTypeByColorAndSpecies(new_data.color, new_data.species); wardrobe.outfits.setPetTypeByColorAndSpecies(new_data.color, new_data.species);
@ -376,7 +376,7 @@ View.Hash = function (wardrobe) {
singleOutfitResponse('updatePetState', function (pet_state) { singleOutfitResponse('updatePetState', function (pet_state) {
var pet_type = wardrobe.outfits.getPetType(); var pet_type = wardrobe.outfits.getPetType();
if(pet_state.id != data.state && pet_type && (data.state || pet_state.id != pet_type.pet_states[0].id)) { if(pet_state.id != data.state && pet_type && (data.state || pet_state.id != pet_type.pet_states[0].id)) {
changeQuery({biologies: undefined, state: pet_state.id}); changeQuery({biology: undefined, state: pet_state.id});
} }
}); });
@ -388,7 +388,7 @@ View.Hash = function (wardrobe) {
wardrobe.outfits.bind('loadOutfit', function (outfit) { wardrobe.outfits.bind('loadOutfit', function (outfit) {
changeQuery({ changeQuery({
biologies: undefined, biology: undefined,
closet: outfit.getClosetItemIds(), closet: outfit.getClosetItemIds(),
color: outfit.pet_type.color_id, color: outfit.pet_type.color_id,
objects: outfit.getWornItemIds(), objects: outfit.getWornItemIds(),