web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some bugs in prompts, alerts, confirms

Browse Source
This commit is contained in:
ansuz
2017-09-13 15:52:31 +02:00
parent 0db33d48fc
commit a332168926
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
www/common/common-interface.js
View File

@@ -279,22 +279,25 @@ define([
]); ]);
var listener; var listener;
var close = Util.once(function () { var close = Util.once(function (result, ev) {
$(frame).fadeOut(150, function () { $(this).remove(); }); var $frame = $(frame).fadeOut(150, function () {
stopListening(listener); stopListening(listener);
$frame.remove();
cb(result, ev);
});
}); });
var $ok = $(ok).click(function (ev) { cb(input.value, ev); }); var $ok = $(ok).click(function (ev) { close(input.value, ev); });
var $cancel = $(cancel).click(function (ev) { cb(null, ev); }); var $cancel = $(cancel).click(function (ev) { close(null, ev); });
listener = listenForKeys(function () { // yes listener = listenForKeys(function () { // yes
close(); $ok.click(); $ok.click();
}, function () { // no }, function () { // no
close(); $cancel.click(); $cancel.click();
}); });
document.body.appendChild(frame); document.body.appendChild(frame);
setTimeout(function () { setTimeout(function () {
input.select().focus(); $(input).select().focus();
UI.notify(); UI.notify();
}); });
}; };
@@ -322,13 +325,14 @@ define([
]); ]);
var listener; var listener;
var close = Util.once(function () { var close = Util.once(function (bool, ev) {
$(frame).fadeOut(150, function () { $(this).remove(); }); $(frame).fadeOut(150, function () { $(this).remove(); });
stopListening(listener); stopListening(listener);
cb(bool, ev);
}); });
var $ok = $(ok).click(function (ev) { close(); cb(true, ev); }); var $ok = $(ok).click(function (ev) { close(true, ev); });
var $cancel = $(cancel).click(function (ev) { close(); cb(false, ev); }); var $cancel = $(cancel).click(function (ev) { close(false, ev); });
if (opt.cancelClass) { $cancel.addClass(opt.cancelClass); } if (opt.cancelClass) { $cancel.addClass(opt.cancelClass); }
if (opt.okClass) { $ok.addClass(opt.okClass); } if (opt.okClass) { $ok.addClass(opt.okClass); }