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

Editor notification cleanup

Browse source 
closes #666

- no more split messaging
This commit is contained in:
Hannah Wolfe 2013-09-17 21:35:30 +01:00
parent 38ae87524d
commit ae01e5eeae
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/client/views/editor.js
View file

@ -76,13 +76,13 @@
}, },
notificationMap: { notificationMap: {
'draft': 'has been saved as a draft', 'draft': 'Your post has been saved as a draft.',
'published': 'has been published' 'published': 'Your post has been published.'
}, },
errorMap: { errorMap: {
'draft': 'could not be saved as a draft', 'draft': 'Your post could not be saved as a draft.',
'published': 'could not be published' 'published': 'Your post could not be published.'
}, },
initialize: function () { initialize: function () {
@ -109,22 +109,23 @@
model = self.model, model = self.model,
prevStatus = model.get('status'), prevStatus = model.get('status'),
currentIndex = keys.indexOf(prevStatus), currentIndex = keys.indexOf(prevStatus),
newIndex; newIndex,
status;
newIndex = currentIndex + 1 > keys.length - 1 ? 0 : currentIndex + 1; newIndex = currentIndex + 1 > keys.length - 1 ? 0 : currentIndex + 1;
status = keys[newIndex];
this.setActiveStatus(keys[newIndex], this.statusMap[keys[newIndex]], prevStatus); this.setActiveStatus(keys[newIndex], this.statusMap[status], prevStatus);
this.savePost({ this.savePost({
status: keys[newIndex] status: keys[newIndex]
}).then(function () { }).then(function () {
Ghost.notifications.addItem({ Ghost.notifications.addItem({
type: 'success', type: 'success',
message: 'Your post has been ' + self.notificationMap[newIndex] + '.', message: self.notificationMap[status],
status: 'passive' status: 'passive'
}); });
}, function (xhr) { }, function (xhr) {
var status = this.errorMap[newIndex];
// Show a notification about the error // Show a notification about the error
self.reportSaveError(xhr, model, status); self.reportSaveError(xhr, model, status);
}); });
@ -189,7 +190,7 @@
}).then(function () { }).then(function () {
Ghost.notifications.addItem({ Ghost.notifications.addItem({
type: 'success', type: 'success',
message: ['Your post ', this.notificationMap[status], '.'].join(''), message: self.notificationMap[status],
status: 'passive' status: 'passive'
}); });
// Refresh publish button and all relevant controls with updated status. // Refresh publish button and all relevant controls with updated status.
@ -200,7 +201,7 @@
// Set appropriate button status // Set appropriate button status
self.setActiveStatus(status, self.statusMap[status], prevStatus); self.setActiveStatus(status, self.statusMap[status], prevStatus);
// Show a notification about the error // Show a notification about the error
self.reportSaveError(xhr, model, self.errorMap[status]); self.reportSaveError(xhr, model, status);
}); });
}, },
@ -224,11 +225,11 @@
}, },
reportSaveError: function (response, model, status) { reportSaveError: function (response, model, status) {
var message = 'Your post ' + status + '.'; var message = this.errorMap[status];
if (response) { if (response) {
// Get message from response // Get message from response
message = Ghost.Views.Utils.getRequestErrorMessage(response); message += " " + Ghost.Views.Utils.getRequestErrorMessage(response);
} else if (model.validationError) { } else if (model.validationError) {
// Grab a validation error // Grab a validation error
message += " " + model.validationError; message += " " + model.validationError;