removes HTML5 whiteboard extra code, whiteboard css trailing space, and rename...

removes HTML5 whiteboard extra code, whiteboard css trailing space, and rename service in slide controls

bigbluebutton-html5/imports/api/presentations/server/methods/SwitchSlideMessage.js → 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({

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}>

bigbluebutton-html5/imports/ui/components/whiteboard/slide-controls/container.jsx

 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);

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 {

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 {

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;
 }

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';