OpenNeo/impress
OpenNeo/impress
1
0
Fork 1
Code Pull requests Activity

start from scratch home js

Browse source
This commit is contained in:
Emi Matchu 2010-11-05 20:17:42 -04:00
parent 2d550724f0
commit db56b0d218
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/models/pet_type.rb
View file

@ -25,9 +25,11 @@ class PetType < ActiveRecord::Base
} }
def as_json(options={}) def as_json(options={})
json = {:id => id, :body_id => body_id} if options[:for] == 'wardrobe'
json[:pet_state_ids] = self.pet_state_ids if options[:for] == 'wardrobe' {:id => id, :body_id => body_id, :pet_state_ids => pet_state_ids}
json else
{:image_hash => image_hash}
end
end end
def color_id=(new_color_id) def color_id=(new_color_id)
@ -59,7 +61,7 @@ class PetType < ActiveRecord::Base
end end
def image_hash def image_hash
BasicHashes[species.name][color.name] self['image_hash'] || BasicHashes[species.name][color.name]
end end
def add_pet_state_from_biology!(biology) def add_pet_state_from_biology!(biology)

6
public/javascripts/outfits/new.js
View file

@ -120,11 +120,9 @@ $(function () {
name = name.join(' '); name = name.join(' ');
Preview.displayLoading(); Preview.displayLoading();
$.ajax({ $.ajax({
url: '/pet_types.json', url: '/species/' + type.species + '/color/' + type.color + '/pet_type.json',
data: { data: {
'for': 'image', 'for': 'image'
'species_id': type.species,
'color_id': type.color
}, },
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {