Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Fix settings back button functionality

Browse source 
Added a redirect call to the router instead of defaulting the pane. To
handle using the back button after clicking through to other tabs I
added an event listener on the route:settings event.
This commit is contained in:
Jacob Gable 2013-09-01 22:54:19 -05:00
parent 14d4145514
commit 1f5dd7144f
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ghost/admin/router.js
View file

@ -33,6 +33,15 @@
}, },
settings: function (pane) { settings: function (pane) {
if (!pane) {
// Redirect to settings/general if no pane supplied
this.navigate('/settings/general', {
trigger: true,
replace: true
});
return;
}
// only update the currentView if we don't already have a Settings view // only update the currentView if we don't already have a Settings view
if (!Ghost.currentView || !(Ghost.currentView instanceof Ghost.Views.Settings)) { if (!Ghost.currentView || !(Ghost.currentView instanceof Ghost.Views.Settings)) {
Ghost.currentView = new Ghost.Views.Settings({ el: '#main', pane: pane }); Ghost.currentView = new Ghost.Views.Settings({ el: '#main', pane: pane });

22
ghost/admin/views/settings.js
View file

@ -9,11 +9,26 @@
Ghost.Views.Settings = Ghost.View.extend({ Ghost.Views.Settings = Ghost.View.extend({
initialize: function (options) { initialize: function (options) {
$(".settings-content").removeClass('active'); $(".settings-content").removeClass('active');
this.addSubview(new Settings.Sidebar({
this.sidebar = new Settings.Sidebar({
el: '.settings-sidebar', el: '.settings-sidebar',
pane: options.pane, pane: options.pane,
model: this.model model: this.model
})); });
this.addSubview(this.sidebar);
this.listenTo(Ghost.router, "route:settings", this.changePane);
},
changePane: function (pane) {
if (!pane) {
// Can happen when trying to load /settings with no pane specified
// let the router navigate itself to /settings/general
return;
}
this.sidebar.showContent(pane);
} }
}); });
@ -23,7 +38,7 @@
initialize: function (options) { initialize: function (options) {
this.render(); this.render();
this.menu = this.$('.settings-menu'); this.menu = this.$('.settings-menu');
this.showContent(options.pane || 'general'); this.showContent(options.pane);
}, },
models: {}, models: {},
@ -36,6 +51,7 @@
e.preventDefault(); e.preventDefault();
var item = $(e.currentTarget), var item = $(e.currentTarget),
id = item.find('a').attr('href').substring(1); id = item.find('a').attr('href').substring(1);
this.showContent(id); this.showContent(id);
}, },