From 62713bf87caccba3969602e97d521488df7aba5e Mon Sep 17 00:00:00 2001
From: Ilya Daynatovich <shupuercha@gmail.com>
Date: Sat, 5 Nov 2016 17:13:47 +0200
Subject: [PATCH] Editions in PR

---
 modules/UI/invite/Invite.js                | 2 +-
 modules/UI/invite/RequirePasswordDialog.js | 6 ++++--
 modules/UI/util/MessageHandler.js          | 7 -------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/UI/invite/Invite.js b/modules/UI/invite/Invite.js
index 7cc821e01..7a786b9fa 100644
--- a/modules/UI/invite/Invite.js
+++ b/modules/UI/invite/Invite.js
@@ -68,7 +68,7 @@ class Invite {
                     // will be marked as locked.
                     if (!pass)
                         this.setLockedFromElsewhere(false);
-                    this.conference.join(roomLocker.password);
+                    this.conference.join(pass);
                 });
             });
     }
diff --git a/modules/UI/invite/RequirePasswordDialog.js b/modules/UI/invite/RequirePasswordDialog.js
index 0dcdf8240..be612d3e0 100644
--- a/modules/UI/invite/RequirePasswordDialog.js
+++ b/modules/UI/invite/RequirePasswordDialog.js
@@ -76,7 +76,7 @@ export default class RequirePasswordDialog {
             let submitFunction = this._submitFunction.bind(this);
             let closeFunction = this._closeFunction.bind(this);
 
-            APP.UI.messageHandler.openTwoButtonDialog({
+            this._dialog = APP.UI.messageHandler.openTwoButtonDialog({
                 titleKey,
                 msgString,
                 leftButtonKey: "dialog.Ok",
@@ -153,7 +153,9 @@ export default class RequirePasswordDialog {
      * Close the dialog
      */
     close() {
-        APP.UI.messageHandler.closeDialog();
+        if (this._dialog) {
+            this._dialog.close();
+        }
         this.isOpened = false;
     }
 }
\ No newline at end of file
diff --git a/modules/UI/util/MessageHandler.js b/modules/UI/util/MessageHandler.js
index 2f63abbf4..e52c5fa60 100644
--- a/modules/UI/util/MessageHandler.js
+++ b/modules/UI/util/MessageHandler.js
@@ -338,13 +338,6 @@ var messageHandler = {
         };
     },
 
-    /**
-     * Closes currently opened dialog.
-     */
-    closeDialog: function () {
-        $.prompt.close();
-    },
-
     /**
      * Shows a dialog with different states to the user.
      *