Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: automatic redirection to /top was a bit janky

This commit is contained in:
Régis Hanol 2014-08-02 00:34:58 +02:00
parent b368667703
commit d13d42f3f6
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ Discourse.DiscoveryRoute = Discourse.Route.extend(Discourse.ScrollTop, Discourse
beforeModel: function(transition) { beforeModel: function(transition) {
if (transition.targetName.indexOf("discovery.top") === -1 && if (transition.targetName.indexOf("discovery.top") === -1 &&
Discourse.User.currentProp("should_be_redirected_to_top")) { Discourse.User.currentProp("should_be_redirected_to_top")) {
Discourse.User.currentProp("should_be_redirected_to_top", false);
this.transitionTo("discovery.top"); this.transitionTo("discovery.top");
} }
}, },

10
app/assets/javascripts/discourse/routes/discovery_top_routes.js
View File

@ -39,6 +39,11 @@ Discourse.DiscoveryTopRoute = Discourse.Route.extend(Discourse.OpenComposer, {
actions: { actions: {
willTransition: function () {
Discourse.User.currentProp("should_be_redirected_to_top", false);
Discourse.User.currentProp("redirected_to_top_reason", null);
},
createTopic: function() { createTopic: function() {
this.openComposer(this.controllerFor('discovery/top')); this.openComposer(this.controllerFor('discovery/top'));
} }
@ -110,6 +115,11 @@ Discourse.DiscoveryTopCategoryRoute = Discourse.Route.extend(Discourse.OpenCompo
actions: { actions: {
willTransition: function () {
Discourse.User.currentProp("should_be_redirected_to_top", false);
Discourse.User.currentProp("redirected_to_top_reason", null);
},
createTopic: function() { createTopic: function() {
this.openComposer(this.controllerFor('discovery/top')); this.openComposer(this.controllerFor('discovery/top'));
} }

2
app/assets/javascripts/discourse/templates/discovery/top.js.handlebars
View File

@ -1,5 +1,5 @@
<div class="top-lists"> <div class="top-lists">
{{#if currentUser.should_be_redirected_to_top}} {{#if currentUser.redirected_to_top_reason}}
<div class="alert alert-info">{{currentUser.redirected_to_top_reason}}</div> <div class="alert alert-info">{{currentUser.redirected_to_top_reason}}</div>
{{/if}} {{/if}}
{{#if content.yearly}} {{#if content.yearly}}