From 76679c9cb9da3d4a45ff8e2f29a1d8e5f91f670e Mon Sep 17 00:00:00 2001
From: Lajellu <l.ajellu@gmail.com>
Date: Fri, 5 Aug 2016 13:13:48 -0700
Subject: [PATCH] removes HTML5 whiteboard extra code, whiteboard css trailing
space, and rename service in slide controls
---
.../{SwitchSlideMessage.js => switchSlideMessage.js} | 2 +-
.../imports/ui/components/whiteboard/component.jsx | 10 ----------
.../components/whiteboard/slide-controls/container.jsx | 10 +++++-----
.../ui/components/whiteboard/slide-controls/service.js | 6 +++---
.../components/whiteboard/slide-controls/styles.scss | 3 +--
.../imports/ui/components/whiteboard/styles.scss | 2 +-
bigbluebutton-html5/server/server.js | 2 +-
7 files changed, 12 insertions(+), 23 deletions(-)
rename bigbluebutton-html5/imports/api/presentations/server/methods/{SwitchSlideMessage.js => switchSlideMessage.js} (96%)
diff --git a/bigbluebutton-html5/imports/api/presentations/server/methods/SwitchSlideMessage.js b/bigbluebutton-html5/imports/api/presentations/server/methods/switchSlideMessage.js
similarity index 96%
rename from bigbluebutton-html5/imports/api/presentations/server/methods/SwitchSlideMessage.js
rename to bigbluebutton-html5/imports/api/presentations/server/methods/switchSlideMessage.js
index b77bc64f7f..6003bbfea8 100755
--- a/bigbluebutton-html5/imports/api/presentations/server/methods/SwitchSlideMessage.js
+++ b/bigbluebutton-html5/imports/api/presentations/server/methods/switchSlideMessage.js
@@ -6,7 +6,7 @@ import Slides from '/imports/api/slides';
import { redisConfig } from '/config';
Meteor.methods({
- SwitchSlideMessage(credentials, requestedSlideNum) {
+ switchSlideMessage(credentials, requestedSlideNum) {
const { meetingId, requesterUserId, requesterToken } = credentials;
const currentPresentationDoc = Presentations.findOne({
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
index aa4c86c8eb..969ef64867 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
@@ -97,16 +97,6 @@ export default class Whiteboard extends React.Component {
}
render() {
- if (this.props.currentSlide) {
- slideControlsContainer =
- <SlideControlsContainer
- currentSlideNum={this.props.currentSlide.slide.num}
- presentationId={this.props.currentSlide.presentationId}
- />;
- } else {
- slideControlsContainer = null;
- }
-
return (
<div className={styles.whiteboardContainer}>
<div className={styles.whiteboardWrapper}>
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/container.jsx
index ec42a844a4..43b31645e7 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/container.jsx
@@ -1,7 +1,7 @@
import React, { Component, PropTypes } from 'react';
import { createContainer } from 'meteor/react-meteor-data';
-import SlideService from './service';
+import SlideControlsService from './service';
import SlideControls from './component.jsx';
const propTypes = {
@@ -48,7 +48,7 @@ class SlideControlsContainer extends React.Component {
}
export default createContainer((params) => {
- const data = SlideService.getSlideData(params);
+ const data = SlideControlsService.getSlideData(params);
const {
userIsPresenter,
@@ -60,11 +60,11 @@ export default createContainer((params) => {
numberOfSlides,
actions: {
nextSlideHandler: () =>
- SlideService.nextSlide(params.currentSlideNum, numberOfSlides),
+ SlideControlsService.nextSlide(params.currentSlideNum, numberOfSlides),
previousSlideHandler: () =>
- SlideService.previousSlide(params.currentSlideNum, numberOfSlides),
+ SlideControlsService.previousSlide(params.currentSlideNum, numberOfSlides),
skipToSlideHandler: (event) =>
- SlideService.skipToSlide(event),
+ SlideControlsService.skipToSlide(event),
},
};
}, SlideControlsContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/service.js b/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/service.js
index 04f749214b..8c6313d9a5 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/service.js
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/service.js
@@ -31,19 +31,19 @@ let getSlideData = (params) => {
const previousSlide = (currentSlideNum) => {
if (currentSlideNum > 1) {
- callServer('SwitchSlideMessage', currentSlideNum - 1);
+ callServer('switchSlideMessage', currentSlideNum - 1);
}
};
const nextSlide = (currentSlideNum, numberOfSlides) => {
if (currentSlideNum < numberOfSlides) {
- callServer('SwitchSlideMessage', currentSlideNum + 1);
+ callServer('switchSlideMessage', currentSlideNum + 1);
}
};
const skipToSlide = (event) => {
const requestedSlideNum = event.target.value;
- callServer('SwitchSlideMessage', requestedSlideNum);
+ callServer('switchSlideMessage', requestedSlideNum);
};
export default {
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/styles.scss b/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/styles.scss
index b7d1feac2b..c56d076422 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/styles.scss
@@ -6,8 +6,8 @@ $controls-background: #F0F2F6 !default;
.slideControlsWrapper,
.zoomForm {
- padding: $line-height-computed / 2;
order: 2;
+ padding: $line-height-computed / 2;
display: flex;
flex-direction: row;
align-items: center;
@@ -39,7 +39,6 @@ $controls-background: #F0F2F6 !default;
font-weight: bolder;
}
}
-
}
.zoomForm {
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss b/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss
index 909219aaf6..b720efc78b 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss
@@ -43,7 +43,7 @@
.whiteboardWrapper {
order: 1;
width: 100%;
- height: 100%;
+ height: 100%;
display: block;
position: relative;
}
diff --git a/bigbluebutton-html5/server/server.js b/bigbluebutton-html5/server/server.js
index c537f705c6..8d5f67de10 100755
--- a/bigbluebutton-html5/server/server.js
+++ b/bigbluebutton-html5/server/server.js
@@ -27,7 +27,7 @@ import '/imports/api/polls/server/modifiers/clearPollCollection';
import '/imports/api/polls/server/modifiers/updatePollCollection';
import '/imports/api/presentations/server/publications';
-import '/imports/api/presentations/server/methods/SwitchSlideMessage';
+import '/imports/api/presentations/server/methods/switchSlideMessage';
import '/imports/api/presentations/server/modifiers/addPresentationToCollection';
import '/imports/api/presentations/server/modifiers/clearPresentationsCollection';
import '/imports/api/presentations/server/modifiers/removePresentationFromCollection';
--
GitLab