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

Fixes issue with unable to open second dialog on wrong room key entered. Still tests to come. Handle dialog action after the dialog is closed, otherwise the event for wrong key can come before the dialog is closed and will not be open again.

This commit is contained in:
Damian Minkov 2014-10-24 16:33:48 +03:00
parent b35e8aaf93
commit a55e3f5d9d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app.js
View File

@ -855,6 +855,10 @@ $(document).bind('passwordrequired.muc', function (event, jid) {
'<input id="lockKey" type="text" placeholder="password" autofocus>',
true,
"Ok",
function (e, v, m, f) {},
function (event) {
document.getElementById('lockKey').focus();
},
function (e, v, m, f) {
if (v) {
var lockKey = document.getElementById('lockKey');
@ -863,9 +867,6 @@ $(document).bind('passwordrequired.muc', function (event, jid) {
connection.emuc.doJoin(jid, lockKey.value);
}
}
},
function (event) {
document.getElementById('lockKey').focus();
}
);
});

7
message_handler.js
View File

@ -24,8 +24,10 @@ var messageHandler = (function(my) {
* @param leftButton the fist button's text
* @param submitFunction function to be called on submit
* @param loadedFunction function to be called after the prompt is fully loaded
* @param closeFunction function to be called after the prompt is closed
*/
my.openTwoButtonDialog = function(titleString, msgString, persistent, leftButton, submitFunction, loadedFunction) {
my.openTwoButtonDialog = function(titleString, msgString, persistent, leftButton,
submitFunction, loadedFunction, closeFunction) {
var buttons = {};
buttons[leftButton] = true;
buttons.Cancel = false;
@ -35,7 +37,8 @@ var messageHandler = (function(my) {
buttons: buttons,
defaultButton: 1,
loaded: loadedFunction,
submit: submitFunction
submit: submitFunction,
close: closeFunction
});
};