hitting enter in the password field should log you in

This commit is contained in:
ansuz 2017-01-31 17:29:32 +01:00
parent f605fd3dde
commit d93086a92d
1 changed files with 14 additions and 141 deletions

View File

@ -6,6 +6,11 @@ define([
'/customize/languageSelector.js', '/customize/languageSelector.js',
'/bower_components/jquery/dist/jquery.min.js', '/bower_components/jquery/dist/jquery.min.js',
], function (Messages, Config, Cryptpad, LilUri, LS) { ], function (Messages, Config, Cryptpad, LilUri, LS) {
if (Cryptpad.isLoggedIn()) {
document.location.href = '/drive';
return;
}
var $ = window.$; var $ = window.$;
var USE_TABLE = Config.USE_HOMEPAGE_TABLE; var USE_TABLE = Config.USE_HOMEPAGE_TABLE;
@ -25,19 +30,13 @@ define([
'/slide/': Messages.type.slide, '/slide/': Messages.type.slide,
}; };
var $table;
var $tbody;
var $tryit;
var now = new Date(); var now = new Date();
var hasRecent = false; var hasRecent = false;
var forgetPad = Cryptpad.forgetPad;
var displayCreateButtons = function () { var displayCreateButtons = function () {
var $parent = $('#buttons'); var $parent = $('#buttons');
Config.availablePadTypes.forEach(function (el) { Config.availablePadTypes.forEach(function (el) {
$('#create-' + el)//.detach().appendTo($parent) $('#create-' + el).attr('target', '_blank').show();
.attr('target', '_blank').show();
}); });
}; };
@ -51,115 +50,6 @@ define([
$sel.find('.cryptpad-dropdown').hide(); $sel.find('.cryptpad-dropdown').hide();
}); });
var makeRecentPadsTable = function (recentPads) {
if (!recentPads.length) { return; }
$('tbody tr').each(function (i, e) {
if (!i) { return; }
$(this).remove();
});
recentPads.some(function (pad, index) {
if (!pad) { return; }
hasRecent = true;
// split up the uri
var uri = LilUri(pad.href);
// derive the name
var name = padTypes[uri.path()];
var title = pad.title || uri.parts.hash.slice(0,8);
var shortTitle = Cryptpad.truncate(pad.title, 48);
var date = new Date(pad.atime).toLocaleDateString();
var created = new Date(pad.ctime).toLocaleDateString();
if (date === now.toLocaleDateString()) {
date = new Date(pad.atime).toLocaleTimeString().replace(/ /g, '');
}
var id = 'pad-'+index;
var $row = $('<tr>', {
id: id
});
var $remove = $('<td>', {
'class': 'remove',
title: Messages.forget + " '"+shortTitle + "'"
}).text('✖').click(function () {
Cryptpad.confirm(Messages.forgetPrompt + ' (' + Cryptpad.fixHTML(shortTitle) + ')', function (yes) {
if (!yes) { return; }
forgetPad(pad.href, function (err, data) {
if (err) {
console.log("Unable to forget pad");
console.log(err);
return;
}
$row.fadeOut(750, function () {
$row.remove();
if (!$table.find('tr').find('td').length) {
$table.remove();
$tryit.text(Messages.tryIt);
}
});
});
});
});
var readOnly = false;
if (pad.href.indexOf('#') !== -1) {
var modeArray = pad.href.split('#')[1].split('/');
if (modeArray.length >= 3 && modeArray[2] === 'view') {
readOnly = true;
}
}
var readOnlyText = readOnly ? '(' + Messages.readonly + ') ' : '';
$row
.append($('<td>').text(name))
.append($('<td>').append(readOnlyText).append($('<a>', {
href: pad.href,
title: pad.title,
target: '_blank',
}).text(shortTitle)))
.append($('<td>').text(created))
.append($('<td>').text(date))
.append($remove);
$tbody.append($row);
});
};
var refreshTable = function () {
Cryptpad.getRecentPads(function (err, recentPads) {
if (err) {
console.log("unable to get recent pads");
console.error(err);
return;
}
if (recentPads.length) {
recentPads.sort(Cryptpad.mostRecent);
$('iframe').attr('style', '');
$tryit.removeAttr('data-localization');
$tryit.text(Messages.recentPadsIframe);
if (USE_TABLE) {
makeRecentPadsTable(recentPads);
}
}
if (USE_TABLE && hasRecent) {
$('table').attr('style', '');
// Race condition here, this is triggered before the localization in HTML
// so we have to remove the data-localization attr
$tryit.removeAttr('data-localization');
$tryit.text(Messages.recentPads);
}
});
};
var addButtonHandlers = function () { var addButtonHandlers = function () {
$('button.login').click(function (e) { $('button.login').click(function (e) {
var username = $('#name').val(); var username = $('#name').val();
@ -198,34 +88,17 @@ define([
scrollTop: $('#tryit').offset().top scrollTop: $('#tryit').offset().top
}, 500); }, 500);
}); });
var $passwd = $('#password');
$passwd.on('keyup', function (e) {
if (e.which !== 13) { return; } // enter
$('button.login').click();
});
}; };
displayCreateButtons(); displayCreateButtons();
//Cryptpad.ready(function () {
console.log("ready");
if (Cryptpad.isLoggedIn()) { addButtonHandlers();
document.location.href = '/drive'; console.log("ready");
}
addButtonHandlers();
$table = $('table.scroll');
$tbody = $table.find('tbody');
$tryit = $('#tryit');
Cryptpad.styleAlerts();
//refreshTable();
/*
if (Cryptpad.store && Cryptpad.store.change) {
Cryptpad.store.change(function (data) {
if (data.key === 'CryptPad_RECENTPADS') {
refreshTable();
}
});
}
*/
//});
}); });