Browse Source

Remove duplicate handler

master
Devin Wilson 10 years ago
parent
commit
d44aed2c11
5 changed files with 12 additions and 20 deletions
  1. 1
    1
      index.html
  2. 6
    10
      libs/app.bundle.js
  3. 4
    0
      modules/RTC/RTC.js
  4. 0
    8
      modules/UI/UI.js
  5. 1
    1
      modules/xmpp/strophe.jingle.js

+ 1
- 1
index.html View File

22
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
22
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
23
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
23
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
24
     <script src="interface_config.js?v=5"></script>
24
     <script src="interface_config.js?v=5"></script>
25
-    <script src="libs/app.bundle.js?v=110"></script>
25
+    <script src="libs/app.bundle.js?v=111"></script>
26
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
26
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
27
     <link rel="stylesheet" href="css/font.css?v=7"/>
27
     <link rel="stylesheet" href="css/font.css?v=7"/>
28
     <link rel="stylesheet" href="css/toastr.css?v=1">
28
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 6
- 10
libs/app.bundle.js View File

884
         APP.xmpp.addListener(XMPPEvents.CALL_INCOMING, function(event) {
884
         APP.xmpp.addListener(XMPPEvents.CALL_INCOMING, function(event) {
885
             DataChannels.init(event.peerconnection, eventEmitter);
885
             DataChannels.init(event.peerconnection, eventEmitter);
886
         });
886
         });
887
+        APP.UI.addListener(UIEvents.SELECTED_ENDPOINT,
888
+            DataChannels.handleSelectedEndpointEvent);
889
+        APP.UI.addListener(UIEvents.PINNED_ENDPOINT,
890
+            DataChannels.handlePinnedEndpointEvent);
887
 
891
 
888
         // In case of IE we continue from 'onReady' callback
892
         // In case of IE we continue from 'onReady' callback
889
         // passed to RTCUtils constructor. It will be invoked by Temasys plugin
893
         // passed to RTCUtils constructor. It will be invoked by Temasys plugin
3108
     = require("../../service/desktopsharing/DesktopSharingEventTypes");
3112
     = require("../../service/desktopsharing/DesktopSharingEventTypes");
3109
 var RTCEvents = require("../../service/RTC/RTCEvents");
3113
 var RTCEvents = require("../../service/RTC/RTCEvents");
3110
 var RTCBrowserType = require("../RTC/RTCBrowserType");
3114
 var RTCBrowserType = require("../RTC/RTCBrowserType");
3111
-var DataChannels = require("../RTC/DataChannels");
3112
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
3115
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
3113
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
3116
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
3114
 var UIEvents = require("../../service/UI/UIEvents");
3117
 var UIEvents = require("../../service/UI/UIEvents");
3393
     APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function() {
3396
     APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function() {
3394
         messageHandler.showError();
3397
         messageHandler.showError();
3395
     });
3398
     });
