diff --git a/bigbluebutton-html5/imports/api/common/server/helpers.js b/bigbluebutton-html5/imports/api/common/server/helpers.js index 219b745325484fe19507a2a55c1f3fd8269a1f57..dfc9438021e776069bb5b7fd503c80e486c3b60a 100755 --- a/bigbluebutton-html5/imports/api/common/server/helpers.js +++ b/bigbluebutton-html5/imports/api/common/server/helpers.js @@ -22,6 +22,7 @@ export function appendMessageHeader(eventName, messageObj) { }; export function clearCollections() { + console.log('in function clearCollections'); //This is to prevent collection clearing in development environment if (process.env.NODE_ENV === "development") { diff --git a/bigbluebutton-html5/imports/startup/client/routes.js b/bigbluebutton-html5/imports/startup/client/routes.js index 0f485b6fdbf11d12306beb4ec0e09906edb971da..de6080029e37eb3a7c68c55348d36b48f9acea72 100755 --- a/bigbluebutton-html5/imports/startup/client/routes.js +++ b/bigbluebutton-html5/imports/startup/client/routes.js @@ -6,7 +6,7 @@ import { isSubscribedForData } from '/imports/ui/components/app/service'; // route components import AppContainer from '/imports/ui/components/app/container'; -import { subscribeToCollections, setCredentials, subscribeForData, subscribeFor } from '/imports/ui/components/app/service'; +import { subscribeToCollections, setCredentials } from '/imports/ui/components/app/service'; import ChatContainer from '/imports/ui/components/chat/container'; import UserListContainer from '/imports/ui/components/user-list/container'; diff --git a/bigbluebutton-html5/imports/ui/components/app/container.jsx b/bigbluebutton-html5/imports/ui/components/app/container.jsx index b097229c94d947d24acd688a60b8a1258c0c1187..ea870a59b7d9a7a987fda10e8faa1dd3dfb9f2d7 100755 --- a/bigbluebutton-html5/imports/ui/components/app/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/app/container.jsx @@ -41,15 +41,15 @@ const actionControlsToShow = () => { } }; -var loading = true; -var loadingDep = new Tracker.Dependency; +let loading = true; +const loadingDep = new Tracker.Dependency; -var getLoading = () => { +const getLoading = () => { loadingDep.depend() return loading; }; -var setLoading = (val) => { +const setLoading = (val) => { if (val !== loading) { loading = val; loadingDep.changed(); diff --git a/bigbluebutton-html5/imports/ui/components/app/service.js b/bigbluebutton-html5/imports/ui/components/app/service.js index a806641e876b28cb4f64fb41cc192aa3361a39b2..0c66e3d843651f0ec8c4195fb578860b99d6a207 100755 --- a/bigbluebutton-html5/imports/ui/components/app/service.js +++ b/bigbluebutton-html5/imports/ui/components/app/service.js @@ -8,7 +8,6 @@ import Cursor from '/imports/api/cursor'; import Polls from '/imports/api/polls'; function setCredentials(nextState, replace) { - console.log('4Head'); if (nextState && nextState.params.authToken) { const { meetingID, userID, authToken } = nextState.params; Auth.setCredentials(meetingID, userID, authToken); @@ -31,6 +30,8 @@ function subscribeForData() { subNames.forEach(name => subs.push(subscribeFor(name))); dataSubscriptions = subs; + + Auth.setLogOut(); return subs; };