Merge branch 'soon' into staging

pull/1/head
ansuz 8 years ago
commit 90bcadd87b

@ -118,6 +118,7 @@ define([
return void Cryptpad.alert(Messages.register_mustAcceptTerms); return void Cryptpad.alert(Messages.register_mustAcceptTerms);
} }
setTimeout(function () {
Cryptpad.confirm("<h2 class='bright'>" + Messages.register_warning + "</h2>", Cryptpad.confirm("<h2 class='bright'>" + Messages.register_warning + "</h2>",
function (yes) { function (yes) {
if (!yes) { return; } if (!yes) { return; }
@ -200,6 +201,24 @@ define([
}, true, function ($dialog) { }, true, function ($dialog) {
$dialog.find('> div').addClass('half'); $dialog.find('> div').addClass('half');
}); });
}, 150);
});
var clickRegister = Cryptpad.notAgainForAnother(function () {
$register.click();
}, 500);
$register.on('keypress', function (e) {
e.preventDefault();
e.stopPropagation();
console.error(e.which);
switch (e.which) {
case 13: return clickRegister();
case 13: return clickRegister();
default:
//console.log(e.which);
}
}); });
Test(function () { Test(function () {

@ -239,6 +239,9 @@ div.modal, div#modal {
transition: margin-left 1s; transition: margin-left 1s;
} }
} }
media-tag button {
max-height: none;
}
} }
box-sizing: border-box; box-sizing: border-box;

Loading…
Cancel
Save