mirror of
https://github.com/discourse/discourse.git
synced 2025-02-26 19:37:39 +08:00
FIX: Use the container to register Discourse's custom location handler
This commit is contained in:
parent
2f9bb6b88f
commit
fc65bc28be
app
assets/javascripts
views/common
@ -165,4 +165,9 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Discourse.Router = Discourse.Router.reopen({ location: 'discourse_location' });
|
Discourse.initializer({
|
||||||
|
name: "register-discourse-location",
|
||||||
|
initialize: function(container, application) {
|
||||||
|
application.register('location:discourse-location', Ember.DiscourseLocation);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
@ -255,8 +255,6 @@ Ember.DiscourseLocation = Ember.Object.extend({
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Ember.Location.registerImplementation('discourse_location', Ember.DiscourseLocation);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Since we're using pushState/replaceState let's add extra hooks to cloakedView to
|
Since we're using pushState/replaceState let's add extra hooks to cloakedView to
|
||||||
eject itself when the popState occurs. This results in better back button
|
eject itself when the popState occurs. This results in better back button
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
Discourse.BaseUri = '<%= Discourse::base_uri "/" %>';
|
Discourse.BaseUri = '<%= Discourse::base_uri "/" %>';
|
||||||
Discourse.Environment = '<%= Rails.env %>';
|
Discourse.Environment = '<%= Rails.env %>';
|
||||||
Discourse.SiteSettings = PreloadStore.get('siteSettings');
|
Discourse.SiteSettings = PreloadStore.get('siteSettings');
|
||||||
|
Discourse.Router = Ember.Router.extend({ location: 'discourse-location' });
|
||||||
Discourse.Router.map(function() { Discourse.routeBuilder.call(this); });
|
Discourse.Router.map(function() { Discourse.routeBuilder.call(this); });
|
||||||
Discourse.start();
|
Discourse.start();
|
||||||
Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
|
Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user