diff --git a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
index 47e6141377477ed76932cbfd5d5553604ce8b45e..ab7a8a188d6acc79eb9cb1a33ed26fe13d8574c7 100644
--- a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
+++ b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
@@ -35,7 +35,8 @@ export default class SIPBridge extends BaseAudioBridge {
}
};
- // Checks periodically until a call is established so we can successfully end the call clean state
+ // Checks periodically until a call is established so we can successfully
+ // end the call clean state
triedHangup = false;
// function to initiate call
diff --git a/bigbluebutton-html5/imports/api/audio/client/manager/index.js b/bigbluebutton-html5/imports/api/audio/client/manager/index.js
index 9054a2e5e480aec68eff84fc5dffbe611e2a4a30..54f431f0928e38caabe8be8bcd3eb3f3018f97a8 100644
--- a/bigbluebutton-html5/imports/api/audio/client/manager/index.js
+++ b/bigbluebutton-html5/imports/api/audio/client/manager/index.js
@@ -6,7 +6,10 @@ import SIPBridge from '../bridge/sip';
export default class AudioManager {
constructor(userData) {
const MEDIA_CONFIG = Meteor.settings.public.media;
- const audioBridge = MEDIA_CONFIG.useSIPAudio ? new SIPBridge(userData) : new VertoBridge(userData);
+ const audioBridge = MEDIA_CONFIG.useSIPAudio
+ ? new SIPBridge(userData)
+ : new VertoBridge(userData);
+
if (!(audioBridge instanceof BaseAudioBridge)) {
throw 'Audio Bridge not compatible';
}
diff --git a/bigbluebutton-html5/imports/api/captions/server/handlers/captionUpdate.js b/bigbluebutton-html5/imports/api/captions/server/handlers/captionUpdate.js
index a655575264a4c94af1e6f4ff4fea360e4e79e557..eb7a4859efba1b5b67a952d96dc02d935b884bc4 100644
--- a/bigbluebutton-html5/imports/api/captions/server/handlers/captionUpdate.js
+++ b/bigbluebutton-html5/imports/api/captions/server/handlers/captionUpdate.js
@@ -136,7 +136,9 @@ export default function handleCaptionUpdate({ payload }) {
//every other object, so that Captions collection could be updated in a proper order
let tempObj = objectsToUpdate.splice(i, 1);
let extraString = tempObj[0].captionHistory.captions.slice(CAPTION_CHUNK_LENGTH);
- tempObj[0].captionHistory.captions = tempObj[0].captionHistory.captions.slice(0, CAPTION_CHUNK_LENGTH);
+
+ tempObj[0].captionHistory.captions =
+ tempObj[0].captionHistory.captions.slice(0, CAPTION_CHUNK_LENGTH);
maxIndex += 1;
let tempIndex = tempObj[0].captionHistory.next;
diff --git a/bigbluebutton-html5/imports/api/chat/server/modifiers/clearUserSystemMessages.js b/bigbluebutton-html5/imports/api/chat/server/modifiers/clearUserSystemMessages.js
old mode 100755
new mode 100644
index 28360789accf6b9e0e099dcd1e97bbe4cd0a2000..e6adcec64e0cc403fad98d9805ddd2f58363eea1
--- a/bigbluebutton-html5/imports/api/chat/server/modifiers/clearUserSystemMessages.js
+++ b/bigbluebutton-html5/imports/api/chat/server/modifiers/clearUserSystemMessages.js
@@ -5,9 +5,9 @@ import { BREAK_LINE } from '/imports/utils/lineEndings.js';
/**
* Remove any system message from the user with userId.
- *
+ *
* @param {string} meetingId
- * @param {string} userId
+ * @param {string} userId
*/
export default function clearUserSystemMessages(meetingId, userId) {
@@ -18,9 +18,9 @@ export default function clearUserSystemMessages(meetingId, userId) {
const selector = {
meetingId,
- "message.from_userid": CHAT_CONFIG.type_system,
- "message.to_userid": userId,
- }
+ 'message.from_userid': CHAT_CONFIG.type_system,
+ 'message.to_userid': userId,
+ };
return Chat.remove(selector, Logger.info(`Removing system messages from: (${userId})`));
};
diff --git a/bigbluebutton-html5/imports/api/chat/server/publishers.js b/bigbluebutton-html5/imports/api/chat/server/publishers.js
old mode 100755
new mode 100644
index dc1ce40d34507a9bb64657498e2328fec29c1325..8636789cf100a814b2ffdd9d7d663028eed0f3aa
--- a/bigbluebutton-html5/imports/api/chat/server/publishers.js
+++ b/bigbluebutton-html5/imports/api/chat/server/publishers.js
@@ -4,7 +4,7 @@ import { check } from 'meteor/check';
import Logger from '/imports/startup/server/logger';
import { isAllowedTo } from '/imports/startup/server/userPermissions';
-Meteor.publish('chat', function(credentials) {
+Meteor.publish('chat', function (credentials) {
if (!isAllowedTo('subscribeChat', credentials)) {
this.error(new Meteor.Error(402, "The user was not authorized to subscribe for 'chats'"));
}
diff --git a/bigbluebutton-html5/imports/api/deskshare/client/bridge/service.js b/bigbluebutton-html5/imports/api/deskshare/client/bridge/service.js
index ba3a058504b993283675810d516b050e94af7371..cd087cfd88926225041721d886c61fe9716f46a3 100644
--- a/bigbluebutton-html5/imports/api/deskshare/client/bridge/service.js
+++ b/bigbluebutton-html5/imports/api/deskshare/client/bridge/service.js
@@ -3,9 +3,8 @@ import Meetings from '/imports/api/meetings';
const getConferenceBridge = () => {
const Meeting = Meetings.findOne();
return Meeting.voiceConf;
-}
+};
export {
getConferenceBridge,
-}
-
+};
diff --git a/bigbluebutton-html5/imports/api/polls/server/publishers.js b/bigbluebutton-html5/imports/api/polls/server/publishers.js
old mode 100755
new mode 100644
index cc7568dab74a444a8673e1dbf5ef908e5c3d032e..27098f6ca8d92ff511c32bed1fcd0561e1e37327
--- a/bigbluebutton-html5/imports/api/polls/server/publishers.js
+++ b/bigbluebutton-html5/imports/api/polls/server/publishers.js
@@ -4,7 +4,7 @@ import Polls from '/imports/api/polls';
import { check } from 'meteor/check';
import { logger } from '/imports/startup/server/logger';
-Meteor.publish('polls', function(credentials) {
+Meteor.publish('polls', function (credentials) {
//checking if it is allowed to see Poll Collection in general
if (!isAllowedTo('subscribePoll', credentials)) {
this.error(new Meteor.Error(402, "The user was not authorized to subscribe for 'polls'"));
diff --git a/bigbluebutton-html5/imports/api/users/server/handlers/emojiStatus.js b/bigbluebutton-html5/imports/api/users/server/handlers/emojiStatus.js
old mode 100644
new mode 100755
index 859687930464f64ceb331022f8a428769c7482a1..f13c2d46451124ae1379947611b7fcb1429589a7
--- a/bigbluebutton-html5/imports/api/users/server/handlers/emojiStatus.js
+++ b/bigbluebutton-html5/imports/api/users/server/handlers/emojiStatus.js
@@ -29,7 +29,9 @@ export default function handleEmojiStatus({ payload }) {
}
if (numChanged) {
- return Logger.info(`Assigned user emoji status '${status}' id=${userId} meeting=${meetingId}`);
+ return Logger.info('Assigned user emoji status'
+ + status + ' id=' + userId + ' meeting=' + meetingId
+ );
}
};
diff --git a/bigbluebutton-html5/imports/api/users/server/handlers/listeningOnly.js b/bigbluebutton-html5/imports/api/users/server/handlers/listeningOnly.js
index 0bc55db33d7d7579cb89f584169566032a7f938c..63fa0c82f7994d68b0e43154d53e99372af8988f 100644
--- a/bigbluebutton-html5/imports/api/users/server/handlers/listeningOnly.js
+++ b/bigbluebutton-html5/imports/api/users/server/handlers/listeningOnly.js
@@ -28,7 +28,9 @@ export default function handleListeningOnly({ payload }) {
}
if (numChanged) {
- return Logger.info(`Assigned listen only status '${listenOnly}' user=${userId} meeting=${meetingId}`);
+ return Logger.info(
+ `Assigned listen only status '${listenOnly}' user=${userId} meeting=${meetingId}`
+ );
}
};
diff --git a/bigbluebutton-html5/imports/api/users/server/handlers/lockedStatusChange.js b/bigbluebutton-html5/imports/api/users/server/handlers/lockedStatusChange.js
index 045a9ec259c88f627b005e6c235acc20bfe11250..f439a9eb1a8fc7eff036e1b730356e889f83556b 100755
--- a/bigbluebutton-html5/imports/api/users/server/handlers/lockedStatusChange.js
+++ b/bigbluebutton-html5/imports/api/users/server/handlers/lockedStatusChange.js
@@ -50,7 +50,8 @@ export default function handleLockedStatusChange({ payload }) {
muteToggle(credentials, userId, true);
}
- return Logger.info(`Assigned locked status '${isLocked ? 'locked' : 'unlocked'}' id=${userId} meeting=${meetingId}`);
+ return Logger.info(`Assigned locked status '${isLocked
+ ? 'locked' : 'unlocked'}' id=${userId} meeting=${meetingId}`);
}
};
diff --git a/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js b/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
old mode 100644
new mode 100755
index b1fdda6ace7dcd5d284a152452af02d224e5e326..b5ae1279ff70655100cc9b6ab880899e3e3fe3c7
--- a/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
+++ b/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
@@ -45,7 +45,9 @@ export default function handleValidateAuthToken({ payload }) {
addWelcomeChatMessage(meetingId, userId);
}
- return Logger.info(`Validated auth token as '${validStatus}' user=${userId} meeting=${meetingId}`);
+ return Logger.info('Validated auth token as ' + validStatus +
+ +' user=' + userId + ' meeting=' + meetingId
+ );
}
};
diff --git a/bigbluebutton-html5/imports/api/users/server/methods/assignPresenter.js b/bigbluebutton-html5/imports/api/users/server/methods/assignPresenter.js
index 3f873ee646e09444f5acbb503539f68b174800a7..4d6f2ff2a51b5d836fa86fe2059d2bdc411e53d4 100755
--- a/bigbluebutton-html5/imports/api/users/server/methods/assignPresenter.js
+++ b/bigbluebutton-html5/imports/api/users/server/methods/assignPresenter.js
@@ -36,7 +36,8 @@ export default function assignPresenter(credentials, userId) {
assigned_by: requesterUserId,
};
- Logger.verbose(`User '${userId}' setted as presenter by '${requesterUserId}' from meeting '${meetingId}'`);
+ Logger.verbose(`User '${userId}' setted as presenterby '${
+ requesterUserId}' from meeting '${meetingId}'`);
return RedisPubSub.publish(CHANNEL, EVENT_NAME, payload);
};
diff --git a/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyToggle.js b/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyToggle.js
old mode 100644
new mode 100755
index 3bd3efcfa5b97aa2c63d83bd39947f1a3e8a0c2a..2fbe1d0f76fd971ffd091e277ab7efeb2e7b776d
--- a/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyToggle.js
+++ b/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyToggle.js
@@ -57,7 +57,8 @@ export default function listenOnlyToggle(credentials, isJoining = true) {
name: User.user.name,
};
- Logger.verbose(`User '${requesterUserId}' ${isJoining ? 'joined' : 'left'} global audio from meeting '${meetingId}'`);
+ Logger.verbose(`User '${requesterUserId}' ${isJoining
+ ? 'joined' : 'left'} global audio from meeting '${meetingId}'`);
return RedisPubSub.publish(CHANNEL, EVENT_NAME, payload);
};
diff --git a/bigbluebutton-html5/imports/api/users/server/methods/muteToggle.js b/bigbluebutton-html5/imports/api/users/server/methods/muteToggle.js
index 03b3a1860c801da03fc46a0f94b1376ce0c25c96..2ca6d69141ac88003fb5a0caef776cf471ba98fb 100755
--- a/bigbluebutton-html5/imports/api/users/server/methods/muteToggle.js
+++ b/bigbluebutton-html5/imports/api/users/server/methods/muteToggle.js
@@ -32,7 +32,8 @@ export default function muteToggle(credentials, userId, isMuted = true) {
requester_id: requesterUserId,
};
- Logger.verbose(`User '${userId}' was ${!isMuted ? 'un' : ''}muted by '${requesterUserId}' from meeting '${meetingId}'`);
+ Logger.verbose(`User '${userId}' was ${!isMuted ? 'un' : ''}muted by '${
+ requesterUserId}' from meeting '${meetingId}'`);
return RedisPubSub.publish(CHANNEL, EVENT_NAME, payload);
};
diff --git a/bigbluebutton-html5/imports/api/users/server/methods/setEmojiStatus.js b/bigbluebutton-html5/imports/api/users/server/methods/setEmojiStatus.js
index 7bbb8e6516b037b42fd830136881b65cd767fd85..f30f5a796ba5d1c9ea5dedd9b16a58d0013a875a 100755
--- a/bigbluebutton-html5/imports/api/users/server/methods/setEmojiStatus.js
+++ b/bigbluebutton-html5/imports/api/users/server/methods/setEmojiStatus.js
@@ -25,7 +25,8 @@ export default function setEmojiStatus(credentials, userId, status) {
meeting_id: meetingId,
};
- Logger.verbose(`User '${userId}' emoji status updated to '${status}' by '${requesterUserId}' from meeting '${meetingId}'`);
+ Logger.verbose(`User '${userId}' emoji status updated to '${status}' by '${
+ requesterUserId}' from meeting '${meetingId}'`);
return RedisPubSub.publish(CHANNEL, EVENT_NAME, payload);
};
diff --git a/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js b/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
index f16b80bb51f5d3efd4697818b28e481613681004..b8ac498d7c2d0aced9cf92f67e7ce5a9bce96a6e 100755
--- a/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
+++ b/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
@@ -42,7 +42,9 @@ export default function validateAuthToken(credentials) {
reply_to: `${meetingId}/${requesterUserId}`,
};
- Logger.info(`User '${requesterUserId}' is trying to validate auth token for meeting '${meetingId}'`);
+ Logger.info(`User '${
+ requesterUserId
+ }' is trying to validate auth tokenfor meeting '${meetingId}'`);
return RedisPubSub.publish(CHANNEL, EVENT_NAME, payload, header);
};
diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
index 931805394396be13097836962d7a4b272ca8f82e..0b58b873b5af0650b902a71493d3cea508045ad5 100644
--- a/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
+++ b/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
@@ -29,7 +29,7 @@ export default function addUser(meetingId, user) {
dummyUser.clientType === 'HTML5' &&
user.role === ROLE_MODERATOR &&
!ALLOW_HTML5_MODERATOR) {
- user.role = ROLE_VIEWER;
+ user.role = ROLE_VIEWER;
}
const modifier = {
diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/setConnectionStatus.js b/bigbluebutton-html5/imports/api/users/server/modifiers/setConnectionStatus.js
old mode 100644
new mode 100755
index 92770a166de88f7058483d1e86c259cd21222174..36a4206c451c6f13e56130f317c2f68f5aecf5c4
--- a/bigbluebutton-html5/imports/api/users/server/modifiers/setConnectionStatus.js
+++ b/bigbluebutton-html5/imports/api/users/server/modifiers/setConnectionStatus.js
@@ -32,7 +32,8 @@ export default function setConnectionStatus(meetingId, userId, status = 'online'
}
if (numChanged) {
- return Logger.info(`Updated connection status user=${userId} status=${status} meeting=${meetingId}`);
+ return Logger.info(`Updated connection status user=${userId} status=${
+ status} meeting=${meetingId}`);
}
};
diff --git a/bigbluebutton-html5/imports/startup/client/auth.js b/bigbluebutton-html5/imports/startup/client/auth.js
old mode 100644
new mode 100755
index 482db4639088d0f104db216c5b9eed89807ae797..5f09e2d164e5c67682577f7d5925ca74183b79d4
--- a/bigbluebutton-html5/imports/startup/client/auth.js
+++ b/bigbluebutton-html5/imports/startup/client/auth.js
@@ -46,7 +46,11 @@ export function authenticatedRouteHandler(nextState, replace, callback) {
Auth.authenticate()
.then(callback)
.catch(reason => {
- logClient('error', { error: reason, method: 'authenticatedRouteHandler', credentialsSnapshot });
+ logClient('error', {
+ error: reason,
+ method: 'authenticatedRouteHandler',
+ credentialsSnapshot,
+ });
// make sure users who did not connect are not added to the meeting
// do **not** use the custom call - it relies on expired data
@@ -77,8 +81,8 @@ function _addReconnectObservable() {
/**
* Check if should revalidate the auth
- * @param {Object} status
- * @param {String} lastStatus
+ * @param {Object} status
+ * @param {String} lastStatus
*/
export function shouldAuthenticate(status, lastStatus) {
return lastStatus != null && lastStatus === STATUS_CONNECTING && status.connected;
@@ -86,8 +90,8 @@ export function shouldAuthenticate(status, lastStatus) {
/**
* Check if the isn't the first connection try, preventing to authenticate on login.
- * @param {Object} status
- * @param {string} lastStatus
+ * @param {Object} status
+ * @param {string} lastStatus
*/
export function updateStatus(status, lastStatus) {
return status.retryCount > 0 && lastStatus !== STATUS_CONNECTING ? status.status : lastStatus;
diff --git a/bigbluebutton-html5/imports/startup/client/intl.js b/bigbluebutton-html5/imports/startup/client/intl.js
index 6b14147766b74400eaca1bed868d8f7182d06928..1c7ddaa0308a9bf82a88f909b45161d5abae1310 100644
--- a/bigbluebutton-html5/imports/startup/client/intl.js
+++ b/bigbluebutton-html5/imports/startup/client/intl.js
@@ -15,9 +15,9 @@ class IntlStartup extends Component {
this.state = {
messages: {},
- appLocale : this.props.locale,
+ appLocale: this.props.locale,
};
-
+
this.fetchLocalizedMessages = this.fetchLocalizedMessages.bind(this);
}
@@ -32,7 +32,7 @@ class IntlStartup extends Component {
if (response.ok) {
return response.json();
} else {
- this.setState({appLocale: 'en'});
+ this.setState({ appLocale: 'en' });
return response.json();
}
})
@@ -53,7 +53,7 @@ class IntlStartup extends Component {
componentWillUpdate(nextProps, nextState) {
if (this.props.locale !== nextProps.locale) {
- this.setState({appLocale: nextProps.locale});
+ this.setState({ appLocale: nextProps.locale });
this.fetchLocalizedMessages(nextProps.locale);
}
}
diff --git a/bigbluebutton-html5/imports/startup/server/userPermissions.js b/bigbluebutton-html5/imports/startup/server/userPermissions.js
index 750e536580db121b8f8a0c385275e024f87438a3..d1e15611b58eb52159b0b1a25d11789f15c14c7e 100755
--- a/bigbluebutton-html5/imports/startup/server/userPermissions.js
+++ b/bigbluebutton-html5/imports/startup/server/userPermissions.js
@@ -128,17 +128,14 @@ export function isAllowedTo(action, credentials) {
userId,
});
- const allowedToInitiateRequest =
- user &&
+ const allowedToInitiateRequest = user &&
user.authToken === authToken &&
user.validated &&
user.clientType === 'HTML5' &&
user.user &&
user.user.connection_status === 'online';
- const listOfSafeActions = [
- 'logoutSelf',
- ];
+ const listOfSafeActions = ['logoutSelf'];
const requestIsSafe = listOfSafeActions.includes(action);
@@ -151,10 +148,10 @@ export function isAllowedTo(action, credentials) {
let result = false;
// check role specific actions
- if ('MODERATOR' === user.user.role) {
+ if (user.user.role === 'MODERATOR') {
logger.debug('user permissions moderator case');
result = result || moderator[action];
- } else if ('VIEWER' === user.user.role) {
+ } else if (user.user.role === 'VIEWER') {
logger.debug('user permissions viewer case');
result = result || viewer(meetingId, userId)[action];
}
diff --git a/bigbluebutton-html5/imports/ui/components/about/container.jsx b/bigbluebutton-html5/imports/ui/components/about/container.jsx
index 5a591892036bd7eabdb160fcac78920632b98d6f..a24f08c72703180a663ee5a4b781965c30c8e8f0 100644
--- a/bigbluebutton-html5/imports/ui/components/about/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/about/container.jsx
@@ -17,13 +17,13 @@ class AboutContainer extends Component {
}
}
-const getClientBuildInfo = () => {
+const getClientBuildInfo = function () {
return {
clientBuild: Meteor.settings.public.app.html5ClientBuild,
copyright: Meteor.settings.public.app.copyright,
};
};
-export default createContainer(() => {
+export default createContainer(function () {
return getClientBuildInfo();
}, AboutContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
old mode 100755
new mode 100644
index 02643917d20a20d2dee172aa39639d8a05c95a3c..7ca0f02ac63d1b2a21901351053a74f834b94d8d
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -16,7 +16,7 @@ export default class ActionsBar extends Component {
return (
<div className={styles.actionsbar}>
<div className={styles.left}>
- <ActionsDropdown {...{isUserPresenter}}/>
+ <ActionsDropdown {...{ isUserPresenter }}/>
</div>
<div className={styles.center}>
<MuteAudioContainer />
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx
index e0d3cf3b83fc660e42eec98028babb0e4211ee00..3da47090e499436d2fc28f9bdcf4389bb2bc0949 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx
@@ -47,7 +47,9 @@ class EmojiMenu extends Component {
// even after the DropdownTrigger inject an onClick handler
onClick={() => null}>
<div id="currentStatus" hidden>
- {intl.formatMessage(intlMessages.currentStatusDesc, { 0: userEmojiStatus}) }
+ {
+ intl.formatMessage(intlMessages.currentStatusDesc, { 0: userEmojiStatus })
+ }
</div>
</Button>
</DropdownTrigger>
@@ -223,7 +225,7 @@ const intlMessages = defineMessages({
currentStatusDesc: {
id: 'app.actionsBar.currentStatusDesc',
description: 'Aria description for status button',
- }
+ },
});
EmojiMenu.propTypes = propTypes;
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/video-button/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/video-button/component.jsx
old mode 100755
new mode 100644
index c01951a324aab1136541d89866006520dcd7dc3d..21398df92ce26eb8153b6c120dcb674b855698a8
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/video-button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/video-button/component.jsx
@@ -16,7 +16,7 @@ export default class JoinVideo extends React.Component {
icon={'video_off'}
size={'lg'}
circle={true}
- style={{visibility: 'hidden'}}
+ style={{ visibility: 'hidden' }}
/>
);
}
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-test/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-test/container.jsx
old mode 100755
new mode 100644
index 1470cfa8bec77299a3a24164fe070f81fa86994c..a9c85b0a7fc93aaa24fbf20bdd7c8968a84b66a2
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-test/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-test/container.jsx
@@ -16,7 +16,7 @@ class AudioTestContainer extends Component {
}
}
-export default createContainer(() => {
+export default createContainer(function () {
return {
handlePlayAudioSample: () => {
const snd = new Audio('resources/sounds/audioSample.mp3');
diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx
index 030ffa9cbd1cbc3d82bc1c203bdcb35ac6283237..2c0dd9e2a99d1841ea9758851a93d2f0ca390479 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx
@@ -123,9 +123,9 @@ class MessageForm extends Component {
disabled={disabled}
label={intl.formatMessage(messages.submitLabel)}
hideLabel={true}
- icon={"send"}
- onClick={()=>{}}
- />
+ icon={'send'}
+ onClick={this.handleMessageKeyDown({ keyCode: 13 })}
+ />
</form>
);
}
diff --git a/bigbluebutton-html5/imports/ui/components/chat/service.js b/bigbluebutton-html5/imports/ui/components/chat/service.js
old mode 100755
new mode 100644
index 102ea702b85bba32df50e522900447d3e4bbd25b..4f1a6fe6b54eef79020000c71b1bc5b7b56af85b
--- a/bigbluebutton-html5/imports/ui/components/chat/service.js
+++ b/bigbluebutton-html5/imports/ui/components/chat/service.js
@@ -97,8 +97,8 @@ const getUser = (userID, userName) => {
if (!user) {
return null;
}
- return mapUser(user.user);
+ return mapUser(user.user);
};
const getPublicMessages = () => {
diff --git a/bigbluebutton-html5/imports/ui/components/closed-captions/container.jsx b/bigbluebutton-html5/imports/ui/components/closed-captions/container.jsx
old mode 100755
new mode 100644
index 98885a855e44e953149b3fb09f91ee8d80b5010b..1ba92f1d8a89054160956b8e8b73ac971a75f764
--- a/bigbluebutton-html5/imports/ui/components/closed-captions/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/closed-captions/container.jsx
@@ -17,6 +17,6 @@ class ClosedCaptionsContainer extends Component {
}
}
-export default createContainer(() => {
+export default createContainer(function () {
return ClosedCaptionsService.getCCData();
}, ClosedCaptionsContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/list/title/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/list/title/component.jsx
old mode 100755
new mode 100644
diff --git a/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx b/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
index fe7b16c1a69e3ec052f96c3fedbc5543d9218338..29cdd9e9016e5f285d8ec99acc61987d5647a8a9 100755
--- a/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
@@ -1,6 +1,6 @@
import React, { Component, PropTypes } from 'react';
import { defineMessages, injectIntl } from 'react-intl';
-import Button from '/imports/ui/components/button/component'
+import Button from '/imports/ui/components/button/component';
import styles from './styles.scss';
@@ -63,7 +63,11 @@ class ErrorScreen extends Component {
{children}
</div>
<div className={styles.content}>
- <Button size={"sm"} label={intl.formatMessage(intlMessages.leave)} onClick={this.onClick}/>
+ <Button
+ size={'sm'}
+ onClick={this.onClick}
+ label={intl.formatMessage(intlMessages.leave)}
+ />
</div>
</div>
);
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
index 4f264a959ed6577d19e422358032cc10eb629606..8906f5679d94c8d647e75ecab1ddc9995488e669 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
@@ -1,59 +1,63 @@
-import React, { Component } from 'react';
-import SettingsDropdown from './component';
-import Service from './service';
-
-export default class SettingsDropdownContainer extends Component {
- constructor(props) {
- super(props);
-
- this.state = {
- isFullScreen: false,
- };
-
- this.handleFullscreenChange = this.handleFullscreenChange.bind(this);
- }
-
- componentDidMount() {
- const fullscreenChangedEvents = ['fullscreenchange',
- 'webkitfullscreenchange',
- 'mozfullscreenchange',
- 'MSFullscreenChange',];
-
- fullscreenChangedEvents.forEach(event =>
- document.addEventListener(event, this.handleFullscreenChange));
- }
-
- componentWillUnmount() {
- const fullscreenChangedEvents = ['fullscreenchange',
- 'webkitfullscreenchange',
- 'mozfullscreenchange',
- 'MSFullscreenChange',];
-
- fullscreenChangedEvents.forEach(event =>
- document.removeEventListener(event, this.fullScreenToggleCallback));
- }
-
- handleFullscreenChange() {
- if (document.fullscreenElement
- || document.webkitFullscreenElement
- || document.mozFullScreenElement
- || document.msFullscreenElement) {
- this.setState({ isFullScreen: true });
- } else {
- this.setState({ isFullScreen: false });
- }
- }
-
- render() {
-
- const handleToggleFullscreen = Service.toggleFullScreen;
- const isFullScreen = this.state.isFullScreen;
-
- return (
- <SettingsDropdown
- handleToggleFullscreen={handleToggleFullscreen}
- isFullScreen={isFullScreen}
- />
- );
- }
-}
+import React, { Component } from 'react';
+import SettingsDropdown from './component';
+import Service from './service';
+
+export default class SettingsDropdownContainer extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ isFullScreen: false,
+ };
+
+ this.handleFullscreenChange = this.handleFullscreenChange.bind(this);
+ }
+
+ componentDidMount() {
+ const fullscreenChangedEvents = [
+ 'fullscreenchange',
+ 'webkitfullscreenchange',
+ 'mozfullscreenchange',
+ 'MSFullscreenChange',
+ ];
+
+ fullscreenChangedEvents.forEach(event =>
+ document.addEventListener(event, this.handleFullscreenChange));
+ }
+
+ componentWillUnmount() {
+ const fullscreenChangedEvents = [
+ 'fullscreenchange',
+ 'webkitfullscreenchange',
+ 'mozfullscreenchange',
+ 'MSFullscreenChange',
+ ];
+
+ fullscreenChangedEvents.forEach(event =>
+ document.removeEventListener(event, this.fullScreenToggleCallback));
+ }
+
+ handleFullscreenChange() {
+ if (document.fullscreenElement
+ || document.webkitFullscreenElement
+ || document.mozFullScreenElement
+ || document.msFullscreenElement) {
+ this.setState({ isFullScreen: true });
+ } else {
+ this.setState({ isFullScreen: false });
+ }
+ }
+
+ render() {
+
+ const handleToggleFullscreen = Service.toggleFullScreen;
+ const isFullScreen = this.state.isFullScreen;
+
+ return (
+ <SettingsDropdown
+ handleToggleFullscreen={handleToggleFullscreen}
+ isFullScreen={isFullScreen}
+ />
+ );
+ }
+}
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js
old mode 100755
new mode 100644
index 0f22dda48f78b20bb9c559535ce18972507b12f0..818a3ce62ec59b4c3c95f4cc310d84df596d4e3a
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js
@@ -1,35 +1,34 @@
-
-toggleFullScreen = () => {
- let element = document.documentElement;
-
- if (document.fullscreenElement
- || document.webkitFullscreenElement
- || document.mozFullScreenElement
- || document.msFullscreenElement) {
-
- if (document.exitFullscreen) {
- document.exitFullscreen();
- } else if (document.mozCancelFullScreen) {
- document.mozCancelFullScreen();
- } else if (document.webkitExitFullscreen) {
- document.webkitExitFullscreen();
- }
-
- // If the page is not currently fullscreen, make fullscreen
- } else {
- if (element.requestFullscreen) {
- element.requestFullscreen();
- } else if (element.mozRequestFullScreen) {
- element.mozRequestFullScreen();
- } else if (element.webkitRequestFullscreen) {
- element.webkitRequestFullscreen();
- element.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
- } else if (element.msRequestFullscreen) {
- element.msRequestFullscreen();
- }
- }
-};
-
-export {
- toggleFullScreen,
-};
+toggleFullScreen = () => {
+ let element = document.documentElement;
+
+ if (document.fullscreenElement
+ || document.webkitFullscreenElement
+ || document.mozFullScreenElement
+ || document.msFullscreenElement) {
+
+ if (document.exitFullscreen) {
+ document.exitFullscreen();
+ } else if (document.mozCancelFullScreen) {
+ document.mozCancelFullScreen();
+ } else if (document.webkitExitFullscreen) {
+ document.webkitExitFullscreen();
+ }
+
+ // If the page is not currently fullscreen, make fullscreen
+ } else {
+ if (element.requestFullscreen) {
+ element.requestFullscreen();
+ } else if (element.mozRequestFullScreen) {
+ element.mozRequestFullScreen();
+ } else if (element.webkitRequestFullscreen) {
+ element.webkitRequestFullscreen();
+ element.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
+ } else if (element.msRequestFullscreen) {
+ element.msRequestFullscreen();
+ }
+ }
+};
+
+export {
+ toggleFullScreen,
+};
diff --git a/bigbluebutton-html5/imports/ui/components/settings/container.jsx b/bigbluebutton-html5/imports/ui/components/settings/container.jsx
index a8e591e85e75717ae3ad354bf57c22ce0f93f408..89ee8a6c263903cf9997253ead8f1a2c18b2c89e 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/container.jsx
@@ -18,7 +18,7 @@ class SettingsContainer extends Component {
}
}
-export default createContainer(() => {
+export default createContainer(function () {
return {
audio: SettingsService.audio,
video: SettingsService.video,
diff --git a/bigbluebutton-html5/imports/ui/components/settings/service.js b/bigbluebutton-html5/imports/ui/components/settings/service.js
index 0ca5d67675df44ed35df10b92dc396ab4ca2102a..dbb617a49654ab936179a21a758d82bd4b096602 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/service.js
+++ b/bigbluebutton-html5/imports/ui/components/settings/service.js
@@ -29,7 +29,7 @@ const updateSettings = (obj) => {
Settings.save();
};
-const getAvailableLocales = () => {
+const getAvailableLocales = function () {
return fetch('/html5client/locales').then(locales => locales.json());
};
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
old mode 100755
new mode 100644
index 0ade0c7fc6ff46bf5165e887a0aff0ed17382f18..2b61739df81145afa81242b7810dcc8e9e06ba70
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
@@ -194,7 +194,10 @@ class ApplicationMenu extends BaseMenu {
) : null }
</select>
</div>
- <div id="changeLangLabel" aria-label={intl.formatMessage(intlMessages.ariaLanguageLabel)}></div>
+ <div
+ id="changeLangLabel"
+ aria-label={intl.formatMessage(intlMessages.ariaLanguageLabel)}>
+ </div>
</div>
</div>
<hr className={styles.separator}/>
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/container.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/container.jsx
index 8147532e491581dd7b3ca92109bc54d4a9f237bb..a3c111ee8fde2ed543d9b374d692524a78217e2f 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/container.jsx
@@ -13,7 +13,7 @@ class ApplicationContainer extends Component {
);
}
}
-export default createContainer(() => {
+export default createContainer(function () {
return {
fontSizes: [
'12px',
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/closed-captions/container.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/closed-captions/container.jsx
index 0637d06de12f1336641fbe7464846689302f0f94..339cc0371ccd5ce6f482a7a3b52e110c37dde522 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/closed-captions/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/closed-captions/container.jsx
@@ -13,6 +13,6 @@ class ClosedCaptionsMenuContainer extends Component {
}
}
-export default createContainer(() => {
+export default createContainer(function () {
return Service.getClosedCaptionSettings();
}, ClosedCaptionsMenuContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/service.js b/bigbluebutton-html5/imports/ui/components/user-list/service.js
old mode 100755
new mode 100644
index 2c92b625af2dcbf7bcd767bc996c66d21367f260..3552b9c2d254506d8e997227d1d9b7afa752a95e
--- a/bigbluebutton-html5/imports/ui/components/user-list/service.js
+++ b/bigbluebutton-html5/imports/ui/components/user-list/service.js
@@ -164,7 +164,7 @@ const userFindSorting = {
const getUsers = () => {
let users = Users
- .find({ "user.connection_status": 'online' }, userFindSorting)
+ .find({ 'user.connection_status': 'online' }, userFindSorting)
.fetch();
return users
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/component.jsx
old mode 100755
new mode 100644
index f7bdaf1ac7479cd3286facab571255bbaeb835b8..b3b0d402ecc3d5f1b7348827daf29d8a1bcdb87a
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/component.jsx
@@ -401,7 +401,11 @@ class UserListItem extends Component {
userNameSub = userNameSub.join(' ');
- const { disablePrivateChat, disableCam, disableMic, lockedLayout, disablePublicChat } = meeting.roomLockSettings;
+ const { disablePrivateChat,
+ disableCam,
+ disableMic,
+ loSckedLayout,
+ disablePublicChat, } = meeting.roomLockSettings;
return (
<div className={styles.userName}>
diff --git a/bigbluebutton-html5/imports/ui/services/auth/index.js b/bigbluebutton-html5/imports/ui/services/auth/index.js
old mode 100755
new mode 100644
index 4ea2e8bc0cd9a0d12870b5e0b33ddbb74d1e5e46..e6f741608621cd08341d7c345215fd0d0d718bc5
--- a/bigbluebutton-html5/imports/ui/services/auth/index.js
+++ b/bigbluebutton-html5/imports/ui/services/auth/index.js
@@ -201,4 +201,4 @@ class Auth {
};
let AuthSingleton = new Auth();
-export default AuthSingleton;
\ No newline at end of file
+export default AuthSingleton;
diff --git a/bigbluebutton-html5/imports/ui/services/notification/index.js b/bigbluebutton-html5/imports/ui/services/notification/index.js
index 5517cc25c98c50f4f8bc0323e0e91f300f5b1cd8..eb8f5534e89efe0bdfcc803d60a169dc60dc02b7 100644
--- a/bigbluebutton-html5/imports/ui/services/notification/index.js
+++ b/bigbluebutton-html5/imports/ui/services/notification/index.js
@@ -3,21 +3,21 @@ import { check } from 'meteor/check';
let collection = new Mongo.Collection(null);
function findById(notificationId) {
- check(notificationId, String);
- collection.find({ notificationId });
+ check(notificationId, String);
+ collection.find({ notificationId });
}
function add(notification) {
- check(notification.notification, String);
- collection.insert(notification);
+ check(notification.notification, String);
+ collection.insert(notification);
}
function remove(notificationId) {
- check(notificationId, String);
- collection.remove({ notificationId });
+ check(notificationId, String);
+ collection.remove({ notificationId });
}
-const NotificationCollection = {findById, add, remove,};
+const NotificationCollection = { findById, add, remove, };
export default NotificationCollection;
diff --git a/bigbluebutton-html5/imports/ui/services/notification/notificationService.js b/bigbluebutton-html5/imports/ui/services/notification/notificationService.js
index 8765349416a95f8374f849afbf8c4e7f83e928a1..09861c62ec26a894a6a3cb7d247e97008b20778f 100644
--- a/bigbluebutton-html5/imports/ui/services/notification/notificationService.js
+++ b/bigbluebutton-html5/imports/ui/services/notification/notificationService.js
@@ -7,28 +7,28 @@ class NotificationService {
* @param {Object} database
*/
constructor(database) {
- this.database = database;
+ this.database = database;
}
/**
* @param {string} notificationID
*/
get(notificationID) {
- this.database.findById(notificationID);
+ this.database.findById(notificationID);
}
/**
* @param {Object} notification
*/
add(notification) {
- this.database.add(notification);
+ this.database.add(notification);
}
/**
* @param {string} notificationID
*/
remove(notificationID) {
- this.database.remove(notificationID);
+ this.database.remove(notificationID);
}
}
diff --git a/bigbluebutton-html5/imports/utils/statuses.js b/bigbluebutton-html5/imports/utils/statuses.js
index a62ca1f0eecae0a098b4f85390b81dba87d9b3b3..8d360b1660edb0db2d6e24aaa64784de5b32d18e 100755
--- a/bigbluebutton-html5/imports/utils/statuses.js
+++ b/bigbluebutton-html5/imports/utils/statuses.js
@@ -1,4 +1,13 @@
-const EMOJI_STATUSES = ['away', 'raiseHand', 'neutral', 'confused', 'sad',
- 'happy', 'applause', 'thumbsUp', 'thumbsDown'];
+const EMOJI_STATUSES = [
+ 'away',
+ 'raiseHand',
+ 'neutral',
+ 'confused',
+ 'sad',
+ 'happy',
+ 'applause',
+ 'thumbsUp',
+ 'thumbsDown',
+];
export { EMOJI_STATUSES };