haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1106 from jitsi/disabled-sidepanels-load 

Disables loading side panels when they are disabled.
This commit is contained in:
yanas 2016-11-02 18:16:13 -05:00 committed by GitHub
parent 6eb767ba11 f6609524ea
commit f02f050e56
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conference.js
View File

@ -514,7 +514,8 @@ export default {
this.isDesktopSharingEnabled = this.isDesktopSharingEnabled =
JitsiMeetJS.isDesktopSharingEnabled(); JitsiMeetJS.isDesktopSharingEnabled();
APP.UI.ContactList = new ContactList(room); if (UIUtil.isButtonEnabled('contacts'))
APP.UI.ContactList = new ContactList(room);
// if user didn't give access to mic or camera or doesn't have // if user didn't give access to mic or camera or doesn't have
// them at all, we disable corresponding toolbar buttons // them at all, we disable corresponding toolbar buttons

15
modules/UI/UI.js
View File

@ -203,7 +203,8 @@ UI.showChatError = function (err, msg) {
* @param {string} displayName new nickname * @param {string} displayName new nickname
*/ */
UI.changeDisplayName = function (id, displayName) { UI.changeDisplayName = function (id, displayName) {
UI.ContactList.onDisplayNameChange(id, displayName); if (UI.ContactList)
UI.ContactList.onDisplayNameChange(id, displayName);
VideoLayout.onDisplayNameChanged(id, displayName); VideoLayout.onDisplayNameChanged(id, displayName);
if (APP.conference.isLocalId(id) || id === 'localVideoContainer') { if (APP.conference.isLocalId(id) || id === 'localVideoContainer') {
@ -249,7 +250,8 @@ UI.setLocalRaisedHandStatus = (raisedHandStatus) => {
UI.initConference = function () { UI.initConference = function () {
let id = APP.conference.getMyUserId(); let id = APP.conference.getMyUserId();
// Add myself to the contact list. // Add myself to the contact list.
UI.ContactList.addContact(id, true); if (UI.ContactList)
UI.ContactList.addContact(id, true);
// Update default button states before showing the toolbar // Update default button states before showing the toolbar
// if local role changes buttons state will be again updated. // if local role changes buttons state will be again updated.
@ -559,7 +561,8 @@ UI.addUser = function (user) {
var id = user.getId(); var id = user.getId();
var displayName = user.getDisplayName(); var displayName = user.getDisplayName();
UI.hideRingOverLay(); UI.hideRingOverLay();
UI.ContactList.addContact(id); if (UI.ContactList)
UI.ContactList.addContact(id);
messageHandler.notify( messageHandler.notify(
displayName,'notify.somebody', 'connected', 'notify.connected' displayName,'notify.somebody', 'connected', 'notify.connected'
@ -586,7 +589,8 @@ UI.addUser = function (user) {
* @param {string} displayName user nickname * @param {string} displayName user nickname
*/ */
UI.removeUser = function (id, displayName) { UI.removeUser = function (id, displayName) {
UI.ContactList.removeContact(id); if (UI.ContactList)
UI.ContactList.removeContact(id);
messageHandler.notify( messageHandler.notify(
displayName,'notify.somebody', 'disconnected', 'notify.disconnected' displayName,'notify.somebody', 'disconnected', 'notify.disconnected'
@ -838,7 +842,8 @@ UI.dockToolbar = function (isDock) {
*/ */
function changeAvatar(id, avatarUrl) { function changeAvatar(id, avatarUrl) {
VideoLayout.changeUserAvatar(id, avatarUrl); VideoLayout.changeUserAvatar(id, avatarUrl);
UI.ContactList.changeUserAvatar(id, avatarUrl); if (UI.ContactList)
UI.ContactList.changeUserAvatar(id, avatarUrl);
if (APP.conference.isLocalId(id)) { if (APP.conference.isLocalId(id)) {
Profile.changeAvatar(avatarUrl); Profile.changeAvatar(avatarUrl);
} }

13
modules/UI/side_pannels/SidePanels.js
View File

@ -2,17 +2,22 @@ import Chat from './chat/Chat';
import SettingsMenu from './settings/SettingsMenu'; import SettingsMenu from './settings/SettingsMenu';
import Profile from './profile/Profile'; import Profile from './profile/Profile';
import ContactListView from './contactlist/ContactListView'; import ContactListView from './contactlist/ContactListView';
import UIUtil from '../util/UIUtil';
const SidePanels = { const SidePanels = {
init (eventEmitter) { init (eventEmitter) {
//Initialize chat //Initialize chat
Chat.init(eventEmitter); if (UIUtil.isButtonEnabled('chat'))
Chat.init(eventEmitter);
//Initialize settings //Initialize settings
SettingsMenu.init(eventEmitter); if (UIUtil.isButtonEnabled('settings'))
SettingsMenu.init(eventEmitter);
//Initialize profile //Initialize profile
Profile.init(eventEmitter); if (UIUtil.isButtonEnabled('profile'))
Profile.init(eventEmitter);
//Initialize contact list view //Initialize contact list view
ContactListView.init(); if (UIUtil.isButtonEnabled('contacts'))
ContactListView.init();
} }
}; };