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

FIX: `refreshTitle` error when navigating to a 404 page

This commit is contained in:
Robin Ward 2014-10-15 14:33:22 -04:00
parent 31e9cafe0e
commit 224f503e6f
10 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
View File

@ -1,4 +1,4 @@
export default Ember.Route.extend({ export default Discourse.Route.extend({
model: function(params) { model: function(params) {
return Discourse.SiteText.find(params.text_type); return Discourse.SiteText.find(params.text_type);
} }

2
app/assets/javascripts/admin/routes/admin-site-text.js.es6
View File

@ -1,4 +1,4 @@
export default Ember.Route.extend({ export default Discourse.Route.extend({
model: function() { model: function() {
return Discourse.SiteTextType.findAll(); return Discourse.SiteTextType.findAll();
} }

2
app/assets/javascripts/admin/routes/admin-user-fields.js.es6
View File

@ -1,6 +1,6 @@
import UserField from 'admin/models/user-field'; import UserField from 'admin/models/user-field';
export default Ember.Route.extend({ export default Discourse.Route.extend({
model: function() { model: function() {
return UserField.findAll(); return UserField.findAll();
}, },

2
app/assets/javascripts/admin/routes/admin_group_route.js
View File

@ -1,4 +1,4 @@
Discourse.AdminGroupRoute = Em.Route.extend({ Discourse.AdminGroupRoute = Discourse.Route.extend({
model: function(params) { model: function(params) {
var groups = this.modelFor('adminGroups'), var groups = this.modelFor('adminGroups'),

1
app/assets/javascripts/discourse/controllers/topic.js.es6
View File

@ -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 // Note normally you don't have to trigger this, but topic titles can be updated
// and are sometimes lazily loaded. // and are sometimes lazily loaded.
console.log(title);
this.send('refreshTitle'); this.send('refreshTitle');
} }
}.observes('title'), }.observes('title'),

2
app/assets/javascripts/discourse/routes/application.js.es6
View File

@ -1,4 +1,4 @@
var ApplicationRoute = Em.Route.extend({ var ApplicationRoute = Discourse.Route.extend({
siteTitle: Discourse.computed.setting('title'), siteTitle: Discourse.computed.setting('title'),

2
app/assets/javascripts/discourse/routes/discourse_route.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
Discourse.Route = Em.Route.extend({ Discourse.Route = Ember.Route.extend({
/** /**
NOT called every time we enter a route on Discourse. NOT called every time we enter a route on Discourse.

2
app/assets/javascripts/discourse/routes/topic-by-slug.js.es6
View File

@ -1,4 +1,4 @@
export default Ember.Route.extend({ export default Discourse.Route.extend({
model: function(params) { model: function(params) {
return Discourse.Topic.idForSlug(params.slug); return Discourse.Topic.idForSlug(params.slug);
}, },

2
app/assets/javascripts/discourse/routes/unknown_route.js
View File

@ -1,4 +1,4 @@
Discourse.UnknownRoute = Em.Route.extend({ Discourse.UnknownRoute = Discourse.Route.extend({
model: function() { model: function() {
return Discourse.ajax("/404-body", {dataType: 'html'}); return Discourse.ajax("/404-body", {dataType: 'html'});
} }

2
app/assets/javascripts/discourse/routes/user-index.js.es6
View File

@ -1,4 +1,4 @@
export default Em.Route.extend({ export default Discourse.Route.extend({
beforeModel: function() { beforeModel: function() {
return this.replaceWith('userActivity'); return this.replaceWith('userActivity');