BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made actions import more clear to read

Browse Source
This commit is contained in:
Oleksandr Zhurbenko 2017-09-21 17:18:15 -07:00
parent 4a4a3d5574
commit 4073501a28
2 changed files with 58 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/container.jsx
View File

@ -8,7 +8,18 @@ const WhiteboardToolbarContainer = ({ ...props }) => (
);
export default createContainer(() => ({
actions: WhiteboardToolbarService.actions,
actions: {
undoAnnotation: WhiteboardToolbarService.undoAnnotation,
clearWhiteboard: WhiteboardToolbarService.clearWhiteboard,
changeWhiteboardMode: WhiteboardToolbarService.changeWhiteboardMode,
setInitialWhiteboardToolbarValues: WhiteboardToolbarService.setInitialWhiteboardToolbarValues,
getCurrentDrawSettings: WhiteboardToolbarService.getCurrentDrawSettings,
setFontSize: WhiteboardToolbarService.setFontSize,
setTool: WhiteboardToolbarService.setTool,
setThickness: WhiteboardToolbarService.setThickness,
setColor: WhiteboardToolbarService.setColor,
setTextShapeObject: WhiteboardToolbarService.setTextShapeObject,
},
textShapeActiveId: WhiteboardToolbarService.getTextShapeActiveId(),
multiUser: WhiteboardToolbarService.getMultiUserStatus(),
isPresenter: WhiteboardToolbarService.isPresenter(),

86
bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/service.js
View File

@ -4,7 +4,6 @@ import Users from '/imports/api/2.0/users';
import Auth from '/imports/ui/services/auth';
import WhiteboardMultiUser from '/imports/api/2.0/whiteboard-multi-user/';
const DRAW_SETTINGS = 'drawSettings';
const makeSetter = key => (value) => {
@ -15,46 +14,44 @@ const makeSetter = key => (value) => {
}
};
const actions = {
undoAnnotation: (whiteboardId) => {
makeCall('undoAnnotation', whiteboardId);
},
clearWhiteboard: (whiteboardId) => {
makeCall('clearWhiteboard', whiteboardId);
},
changeWhiteboardMode: (multiUser) => {
makeCall('changeWhiteboardAccess', multiUser);
},
setInitialWhiteboardToolbarValues: (tool, thickness, color, fontSize, textShape) => {
const _drawSettings = Storage.getItem(DRAW_SETTINGS);
if (!_drawSettings) {
const drawSettings = {
whiteboardAnnotationTool: tool,
whiteboardAnnotationThickness: thickness,
whiteboardAnnotationColor: color,
textFontSize: fontSize,
textShape,
};
Storage.setItem(DRAW_SETTINGS, drawSettings);
}
},
getCurrentDrawSettings: () => Storage.getItem(DRAW_SETTINGS),
setFontSize: makeSetter('textFontSize'),
setTool: makeSetter('whiteboardAnnotationTool'),
setThickness: makeSetter('whiteboardAnnotationThickness'),
setColor: makeSetter('whiteboardAnnotationColor'),
setTextShapeObject: makeSetter('textShape'),
const undoAnnotation = (whiteboardId) => {
makeCall('undoAnnotation', whiteboardId);
};
const clearWhiteboard = (whiteboardId) => {
makeCall('clearWhiteboard', whiteboardId);
};
const changeWhiteboardMode = (multiUser) => {
makeCall('changeWhiteboardAccess', multiUser);
};
const setInitialWhiteboardToolbarValues = (tool, thickness, color, fontSize, textShape) => {
const _drawSettings = Storage.getItem(DRAW_SETTINGS);
if (!_drawSettings) {
const drawSettings = {
whiteboardAnnotationTool: tool,
whiteboardAnnotationThickness: thickness,
whiteboardAnnotationColor: color,
textFontSize: fontSize,
textShape,
};
Storage.setItem(DRAW_SETTINGS, drawSettings);
}
};
const getCurrentDrawSettings = () => Storage.getItem(DRAW_SETTINGS);
const setFontSize = makeSetter('textFontSize');
const setTool = makeSetter('whiteboardAnnotationTool');
const setThickness = makeSetter('whiteboardAnnotationThickness');
const setColor = makeSetter('whiteboardAnnotationColor');
const setTextShapeObject = makeSetter('textShape');
const getTextShapeActiveId = () => {
const drawSettings = Storage.getItem(DRAW_SETTINGS);
return drawSettings ? drawSettings.textShape.textShapeActiveId : '';
@ -71,7 +68,16 @@ const isPresenter = () => {
};
export default {
actions,
undoAnnotation,
clearWhiteboard,
changeWhiteboardMode,
setInitialWhiteboardToolbarValues,
getCurrentDrawSettings,
setFontSize,
setTool,
setThickness,
setColor,
setTextShapeObject,
getTextShapeActiveId,
getMultiUserStatus,
isPresenter,