mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-03 23:00:14 -05:00
Improvements to settings pane switching
closes #174 - Triggering router events for navigation between settings panes caused the route function to be re-executed, which caused all kinds of fun. - Wrapped the settings route function in an if statement to preserve the current view if it already a settings view. - Added Ghost pub-sub and using that instead of History API
This commit is contained in:
parent
1e95ec0c3d
commit
9092ed95ba
5 changed files with 86 additions and 6 deletions
|
@ -20,6 +20,8 @@
|
|||
router: null
|
||||
};
|
||||
|
||||
_.extend(Ghost, Backbone.Events);
|
||||
|
||||
Ghost.init = function () {
|
||||
Ghost.router = new Ghost.Router();
|
||||
|
||||
|
|
|
@ -33,7 +33,10 @@
|
|||
},
|
||||
|
||||
settings: function (pane) {
|
||||
Ghost.currentView = new Ghost.Views.Settings({ el: '#main', pane: pane });
|
||||
// only update the currentView if we don't already have a Settings view
|
||||
if (!Ghost.currentView || !(Ghost.currentView instanceof Ghost.Views.Settings)) {
|
||||
Ghost.currentView = new Ghost.Views.Settings({ el: '#main', pane: pane });
|
||||
}
|
||||
},
|
||||
|
||||
editor: function (id) {
|
||||
|
|
|
@ -153,7 +153,7 @@
|
|||
initialize: function () {
|
||||
var self = this;
|
||||
this.render();
|
||||
Backbone.history.on('route', function () {
|
||||
Ghost.on('urlchange', function () {
|
||||
self.clearEverything();
|
||||
});
|
||||
},
|
||||
|
|
|
@ -43,7 +43,8 @@
|
|||
var self = this,
|
||||
model;
|
||||
|
||||
Backbone.history.navigate('/settings/' + id, {trigger: true});
|
||||
Ghost.router.navigate('/settings/' + id);
|
||||
Ghost.trigger('urlchange');
|
||||
if (this.pane && id === this.pane.el.id) {
|
||||
return;
|
||||
}
|
||||
|
@ -100,7 +101,6 @@
|
|||
message: 'Saved',
|
||||
status: 'passive'
|
||||
});
|
||||
|
||||
},
|
||||
saveError: function (message) {
|
||||
message = message || 'Something went wrong, not saved :(';
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/*globals casper, __utils__, url */
|
||||
|
||||
casper.test.begin("Settings screen is correct", 12, function suite(test) {
|
||||
casper.test.begin("Settings screen is correct", 19, function suite(test) {
|
||||
|
||||
casper.test.filename = "settings_test.png";
|
||||
|
||||
|
@ -23,6 +23,7 @@ casper.test.begin("Settings screen is correct", 12, function suite(test) {
|
|||
}, "loaded content is general screen");
|
||||
});
|
||||
|
||||
// test the publishing / content tab
|
||||
casper.thenClick('.settings-menu .publishing', function then() {
|
||||
test.assertEval(function testGeneralIsNotActive() {
|
||||
return !document.querySelector('.settings-menu .general').classList.contains('active');
|
||||
|
@ -32,10 +33,84 @@ casper.test.begin("Settings screen is correct", 12, function suite(test) {
|
|||
}, "content tab is marked active");
|
||||
test.assertEval(function testContentIsContent() {
|
||||
return document.querySelector('.settings-content').id === 'content';
|
||||
}, "loaded content is contentß screen");
|
||||
}, "loaded content is content screen");
|
||||
});
|
||||
|
||||
// test the user tab
|
||||
casper.thenClick('.settings-menu .users', function then() {
|
||||
test.assertEval(function testGeneralIsNotActive() {
|
||||
return !document.querySelector('.settings-menu .general').classList.contains('active');
|
||||
}, "general tab is not marked active");
|
||||
test.assertEval(function testContentIsNotActive() {
|
||||
return !document.querySelector('.settings-menu .publishing').classList.contains('active');
|
||||
}, "content tab is marked active");
|
||||
test.assertEval(function testUserIsActive() {
|
||||
return document.querySelector('.settings-menu .users').classList.contains('active');
|
||||
}, "user tab is marked active");
|
||||
test.assertEval(function testContentIsUser() {
|
||||
return document.querySelector('.settings-content').id === 'user';
|
||||
}, "loaded content is user screen");
|
||||
});
|
||||
|
||||
function handleUserRequest(requestData, request) {
|
||||
// make sure we only get requests from the user pane
|
||||
if (requestData.url.indexOf('settings/') !== -1) {
|
||||
casper.test.fail("Saving the user pane triggered another settings pane to save");
|
||||
}
|
||||
}
|
||||
|
||||
function handleSettingsRequest(requestData, request) {
|
||||
// make sure we only get requests from the user pane
|
||||
if (requestData.url.indexOf('users/') !== -1) {
|
||||
casper.test.fail("Saving a settings pane triggered the user pane to save");
|
||||
}
|
||||
}
|
||||
|
||||
casper.then(function listenForRequests() {
|
||||
casper.on('resource.requested', handleUserRequest);
|
||||
});
|
||||
|
||||
casper.thenClick('#user .button-save').waitFor(function successNotification() {
|
||||
return this.evaluate(function () {
|
||||
return document.querySelectorAll('.js-bb-notification section').length > 0;
|
||||
});
|
||||
}, function doneWaiting() {
|
||||
|
||||
}, function waitTimeout() {
|
||||
casper.test.fail("Saving the user pane did not result in a notification");
|
||||
});
|
||||
|
||||
casper.then(function checkUserWasSaved() {
|
||||
casper.removeListener('resource.requested', handleUserRequest);
|
||||
test.assertExists('.notification-success', 'got success notification');
|
||||
});
|
||||
|
||||
casper.thenClick('#main-menu .settings a').then(function testOpeningSettingsTwice() {
|
||||
casper.on('resource.requested', handleSettingsRequest);
|
||||
test.assertEval(function testUserIsActive() {
|
||||
return document.querySelector('.settings-menu .general').classList.contains('active');
|
||||
}, "general tab is marked active");
|
||||
|
||||
});
|
||||
|
||||
casper.thenClick('#general .button-save').waitFor(function successNotification() {
|
||||
return this.evaluate(function () {
|
||||
return document.querySelectorAll('.js-bb-notification section').length > 0;
|
||||
});
|
||||
}, function doneWaiting() {
|
||||
|
||||
}, function waitTimeout() {
|
||||
casper.test.fail("Saving the general pane did not result in a notification");
|
||||
});
|
||||
|
||||
casper.then(function checkSettingsWereSaved() {
|
||||
casper.removeListener('resource.requested', handleSettingsRequest);
|
||||
test.assertExists('.notification-success', 'got success notification');
|
||||
});
|
||||
|
||||
casper.run(function () {
|
||||
casper.removeListener('resource.requested', handleUserRequest);
|
||||
casper.removeListener('resource.requested', handleSettingsRequest);
|
||||
test.done();
|
||||
});
|
||||
});
|
Loading…
Add table
Reference in a new issue