TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-29 07:09:48 +03:00
Code Issues Projects Releases Wiki Activity

Enabled auto reset state for action buttons

Browse Source 
no issue

- By default, action buttons had auto-reset off and reset had to be explicitly set
- Auto reset for action buttons is on by default now, and any button that should not reset should explicitly switch it off
This commit is contained in:
Rish 2020-06-04 11:30:30 +05:30 committed by Rishabh Garg
parent b7ee0839d5
commit f198bb8a45
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/admin/app/components/gh-task-button.js
View File

@ -35,7 +35,7 @@ const GhTaskButton = Component.extend({
idleClass: '', idleClass: '',
runningClass: '', runningClass: '',
showSuccess: true, // set to false if you want the spinner to show until a transition occurs showSuccess: true, // set to false if you want the spinner to show until a transition occurs
autoReset: false, // set to false if you want don't want task button to reset after timeout autoReset: true, // set to false if you want don't want task button to reset after timeout
successText: 'Saved', successText: 'Saved',
successClass: 'gh-btn-green', successClass: 'gh-btn-green',
failureText: 'Retry', failureText: 'Retry',

15
ghost/admin/tests/acceptance/staff-test.js
View File

@ -522,7 +522,12 @@ describe('Acceptance: Staff', function () {
// Save changes // Save changes
await click('[data-test-save-button]'); await click('[data-test-save-button]');
expect(find('[data-test-save-button]').textContent.trim(), 'save button text').to.equal('Saved'); // Since we reset save status so there's no on-screen indication
// that we've had a save, check the request was fired instead
let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
let params = JSON.parse(lastRequest.requestBody);
expect(params.users[0].name).to.equal('Test User');
// CMD-S shortcut works // CMD-S shortcut works
await fillIn('[data-test-slug-input]', 'Test User'); await fillIn('[data-test-slug-input]', 'Test User');
@ -532,10 +537,10 @@ describe('Acceptance: Staff', function () {
ctrlKey: ctrlOrCmd === 'ctrl' ctrlKey: ctrlOrCmd === 'ctrl'
}); });
// we've already saved in this test so there's no on-screen indication // Since we reset save status so there's no on-screen indication
// that we've had another save, check the request was fired instead // that we've had a save, check the request was fired instead
let [lastRequest] = this.server.pretender.handledRequests.slice(-1); [lastRequest] = this.server.pretender.handledRequests.slice(-1);
let params = JSON.parse(lastRequest.requestBody); params = JSON.parse(lastRequest.requestBody);
expect(params.users[0].name).to.equal('Test User'); expect(params.users[0].name).to.equal('Test User');