Merge pull request #1518 from velesin/preload_store_context_refactoring
removes redundant context binding
This commit is contained in:
commit
c3c06ae8ea
|
@ -31,11 +31,9 @@ PreloadStore = {
|
||||||
@returns {Ember.Deferred} a promise that will eventually be the object we want.
|
@returns {Ember.Deferred} a promise that will eventually be the object we want.
|
||||||
**/
|
**/
|
||||||
getAndRemove: function(key, finder) {
|
getAndRemove: function(key, finder) {
|
||||||
var preloadStore = this;
|
if (this.data[key]) {
|
||||||
|
var promise = Ember.RSVP.resolve(this.data[key]);
|
||||||
if (preloadStore.data[key]) {
|
delete this.data[key];
|
||||||
var promise = Ember.RSVP.resolve(preloadStore.data[key]);
|
|
||||||
delete preloadStore.data[key];
|
|
||||||
return promise;
|
return promise;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue