FIX: FAQ wasn't loading sometimes

This commit is contained in:
Robin Ward
2013-07-16 12:11:30 -04:00
parent 1927263d1d
commit 82c734ec84
3 changed files with 5 additions and 4 deletions

View File

@ -250,9 +250,7 @@ Discourse = Ember.Application.createWithMixins({
// If we have URL_FIXTURES, load from there instead (testing)
var fixture = Discourse.URL_FIXTURES && Discourse.URL_FIXTURES[url];
if (fixture) {
return Ember.Deferred.promise(function(promise) {
promise.resolve(fixture);
});
return Ember.RSVP.resolve(fixture);
}
return Ember.Deferred.promise(function (promise) {