github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: FAQ wasn't loading sometimes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse.js
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) {

2
app/assets/javascripts/discourse/controllers/static_controller.js
View File

@ -20,7 +20,7 @@ Discourse.StaticController = Discourse.Controller.extend({
text = text[1];
this.set('content', text);
} else {
return Discourse.ajax(path).then(function (result) {
return Discourse.ajax(path, {dataType: 'html'}).then(function (result) {
staticController.set('content', result);
});
}

3
app/assets/javascripts/discourse/routes/static_route.js
View File

@ -9,9 +9,11 @@
Discourse.StaticController.pages.forEach(function(page) {
Discourse[(page.capitalize()) + "Route"] = Discourse.Route.extend({
renderTemplate: function() {
this.render('static');
},
setupController: function() {
var config_key = Discourse.StaticController.configs[page];
if (config_key && Discourse.SiteSettings[config_key].length > 0) {
@ -20,6 +22,7 @@ Discourse.StaticController.pages.forEach(function(page) {
this.controllerFor('static').loadPath("/" + page);
}
}
});
});