haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Editions in PR

This commit is contained in:
Ilya Daynatovich 2016-11-05 17:13:47 +02:00
parent 7a2eca3706
commit 62713bf87c
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/UI/invite/Invite.js
View File

@ -68,7 +68,7 @@ class Invite {
// will be marked as locked. // will be marked as locked.
if (!pass) if (!pass)
this.setLockedFromElsewhere(false); this.setLockedFromElsewhere(false);
this.conference.join(roomLocker.password); this.conference.join(pass);
}); });
}); });
} }

6
modules/UI/invite/RequirePasswordDialog.js
View File

@ -76,7 +76,7 @@ export default class RequirePasswordDialog {
let submitFunction = this._submitFunction.bind(this); let submitFunction = this._submitFunction.bind(this);
let closeFunction = this._closeFunction.bind(this); let closeFunction = this._closeFunction.bind(this);
APP.UI.messageHandler.openTwoButtonDialog({ this._dialog = APP.UI.messageHandler.openTwoButtonDialog({
titleKey, titleKey,
msgString, msgString,
leftButtonKey: "dialog.Ok", leftButtonKey: "dialog.Ok",
@ -153,7 +153,9 @@ export default class RequirePasswordDialog {
* Close the dialog * Close the dialog
*/ */
close() { close() {
APP.UI.messageHandler.closeDialog(); if (this._dialog) {
this._dialog.close();
}
this.isOpened = false; this.isOpened = false;
} }
} }

7
modules/UI/util/MessageHandler.js
View File

@ -338,13 +338,6 @@ var messageHandler = {
}; };
}, },
/**
* Closes currently opened dialog.
*/
closeDialog: function () {
$.prompt.close();
},
/** /**
* Shows a dialog with different states to the user. * Shows a dialog with different states to the user.
* *