ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00
Code Issues Releases Wiki Activity

Merge pull request #160 from ascribe/add-default-notifications-message

Browse Source 
Discard (and log) global notifications that do not have a message specified
This commit is contained in:
Brett Sun 2016-05-27 11:33:39 +02:00
commit 26dde8a42c
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/components/ascribe_forms/create_editions_form.js
View File

@ -26,11 +26,13 @@ let CreateEditionsForm = React.createClass({
},
handleSuccess(response) {
let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
const { handleSuccess } = this.props;
const notification = new GlobalNotificationModel(response.notification, 'success', 10000);
GlobalNotificationActions.appendGlobalNotification(notification);
if(this.props.handleSuccess) {
this.props.handleSuccess(response);
if (typeof handleSuccess === 'function') {
handleSuccess(response);
}
},

20
js/models/global_notification_model.js
View File

@ -1,19 +1,21 @@
'use strict';
export default class GlobalNotificationModel {
constructor(message, type = 'info', dismissAfter = 5000) {
if(message) {
this.message = message;
} else {
throw new Error('A notifications message must be defined.');
constructor(message, type = 'success', dismissAfter = 5000) {
if (type !== 'success' && type !== 'danger') {
throw new Error(`A notification's type either has to be success, or danger. Not: ${type}`);
}
if(type === 'info' || type === 'success' || type === 'warning' || type === 'danger') {
this.type = type;
if (message) {
this.message = message;
} else {
throw new Error('A notification\'s type either has to be info, success, warning, danger. Not: ' + type);
console.logGlobal(new Error('Global notification did not contain a message and was ignored'), {
dismissAfter,
type
});
}
this.dismissAfter = dismissAfter;
this.type = type;
}
}
}

8
js/stores/global_notification_store.js
View File

@ -16,10 +16,12 @@ class GlobalNotificationStore {
}
onAppendGlobalNotification(newNotification) {
this.notificationQueue.push(newNotification);
if (newNotification && newNotification.message) {
this.notificationQueue.push(newNotification);
if (!this.notificationsPaused && this.notificationStatus === 'ready') {
this.showNextNotification();
if (!this.notificationsPaused && this.notificationStatus === 'ready') {
this.showNextNotification();
}
}
}