3396
-    APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function() {
3397
-        messageHandler.showError();
3398
-    });
3399
     APP.xmpp.addListener(XMPPEvents.PROMPT_FOR_LOGIN, function() {
3399
     APP.xmpp.addListener(XMPPEvents.PROMPT_FOR_LOGIN, function() {
3400
         // FIXME: re-use LoginDialog which supports retries
3400
         // FIXME: re-use LoginDialog which supports retries
3401
         UI.showLoginPopup(connect);
3401
         UI.showLoginPopup(connect);
3426
     UI.addListener(UIEvents.NICKNAME_CHANGED, function (nickname) {
3426
     UI.addListener(UIEvents.NICKNAME_CHANGED, function (nickname) {
3427
         APP.xmpp.addToPresence("displayName", nickname);
3427
         APP.xmpp.addToPresence("displayName", nickname);
3428
     });
3428
     });
3429
-    UI.addListener(UIEvents.SELECTED_ENDPOINT,
3430
-        DataChannels.handleSelectedEndpointEvent);
3431
-    UI.addListener(UIEvents.PINNED_ENDPOINT,
3432
-        DataChannels.handlePinnedEndpointEvent);
3433
 }
3429
 }
3434
 
3430
 
3435
 
3431
 
4003
 module.exports = UI;
3999
 module.exports = UI;
4004
 
4000
 
4005
 
4001
 
4006
-},{"../../service/RTC/RTCEvents":99,"../../service/RTC/StreamEventTypes":101,"../../service/UI/UIEvents":102,"../../service/connectionquality/CQEvents":104,"../../service/desktopsharing/DesktopSharingEventTypes":105,"../../service/members/Events":106,"../../service/xmpp/XMPPEvents":108,"../RTC/DataChannels":4,"../RTC/RTCBrowserType":8,"./../settings/Settings":47,"./audio_levels/AudioLevels.js":12,"./authentication/Authentication":14,"./avatar/Avatar":16,"./etherpad/Etherpad.js":17,"./prezi/Prezi.js":18,"./side_pannels/SidePanelToggler":20,"./side_pannels/chat/Chat.js":21,"./side_pannels/contactlist/ContactList":25,"./side_pannels/settings/SettingsMenu":26,"./toolbars/BottomToolbar":27,"./toolbars/Toolbar":28,"./toolbars/ToolbarToggler":29,"./util/MessageHandler":31,"./util/NicknameHandler":32,"./util/UIUtil":33,"./videolayout/VideoLayout.js":39,"./welcome_page/RoomnameGenerator":40,"./welcome_page/WelcomePage":41,"events":109}],12:[function(require,module,exports){
4002
+},{"../../service/RTC/RTCEvents":99,"../../service/RTC/StreamEventTypes":101,"../../service/UI/UIEvents":102,"../../service/connectionquality/CQEvents":104,"../../service/desktopsharing/DesktopSharingEventTypes":105,"../../service/members/Events":106,"../../service/xmpp/XMPPEvents":108,"../RTC/RTCBrowserType":8,"./../settings/Settings":47,"./audio_levels/AudioLevels.js":12,"./authentication/Authentication":14,"./avatar/Avatar":16,"./etherpad/Etherpad.js":17,"./prezi/Prezi.js":18,"./side_pannels/SidePanelToggler":20,"./side_pannels/chat/Chat.js":21,"./side_pannels/contactlist/ContactList":25,"./side_pannels/settings/SettingsMenu":26,"./toolbars/BottomToolbar":27,"./toolbars/Toolbar":28,"./toolbars/ToolbarToggler":29,"./util/MessageHandler":31,"./util/NicknameHandler":32,"./util/UIUtil":33,"./videolayout/VideoLayout.js":39,"./welcome_page/RoomnameGenerator":40,"./welcome_page/WelcomePage":41,"events":109}],12:[function(require,module,exports){
4007
 var CanvasUtil = require("./CanvasUtils");
4003
 var CanvasUtil = require("./CanvasUtils");
4008
 
4004
 
4009
 var ASDrawContext = $('#activeSpeakerAudioLevel')[0].getContext('2d');
4005
 var ASDrawContext = $('#activeSpeakerAudioLevel')[0].getContext('2d');
17531
                         var audioMuted = startMuted.attr("audio");
17527
                         var audioMuted = startMuted.attr("audio");
17532
                         var videoMuted = startMuted.attr("video");
17528
                         var videoMuted = startMuted.attr("video");
17533
                         eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
17529
                         eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
17534
-                                startMuted.attr("audio") === "true", startMuted.attr("video") === "true");
17530
+                                autioMuted === "true", videoMuted === "true");
17535
                     }
17531
                     }
