From 425b59d381b38e01920b92923d726e0f4917a322 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 29 Aug 2013 12:26:05 -0400
Subject: [PATCH] FIX: Don't name two routes the same. It breaks in Ember RC8.
---
app/assets/javascripts/discourse/routes/application_routes.js | 2 +-
.../javascripts/discourse/routes/topic_from_params_route.js | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/discourse/routes/application_routes.js b/app/assets/javascripts/discourse/routes/application_routes.js
index 5eadf489a..663314d3f 100644
--- a/app/assets/javascripts/discourse/routes/application_routes.js
+++ b/app/assets/javascripts/discourse/routes/application_routes.js
@@ -10,7 +10,7 @@ Discourse.Route.buildRoutes(function() {
// Topic routes
this.resource('topic', { path: '/t/:slug/:id' }, function() {
this.route('fromParams', { path: '/' });
- this.route('fromParams', { path: '/:nearPost' });
+ this.route('fromParamsNear', { path: '/:nearPost' });
});
// Generate static page routes
diff --git a/app/assets/javascripts/discourse/routes/topic_from_params_route.js b/app/assets/javascripts/discourse/routes/topic_from_params_route.js
index 368e5444f..0b8a1455e 100644
--- a/app/assets/javascripts/discourse/routes/topic_from_params_route.js
+++ b/app/assets/javascripts/discourse/routes/topic_from_params_route.js
@@ -58,4 +58,5 @@ Discourse.TopicFromParamsRoute = Discourse.Route.extend({
});
+Discourse.TopicFromParamsNearRoute = Discourse.TopicFromParamsRoute;