From 8d5e50c0ca718065d64ee2a62df27f6c9194e419 Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Fri, 9 Jan 2015 11:18:58 +0100
Subject: [PATCH] Moves 'callSipButtonClicked' method to Toolbar.js in order to
 fix 'sharedKey' undefined error.

---
 app.js                         | 26 --------------------------
 libs/modules/UI.bundle.js      | 29 ++++++++++++++++++++++++++++-
 libs/rayo.js                   |  6 +++---
 modules/UI/toolbars/Toolbar.js | 29 ++++++++++++++++++++++++++++-
 4 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/app.js b/app.js
index 9bdd95b9a..be608869e 100644
--- a/app.js
+++ b/app.js
@@ -973,32 +973,6 @@ $(document).bind('fatalError.jingle',
     }
 );
 
-function callSipButtonClicked()
-{
-    var defaultNumber
-        = config.defaultSipNumber ? config.defaultSipNumber : '';
-
-    UI.messageHandler.openTwoButtonDialog(null,
-        '<h2>Enter SIP number</h2>' +
-            '<input id="sipNumber" type="text"' +
-            ' value="' + defaultNumber + '" autofocus>',
-        false,
-        "Dial",
-        function (e, v, m, f) {
-            if (v) {
-                var numberInput = document.getElementById('sipNumber');
-                if (numberInput.value) {
-                    connection.rayo.dial(
-                        numberInput.value, 'fromnumber', roomName);
-                }
-            }
-        },
-        function (event) {
-            document.getElementById('sipNumber').focus();
-        }
-    );
-}
-
 function hangup() {
     disposeConference();
     sessionTerminated = true;
diff --git a/libs/modules/UI.bundle.js b/libs/modules/UI.bundle.js
index df85f861d..c0ba77ddc 100644
--- a/libs/modules/UI.bundle.js
+++ b/libs/modules/UI.bundle.js
@@ -2922,7 +2922,7 @@ var ToolbarToggler = {
 
 module.exports = ToolbarToggler;
 },{}],17:[function(require,module,exports){
-/* global $, buttonClick, config, lockRoom,  Moderator,
+/* global $, buttonClick, config, lockRoom,  Moderator, roomName,
    setSharedKey, sharedKey, Util */
 var messageHandler = require("../util/MessageHandler");
 var BottomToolbar = require("./BottomToolbar");
@@ -3065,6 +3065,33 @@ function inviteParticipants() {
     window.open("mailto:?subject=" + subject + "&body=" + body, '_blank');
 }
 
+function callSipButtonClicked()
+{
+    var defaultNumber
+        = config.defaultSipNumber ? config.defaultSipNumber : '';
+
+    messageHandler.openTwoButtonDialog(null,
+        '<h2>Enter SIP number</h2>' +
+        '<input id="sipNumber" type="text"' +
+        ' value="' + defaultNumber + '" autofocus>',
+        false,
+        "Dial",
+        function (e, v, m, f) {
+            if (v) {
+                var numberInput = document.getElementById('sipNumber');
+                if (numberInput.value) {
+                    connection.rayo.dial(
+                        numberInput.value, 'fromnumber',
+                        roomName, sharedKey);
+                }
+            }
+        },
+        function (event) {
+            document.getElementById('sipNumber').focus();
+        }
+    );
+}
+
 var Toolbar = (function (my) {
 
     my.init = function () {
diff --git a/libs/rayo.js b/libs/rayo.js
index e719dde6b..3298093f8 100644
--- a/libs/rayo.js
+++ b/libs/rayo.js
@@ -18,7 +18,7 @@ Strophe.addConnectionPlugin('rayo',
         {
             console.info("Rayo IQ", iq);
         },
-        dial: function (to, from, roomName)
+        dial: function (to, from, roomName, roomPass)
         {
             var self = this;
             var req = $iq(
@@ -39,12 +39,12 @@ Strophe.addConnectionPlugin('rayo',
                     value: roomName
                 }).up();
 
-            if (sharedKey !== null && sharedKey.length) {
+            if (roomPass !== null && roomPass.length) {
 
                 req.c('header',
                     {
                         name: 'JvbRoomPassword',
-                        value: sharedKey
+                        value: roomPass
                     }).up();
             }
 
diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index 8d0d122f3..d163889a8 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -1,4 +1,4 @@
-/* global $, buttonClick, config, lockRoom,  Moderator,
+/* global $, buttonClick, config, lockRoom,  Moderator, roomName,
    setSharedKey, sharedKey, Util */
 var messageHandler = require("../util/MessageHandler");
 var BottomToolbar = require("./BottomToolbar");
@@ -141,6 +141,33 @@ function inviteParticipants() {
     window.open("mailto:?subject=" + subject + "&body=" + body, '_blank');
 }
 
+function callSipButtonClicked()
+{
+    var defaultNumber
+        = config.defaultSipNumber ? config.defaultSipNumber : '';
+
+    messageHandler.openTwoButtonDialog(null,
+        '<h2>Enter SIP number</h2>' +
+        '<input id="sipNumber" type="text"' +
+        ' value="' + defaultNumber + '" autofocus>',
+        false,
+        "Dial",
+        function (e, v, m, f) {
+            if (v) {
+                var numberInput = document.getElementById('sipNumber');
+                if (numberInput.value) {
+                    connection.rayo.dial(
+                        numberInput.value, 'fromnumber',
+                        roomName, sharedKey);
+                }
+            }
+        },
+        function (event) {
+            document.getElementById('sipNumber').focus();
+        }
+    );
+}
+
 var Toolbar = (function (my) {
 
     my.init = function () {