diff --git a/bigbluebutton-html5/imports/api/1.1/chat/index.js b/bigbluebutton-html5/imports/api/1.1/chat/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/chat/server/methods/sendChat.js b/bigbluebutton-html5/imports/api/1.1/chat/server/methods/sendChat.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/chat/server/modifiers/addChat.js b/bigbluebutton-html5/imports/api/1.1/chat/server/modifiers/addChat.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/chat/server/modifiers/clearChats.js b/bigbluebutton-html5/imports/api/1.1/chat/server/modifiers/clearChats.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/cursor/index.js b/bigbluebutton-html5/imports/api/1.1/cursor/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/cursor/server/methods.js b/bigbluebutton-html5/imports/api/1.1/cursor/server/methods.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/cursor/server/methods/publishCursorUpdate.js b/bigbluebutton-html5/imports/api/1.1/cursor/server/methods/publishCursorUpdate.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/cursor/server/modifiers/clearCursor.js b/bigbluebutton-html5/imports/api/1.1/cursor/server/modifiers/clearCursor.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/cursor/server/modifiers/initializeCursor.js b/bigbluebutton-html5/imports/api/1.1/cursor/server/modifiers/initializeCursor.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/cursor/server/modifiers/updateCursor.js b/bigbluebutton-html5/imports/api/1.1/cursor/server/modifiers/updateCursor.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/cursor/server/publishers.js b/bigbluebutton-html5/imports/api/1.1/cursor/server/publishers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/deskshare/index.js b/bigbluebutton-html5/imports/api/1.1/deskshare/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/deskshare/server/eventHandlers.js b/bigbluebutton-html5/imports/api/1.1/deskshare/server/eventHandlers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/deskshare/server/handlers/incomingDeskshareEvent.js b/bigbluebutton-html5/imports/api/1.1/deskshare/server/handlers/incomingDeskshareEvent.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/deskshare/server/index.js b/bigbluebutton-html5/imports/api/1.1/deskshare/server/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/deskshare/server/modifiers/clearDeskshareCollection.js b/bigbluebutton-html5/imports/api/1.1/deskshare/server/modifiers/clearDeskshareCollection.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/deskshare/server/modifiers/modifyDeskshareStatus.js b/bigbluebutton-html5/imports/api/1.1/deskshare/server/modifiers/modifyDeskshareStatus.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/deskshare/server/publishers.js b/bigbluebutton-html5/imports/api/1.1/deskshare/server/publishers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/meetings/index.js b/bigbluebutton-html5/imports/api/1.1/meetings/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/meetings/server/modifiers/addMeeting.js b/bigbluebutton-html5/imports/api/1.1/meetings/server/modifiers/addMeeting.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/meetings/server/modifiers/clearMeetings.js b/bigbluebutton-html5/imports/api/1.1/meetings/server/modifiers/clearMeetings.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/meetings/server/modifiers/removeMeeting.js b/bigbluebutton-html5/imports/api/1.1/meetings/server/modifiers/removeMeeting.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/presentations/index.js b/bigbluebutton-html5/imports/api/1.1/presentations/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/presentations/server/modifiers/addPresentation.js b/bigbluebutton-html5/imports/api/1.1/presentations/server/modifiers/addPresentation.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/presentations/server/modifiers/clearPresentations.js b/bigbluebutton-html5/imports/api/1.1/presentations/server/modifiers/clearPresentations.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/presentations/server/publishers.js b/bigbluebutton-html5/imports/api/1.1/presentations/server/publishers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/index.js b/bigbluebutton-html5/imports/api/1.1/shapes/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardCleared.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardCleared.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardGetReply.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardGetReply.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardSend.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardSend.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardUndo.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardUndo.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/methods.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/methods.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/methods/clearWhiteboard.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/methods/clearWhiteboard.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/methods/sendAnnotation.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/methods/sendAnnotation.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/methods/undoAnnotation.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/methods/undoAnnotation.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/addShape.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/addShape.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/clearShapes.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/clearShapes.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/clearShapesWhiteboard.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/clearShapesWhiteboard.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/removeShape.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/removeShape.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/publishers.js b/bigbluebutton-html5/imports/api/1.1/shapes/server/publishers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/slides/index.js b/bigbluebutton-html5/imports/api/1.1/slides/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/slides/server/methods.js b/bigbluebutton-html5/imports/api/1.1/slides/server/methods.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/slides/server/methods/switchSlide.js b/bigbluebutton-html5/imports/api/1.1/slides/server/methods/switchSlide.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/slides/server/modifiers/addSlide.js b/bigbluebutton-html5/imports/api/1.1/slides/server/modifiers/addSlide.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/slides/server/modifiers/changeCurrentSlide.js b/bigbluebutton-html5/imports/api/1.1/slides/server/modifiers/changeCurrentSlide.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/slides/server/modifiers/clearSlides.js b/bigbluebutton-html5/imports/api/1.1/slides/server/modifiers/clearSlides.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/slides/server/modifiers/resizeSlide.js b/bigbluebutton-html5/imports/api/1.1/slides/server/modifiers/resizeSlide.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/index.js b/bigbluebutton-html5/imports/api/1.1/users/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/handlers/emojiStatus.js b/bigbluebutton-html5/imports/api/1.1/users/server/handlers/emojiStatus.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/handlers/lockedStatusChange.js b/bigbluebutton-html5/imports/api/1.1/users/server/handlers/lockedStatusChange.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/handlers/validateAuthToken.js b/bigbluebutton-html5/imports/api/1.1/users/server/handlers/validateAuthToken.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/methods/assignPresenter.js b/bigbluebutton-html5/imports/api/1.1/users/server/methods/assignPresenter.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/methods/kickUser.js b/bigbluebutton-html5/imports/api/1.1/users/server/methods/kickUser.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/methods/listenOnlyToggle.js b/bigbluebutton-html5/imports/api/1.1/users/server/methods/listenOnlyToggle.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/methods/muteToggle.js b/bigbluebutton-html5/imports/api/1.1/users/server/methods/muteToggle.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/methods/setEmojiStatus.js b/bigbluebutton-html5/imports/api/1.1/users/server/methods/setEmojiStatus.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/methods/userLeaving.js b/bigbluebutton-html5/imports/api/1.1/users/server/methods/userLeaving.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/methods/userLogout.js b/bigbluebutton-html5/imports/api/1.1/users/server/methods/userLogout.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/methods/validateAuthToken.js b/bigbluebutton-html5/imports/api/1.1/users/server/methods/validateAuthToken.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/modifiers/clearUsers.js b/bigbluebutton-html5/imports/api/1.1/users/server/modifiers/clearUsers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/modifiers/createDummyUser.js b/bigbluebutton-html5/imports/api/1.1/users/server/modifiers/createDummyUser.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/modifiers/lockAllViewersMic.js b/bigbluebutton-html5/imports/api/1.1/users/server/modifiers/lockAllViewersMic.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/modifiers/setConnectionStatus.js b/bigbluebutton-html5/imports/api/1.1/users/server/modifiers/setConnectionStatus.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/modifiers/updateVoiceUser.js b/bigbluebutton-html5/imports/api/1.1/users/server/modifiers/updateVoiceUser.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/1.1/users/server/publishers.js b/bigbluebutton-html5/imports/api/1.1/users/server/publishers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/annotations/server/eventHandlers.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/eventHandlers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardAnnotations.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardAnnotations.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardCleared.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardCleared.js old mode 100755 new mode 100644 index de5ae8435669e42f4f30f6b89ef25b3e49b92233..53b584598f34007b4a22249338e458d14dfabbb9 --- a/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardCleared.js +++ b/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardCleared.js @@ -9,9 +9,7 @@ export default function handleWhiteboardCleared({ body }, meetingId) { fullClear: Boolean, }); - const whiteboardId = body.whiteboardId; - const fullClear = body.fullClear; - const userId = body.userId; + const { whiteboardId, fullClear, userId } = body; return clearAnnotations(meetingId, whiteboardId, userId, fullClear); } diff --git a/bigbluebutton-html5/imports/api/2.0/annotations/server/methods.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/methods.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/annotations/server/methods/clearWhiteboard.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/methods/clearWhiteboard.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/annotations/server/methods/sendAnnotation.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/methods/sendAnnotation.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/annotations/server/methods/undoAnnotation.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/methods/undoAnnotation.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/addAnnotation.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/addAnnotation.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/clearAnnotations.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/clearAnnotations.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/audio/client/bridge/sip.js b/bigbluebutton-html5/imports/api/2.0/audio/client/bridge/sip.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/audio/client/manager/index.js b/bigbluebutton-html5/imports/api/2.0/audio/client/manager/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/bbb/index.js b/bigbluebutton-html5/imports/api/2.0/bbb/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/chat/index.js b/bigbluebutton-html5/imports/api/2.0/chat/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/chat/server/methods/sendChat.js b/bigbluebutton-html5/imports/api/2.0/chat/server/methods/sendChat.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/chat/server/modifiers/addChat.js b/bigbluebutton-html5/imports/api/2.0/chat/server/modifiers/addChat.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/chat/server/modifiers/clearChats.js b/bigbluebutton-html5/imports/api/2.0/chat/server/modifiers/clearChats.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/cursor/index.js b/bigbluebutton-html5/imports/api/2.0/cursor/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/cursor/server/methods.js b/bigbluebutton-html5/imports/api/2.0/cursor/server/methods.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/cursor/server/methods/publishCursorUpdate.js b/bigbluebutton-html5/imports/api/2.0/cursor/server/methods/publishCursorUpdate.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/cursor/server/modifiers/clearCursor.js b/bigbluebutton-html5/imports/api/2.0/cursor/server/modifiers/clearCursor.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/cursor/server/modifiers/initializeCursor.js b/bigbluebutton-html5/imports/api/2.0/cursor/server/modifiers/initializeCursor.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/cursor/server/modifiers/updateCursor.js b/bigbluebutton-html5/imports/api/2.0/cursor/server/modifiers/updateCursor.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/cursor/server/publishers.js b/bigbluebutton-html5/imports/api/2.0/cursor/server/publishers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/meetings/index.js b/bigbluebutton-html5/imports/api/2.0/meetings/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/meetings/server/methods.js b/bigbluebutton-html5/imports/api/2.0/meetings/server/methods.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/meetings/server/methods/endMeeting.js b/bigbluebutton-html5/imports/api/2.0/meetings/server/methods/endMeeting.js old mode 100755 new mode 100644 index 59c1bbd87e3c754651f93fd2e46d854e9ea89f60..3c1c1fab1a1c678a265b194c352cc1acd8fea962 --- a/bigbluebutton-html5/imports/api/2.0/meetings/server/methods/endMeeting.js +++ b/bigbluebutton-html5/imports/api/2.0/meetings/server/methods/endMeeting.js @@ -1,30 +1,30 @@ -import { Meteor } from 'meteor/meteor'; -import { check } from 'meteor/check'; -import RedisPubSub from '/imports/startup/server/redis2x'; -import Logger from '/imports/startup/server/logger'; - -export default function endMeeting(credentials) { - const REDIS_CONFIG = Meteor.settings.redis; - const CHANNEL = REDIS_CONFIG.channels.toAkkaApps; - const EVENT_NAME = 'LogoutAndEndMeetingCmdMsg'; - - const { meetingId, requesterUserId, requesterToken } = credentials; - - check(meetingId, String); - check(requesterUserId, String); - check(requesterToken, String); - - const payload = { - userId: requesterUserId, - }; - - const header = { - meetingId, - name: EVENT_NAME, - userId: requesterUserId, - }; - - Logger.verbose(`Meeting '${meetingId}' is destroyed by '${requesterUserId}'`); - - return RedisPubSub.publish(CHANNEL, EVENT_NAME, meetingId, payload, header); -} +import { Meteor } from 'meteor/meteor'; +import { check } from 'meteor/check'; +import RedisPubSub from '/imports/startup/server/redis2x'; +import Logger from '/imports/startup/server/logger'; + +export default function endMeeting(credentials) { + const REDIS_CONFIG = Meteor.settings.redis; + const CHANNEL = REDIS_CONFIG.channels.toAkkaApps; + const EVENT_NAME = 'LogoutAndEndMeetingCmdMsg'; + + const { meetingId, requesterUserId, requesterToken } = credentials; + + check(meetingId, String); + check(requesterUserId, String); + check(requesterToken, String); + + const payload = { + userId: requesterUserId, + }; + + const header = { + meetingId, + name: EVENT_NAME, + userId: requesterUserId, + }; + + Logger.verbose(`Meeting '${meetingId}' is destroyed by '${requesterUserId}'`); + + return RedisPubSub.publish(CHANNEL, EVENT_NAME, meetingId, payload, header); +} diff --git a/bigbluebutton-html5/imports/api/2.0/meetings/server/modifiers/addMeeting.js b/bigbluebutton-html5/imports/api/2.0/meetings/server/modifiers/addMeeting.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/meetings/server/modifiers/removeMeeting.js b/bigbluebutton-html5/imports/api/2.0/meetings/server/modifiers/removeMeeting.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/presentations/index.js b/bigbluebutton-html5/imports/api/2.0/presentations/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/presentations/server/modifiers/addPresentation.js b/bigbluebutton-html5/imports/api/2.0/presentations/server/modifiers/addPresentation.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/presentations/server/modifiers/clearPresentations.js b/bigbluebutton-html5/imports/api/2.0/presentations/server/modifiers/clearPresentations.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/presentations/server/publishers.js b/bigbluebutton-html5/imports/api/2.0/presentations/server/publishers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/screenshare/client/bridge/verto.js b/bigbluebutton-html5/imports/api/2.0/screenshare/client/bridge/verto.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/slides/index.js b/bigbluebutton-html5/imports/api/2.0/slides/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/slides/server/methods.js b/bigbluebutton-html5/imports/api/2.0/slides/server/methods.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/slides/server/methods/switchSlide.js b/bigbluebutton-html5/imports/api/2.0/slides/server/methods/switchSlide.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/addSlide.js b/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/addSlide.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/changeCurrentSlide.js b/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/changeCurrentSlide.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/clearSlides.js b/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/clearSlides.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/resizeSlide.js b/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/resizeSlide.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/index.js b/bigbluebutton-html5/imports/api/2.0/users/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/handlers/emojiStatus.js b/bigbluebutton-html5/imports/api/2.0/users/server/handlers/emojiStatus.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/handlers/validateAuthToken.js b/bigbluebutton-html5/imports/api/2.0/users/server/handlers/validateAuthToken.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/methods/assignPresenter.js b/bigbluebutton-html5/imports/api/2.0/users/server/methods/assignPresenter.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/methods/setEmojiStatus.js b/bigbluebutton-html5/imports/api/2.0/users/server/methods/setEmojiStatus.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/methods/userLeaving.js b/bigbluebutton-html5/imports/api/2.0/users/server/methods/userLeaving.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/methods/userLogout.js b/bigbluebutton-html5/imports/api/2.0/users/server/methods/userLogout.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/methods/validateAuthToken.js b/bigbluebutton-html5/imports/api/2.0/users/server/methods/validateAuthToken.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/modifiers/clearUsers.js b/bigbluebutton-html5/imports/api/2.0/users/server/modifiers/clearUsers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/modifiers/createDummyUser.js b/bigbluebutton-html5/imports/api/2.0/users/server/modifiers/createDummyUser.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/modifiers/setConnectionStatus.js b/bigbluebutton-html5/imports/api/2.0/users/server/modifiers/setConnectionStatus.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/voice-users/index.js b/bigbluebutton-html5/imports/api/2.0/voice-users/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/voice-users/server/methods/listenOnlyToggle.js b/bigbluebutton-html5/imports/api/2.0/voice-users/server/methods/listenOnlyToggle.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/voice-users/server/modifiers/addVoiceUser.js b/bigbluebutton-html5/imports/api/2.0/voice-users/server/modifiers/addVoiceUser.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/index.js b/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/eventHandlers.js b/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/eventHandlers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/handlers/getWhiteboardAccess.js b/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/handlers/getWhiteboardAccess.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/handlers/modifyWhiteboardAccess.js b/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/handlers/modifyWhiteboardAccess.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/index.js b/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/methods.js b/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/methods.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/methods/changeWhiteboardAccess.js b/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/methods/changeWhiteboardAccess.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/publishers.js b/bigbluebutton-html5/imports/api/2.0/whiteboard-multi-user/server/publishers.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/api/common/server/helpers.js b/bigbluebutton-html5/imports/api/common/server/helpers.js old mode 100755 new mode 100644 index 15a6674a955fa35a78038ba2e08b608ce6f0137d..02e076f6703ccc683cfcab5a7d5ee75d856a93c9 --- a/bigbluebutton-html5/imports/api/common/server/helpers.js +++ b/bigbluebutton-html5/imports/api/common/server/helpers.js @@ -10,7 +10,7 @@ export const indexOf = [].indexOf || function (item) { return -1; }; -//used in 1.1 +// used in 1.1 export const inReplyToHTML5Client = function (arg) { return arg.routing.userId === 'nodeJSapp'; }; diff --git a/bigbluebutton-html5/imports/startup/client/auth.js b/bigbluebutton-html5/imports/startup/client/auth.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/startup/client/base.jsx b/bigbluebutton-html5/imports/startup/client/base.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/startup/client/intl.jsx b/bigbluebutton-html5/imports/startup/client/intl.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/startup/client/routes.js b/bigbluebutton-html5/imports/startup/client/routes.js old mode 100755 new mode 100644 index 2d3a4b35362d7600c7257d2f9ab465ccc6523631..a20391810b6cb1db6ea4c17e50218a8c318c4b91 --- a/bigbluebutton-html5/imports/startup/client/routes.js +++ b/bigbluebutton-html5/imports/startup/client/routes.js @@ -18,13 +18,16 @@ export const renderRoutes = () => ( <Route path="/logout" onEnter={logoutRouteHandler} /> <Route path="/join" - component={LoadingScreen} onEnter={joinRouteHandler} + component={LoadingScreen} + onEnter={joinRouteHandler} /> <Route path="/" component={Base} onEnter={authenticatedRouteHandler} > <IndexRoute components={{}} /> <Route name="users" path="users" components={{ userList: UserListContainer }} /> <Route - name="chat" path="users/chat/:chatID" components={{ + name="chat" + path="users/chat/:chatID" + components={{ userList: UserListContainer, chat: ChatContainer, }} diff --git a/bigbluebutton-html5/imports/startup/server/index.js b/bigbluebutton-html5/imports/startup/server/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/startup/server/logger.js b/bigbluebutton-html5/imports/startup/server/logger.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/startup/server/redis.js b/bigbluebutton-html5/imports/startup/server/redis.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/startup/server/redis2x.js b/bigbluebutton-html5/imports/startup/server/redis2x.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/about/component.jsx b/bigbluebutton-html5/imports/ui/components/about/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/about/container.jsx b/bigbluebutton-html5/imports/ui/components/about/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/service.js b/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/mute-button/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/mute-button/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/mute-button/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/mute-button/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/video-button/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/video-button/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/app/container.jsx b/bigbluebutton-html5/imports/ui/components/app/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/app/service.js b/bigbluebutton-html5/imports/ui/components/app/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/app/styles.scss b/bigbluebutton-html5/imports/ui/components/app/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-menu/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-menu/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-menu/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/styles.scss b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-notification/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-notification/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-notification/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-notification/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-notification/styles.scss b/bigbluebutton-html5/imports/ui/components/audio/audio-notification/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-settings/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-settings/component.jsx old mode 100755 new mode 100644 index 089a247f3b0ffc79c6dde6010ccb4520b73452f0..3c76e00120a3311d1b6a387e9dce536b9b774fd0 --- a/bigbluebutton-html5/imports/ui/components/audio/audio-settings/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/audio/audio-settings/component.jsx @@ -107,7 +107,7 @@ class AudioSettings extends React.Component { <div className={styles.col}> <div className={styles.formElement}> <label className={cx(styles.label, styles.labelSmall)}> - {intl.formatMessage(intlMessages.streamVolumeLabel)} + {intl.formatMessage(intlMessages.streamVolumeLabel)} <AudioStreamVolume deviceId={this.state.inputDeviceId} className={styles.audioMeter} diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-stream-volume/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-stream-volume/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-test/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-test/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/device-selector/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/device-selector/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/enter-audio/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/enter-audio/component.jsx old mode 100755 new mode 100644 index 3b0d7e83802956ecf6c355ecd4905f0dc9780b67..fceea096a8adb822b117ea1345be759125d8479d --- a/bigbluebutton-html5/imports/ui/components/audio/enter-audio/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/audio/enter-audio/component.jsx @@ -13,12 +13,12 @@ class EnterAudio extends React.Component { } = this.props; return ( - <Button - label={intl.formatMessage(intlMessages.enterSessionLabel)} - size={'md'} - color={'primary'} - onClick={this.props.handleJoin} - /> + <Button + label={intl.formatMessage(intlMessages.enterSessionLabel)} + size={'md'} + color={'primary'} + onClick={this.props.handleJoin} + /> ); } } diff --git a/bigbluebutton-html5/imports/ui/components/audio/enter-audio/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/enter-audio/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/join-audio/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/join-audio/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/audio/service.js b/bigbluebutton-html5/imports/ui/components/audio/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/button/base/component.jsx b/bigbluebutton-html5/imports/ui/components/button/base/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/button/component.jsx b/bigbluebutton-html5/imports/ui/components/button/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/button/styles.scss b/bigbluebutton-html5/imports/ui/components/button/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/component.jsx old mode 100755 new mode 100644 index f05d901b7985d83ca496b6665e96c61f41a7d417..6bb60620934b3e95fe0df71cebe70c20547a9e74 --- a/bigbluebutton-html5/imports/ui/components/chat/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/chat/component.jsx @@ -26,12 +26,12 @@ class Chat extends Component { } componentDidMount() { - //to let the whiteboard know that the presentation area's size has changed + // to let the whiteboard know that the presentation area's size has changed window.dispatchEvent(new Event('resize')); } componentWillUnmount() { - //to let the whiteboard know that the presentation area's size has changed + // to let the whiteboard know that the presentation area's size has changed window.dispatchEvent(new Event('resize')); } @@ -100,6 +100,6 @@ class Chat extends Component { </div> ); } -}; +} export default injectIntl(Chat); diff --git a/bigbluebutton-html5/imports/ui/components/chat/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-form/message-form-actions/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-form/message-form-actions/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-form/message-form-actions/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/message-form/message-form-actions/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx old mode 100755 new mode 100644 index fe4c3efd4f453c66b62ef521dae144f1b28f5310..6d00b97e138321be956a5aaa3f7e0211756b3253 --- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx @@ -54,11 +54,11 @@ export default class MessageListItem extends Component { } componentDidMount() { - const { scrollArea } = this.props; + const { scrollArea } = this.props; if (scrollArea) { eventsToBeBound.forEach( - e => { scrollArea.addEventListener(e, this.handleMessageInViewport, false) }, + (e) => { scrollArea.addEventListener(e, this.handleMessageInViewport, false); }, ); } @@ -70,7 +70,7 @@ export default class MessageListItem extends Component { if (scrollArea) { eventsToBeBound.forEach( - e => { scrollArea.removeEventListener(e, this.handleMessageInViewport, false) }, + (e) => { scrollArea.removeEventListener(e, this.handleMessageInViewport, false); }, ); } } diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx old mode 100755 new mode 100644 index 13ffff881f4c1957e6c50a71bb85f9ab29930d94..d285974f7ce17bf4c09d008839ebe45d053f0373 --- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx @@ -67,12 +67,10 @@ export default class MessageListItem extends Component { if (isElementInViewport(node)) { this.props.handleReadMessage(this.props.time); - } else { - if (scrollArea){ - eventsToBeBound.forEach( - e => { scrollArea.addEventListener(e, this.handleMessageInViewport, false) }, + } else if (scrollArea) { + eventsToBeBound.forEach( + (e) => { scrollArea.addEventListener(e, this.handleMessageInViewport, false); }, ); - } } } @@ -85,10 +83,9 @@ export default class MessageListItem extends Component { if (scrollArea) { eventsToBeBound.forEach( - e => { scrollArea.removeEventListener(e, this.handleMessageInViewport, false) }, + (e) => { scrollArea.removeEventListener(e, this.handleMessageInViewport, false); }, ); } - } render() { diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/message-list/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/notification/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/notification/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/chat/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/checkbox/component.jsx b/bigbluebutton-html5/imports/ui/components/checkbox/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/closed-captions/component.jsx b/bigbluebutton-html5/imports/ui/components/closed-captions/component.jsx old mode 100755 new mode 100644 index 9579ce29b36098acf055e1c3f0fc5dd92553b689..6d16c52d426ef961707153bb21ab0b49817c94dd --- a/bigbluebutton-html5/imports/ui/components/closed-captions/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/closed-captions/component.jsx @@ -30,17 +30,16 @@ export default class ClosedCaptions extends React.Component { } componentDidMount() { - //to let the whiteboard know that the presentation area's size has changed + // to let the whiteboard know that the presentation area's size has changed window.dispatchEvent(new Event('resize')); } componentWillUnmount() { - //to let the whiteboard know that the presentation area's size has changed + // to let the whiteboard know that the presentation area's size has changed window.dispatchEvent(new Event('resize')); } componentWillUpdate() { - const node = findDOMNode(this.ccScrollArea); // number 4 is for the border 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 diff --git a/bigbluebutton-html5/imports/ui/components/closed-captions/service.js b/bigbluebutton-html5/imports/ui/components/closed-captions/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/closed-captions/styles.scss b/bigbluebutton-html5/imports/ui/components/closed-captions/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/content/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/content/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/list/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/list/component.jsx old mode 100755 new mode 100644 index eadc2f63739b8b9508635486f65e8910f434fcb5..e1bafbb1b702bc1fcc361bbed303f1675360b047 --- a/bigbluebutton-html5/imports/ui/components/dropdown/list/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/dropdown/list/component.jsx @@ -157,7 +157,8 @@ export default class DropdownList extends Component { <ul style={style} className={cx(styles.list, className)} - role="menu" ref={r => this._menu = r} + role="menu" + ref={r => this._menu = r} > {boundChildren} </ul> diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/list/item/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/list/item/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/list/separator/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/list/separator/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/list/styles.scss b/bigbluebutton-html5/imports/ui/components/dropdown/list/styles.scss old mode 100755 new mode 100644 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 index ccd1aba10519e881d4cdde61698388e245fedecf..69cadebbc58cdcf03c3fc4c6dfd877a5967a49fb --- a/bigbluebutton-html5/imports/ui/components/dropdown/list/title/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/dropdown/list/title/component.jsx @@ -10,7 +10,7 @@ export default class DropdownListTitle extends Component { constructor(props) { super(props); - this.labelID = _.uniqueId("labelContext-"); + this.labelID = _.uniqueId('labelContext-'); } render() { diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/styles.scss b/bigbluebutton-html5/imports/ui/components/dropdown/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/trigger/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/trigger/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 old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/icon/component.jsx b/bigbluebutton-html5/imports/ui/components/icon/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx b/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx old mode 100755 new mode 100644 index c8e4533e0b666d8839716af58e7b0c3b01871ba7..ded0963894e5435fbb9a5356cba08c306aff7533 --- a/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx @@ -4,23 +4,19 @@ import LogoutConfirmation from './component'; import LogoutConfirmationService from './service'; class LogoutConfirmationContainer extends Component { - + constructor(props) { super(props); } render() { - return( + return ( <LogoutConfirmation {...this.props} /> ); } } -export default createContainer(() => { - - return { - isModerator: LogoutConfirmationService.isModerator(), - endMeeting: LogoutConfirmationService.endMeeting, - }; - -}, LogoutConfirmationContainer); +export default createContainer(() => ({ + isModerator: LogoutConfirmationService.isModerator(), + endMeeting: LogoutConfirmationService.endMeeting, +}), LogoutConfirmationContainer); diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/service.js b/bigbluebutton-html5/imports/ui/components/logout-confirmation/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/styles.scss b/bigbluebutton-html5/imports/ui/components/logout-confirmation/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/media/component.jsx b/bigbluebutton-html5/imports/ui/components/media/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/media/container.jsx b/bigbluebutton-html5/imports/ui/components/media/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/media/service.js b/bigbluebutton-html5/imports/ui/components/media/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/media/styles.scss b/bigbluebutton-html5/imports/ui/components/media/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/modal/base/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/base/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/modal/base/styles.scss b/bigbluebutton-html5/imports/ui/components/modal/base/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/modal/fullscreen/styles.scss b/bigbluebutton-html5/imports/ui/components/modal/fullscreen/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/styles.scss b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/notifications-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/notifications-bar/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/notifications-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/notifications-bar/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/notifications-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/notifications-bar/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/polling/component.jsx b/bigbluebutton-html5/imports/ui/components/polling/component.jsx old mode 100755 new mode 100644 index 4811c94c226f4de3c18972453299a7fcdf0f7477..99edf9551500a93f8602e32ca9f183ff0acac8ea --- a/bigbluebutton-html5/imports/ui/components/polling/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/polling/component.jsx @@ -16,12 +16,12 @@ class PollingComponent extends React.Component { } componentDidMount() { - //to let the whiteboard know that the presentation area's size has changed + // to let the whiteboard know that the presentation area's size has changed window.dispatchEvent(new Event('resize')); } componentWillUnmount() { - //to let the whiteboard know that the presentation area's size has changed + // to let the whiteboard know that the presentation area's size has changed window.dispatchEvent(new Event('resize')); } diff --git a/bigbluebutton-html5/imports/ui/components/polling/container.jsx b/bigbluebutton-html5/imports/ui/components/polling/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/polling/service.js b/bigbluebutton-html5/imports/ui/components/polling/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/polling/styles.scss b/bigbluebutton-html5/imports/ui/components/polling/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/container.jsx b/bigbluebutton-html5/imports/ui/components/presentation/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/cursor/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/cursor/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/cursor/container.jsx b/bigbluebutton-html5/imports/ui/components/presentation/cursor/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/cursor/cursor-wrapper-container/container.jsx b/bigbluebutton-html5/imports/ui/components/presentation/cursor/cursor-wrapper-container/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/cursor/cursor-wrapper-container/service.js b/bigbluebutton-html5/imports/ui/components/presentation/cursor/cursor-wrapper-container/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/cursor/service.js b/bigbluebutton-html5/imports/ui/components/presentation/cursor/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/default-content/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/default-content/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/default-content/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/default-content/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/container.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/service.js b/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx old mode 100755 new mode 100644 index 2d23e36ce9b4fc772fe3800c8aed98fd16978f93..6e9eab3d1a7784694480110527976c40104725d6 --- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx @@ -19,7 +19,7 @@ class PresentationToolbar extends Component { static renderAriaLabelsDescs() { return ( <div hidden > - {/* Previous Slide button aria*/} + {/* Previous Slide button aria */} <div id="prevSlideLabel"> <FormattedMessage id="app.presentation.presentationToolbar.prevSlideLabel" @@ -34,7 +34,7 @@ class PresentationToolbar extends Component { defaultMessage="Change the presentation to the previous slide" /> </div> - {/* Next Slide button aria*/} + {/* Next Slide button aria */} <div id="nextSlideLabel"> <FormattedMessage id="app.presentation.presentationToolbar.nextSlideLabel" @@ -49,7 +49,7 @@ class PresentationToolbar extends Component { defaultMessage="Change the presentation to the next slide" /> </div> - {/* Skip Slide drop down aria*/} + {/* Skip Slide drop down aria */} <div id="skipSlideLabel"> <FormattedMessage id="app.presentation.presentationToolbar.skipSlideLabel" @@ -64,7 +64,7 @@ class PresentationToolbar extends Component { defaultMessage="Change the presentation to a specific slide" /> </div> - {/* Fit to width button aria*/} + {/* Fit to width button aria */} <div id="fitWidthLabel"> <FormattedMessage id="app.presentation.presentationToolbar.fitWidthLabel" @@ -79,7 +79,7 @@ class PresentationToolbar extends Component { defaultMessage="Display the whole width of the slide" /> </div> - {/* Fit to screen button aria*/} + {/* Fit to screen button aria */} <div id="fitScreenLabel"> <FormattedMessage id="app.presentation.presentationToolbar.fitScreenLabel" @@ -94,7 +94,7 @@ class PresentationToolbar extends Component { defaultMessage="Display the whole slide" /> </div> - {/* Zoom slider aria*/} + {/* Zoom slider aria */} <div id="zoomLabel"> <FormattedMessage id="app.presentation.presentationToolbar.zoomLabel" @@ -261,7 +261,7 @@ class PresentationToolbar extends Component { className={styles.zoomSlider} /> <div className={styles.zoomMinMax}> 400% </div> - </div>*/} + </div> */} </div> ); } diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/container.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/service.js b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/service.js b/bigbluebutton-html5/imports/ui/components/presentation/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/slide/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/slide/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx b/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/screenshare/container.jsx b/bigbluebutton-html5/imports/ui/components/screenshare/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/screenshare/service.js b/bigbluebutton-html5/imports/ui/components/screenshare/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/settings/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/component.jsx old mode 100755 new mode 100644 index a4e3b9b60e4e0fcf50859b7ac72ce354c4e2a759..31d5226a01de1a27d6e3b986cd4c23156e9a7df9 --- a/bigbluebutton-html5/imports/ui/components/settings/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/settings/component.jsx @@ -155,10 +155,10 @@ class Settings extends Component { <Icon iconName="application" className={styles.icon} /> <span id="appTab">{intl.formatMessage(intlMessages.appTabLabel)}</span> </Tab> - {/* <Tab className={styles.tabSelector} aria-labelledby="videoTab">*/} - {/* <Icon iconName='video' className={styles.icon}/>*/} - {/* <span id="videoTab">{intl.formatMessage(intlMessages.videoTabLabel)}</span>*/} - {/* </Tab>*/} + {/* <Tab className={styles.tabSelector} aria-labelledby="videoTab"> */} + {/* <Icon iconName='video' className={styles.icon}/> */} + {/* <span id="videoTab">{intl.formatMessage(intlMessages.videoTabLabel)}</span> */} + {/* </Tab> */} <Tab className={styles.tabSelector} aria-labelledby="ccTab"> <Icon iconName="user" className={styles.icon} /> <span id="ccTab">{intl.formatMessage(intlMessages.closecaptionTabLabel)}</span> @@ -177,12 +177,12 @@ class Settings extends Component { settings={this.state.current.application} /> </TabPanel> - {/* <TabPanel className={styles.tabPanel}>*/} - {/* <Video*/} - {/* handleUpdateSettings={this.handleUpdateSettings}*/} - {/* settings={this.state.current.video}*/} - {/* />*/} - {/* </TabPanel>*/} + {/* <TabPanel className={styles.tabPanel}> */} + {/* <Video */} + {/* handleUpdateSettings={this.handleUpdateSettings} */} + {/* settings={this.state.current.video} */} + {/* /> */} + {/* </TabPanel> */} <TabPanel className={styles.tabPanel}> <ClosedCaptions settings={this.state.current.cc} diff --git a/bigbluebutton-html5/imports/ui/components/settings/container.jsx b/bigbluebutton-html5/imports/ui/components/settings/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/container.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/closed-captions/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/closed-captions/component.jsx old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/participants/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/participants/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/video/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/video/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/switch/component.jsx b/bigbluebutton-html5/imports/ui/components/switch/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/user-avatar/component.jsx b/bigbluebutton-html5/imports/ui/components/user-avatar/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx old mode 100755 new mode 100644 index 3aeb9ebd164cdc20a6fa4b13224cc50a9a59725a..66bb6a710ecf536e0e084fab8e89ab703266f949 --- a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx @@ -343,7 +343,7 @@ class UserList extends Component { </div> ); } - + render() { return ( <div className={styles.userList}> diff --git a/bigbluebutton-html5/imports/ui/components/user-list/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/styles.scss old mode 100755 new mode 100644 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 diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/video-dock/component.jsx b/bigbluebutton-html5/imports/ui/components/video-dock/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/video-dock/container.jsx b/bigbluebutton-html5/imports/ui/components/video-dock/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/video-dock/styles.scss b/bigbluebutton-html5/imports/ui/components/video-dock/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/reactive-annotation/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/reactive-annotation/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/reactive-annotation/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/reactive-annotation/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/reactive-annotation/service.js b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/reactive-annotation/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/static-annotation/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/static-annotation/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/static-annotation/service.js b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-factory/static-annotation/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/service.js b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/ellipse/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/ellipse/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/helpers.js b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/helpers.js old mode 100755 new mode 100644 index dde707b1fedf74796b86bc73f760f054f2f8316f..7c4ff2a769ee0d2171ba9061b7b2ae6b74e0c259 --- a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/helpers.js +++ b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/helpers.js @@ -9,13 +9,7 @@ const colourToHex = (value) => { }; const getFormattedColor = (color) => { - let _color; - - if (!color) { - _color = '0'; // default value - } else { - _color = color; - } + let _color = color || '0'; if (!_color.toString().match(/#.*/)) { _color = colourToHex(_color); diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/line/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/line/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/pencil/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/pencil/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/poll/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/poll/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/rectangle/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/rectangle/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/text/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/text/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/text/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/text/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/text/service.js b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/text/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/triangle/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/triangle/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/pan-zoom-draw-listener/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/pan-zoom-draw-listener/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/pencil-draw-listener/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/pencil-draw-listener/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/service.js b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/shape-draw-listener/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/shape-draw-listener/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/styles.scss b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/text-draw-listener/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-overlay/text-draw-listener/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/container.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/service.js b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/service.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/styles.scss b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/styles.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/whiteboard-toolbar-item/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/whiteboard-toolbar-item/component.jsx old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/services/api/index.js b/bigbluebutton-html5/imports/ui/services/api/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/services/unread-messages/index.js b/bigbluebutton-html5/imports/ui/services/unread-messages/index.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/stylesheets/variables/general.scss b/bigbluebutton-html5/imports/ui/stylesheets/variables/general.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/ui/stylesheets/variables/palette.scss b/bigbluebutton-html5/imports/ui/stylesheets/variables/palette.scss old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/utils/keyCodes.js b/bigbluebutton-html5/imports/utils/keyCodes.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/utils/lineEndings.js b/bigbluebutton-html5/imports/utils/lineEndings.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/utils/regex-weburl.js b/bigbluebutton-html5/imports/utils/regex-weburl.js old mode 100755 new mode 100644 diff --git a/bigbluebutton-html5/imports/utils/statuses.js b/bigbluebutton-html5/imports/utils/statuses.js old mode 100755 new mode 100644