IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated Ember.Deferred

Browse Source
This commit is contained in:
Robin Ward
2014-09-24 14:17:09 -04:00
parent cef3cdff86
commit 98d21ed21f
4 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/preload_store.js
View File

@@ -28,7 +28,7 @@ window.PreloadStore = {
@method getAndRemove
@param {String} key the key to look up the object with
@param {function} finder a function to find the object with
@returns {Ember.Deferred} a promise that will eventually be the object we want.
@returns {Promise} a promise that will eventually be the object we want.
**/
getAndRemove: function(key, finder) {
if (this.data[key]) {
@@ -38,23 +38,23 @@ window.PreloadStore = {
}
if (finder) {
return Em.Deferred.promise(function(promise) {
return new Ember.RSVP.Promise(function(resolve, reject) {
var result = finder();
// If the finder returns a promise, we support that too
if (result.then) {
result.then(function(result) {
return promise.resolve(result);
return resolve(result);
}, function(result) {
return promise.reject(result);
return reject(result);
});
} else {
promise.resolve(result);
resolve(result);
}
});
}
return Em.RSVP.resolve(null);
return Ember.RSVP.resolve(null);
},
/**