From d40c0970749c07a7278a43a714b413b77afaf20c Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 13 Sep 2013 22:36:18 +0200 Subject: [PATCH] Update ember-model with a reloading fix --- assets/scripts/vendor/ember-model.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/assets/scripts/vendor/ember-model.js b/assets/scripts/vendor/ember-model.js index a5eea67b..4665d5d1 100644 --- a/assets/scripts/vendor/ember-model.js +++ b/assets/scripts/vendor/ember-model.js @@ -775,22 +775,11 @@ Ember.Model.reopenClass({ this._currentBatchIds = 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) { promise = get(this, 'adapter').find(this.cachedRecordForId(batchIds[0]), batchIds[0]); } else { var recordArray = Ember.RecordArray.create({_ids: batchIds}); - if (requestIds.length === 0) { - promise = new Ember.RSVP.Promise(function(resolve, reject) { resolve(recordArray); }); - recordArray.notifyLoaded(); - } else { - promise = get(this, 'adapter').findMany(this, recordArray, requestIds); - } + promise = get(this, 'adapter').findMany(this, recordArray, batchIds); } promise.then(function() {