17536
                     sess = new JingleSession(
17532
                     sess = new JingleSession(
17537
                         $(iq).attr('to'), $(iq).find('jingle').attr('sid'),
17533
                         $(iq).attr('to'), $(iq).find('jingle').attr('sid'),

+ 4
- 0
modules/RTC/RTC.js View File

151
         APP.xmpp.addListener(XMPPEvents.CALL_INCOMING, function(event) {
151
         APP.xmpp.addListener(XMPPEvents.CALL_INCOMING, function(event) {
152
             DataChannels.init(event.peerconnection, eventEmitter);
152
             DataChannels.init(event.peerconnection, eventEmitter);
153
         });
153
         });
154
+        APP.UI.addListener(UIEvents.SELECTED_ENDPOINT,
155
+            DataChannels.handleSelectedEndpointEvent);
156
+        APP.UI.addListener(UIEvents.PINNED_ENDPOINT,
157
+            DataChannels.handlePinnedEndpointEvent);
154
 
158
 
155
         // In case of IE we continue from 'onReady' callback
159
         // In case of IE we continue from 'onReady' callback
156
         // passed to RTCUtils constructor. It will be invoked by Temasys plugin
160
         // passed to RTCUtils constructor. It will be invoked by Temasys plugin

+ 0
- 8
modules/UI/UI.js View File

25
     = require("../../service/desktopsharing/DesktopSharingEventTypes");
25
     = require("../../service/desktopsharing/DesktopSharingEventTypes");
26
 var RTCEvents = require("../../service/RTC/RTCEvents");
26
 var RTCEvents = require("../../service/RTC/RTCEvents");
27
 var RTCBrowserType = require("../RTC/RTCBrowserType");
27
 var RTCBrowserType = require("../RTC/RTCBrowserType");
28
-var DataChannels = require("../RTC/DataChannels");
29
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
28
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
30
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
29
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
31
 var UIEvents = require("../../service/UI/UIEvents");
30
 var UIEvents = require("../../service/UI/UIEvents");
310
     APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function() {
309
     APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function() {
311
         messageHandler.showError();
310
         messageHandler.showError();
312
     });
311
     });
313
-    APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function() {
314
-        messageHandler.showError();
315
-    });
316
     APP.xmpp.addListener(XMPPEvents.PROMPT_FOR_LOGIN, function() {
312
     APP.xmpp.addListener(XMPPEvents.PROMPT_FOR_LOGIN, function() {
317
         // FIXME: re-use LoginDialog which supports retries
313
         // FIXME: re-use LoginDialog which supports retries
318
         UI.showLoginPopup(connect);
314
         UI.showLoginPopup(connect);
343
     UI.addListener(UIEvents.NICKNAME_CHANGED, function (nickname) {
339
     UI.addListener(UIEvents.NICKNAME_CHANGED, function (nickname) {
344
         APP.xmpp.addToPresence("displayName", nickname);
340
         APP.xmpp.addToPresence("displayName", nickname);
345
     });
341
     });
346
-    UI.addListener(UIEvents.SELECTED_ENDPOINT,
347
-        DataChannels.handleSelectedEndpointEvent);
348
-    UI.addListener(UIEvents.PINNED_ENDPOINT,
349
-        DataChannels.handlePinnedEndpointEvent);
350
 }
342
 }
351
 
343
 
352
 
344
 

+ 1
- 1
modules/xmpp/strophe.jingle.js View File

120
                         var audioMuted = startMuted.attr("audio");
120
                         var audioMuted = startMuted.attr("audio");
121
                         var videoMuted = startMuted.attr("video");
121
                         var videoMuted = startMuted.attr("video");
122
                         eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
122
                         eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
123
-                                startMuted.attr("audio") === "true", startMuted.attr("video") === "true");
123
+                                autioMuted === "true", videoMuted === "true");
124
                     }
124
                     }
125
                     sess = new JingleSession(
125
                     sess = new JingleSession(
126
                         $(iq).attr('to'), $(iq).find('jingle').attr('sid'),
126
                         $(iq).attr('to'), $(iq).find('jingle').attr('sid'),

Loading…
Cancel
Save