suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ember and ember-data

Browse Source
This commit is contained in:
Piotr Sarnacki 2012-07-30 03:39:26 +02:00
parent 3eb8e17daa
commit cd26fc103e
3 changed files with 1124 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
assets/javascripts/vendor/ember-data.js vendored
View File

@ -248,7 +248,7 @@ DS.ManyArrayStateManager = Ember.StateManager.extend({
(function() { (function() {
var get = Ember.get, set = Ember.set, set = Ember.set; var get = Ember.get, set = Ember.set;
DS.ManyArray = DS.RecordArray.extend({ DS.ManyArray = DS.RecordArray.extend({
init: function() { init: function() {
@ -3743,31 +3743,35 @@ DS.FixtureAdapter = DS.Adapter.extend({
find: function(store, type, id) { find: function(store, type, id) {
var fixtures = this.fixturesForType(type); var fixtures = this.fixturesForType(type);
Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures);
if (fixtures) { if (fixtures) {
fixtures = fixtures.findProperty('id', id); fixtures = fixtures.findProperty('id', id);
} }
Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures); if (fixtures) {
this.simulateRemoteCall(function() {
this.simulateRemoteCall(function() { store.load(type, fixtures);
store.load(type, fixtures); }, store, type);
}, store, type); }
}, },
findMany: function(store, type, ids) { findMany: function(store, type, ids) {
var fixtures = this.fixturesForType(type); var fixtures = this.fixturesForType(type);
Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures);
if (fixtures) { if (fixtures) {
fixtures = fixtures.filter(function(item) { fixtures = fixtures.filter(function(item) {
return ids.indexOf(item.id) !== -1; return ids.indexOf(item.id) !== -1;
}); });
} }
Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures); if (fixtures) {
this.simulateRemoteCall(function() {
this.simulateRemoteCall(function() { store.loadMany(type, fixtures);
store.loadMany(type, fixtures); }, store, type);
}, store, type); }
}, },
findAll: function(store, type) { findAll: function(store, type) {
@ -3783,13 +3787,15 @@ DS.FixtureAdapter = DS.Adapter.extend({
findQuery: function(store, type, query, array) { findQuery: function(store, type, query, array) {
var fixtures = this.fixturesForType(type); var fixtures = this.fixturesForType(type);
fixtures = this.queryFixtures(fixtures, query);
Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures); Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures);
this.simulateRemoteCall(function() { fixtures = this.queryFixtures(fixtures, query);
array.load(fixtures);
}, store, type); if (fixtures) {
this.simulateRemoteCall(function() {
array.load(fixtures);
}, store, type);
}
}, },
createRecord: function(store, type, record) { createRecord: function(store, type, record) {
@ -4030,7 +4036,9 @@ DS.RESTAdapter = DS.Adapter.extend({
data: query, data: query,
success: function(json) { success: function(json) {
this.sideload(store, type, json, plural); this.sideload(store, type, json, plural);
recordArray.load(json[plural]); setTimeout(function() {
recordArray.load(json[plural]);
}, 10);
} }
}); });
}, },

779
assets/javascripts/vendor/ember.js vendored
View File

File diff suppressed because it is too large Load Diff

821
public/javascripts/vendor.js
View File

File diff suppressed because it is too large Load Diff