Skip to content
This repository was archived by the owner on Oct 10, 2025. It is now read-only.
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions lib/model/proxies.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,24 +128,27 @@ Ep.LazyModel = Ep.ModelPromise.extend({
var session = get(this, 'session');
var type = get(this, 'type');
var id = get(this, 'id');
set(this, 'isLoading', true);

Ember.assert("Must be attached to a session.", get(this, 'session'));
Ember.assert("Must have an id to load.", id);
// The model can happen to not have a session yet
if (session) {
set(this, 'isLoading', true);

var promise = this.session.load(type, id);
Ember.assert("Must have an id to load.", id);

if(get(promise, 'isLoaded')) {
this.resolve(Ep.unwrap(promise));
} else {
var proxy = this;
promise.then(function(model) {
proxy.resolve(model);
return model;
}, function(err) {
proxy.reject(err);
return err;
});
var promise = this.session.load(type, id);

if(get(promise, 'isLoaded')) {
this.resolve(Ep.unwrap(promise));
} else {
var proxy = this;
promise.then(function(model) {
proxy.resolve(model);
return model;
}, function(err) {
proxy.reject(err);
return err;
});
}
}
return this;
},
Expand Down Expand Up @@ -190,4 +193,4 @@ Ep.resolveModel = function(modelOrPromise, type, id, session) {
}

return promise;
};
};