do not use members module

2015-12-03 15:11:01 +02:00
parent 272cfea493
commit 09aa9482c0
13 changed files with 929 additions and 1243 deletions
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -27,10 +27,10 @@ var DesktopSharingEventTypes
    = require("../../service/desktopsharing/DesktopSharingEventTypes");
 var StatisticsEvents = require("../../service/statistics/Events");
 var UIEvents = require("../../service/UI/UIEvents");
-var MemberEvents = require("../../service/members/Events");
 var Feedback = require("./Feedback");

 var eventEmitter = new EventEmitter();
+UI.eventEmitter = eventEmitter;
 var roomNode = null;
 var roomName = null;

@@ -94,7 +94,7 @@ function setupChat() {
 }

 function setupToolbars() {
-    Toolbar.init(UI);
+    Toolbar.init(eventEmitter);
    Toolbar.setupButtonsFromConfig();
    BottomToolbar.init(eventEmitter);
 }
@@ -135,7 +135,8 @@ UI.changeDisplayName = function (id, displayName) {
    VideoLayout.onDisplayNameChanged(id, displayName);
 };

-UI.initConference = function (id) {
+UI.initConference = function () {
+    var id = APP.conference.localId;
    Toolbar.updateRoomUrl(window.location.href);
    var meHTML = APP.translation.generateTranslationHTML("me");
    var settings = Settings.getSettings();
@@ -172,21 +173,20 @@ function registerListeners() {
    });

    UI.addListener(UIEvents.EMAIL_CHANGED, function (email) {
-        UI.setUserAvatar(APP.conference.localId(), email);
+        UI.setUserAvatar(APP.conference.localId, email);
    });
 }

-function onResize() {
-    Chat.resizeChat();
-    VideoLayout.resizeLargeVideoContainer();
-}
-
 function bindEvents() {
-    /**
-     * Resizes and repositions videos in full screen mode.
-     */
-    $(document).on('webkitfullscreenchange mozfullscreenchange fullscreenchange',
-        onResize);
+    function onResize() {
+        Chat.resizeChat();
+        VideoLayout.resizeLargeVideoContainer();
+    }
+
+    // Resize and reposition videos in full screen mode.
+    $(document).on(
+        'webkitfullscreenchange mozfullscreenchange fullscreenchange', onResize
+    );

    $(window).resize(onResize);
 }
@@ -386,7 +386,7 @@ UI.addUser = function (jid, id, displayName) {
    );

    if (!config.startAudioMuted ||
-        config.startAudioMuted > APP.members.size())
+        config.startAudioMuted > APP.conference.membersCount)
        UIUtil.playSoundNotification('userJoined');

    // Configure avatar
@@ -404,7 +404,7 @@ UI.removeUser = function (jid) {
        'disconnected',
        'notify.disconnected');
    if (!config.startAudioMuted ||
-        config.startAudioMuted > APP.members.size()) {
+        config.startAudioMuted > APP.conference.membersCount) {
        UIUtil.playSoundNotification('userLeft');
    }

