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

Improve keyboard shortcuts in the pad creation screen

Browse Source
This commit is contained in:
yflory
2018-03-08 12:16:40 +01:00
parent 2bcf28bb34
commit cbd29794b8
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
www/common/common-ui-elements.js
View File

@@ -1804,6 +1804,7 @@ define([
}; };
// Owned pads // Owned pads
// Default is Owned pad
var owned = h('div.cp-creation-owned', [ var owned = h('div.cp-creation-owned', [
h('h2', [ h('h2', [
Messages.creation_ownedTitle, Messages.creation_ownedTitle,
@@ -1829,7 +1830,7 @@ define([
]); ]);
$creation.append(owned); $creation.append(owned);
// If set to "open pad" or not set, check "open pad" // If set to "open pad", check "open pad"
if (!cfg.owned && typeof cfg.owned !== "undefined") { if (!cfg.owned && typeof cfg.owned !== "undefined") {
$creation.find('#cp-creation-owned-false').attr('checked', true); $creation.find('#cp-creation-owned-false').attr('checked', true);
} }
@@ -1877,6 +1878,16 @@ define([
]) ])
]); ]);
$creation.append(expire); $creation.append(expire);
$creation.find('#cp-creation-expire-val').keydown(function (e) {
if (e.which === 9) {
e.stopPropagation();
}
});
$creation.find('#cp-creation-expire-unit').keydown(function (e) {
if (e.which === 9 && e.shiftKey) {
e.stopPropagation();
}
});
UIElements.setExpirationValue(cfg.expire, $creation); UIElements.setExpirationValue(cfg.expire, $creation);
@@ -1945,6 +1956,7 @@ define([
}); });
var $button = $('<button>').text(Messages.creation_createFromScratch).appendTo($create); var $button = $('<button>').text(Messages.creation_createFromScratch).appendTo($create);
$button.addClass('cp-creation-button-selected');
$button.click(function () { $button.click(function () {
create(); create();
}); });
@@ -1985,7 +1997,7 @@ define([
$spinner[0] $spinner[0]
])).appendTo($creation); ])).appendTo($creation);
var selected = -1; var selected = 0;
var next = function () { var next = function () {
selected = ++selected % $creation.find('button').length; selected = ++selected % $creation.find('button').length;
$creation.find('button').removeClass('cp-creation-button-selected'); $creation.find('button').removeClass('cp-creation-button-selected');

6
www/settings/inner.js
View File

@@ -335,13 +335,13 @@ define([
type: 'radio', type: 'radio',
name: 'cp-creation-owned', name: 'cp-creation-owned',
value: 1, value: 1,
checked: 'checked'
}), }),
h('label', { 'for': 'cp-creation-owned-true' }, Messages.creation_ownedTrue), h('label', { 'for': 'cp-creation-owned-true' }, Messages.creation_ownedTrue),
h('input#cp-creation-owned-false.cp-creation-owned-value', { h('input#cp-creation-owned-false.cp-creation-owned-value', {
type: 'radio', type: 'radio',
name: 'cp-creation-owned', name: 'cp-creation-owned',
value: 0, value: 0,
checked: 'checked'
}), }),
h('label', { 'for': 'cp-creation-owned-false' }, Messages.creation_ownedFalse), h('label', { 'for': 'cp-creation-owned-false' }, Messages.creation_ownedFalse),
h('span.fa.fa-check', {title: Messages.saved}), h('span.fa.fa-check', {title: Messages.saved}),
@@ -364,8 +364,8 @@ define([
}); });
}); });
common.getAttribute(['general', 'creation', 'owned'], function (e, val) { common.getAttribute(['general', 'creation', 'owned'], function (e, val) {
if (val) { if (!val && typeof val !== "undefined") {
$owned.find('#cp-creation-owned-true').attr('checked', true); $owned.find('#cp-creation-owned-false').attr('checked', true);
} }
}); });