Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
ansuz
2017-12-15 19:12:00 +01:00
12 changed files with 85 additions and 69 deletions

View File

@@ -55,6 +55,7 @@
};
var stopListening = UI.stopListening = function (handler) {
if (!handler) { return; } // we don't want to stop all the 'keyup' listeners
$(window).off('keyup', handler);
};
@@ -219,7 +220,7 @@
var $cancel = findCancelButton(tagger).click(function (e) {
close(null, e);
});
listenForKeys(function () {
listener = listenForKeys(function () {
$ok.click();
}, function () {
$cancel.click();