Editions in PR

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);
                 });
             });
     }

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;
     }
 }

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.
      *