TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 11:55:03 +03:00
Code Issues Projects Releases Wiki Activity

Validation consistency

Browse Source 
- introduced validation method in the post and user model
- moved signup validation onto model
- consistent use of validation & error messaging in the admin UI
- helper methods in base view moved to a utils object
This commit is contained in:
Hannah Wolfe 2013-08-20 19:52:44 +01:00
parent 163f88b83d
commit c75286ffb8
5 changed files with 54 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ghost/admin/views/base.js
View File

@ -73,7 +73,10 @@
this.removeSubviews(); this.removeSubviews();
} }
return Backbone.View.prototype.remove.apply(this, arguments); return Backbone.View.prototype.remove.apply(this, arguments);
}, }
});
Ghost.Views.Utils = {
// Used in API request fail handlers to parse a standard api error // Used in API request fail handlers to parse a standard api error
// response json for the message to display // response json for the message to display
@ -115,7 +118,7 @@
} }
return vars; return vars;
} }
}); };
/** /**
* This is the view to generate the markup for the individual * This is the view to generate the markup for the individual

4
ghost/admin/views/blog.js
View File

@ -72,9 +72,9 @@
}, },
removeItem: function () { removeItem: function () {
var view = this; var self = this;
$.when(this.$el.slideUp()).then(function () { $.when(this.$el.slideUp()).then(function () {
view.remove(); self.remove();
}); });
}, },

58
ghost/admin/views/editor.js
View File

@ -90,7 +90,7 @@
}, },
toggleStatus: function () { toggleStatus: function () {
var view = this, var self = this,
keys = Object.keys(this.statusMap), keys = Object.keys(this.statusMap),
model = this.model, model = this.model,
prevStatus = this.model.get('status'), prevStatus = this.model.get('status'),
@ -112,10 +112,10 @@
message: 'Your post: ' + model.get('title') + ' has been ' + keys[newIndex], message: 'Your post: ' + model.get('title') + ' has been ' + keys[newIndex],
status: 'passive' status: 'passive'
}); });
}, function (response) { }, function (xhr) {
var status = keys[newIndex]; var status = keys[newIndex];
// Show a notification about the error // Show a notification about the error
view.reportSaveError(response, model, status); self.reportSaveError(xhr, model, status);
// Set the button text back to previous // Set the button text back to previous
model.set({ status: prevStatus }); model.set({ status: prevStatus });
}); });
@ -136,10 +136,9 @@
handleStatus: function (e) { handleStatus: function (e) {
if (e) { e.preventDefault(); } if (e) { e.preventDefault(); }
var view = this, var status = $(e.currentTarget).attr('data-set-status');
status = $(e.currentTarget).attr('data-set-status');
view.setActiveStatus(status, this.statusMap[status]); this.setActiveStatus(status, this.statusMap[status]);
// Dismiss the popup menu // Dismiss the popup menu
$('body').find('.overlay:visible').fadeOut(); $('body').find('.overlay:visible').fadeOut();
@ -147,8 +146,8 @@
updatePost: function (e) { updatePost: function (e) {
if (e) { e.preventDefault(); } if (e) { e.preventDefault(); }
var view = this, var self = this,
model = view.model, model = this.model,
$currentTarget = $(e.currentTarget), $currentTarget = $(e.currentTarget),
status = $currentTarget.attr('data-status'), status = $currentTarget.attr('data-status'),
prevStatus = model.get('status'); prevStatus = model.get('status');
@ -168,7 +167,7 @@
}); });
} }
view.savePost({ this.savePost({
status: status status: status
}).then(function () { }).then(function () {
Ghost.notifications.addItem({ Ghost.notifications.addItem({
@ -176,15 +175,10 @@
message: ['Your post "', model.get('title'), '" has been ', status, '.'].join(''), message: ['Your post "', model.get('title'), '" has been ', status, '.'].join(''),
status: 'passive' status: 'passive'
}); });
}, function (request) { }, function (xhr) {
var message = view.getRequestErrorMessage(request) || model.validationError; // Show a notification about the error
self.reportSaveError(xhr, model, status);
Ghost.notifications.addItem({ // Set the button text back to previous
type: 'error',
message: message,
status: 'passive'
});
model.set({ status: prevStatus }); model.set({ status: prevStatus });
}); });
}, },
@ -214,7 +208,7 @@
if (response) { if (response) {
// Get message from response // Get message from response
message = this.getErrorMessageFromResponse(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;
@ -228,9 +222,7 @@
}, },
render: function () { render: function () {
var status = this.model.get('status'); this.$('.js-post-button').text(this.statusMap[this.model.get('status')]);
this.setActiveStatus(status, this.statusMap[status]);
} }
}); });
@ -337,19 +329,21 @@
// Currently gets called on every key press. // Currently gets called on every key press.
// Also trigger word count update // Also trigger word count update
renderPreview: function () { renderPreview: function () {
var view = this, var self = this,
preview = document.getElementsByClassName('rendered-markdown')[0]; preview = document.getElementsByClassName('rendered-markdown')[0];
preview.innerHTML = this.converter.makeHtml(this.editor.getValue()); preview.innerHTML = this.converter.makeHtml(this.editor.getValue());
view.$('.js-drop-zone').upload({editor: true}); this.$('.js-drop-zone').upload({editor: true});
Countable.once(preview, function (counter) { Countable.once(preview, function (counter) {
view.$('.entry-word-count').text($.pluralize(counter.words, 'word')); self.$('.entry-word-count').text($.pluralize(counter.words, 'word'));
view.$('.entry-character-count').text($.pluralize(counter.characters, 'character')); self.$('.entry-character-count').text($.pluralize(counter.characters, 'character'));
view.$('.entry-paragraph-count').text($.pluralize(counter.paragraphs, 'paragraph')); self.$('.entry-paragraph-count').text($.pluralize(counter.paragraphs, 'paragraph'));
}); });
}, },
// Markdown converter & markdown shortcut initialization. // Markdown converter & markdown shortcut initialization.
initMarkdown: function () { initMarkdown: function () {
var self = this;
this.converter = new Showdown.converter({extensions: ['ghostdown']}); this.converter = new Showdown.converter({extensions: ['ghostdown']});
this.editor = CodeMirror.fromTextArea(document.getElementById('entry-markdown'), { this.editor = CodeMirror.fromTextArea(document.getElementById('entry-markdown'), {
mode: 'markdown', mode: 'markdown',
@ -359,24 +353,22 @@
dragDrop: false dragDrop: false
}); });
var view = this;
// Inject modal for HTML to be viewed in // Inject modal for HTML to be viewed in
shortcut.add("Ctrl+Alt+C", function () { shortcut.add("Ctrl+Alt+C", function () {
view.showHTML(); self.showHTML();
}); });
shortcut.add("Ctrl+Alt+C", function () { shortcut.add("Ctrl+Alt+C", function () {
view.showHTML(); self.showHTML();
}); });
_.each(MarkdownShortcuts, function (combo) { _.each(MarkdownShortcuts, function (combo) {
shortcut.add(combo.key, function () { shortcut.add(combo.key, function () {
return view.editor.addMarkdown({style: combo.style}); return self.editor.addMarkdown({style: combo.style});
}); });
}); });
this.editor.on('change', function () { this.editor.on('change', function () {
view.renderPreview(); self.renderPreview();
}); });
}, },

14
ghost/admin/views/login.js
View File

@ -52,8 +52,7 @@
event.preventDefault(); event.preventDefault();
var email = this.$el.find('.email').val(), var email = this.$el.find('.email').val(),
password = this.$el.find('.password').val(), password = this.$el.find('.password').val(),
redirect = this.getUrlVariables().r, redirect = Ghost.Views.Utils.getUrlVariables().r;
self = this;
$.ajax({ $.ajax({
url: '/ghost/signin/', url: '/ghost/signin/',
@ -66,10 +65,10 @@
success: function (msg) { success: function (msg) {
window.location.href = msg.redirect; window.location.href = msg.redirect;
}, },
error: function (obj, string, status) { error: function (xhr) {
Ghost.notifications.addItem({ Ghost.notifications.addItem({
type: 'error', type: 'error',
message: self.getRequestErrorMessage(obj), message: Ghost.Views.Utils.getRequestErrorMessage(xhr),
status: 'passive' status: 'passive'
}); });
} }
@ -88,8 +87,7 @@
submitHandler: function (event) { submitHandler: function (event) {
event.preventDefault(); event.preventDefault();
var email = this.$el.find('.email').val(), var email = this.$el.find('.email').val(),
password = this.$el.find('.password').val(), password = this.$el.find('.password').val();
self = this;
$.ajax({ $.ajax({
url: '/ghost/signup/', url: '/ghost/signup/',
@ -101,10 +99,10 @@
success: function (msg) { success: function (msg) {
window.location.href = msg.redirect; window.location.href = msg.redirect;
}, },
error: function (obj, string, status) { error: function (xhr) {
Ghost.notifications.addItem({ Ghost.notifications.addItem({
type: 'error', type: 'error',
message: self.getRequestErrorMessage(obj), message: Ghost.Views.Utils.getRequestErrorMessage(xhr),
status: 'passive' status: 'passive'
}); });
} }

27
ghost/admin/views/settings.js
View File

@ -95,15 +95,22 @@
checkboxClass: 'icheckbox_ghost' checkboxClass: 'icheckbox_ghost'
}); });
}, },
saveSuccess: function () { saveSuccess: function (model, response, options) {
// TODO: better messaging here?
Ghost.notifications.addItem({ Ghost.notifications.addItem({
type: 'success', type: 'success',
message: 'Saved', message: 'Saved',
status: 'passive' status: 'passive'
}); });
}, },
saveError: function (message) { saveError: function (model, xhr) {
message = message || 'Something went wrong, not saved :('; Ghost.notifications.addItem({
type: 'error',
message: Ghost.Views.Utils.getRequestErrorMessage(xhr),
status: 'passive'
});
},
validationError: function (message) {
Ghost.notifications.addItem({ Ghost.notifications.addItem({
type: 'error', type: 'error',
message: message, message: message,
@ -210,12 +217,12 @@
ne2Password = this.$('#user-new-password-verification').val(); ne2Password = this.$('#user-new-password-verification').val();
if (newPassword !== ne2Password) { if (newPassword !== ne2Password) {
this.saveError('The passwords do not match'); this.validationError('Your new passwords do not match');
return; return;
} }
if (newPassword.length < 7) { if (newPassword.length < 8) {
this.saveError('The password is not long enough. Have at least 7 characters'); this.validationError('Your password is not long enough. It must be at least 8 chars long.');
return; return;
} }
@ -234,14 +241,12 @@
status: 'passive', status: 'passive',
id: 'success-98' id: 'success-98'
}); });
self.$('#user-password-old').val(''); self.$('#user-password-old, #user-password-new, #user-new-password-verification').val('');
self.$('#user-password-new').val('');
self.$('#user-new-password-verification').val('');
}, },
error: function (obj, string, status) { error: function (xhr) {
Ghost.notifications.addItem({ Ghost.notifications.addItem({
type: 'error', type: 'error',
message: 'Invalid username or password', message: Ghost.Views.Utils.getRequestErrorMessage(xhr),
status: 'passive' status: 'passive'
}); });
} }