1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00

Fix global notifications not showing initial transition

This commit is contained in:
Brett Sun 2015-12-07 14:31:18 +01:00
parent 6649b7d7f1
commit 75e010f3fb

View File

@ -59,19 +59,22 @@ let GlobalNotification = React.createClass({
notificationsPaused, notificationsPaused,
containerWidth } = this.state; containerWidth } = this.state;
if (notification && !notificationsPaused) { const notificationClasses = [];
const notificationClasses = [];
let textClass;
if (this.state.containerWidth > 768) { if (this.state.containerWidth > 768) {
notificationClasses.push('ascribe-global-notification-bubble'); notificationClasses.push('ascribe-global-notification-bubble');
notificationClasses.push(notificationStatus === 'show' ? 'ascribe-global-notification-bubble-on' notificationClasses.push(notificationStatus === 'show' ? 'ascribe-global-notification-bubble-on'
: 'ascribe-global-notification-bubble-off'); : 'ascribe-global-notification-bubble-off');
} else { } else {
notificationClasses.push('ascribe-global-notification'); notificationClasses.push('ascribe-global-notification');
notificationClasses.push(notificationStatus === 'show' ? 'ascribe-global-notification-on' notificationClasses.push(notificationStatus === 'show' ? 'ascribe-global-notification-on'
: 'ascribe-global-notification-off'); : 'ascribe-global-notification-off');
} }
let textClass;
let message;
if (notification && !notificationsPaused) {
message = notification.message;
switch(notification.type) { switch(notification.type) {
case 'success': case 'success':
@ -83,13 +86,13 @@ let GlobalNotification = React.createClass({
default: default:
console.warn('Could not find a matching notification type in global_notification.js'); console.warn('Could not find a matching notification type in global_notification.js');
} }
return (
<div className={classNames(...notificationClasses)}>
<div className={textClass}>{notification.message}</div>
</div>
);
} }
return (
<div className={classNames(...notificationClasses)}>
<div className={textClass}>{message}</div>
</div>
);
}, },
render() { render() {