From 29bcbea9237a38b31137db604c585a12256eaef1 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Wed, 15 Aug 2018 02:35:58 +0000
Subject: [PATCH] rename to alerts / missing from #5973
---
.../chat/alert/audio-alert/component.jsx | 6 +++---
.../ui/components/chat/alert/container.jsx | 4 ++--
.../chat/alert/push-alert/component.jsx | 18 +++++++++---------
.../submenus/application/component.jsx | 8 ++++----
.../private/config/settings-development.json | 4 ++--
.../private/config/settings-production.json | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/chat/alert/audio-alert/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/audio-alert/component.jsx
index 5895a2833a..fad03755af 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/alert/audio-alert/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/audio-alert/component.jsx
@@ -7,7 +7,7 @@ const propTypes = {
count: PropTypes.number.isRequired,
};
-class ChatAudioNotification extends React.Component {
+class ChatAudioAlert extends React.Component {
constructor(props) {
super(props);
this.audio = new Audio(`${Meteor.settings.public.app.basename}/resources/sounds/notify.mp3`);
@@ -43,6 +43,6 @@ class ChatAudioNotification extends React.Component {
return null;
}
}
-ChatAudioNotification.propTypes = propTypes;
+ChatAudioAlert.propTypes = propTypes;
-export default ChatAudioNotification;
+export default ChatAudioAlert;
diff --git a/bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx
index 574bcd9ec7..a5b350b729 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx
@@ -13,8 +13,8 @@ export default withTracker(() => {
const openChats = UserListService.getOpenChats();
return {
- disableAudio: !AppSettings.chatAudioNotifications,
- disableNotify: !AppSettings.chatPushNotifications,
+ disableAudio: !AppSettings.chatAudioAlerts,
+ disableNotify: !AppSettings.chatPushAlerts,
openChats,
publicUserId: Meteor.settings.public.chat.public_userid,
};
diff --git a/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
index 78ad2d0e09..19a0ddc66c 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
@@ -5,15 +5,15 @@ import injectNotify from '/imports/ui/components/toast/inject-notify/component';
import { Link } from 'react-router';
import { styles } from '../../styles.scss';
-const NOTIFICATION_INTERVAL = 2000; // 2 seconds
-const NOTIFICATION_LIFETIME = 4000; // 4 seconds
+const ALERT_INTERVAL = 2000; // 2 seconds
+const ALERT_LIFETIME = 4000; // 4 seconds
const propTypes = {
notify: PropTypes.func.isRequired,
onOpen: PropTypes.func.isRequired,
};
-class ChatPushNotification extends React.Component {
+class ChatPushAlert extends React.Component {
static link(message, chatId) {
return (
<Link className={styles.link} to={`/users/chat/${chatId}`}>
@@ -24,7 +24,7 @@ class ChatPushNotification extends React.Component {
constructor(props) {
super(props);
- this.showNotify = _.debounce(this.showNotify.bind(this), NOTIFICATION_INTERVAL);
+ this.showNotify = _.debounce(this.showNotify.bind(this), ALERT_INTERVAL);
this.componentDidMount = this.showNotify;
this.componentDidUpdate = this.showNotify;
@@ -40,11 +40,11 @@ class ChatPushNotification extends React.Component {
} = this.props;
return notify(
- ChatPushNotification.link(message, chatId),
+ ChatPushAlert.link(message, chatId),
'info',
'chat',
- { onOpen, autoClose: NOTIFICATION_LIFETIME },
- ChatPushNotification.link(content, chatId),
+ { onOpen, autoClose: ALERT_LIFETIME },
+ ChatPushAlert.link(content, chatId),
true,
);
}
@@ -53,6 +53,6 @@ class ChatPushNotification extends React.Component {
return null;
}
}
-ChatPushNotification.propTypes = propTypes;
+ChatPushAlert.propTypes = propTypes;
-export default injectNotify(ChatPushNotification);
+export default injectNotify(ChatPushAlert);
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
index 2ea198e23d..4fe72aec49 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
@@ -149,8 +149,8 @@ class ApplicationMenu extends BaseMenu {
<div className={cx(styles.formElement, styles.pullContentRight)}>
<Toggle
icons={false}
- defaultChecked={this.state.settings.chatAudioNotifications}
- onChange={() => this.handleToggle('chatAudioNotifications')}
+ defaultChecked={this.state.settings.chatAudioAlerts}
+ onChange={() => this.handleToggle('chatAudioAlerts')}
ariaLabel={intl.formatMessage(intlMessages.audioAlertLabel)}
/>
</div>
@@ -169,8 +169,8 @@ class ApplicationMenu extends BaseMenu {
<div className={cx(styles.formElement, styles.pullContentRight)}>
<Toggle
icons={false}
- defaultChecked={this.state.settings.chatPushNotifications}
- onChange={() => this.handleToggle('chatPushNotifications')}
+ defaultChecked={this.state.settings.chatPushAlerts}
+ onChange={() => this.handleToggle('chatPushAlerts')}
ariaLabel={intl.formatMessage(intlMessages.pushAlertLabel)}
/>
</div>
diff --git a/bigbluebutton-html5/private/config/settings-development.json b/bigbluebutton-html5/private/config/settings-development.json
index 75dc9e6c49..20f055a90f 100755
--- a/bigbluebutton-html5/private/config/settings-development.json
+++ b/bigbluebutton-html5/private/config/settings-development.json
@@ -19,8 +19,8 @@
"askForFeedbackOnLogout": false,
"defaultSettings": {
"application": {
- "chatAudioNotifications": false,
- "chatPushNotifications": false,
+ "chatAudioAlerts": false,
+ "chatPushAlerts": false,
"fontSize": "16px",
"fallbackLocale": "en"
},
diff --git a/bigbluebutton-html5/private/config/settings-production.json b/bigbluebutton-html5/private/config/settings-production.json
index e5ed8b1f83..b493a3687f 100755
--- a/bigbluebutton-html5/private/config/settings-production.json
+++ b/bigbluebutton-html5/private/config/settings-production.json
@@ -19,8 +19,8 @@
"askForFeedbackOnLogout": false,
"defaultSettings": {
"application": {
- "chatAudioNotifications": false,
- "chatPushNotifications": false,
+ "chatAudioAlerts": false,
+ "chatPushAlerts": false,
"fontSize": "16px",
"fallbackLocale": "en"
},
--
GitLab