github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 21:41:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

shift site settings in front of routes

Browse Source
This commit is contained in:
Sam
2013-10-15 10:17:32 +11:00
parent e26cbe79ad
commit b567bd3d37
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse.js
View File

@ -227,7 +227,6 @@ Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
**/ **/
start: function() { start: function() {
Discourse.bindDOMEvents(); Discourse.bindDOMEvents();
Discourse.SiteSettings = PreloadStore.get('siteSettings');
Discourse.MessageBus.alwaysLongPoll = Discourse.Environment === "development"; Discourse.MessageBus.alwaysLongPoll = Discourse.Environment === "development";
Discourse.MessageBus.start(); Discourse.MessageBus.start();
Discourse.KeyValueStore.init("discourse_", Discourse.MessageBus); Discourse.KeyValueStore.init("discourse_", Discourse.MessageBus);

1
app/views/common/_discourse_javascript.html.erb
View File

@ -21,6 +21,7 @@
Discourse.BaseUrl = '<%= RailsMultisite::ConnectionManagement.current_hostname %>'; Discourse.BaseUrl = '<%= RailsMultisite::ConnectionManagement.current_hostname %>';
Discourse.BaseUri = '<%= Discourse::base_uri "/" %>'; Discourse.BaseUri = '<%= Discourse::base_uri "/" %>';
Discourse.Environment = '<%= Rails.env %>'; Discourse.Environment = '<%= Rails.env %>';
Discourse.SiteSettings.login_required && !Discourse.User.current();
Discourse.Router.map(function() { Discourse.Router.map(function() {
Discourse.routeBuilder.call(this); Discourse.routeBuilder.call(this);
}); });