diff --git a/bigbluebutton-html5/imports/api/common/server/helpers.js b/bigbluebutton-html5/imports/api/common/server/helpers.js index 22897e07d67076c3f78690e25bca8ea58c98cfe0..c9d9e93d49e4a248e30e9e9abf75f45c5e431325 100755 --- a/bigbluebutton-html5/imports/api/common/server/helpers.js +++ b/bigbluebutton-html5/imports/api/common/server/helpers.js @@ -29,7 +29,7 @@ export function clearCollections() { refreshes. Related to: https://github.com/meteor/meteor/issues/6576 */ - if (process.env.NODE_ENV === "development") { + if (process.env.NODE_ENV === 'development') { return; } diff --git a/bigbluebutton-html5/imports/startup/client/routes.js b/bigbluebutton-html5/imports/startup/client/routes.js index db74455a073dde6863a2523f5ed8d2552e2faadd..5ec4ec2e384610cbe4064e5a5b5718a7b9cd7b78 100755 --- a/bigbluebutton-html5/imports/startup/client/routes.js +++ b/bigbluebutton-html5/imports/startup/client/routes.js @@ -18,8 +18,9 @@ export const renderRoutes = () => ( <Router history={browserHistory}> <Route path="/join/:meetingID/:userID/:authToken" onEnter={setCredentials} /> <Route path="/" onEnter={() => { - subscribeToCollections() - }} + subscribeToCollections(); + }} + getComponent={(nextState, cb) => { subscribeToCollections(() => cb(null, AppContainer)); }}> diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx index f0c50c201e4cbe10db423937fb34cc010cc20627..b34b9312d7433f658e3e6a9182a725a40febc673 100755 --- a/bigbluebutton-html5/imports/ui/components/app/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx @@ -117,7 +117,7 @@ export default class App extends Component { } render() { - if(this.props.isLoading) { + if (this.props.isLoading) { return <Loader/>; } diff --git a/bigbluebutton-html5/imports/ui/components/app/container.jsx b/bigbluebutton-html5/imports/ui/components/app/container.jsx index c9911a30b1f1078349da337f538b7704756c7092..9029aad162af0968c5e8790e5b3af477ff750293 100755 --- a/bigbluebutton-html5/imports/ui/components/app/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/app/container.jsx @@ -40,7 +40,7 @@ let loading = true; const loadingDep = new Tracker.Dependency; const getLoading = () => { - loadingDep.depend() + loadingDep.depend(); return loading; }; @@ -60,7 +60,7 @@ export default createContainer(() => { return { isLoading: getLoading(), - actionsbar: <ActionsBarContainer /> + actionsbar: <ActionsBarContainer />, }; }, AppContainer); diff --git a/bigbluebutton-html5/imports/ui/components/app/service.js b/bigbluebutton-html5/imports/ui/components/app/service.js index 86c033f7d1460416e892ebf2da8563c0348eb487..930534759e2eb6278e0bb04f2fc52fc35025c7cf 100755 --- a/bigbluebutton-html5/imports/ui/components/app/service.js +++ b/bigbluebutton-html5/imports/ui/components/app/service.js @@ -11,19 +11,23 @@ function setCredentials(nextState, replace) { const { meetingID, userID, authToken } = nextState.params; Auth.setCredentials(meetingID, userID, authToken); replace({ - pathname: '/' + pathname: '/', }); } }; let dataSubscriptions = null; function subscribeForData() { - if(dataSubscriptions) { + if (dataSubscriptions) { return dataSubscriptions; } - const subNames = ['users', 'chat', 'cursor', 'deskshare', 'meetings', - 'polls', 'presentations', 'shapes', 'slides']; + const subNames = [ + 'users', 'chat', 'cursor', + 'deskshare', 'meetings', + 'polls', 'presentations', + 'shapes', 'slides', + ]; let subs = []; subNames.forEach(name => subs.push(subscribeFor(name))); @@ -47,11 +51,11 @@ function subscribeFor(collectionName) { function subscribeToCollections(cb) { subscribeFor('users').then(() => { Promise.all(subscribeForData()).then(() => { - if(cb) { + if (cb) { cb(); } - }) - }) + }); + }); }; function onStop(error, result) { @@ -59,7 +63,7 @@ function onStop(error, result) { }; function onReady() { - console.log("OnReady"); + console.log('OnReady'); }; export {