--- a/modules/UI/audio_levels/AudioLevels.js
+++ b/modules/UI/audio_levels/AudioLevels.js
@@ -109,7 +109,7 @@ var AudioLevels = (function(my) {
        drawContext.drawImage(canvasCache, 0, 0);

        if(resourceJid === AudioLevels.LOCAL_LEVEL) {
-            resourceJid = APP.conference.localId();
+            resourceJid = APP.conference.localId;
            if (!resourceJid) {
                return;
            }
@@ -223,11 +223,9 @@ var AudioLevels = (function(my) {
     */
    function getVideoSpanId(resourceJid) {
        var videoSpanId = null;
-        if (resourceJid === AudioLevels.LOCAL_LEVEL ||
-            (APP.conference.localId() && resourceJid === APP.conference.localId())) {
+        if (resourceJid === AudioLevels.LOCAL_LEVEL || APP.conference.isLocalId(resourceJid)) {
            videoSpanId = 'localVideoContainer';
-        }
-        else {
+        } else {
            videoSpanId = 'participant_' + resourceJid;
        }

--- a/modules/UI/side_pannels/contactlist/ContactList.js
+++ b/modules/UI/side_pannels/contactlist/ContactList.js
@@ -171,7 +171,7 @@ var ContactList = {

    onDisplayNameChange: function (id, displayName) {
        if (id === 'localVideoContainer') {
-            id = APP.conference.localId();
+            id = APP.conference.localId;
        }
        var contactName = $('#contacts #' + id + '>p');

--- a/modules/UI/side_pannels/settings/SettingsMenu.js
+++ b/modules/UI/side_pannels/settings/SettingsMenu.js
@@ -36,7 +36,7 @@ var SettingsMenu = {
            }
        });

-        if (APP.conference.isModerator()) {
+        if (APP.conference.isModerator) {
            startMutedSelector.css("display", "block");
        } else {
            startMutedSelector.css("display", "none");
@@ -48,7 +48,7 @@ var SettingsMenu = {
    },

    onRoleChanged: function () {
-        if(APP.conference.isModerator()) {
+        if(APP.conference.isModerator) {
            $("#startMutedOptions").css("display", "block");
        }
        else {
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -1,5 +1,4 @@
-/* global APP, $, buttonClick, config, lockRoom, interfaceConfig, setSharedKey,
- Util */
+/* global APP, $, config, interfaceConfig */
 /* jshint -W101 */
 var messageHandler = require("../util/MessageHandler");
 var BottomToolbar = require("./BottomToolbar");
@@ -12,28 +11,31 @@ var AuthenticationEvents
    = require("../../../service/authentication/AuthenticationEvents");
 var AnalyticsAdapter = require("../../statistics/AnalyticsAdapter");
 var Feedback = require("../Feedback");
+var UIEvents = require("../../../service/UI/UIEvents");

 var roomUrl = null;
 var sharedKey = '';
-var UI = null;
 var recordingToaster = null;
+var emitter = null;

 var buttonHandlers = {
    "toolbar_button_mute": function () {
        if (APP.RTC.localAudio.isMuted()) {
            AnalyticsAdapter.sendEvent('toolbar.audio.unmuted');
+            emitter.emit(UIEvents.AUDIO_MUTED, false);
        } else {
            AnalyticsAdapter.sendEvent('toolbar.audio.muted');
+            emitter.emit(UIEvents.AUDIO_MUTED, true);
        }
-        return APP.conference.toggleAudioMuted();
    },
    "toolbar_button_camera": function () {
        if (APP.RTC.localVideo.isMuted()) {
            AnalyticsAdapter.sendEvent('toolbar.video.enabled');
+            emitter.emit(UIEvents.VIDEO_MUTED, false);
        } else {
            AnalyticsAdapter.sendEvent('toolbar.video.disabled');
+            emitter.emit(UIEvents.VIDEO_MUTED, true);
        }
-        return APP.conference.toggleVideoMuted();
    },
    /*"toolbar_button_authentication": function () {
        return Toolbar.authenticateClicked();
@@ -299,7 +301,7 @@ function callSipButtonClicked() {
                var numberInput = f.sipNumber;
                if (numberInput) {
                    APP.xmpp.dial(
-                        numberInput, 'fromnumber', UI.getRoomName(), sharedKey);
+                        numberInput, 'fromnumber', APP.UI.getRoomName(), sharedKey);
                }
            }
        },
@@ -309,12 +311,12 @@ function callSipButtonClicked() {

 var Toolbar = (function (my) {

-    my.init = function (ui) {
+    my.init = function (eventEmitter) {
+        emitter = eventEmitter;
        UIUtil.hideDisabledButtons(defaultToolbarButtons);

        for(var k in buttonHandlers)
            $("#" + k).click(buttonHandlers[k]);
-        UI = ui;
        // Update login info
        APP.xmpp.addListener(
            AuthenticationEvents.IDENTITY_UPDATED,
@@ -353,12 +355,12 @@ var Toolbar = (function (my) {
        }
        // Get authentication URL
        if (!APP.xmpp.isMUCJoined()) {
-            APP.xmpp.getLoginUrl(UI.getRoomName(), function (url) {
+            APP.xmpp.getLoginUrl(APP.UI.getRoomName(), function (url) {
                // If conference has not been started yet - redirect to login page
                window.location.href = url;
            });
        } else {
-            APP.xmpp.getPopupLoginUrl(UI.getRoomName(), function (url) {
+            APP.xmpp.getPopupLoginUrl(APP.UI.getRoomName(), function (url) {
                // Otherwise - open popup with authentication URL
                var authenticationWindow = Authentication.createAuthenticationWindow(
                    function () {
--- a/modules/UI/toolbars/ToolbarToggler.js
+++ b/modules/UI/toolbars/ToolbarToggler.js
@@ -1,5 +1,4 @@
-/* global APP, config, $, interfaceConfig, Moderator,
- DesktopStreaming.showDesktopSharingButton */
+/* global APP, config, $, interfaceConfig */

 var toolbarTimeoutObject,
    toolbarTimeout = interfaceConfig.INITIAL_TOOLBAR_TIMEOUT,
@@ -75,12 +74,6 @@ var ToolbarToggler = {
            toolbarTimeout = interfaceConfig.TOOLBAR_TIMEOUT;
        }

-        if (APP.conference.isModerator()) {
-//            TODO: Enable settings functionality.
-//                  Need to uncomment the settings button in index.html.
-//            $('#settingsButton').css({visibility:"visible"});
-        }
-
        // Show/hide desktop sharing button
        showDesktopSharingButton();
    },
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -56,9 +56,6 @@ var VideoLayout = (function (my) {
    };

    my.changeLocalAudio = function(stream, isMuted) {
-        if (isMuted) { // FIXME remove this?
-            APP.conference.muteAudio(true);
-        }
        APP.RTC.attachMediaStream($('#localAudio'), stream.getOriginalStream());
        var localAudio = document.getElementById('localAudio');
        // Writing volume not allowed in IE