Merge branch 'soon' into staging

This commit is contained in:
ansuz
2017-07-04 14:58:45 +02:00
2 changed files with 22 additions and 0 deletions

View File

@@ -118,6 +118,7 @@ define([
return void Cryptpad.alert(Messages.register_mustAcceptTerms);
}
setTimeout(function () {
Cryptpad.confirm("<h2 class='bright'>" + Messages.register_warning + "</h2>",
function (yes) {
if (!yes) { return; }
@@ -200,6 +201,24 @@ define([
}, true, function ($dialog) {
$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 () {

View File

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