deploy issues, assigning click event issues, first load issues
This commit is contained in:
parent
71f8ef04d9
commit
7a16f0b81d
2 changed files with 146 additions and 8 deletions
135
Gemfile.lock
Normal file
135
Gemfile.lock
Normal file
|
@ -0,0 +1,135 @@
|
||||||
|
---
|
||||||
|
hash: 69933c49c3e95c92aa2fa74961dcafc1b817fff7
|
||||||
|
sources:
|
||||||
|
- Git:
|
||||||
|
git: git://github.com/thoughtbot/factory_girl.git
|
||||||
|
branch: rails3
|
||||||
|
uri: git://github.com/thoughtbot/factory_girl.git
|
||||||
|
ref: feac7298352a83fef0717d8beadd2eda9aabfe56
|
||||||
|
- Git:
|
||||||
|
git: http://github.com/mislav/will_paginate.git
|
||||||
|
branch: rails3
|
||||||
|
uri: http://github.com/mislav/will_paginate.git
|
||||||
|
ref: 60aa1c7b2ef03ee7c7a5ed657efb479a69f7d128
|
||||||
|
- Rubygems:
|
||||||
|
uri: http://rubygems.org
|
||||||
|
specs:
|
||||||
|
- rake:
|
||||||
|
version: 0.8.7
|
||||||
|
- abstract:
|
||||||
|
version: 1.0.0
|
||||||
|
- activesupport:
|
||||||
|
version: 3.0.0.beta4
|
||||||
|
- builder:
|
||||||
|
version: 2.1.2
|
||||||
|
- i18n:
|
||||||
|
version: 0.4.1
|
||||||
|
- activemodel:
|
||||||
|
version: 3.0.0.beta4
|
||||||
|
- erubis:
|
||||||
|
version: 2.6.6
|
||||||
|
- rack:
|
||||||
|
version: 1.1.0
|
||||||
|
- rack-mount:
|
||||||
|
version: 0.6.6
|
||||||
|
- rack-test:
|
||||||
|
version: 0.5.4
|
||||||
|
- tzinfo:
|
||||||
|
version: 0.3.22
|
||||||
|
- actionpack:
|
||||||
|
version: 3.0.0.beta4
|
||||||
|
- mime-types:
|
||||||
|
version: "1.16"
|
||||||
|
- polyglot:
|
||||||
|
version: 0.3.1
|
||||||
|
- treetop:
|
||||||
|
version: 1.4.8
|
||||||
|
- mail:
|
||||||
|
version: 2.2.5
|
||||||
|
- actionmailer:
|
||||||
|
version: 3.0.0.beta4
|
||||||
|
- arel:
|
||||||
|
version: 0.4.0
|
||||||
|
- activerecord:
|
||||||
|
version: 3.0.0.beta4
|
||||||
|
- activeresource:
|
||||||
|
version: 3.0.0.beta4
|
||||||
|
- bundler:
|
||||||
|
version: 0.9.26
|
||||||
|
- haml:
|
||||||
|
version: 3.0.13
|
||||||
|
- compass:
|
||||||
|
version: 0.10.2
|
||||||
|
- diff-lcs:
|
||||||
|
version: 1.1.2
|
||||||
|
- factory_girl:
|
||||||
|
version: 1.2.3
|
||||||
|
source: 0
|
||||||
|
- mysql:
|
||||||
|
version: 2.8.1
|
||||||
|
- nokogiri:
|
||||||
|
version: 1.4.2
|
||||||
|
- thor:
|
||||||
|
version: 0.13.7
|
||||||
|
- railties:
|
||||||
|
version: 3.0.0.beta4
|
||||||
|
- rails:
|
||||||
|
version: 3.0.0.beta4
|
||||||
|
- rdiscount:
|
||||||
|
version: 1.6.5
|
||||||
|
- rspec-core:
|
||||||
|
version: 2.0.0.beta.14
|
||||||
|
- rspec-expectations:
|
||||||
|
version: 2.0.0.beta.14
|
||||||
|
- rspec-mocks:
|
||||||
|
version: 2.0.0.beta.14
|
||||||
|
- rspec:
|
||||||
|
version: 2.0.0.beta.14
|
||||||
|
- webrat:
|
||||||
|
version: 0.7.1
|
||||||
|
- rspec-rails:
|
||||||
|
version: 2.0.0.beta.14.2
|
||||||
|
- sqlite3-ruby:
|
||||||
|
version: 1.3.0
|
||||||
|
- will_paginate:
|
||||||
|
version: 3.0.pre
|
||||||
|
source: 1
|
||||||
|
dependencies:
|
||||||
|
rails:
|
||||||
|
version: = 3.0.0.beta4
|
||||||
|
group:
|
||||||
|
- :default
|
||||||
|
sqlite3-ruby:
|
||||||
|
version: ">= 0"
|
||||||
|
group:
|
||||||
|
- :default
|
||||||
|
require:
|
||||||
|
- sqlite3
|
||||||
|
haml:
|
||||||
|
version: ">= 3.0.0"
|
||||||
|
group:
|
||||||
|
- :default
|
||||||
|
will_paginate:
|
||||||
|
version: ">= 0"
|
||||||
|
group:
|
||||||
|
- :default
|
||||||
|
rdiscount:
|
||||||
|
version: ">= 0"
|
||||||
|
group:
|
||||||
|
- :default
|
||||||
|
compass:
|
||||||
|
version: ">= 0.10.1"
|
||||||
|
group:
|
||||||
|
- :default
|
||||||
|
mysql:
|
||||||
|
version: ">= 0"
|
||||||
|
group:
|
||||||
|
- :development
|
||||||
|
rspec-rails:
|
||||||
|
version: ">= 2.0.0.beta.8"
|
||||||
|
group:
|
||||||
|
- :test
|
||||||
|
factory_girl:
|
||||||
|
version: ">= 0"
|
||||||
|
group:
|
||||||
|
- :test
|
|
@ -180,16 +180,18 @@ Item.createFromLocation = function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
Preview = new function Preview() {
|
Preview = new function Preview() {
|
||||||
var swf_id, swf, updateWhenFlashReady = false;
|
var preview = this, swf_id, swf, update_when_swf_ready = false;
|
||||||
|
|
||||||
window.previewSWFIsReady = function () {
|
window.previewSWFIsReady = function () {
|
||||||
|
log('preview SWF is ready');
|
||||||
swf = document.getElementById(swf_id);
|
swf = document.getElementById(swf_id);
|
||||||
if(updateWhenFlashReady) this.update();
|
if(update_when_swf_ready) preview.update();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.update = function (assets) {
|
this.update = function (assets) {
|
||||||
var assets;
|
var assets;
|
||||||
if(swf) {
|
if(swf) {
|
||||||
|
log('now doing update');
|
||||||
assets = PetType.current.assets.concat(
|
assets = PetType.current.assets.concat(
|
||||||
Item.current.getAssetsForPetType(PetType.current)
|
Item.current.getAssetsForPetType(PetType.current)
|
||||||
);
|
);
|
||||||
|
@ -200,7 +202,8 @@ Preview = new function Preview() {
|
||||||
});
|
});
|
||||||
swf.setAssets(assets);
|
swf.setAssets(assets);
|
||||||
} else {
|
} else {
|
||||||
updateWhenFlashReady = true;
|
log('putting off update');
|
||||||
|
update_when_swf_ready = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -237,11 +240,11 @@ Item.current.name = $('#item-name').text();
|
||||||
PetType.createFromLink(speciesList.eq(Math.floor(Math.random()*speciesList.length))).setAsCurrent();
|
PetType.createFromLink(speciesList.eq(Math.floor(Math.random()*speciesList.length))).setAsCurrent();
|
||||||
|
|
||||||
speciesList.each(function () {
|
speciesList.each(function () {
|
||||||
var pet_type = PetType.createFromLink($(this));
|
var el = $(this);
|
||||||
$(this).click(function (e) {
|
el.data('pet_type', PetType.createFromLink(el));
|
||||||
e.preventDefault();
|
}).live('click', function (e) {
|
||||||
pet_type.setAsCurrent();
|
e.preventDefault();
|
||||||
});
|
$(this).data('pet_type').setAsCurrent();
|
||||||
});
|
});
|
||||||
|
|
||||||
setTimeout($.proxy(Item.current, 'loadAllStandard'), 5000);
|
setTimeout($.proxy(Item.current, 'loadAllStandard'), 5000);
|
||||||
|
|
Loading…
Reference in a new issue