瀏覽代碼

Moves 'callSipButtonClicked' method to Toolbar.js in order to fix 'sharedKey' undefined error.

master
paweldomas 10 年之前
父節點
當前提交
8d5e50c0ca
共有 4 個檔案被更改,包括 59 行新增31 行删除
  1. 0
    26
      app.js
  2. 28
    1
      libs/modules/UI.bundle.js
  3. 3
    3
      libs/rayo.js
  4. 28
    1
      modules/UI/toolbars/Toolbar.js

+ 0
- 26
app.js 查看文件

973
     }
973
     }
974
 );
974
 );
975
 
975
 
976
-function callSipButtonClicked()
977
-{
978
-    var defaultNumber
979
-        = config.defaultSipNumber ? config.defaultSipNumber : '';
980
-
981
-    UI.messageHandler.openTwoButtonDialog(null,
982
-        '<h2>Enter SIP number</h2>' +
983
-            '<input id="sipNumber" type="text"' +
984
-            ' value="' + defaultNumber + '" autofocus>',
985
-        false,
986
-        "Dial",
987
-        function (e, v, m, f) {
988
-            if (v) {
989
-                var numberInput = document.getElementById('sipNumber');
990
-                if (numberInput.value) {
991
-                    connection.rayo.dial(
992
-                        numberInput.value, 'fromnumber', roomName);
993
-                }
994
-            }
995
-        },
996
-        function (event) {
997
-            document.getElementById('sipNumber').focus();
998
-        }
999
-    );
1000
-}
1001
-
1002
 function hangup() {
976
 function hangup() {
1003
     disposeConference();
977
     disposeConference();
1004
     sessionTerminated = true;
978
     sessionTerminated = true;

+ 28
- 1
libs/modules/UI.bundle.js 查看文件

2922
 
2922
 
2923
 module.exports = ToolbarToggler;
2923
 module.exports = ToolbarToggler;
2924
 },{}],17:[function(require,module,exports){
2924
 },{}],17:[function(require,module,exports){
2925
-/* global $, buttonClick, config, lockRoom,  Moderator,
2925
+/* global $, buttonClick, config, lockRoom,  Moderator, roomName,
2926
    setSharedKey, sharedKey, Util */
2926
    setSharedKey, sharedKey, Util */
2927
 var messageHandler = require("../util/MessageHandler");
2927
 var messageHandler = require("../util/MessageHandler");
2928
 var BottomToolbar = require("./BottomToolbar");
2928
 var BottomToolbar = require("./BottomToolbar");
3065
     window.open("mailto:?subject=" + subject + "&body=" + body, '_blank');
3065
     window.open("mailto:?subject=" + subject + "&body=" + body, '_blank');
3066
 }
3066
 }
3067
 
3067
 
3068
+function callSipButtonClicked()
3069
+{
3070
+    var defaultNumber
3071
+        = config.defaultSipNumber ? config.defaultSipNumber : '';
3072
+
3073
+    messageHandler.openTwoButtonDialog(null,
3074
+        '<h2>Enter SIP number</h2>' +
3075
+        '<input id="sipNumber" type="text"' +
3076
+        ' value="' + defaultNumber + '" autofocus>',
3077
+        false,
3078
+        "Dial",
3079
+        function (e, v, m, f) {
3080
+            if (v) {
3081
+                var numberInput = document.getElementById('sipNumber');
3082
+                if (numberInput.value) {
3083
+                    connection.rayo.dial(
3084
+                        numberInput.value, 'fromnumber',
3085
+                        roomName, sharedKey);
3086
+                }
3087
+            }
3088
+        },
3089
+        function (event) {
3090
+            document.getElementById('sipNumber').focus();
3091
+        }
3092
+    );
3093
+}
3094
+
3068
 var Toolbar = (function (my) {
3095
 var Toolbar = (function (my) {
3069
 
3096
 
3070
     my.init = function () {
3097
     my.init = function () {

+ 3
- 3
libs/rayo.js 查看文件

18
         {
18
         {
19
             console.info("Rayo IQ", iq);
19
             console.info("Rayo IQ", iq);
20
         },
20
         },
21
-        dial: function (to, from, roomName)
21
+        dial: function (to, from, roomName, roomPass)
22
         {
22
         {
23
             var self = this;
23
             var self = this;
24
             var req = $iq(
24
             var req = $iq(
39
                     value: roomName
39
                     value: roomName
40
                 }).up();
40
                 }).up();
41
 
41
 
42
-            if (sharedKey !== null && sharedKey.length) {
42
+            if (roomPass !== null && roomPass.length) {
43
 
43
 
44
                 req.c('header',
44
                 req.c('header',
45
                     {
45
                     {
46
                         name: 'JvbRoomPassword',
46
                         name: 'JvbRoomPassword',
47
-                        value: sharedKey
47
+                        value: roomPass
48
                     }).up();
48
                     }).up();
49
             }
49
             }
50
 
50
 

+ 28
- 1
modules/UI/toolbars/Toolbar.js 查看文件

1
-/* global $, buttonClick, config, lockRoom,  Moderator,
1
+/* global $, buttonClick, config, lockRoom,  Moderator, roomName,
2
    setSharedKey, sharedKey, Util */
2
    setSharedKey, sharedKey, Util */
3
 var messageHandler = require("../util/MessageHandler");
3
 var messageHandler = require("../util/MessageHandler");
4
 var BottomToolbar = require("./BottomToolbar");
4
 var BottomToolbar = require("./BottomToolbar");
141
     window.open("mailto:?subject=" + subject + "&body=" + body, '_blank');
141
     window.open("mailto:?subject=" + subject + "&body=" + body, '_blank');
142
 }
142
 }
143
 
143
 
144
+function callSipButtonClicked()
145
+{
146
+    var defaultNumber
147
+        = config.defaultSipNumber ? config.defaultSipNumber : '';
148
+
149
+    messageHandler.openTwoButtonDialog(null,
150
+        '<h2>Enter SIP number</h2>' +
151
+        '<input id="sipNumber" type="text"' +
152
+        ' value="' + defaultNumber + '" autofocus>',
153
+        false,
154
+        "Dial",
155
+        function (e, v, m, f) {
156
+            if (v) {
157
+                var numberInput = document.getElementById('sipNumber');
158
+                if (numberInput.value) {
159
+                    connection.rayo.dial(
160
+                        numberInput.value, 'fromnumber',
161
+                        roomName, sharedKey);
162
+                }
163
+            }
164
+        },
165
+        function (event) {
166
+            document.getElementById('sipNumber').focus();
167
+        }
168
+    );
169
+}
170
+
144
 var Toolbar = (function (my) {
171
 var Toolbar = (function (my) {
145
 
172
 
146
     my.init = function () {
173
     my.init = function () {

Loading…
取消
儲存