codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-04-30 07:53:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: properly defer authentication complete

Browse source
This commit is contained in:
Sam Saffron 2016-02-08 08:44:12 +11:00
parent b0567f9c62
commit b032c63773
1 changed files with 12 additions and 5 deletions

17
app/views/common/_discourse_javascript.html.erb
View file

@ -33,6 +33,18 @@
</script> </script>
<script> <script>
<%- if !current_user && flash[:authentication_data] %>
require('discourse/routes/application').default.reopen({
actions: {
didTransition: function() {
Em.run.next(function(){
Discourse.authenticationComplete(<%=flash[:authentication_date].html_safe%>);
});
return this._super();
}
}
});
<%- end %>
Discourse.CDN = '<%= Rails.configuration.action_controller.asset_host %>'; Discourse.CDN = '<%= Rails.configuration.action_controller.asset_host %>';
Discourse.BaseUrl = '<%= RailsMultisite::ConnectionManagement.current_hostname %>'.replace(/:[\d]*$/,""); Discourse.BaseUrl = '<%= RailsMultisite::ConnectionManagement.current_hostname %>'.replace(/:[\d]*$/,"");
Discourse.BaseUri = '<%= Discourse::base_uri %>'; Discourse.BaseUri = '<%= Discourse::base_uri %>';
@ -53,11 +65,6 @@
<%- end %> <%- end %>
Discourse.S3BaseUrl = '<%= Discourse.store.absolute_base_url %>'; Discourse.S3BaseUrl = '<%= Discourse.store.absolute_base_url %>';
<%- end %> <%- end %>
<%- if !current_user && flash[:authentication_data] %>
Em.run.next(function(){
Discourse.authenticationComplete(<%=flash[:authentication_data].html_safe%>);
});
<%- end %>
</script> </script>
<%= script 'browser-update' %> <%= script 'browser-update' %>