From 224f503e6f412264c0d6d5df1281f9c9e570b98f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 15 Oct 2014 14:33:22 -0400
Subject: [PATCH] FIX: `refreshTitle` error when navigating to a 404 page

---
 app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 | 2 +-
 app/assets/javascripts/admin/routes/admin-site-text.js.es6      | 2 +-
 app/assets/javascripts/admin/routes/admin-user-fields.js.es6    | 2 +-
 app/assets/javascripts/admin/routes/admin_group_route.js        | 2 +-
 app/assets/javascripts/discourse/controllers/topic.js.es6       | 1 +
 app/assets/javascripts/discourse/routes/application.js.es6      | 2 +-
 app/assets/javascripts/discourse/routes/discourse_route.js      | 2 +-
 app/assets/javascripts/discourse/routes/topic-by-slug.js.es6    | 2 +-
 app/assets/javascripts/discourse/routes/unknown_route.js        | 2 +-
 app/assets/javascripts/discourse/routes/user-index.js.es6       | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
index 5131eff16..6eba6e76e 100644
--- a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
@@ -1,4 +1,4 @@
-export default Ember.Route.extend({
+export default Discourse.Route.extend({
   model: function(params) {
     return Discourse.SiteText.find(params.text_type);
   }
diff --git a/app/assets/javascripts/admin/routes/admin-site-text.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text.js.es6
index df5cfacd8..e850fd6c6 100644
--- a/app/assets/javascripts/admin/routes/admin-site-text.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-text.js.es6
@@ -1,4 +1,4 @@
-export default Ember.Route.extend({
+export default Discourse.Route.extend({
   model: function() {
     return Discourse.SiteTextType.findAll();
   }
diff --git a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
index 10704c845..a540f343c 100644
--- a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
@@ -1,6 +1,6 @@
 import UserField from 'admin/models/user-field';
 
-export default Ember.Route.extend({
+export default Discourse.Route.extend({
   model: function() {
     return UserField.findAll();
   },
diff --git a/app/assets/javascripts/admin/routes/admin_group_route.js b/app/assets/javascripts/admin/routes/admin_group_route.js
index d4a8fd3ce..3de37b38e 100644
--- a/app/assets/javascripts/admin/routes/admin_group_route.js
+++ b/app/assets/javascripts/admin/routes/admin_group_route.js
@@ -1,4 +1,4 @@
-Discourse.AdminGroupRoute = Em.Route.extend({
+Discourse.AdminGroupRoute = Discourse.Route.extend({
 
   model: function(params) {
     var groups = this.modelFor('adminGroups'),
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 8c54c841a..a2cd37e97 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -21,6 +21,7 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, {
 
       // Note normally you don't have to trigger this, but topic titles can be updated
       // and are sometimes lazily loaded.
+      console.log(title);
       this.send('refreshTitle');
     }
   }.observes('title'),
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index ddc4d6359..c60977db1 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -1,4 +1,4 @@
-var ApplicationRoute = Em.Route.extend({
+var ApplicationRoute = Discourse.Route.extend({
 
   siteTitle: Discourse.computed.setting('title'),
 
diff --git a/app/assets/javascripts/discourse/routes/discourse_route.js b/app/assets/javascripts/discourse/routes/discourse_route.js
index 4beffeace..b9be76632 100644
--- a/app/assets/javascripts/discourse/routes/discourse_route.js
+++ b/app/assets/javascripts/discourse/routes/discourse_route.js
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.Route = Em.Route.extend({
+Discourse.Route = Ember.Route.extend({
 
   /**
     NOT called every time we enter a route on Discourse.
diff --git a/app/assets/javascripts/discourse/routes/topic-by-slug.js.es6 b/app/assets/javascripts/discourse/routes/topic-by-slug.js.es6
index 04d6cd1d6..e9482adb5 100644
--- a/app/assets/javascripts/discourse/routes/topic-by-slug.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-by-slug.js.es6
@@ -1,4 +1,4 @@
-export default Ember.Route.extend({
+export default Discourse.Route.extend({
   model: function(params) {
     return Discourse.Topic.idForSlug(params.slug);
   },
diff --git a/app/assets/javascripts/discourse/routes/unknown_route.js b/app/assets/javascripts/discourse/routes/unknown_route.js
index 06360a7f1..334ce0274 100644
--- a/app/assets/javascripts/discourse/routes/unknown_route.js
+++ b/app/assets/javascripts/discourse/routes/unknown_route.js
@@ -1,4 +1,4 @@
-Discourse.UnknownRoute = Em.Route.extend({
+Discourse.UnknownRoute = Discourse.Route.extend({
   model: function() {
     return Discourse.ajax("/404-body", {dataType: 'html'});
   }
diff --git a/app/assets/javascripts/discourse/routes/user-index.js.es6 b/app/assets/javascripts/discourse/routes/user-index.js.es6
index 1acc4d93c..42dbb50bc 100644
--- a/app/assets/javascripts/discourse/routes/user-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-index.js.es6
@@ -1,4 +1,4 @@
-export default Em.Route.extend({
+export default Discourse.Route.extend({
 
   beforeModel: function() {
     return this.replaceWith('userActivity');