Update ember-model with a reloading fix
This commit is contained in:
parent
226b938214
commit
d40c097074
13
assets/scripts/vendor/ember-model.js
vendored
13
assets/scripts/vendor/ember-model.js
vendored
|
@ -775,22 +775,11 @@ Ember.Model.reopenClass({
|
||||||
this._currentBatchIds = null;
|
this._currentBatchIds = null;
|
||||||
this._currentBatchRecordArrays = null;
|
this._currentBatchRecordArrays = null;
|
||||||
|
|
||||||
for (i = 0; i < batchIds.length; i++) {
|
|
||||||
if (!this.cachedRecordForId(batchIds[i]).get('isLoaded')) {
|
|
||||||
requestIds.push(batchIds[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (batchIds.length === 1) {
|
if (batchIds.length === 1) {
|
||||||
promise = get(this, 'adapter').find(this.cachedRecordForId(batchIds[0]), batchIds[0]);
|
promise = get(this, 'adapter').find(this.cachedRecordForId(batchIds[0]), batchIds[0]);
|
||||||
} else {
|
} else {
|
||||||
var recordArray = Ember.RecordArray.create({_ids: batchIds});
|
var recordArray = Ember.RecordArray.create({_ids: batchIds});
|
||||||
if (requestIds.length === 0) {
|
promise = get(this, 'adapter').findMany(this, recordArray, batchIds);
|
||||||
promise = new Ember.RSVP.Promise(function(resolve, reject) { resolve(recordArray); });
|
|
||||||
recordArray.notifyLoaded();
|
|
||||||
} else {
|
|
||||||
promise = get(this, 'adapter').findMany(this, recordArray, requestIds);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
promise.then(function() {
|
promise.then(function() {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user