Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-28 12:16:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #3066 from marc1006/shortcuts

Browse source 
Fix shortcuts list and support card shortcuts when hovering a card
This commit is contained in:
Lauri Ojansivu 2020-04-29 16:32:59 +03:00 • committed by GitHub
commit e42adcaed0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
client/lib/keyboard.js
View file

@ -1,6 +1,16 @@
// XXX There is no reason to define these shortcuts globally, they should be
// attached to a template (most of them will go in the `board` template).
function getHoveredCardId() {
const card = $('.js-minicard:hover').get(0);
if (!card) return null;
return Blaze.getData(card)._id;
}
function getSelectedCardId() {
return Session.get('selectedCard') || getHoveredCardId();
}
Mousetrap.bind('?', () => {
FlowRouter.go('shortcuts');
});
@ -50,9 +60,9 @@ Mousetrap.bind(['down', 'up'], (evt, key) => {
}
});
// XXX This shortcut should also work when hovering over a card in board view
Mousetrap.bind('space', evt => {
if (!Session.get('currentCard')) {
const cardId = getSelectedCardId();
if (!cardId) {
return;
}
@ -62,7 +72,7 @@ Mousetrap.bind('space', evt => {
}
if (Meteor.user().isBoardMember()) {
const card = Cards.findOne(Session.get('currentCard'));
const card = Cards.findOne(cardId);
card.toggleMember(currentUserId);
// We should prevent scrolling in card when spacebar is clicked
// This should do it according to Mousetrap docs, but it doesn't
@ -70,9 +80,9 @@ Mousetrap.bind('space', evt => {
}
});
// XXX This shortcut should also work when hovering over a card in board view
Mousetrap.bind('c', evt => {
if (!Session.get('currentCard')) {
const cardId = getSelectedCardId();
if (!cardId) {
return;
}
@ -86,7 +96,7 @@ Mousetrap.bind('c', evt => {
!Meteor.user().isCommentOnly() &&
!Meteor.user().isWorker()
) {
const card = Cards.findOne(Session.get('currentCard'));
const card = Cards.findOne(cardId);
card.archive();
// We should prevent scrolling in card when spacebar is clicked
// This should do it according to Mousetrap docs, but it doesn't
@ -97,19 +107,19 @@ Mousetrap.bind('c', evt => {
Template.keyboardShortcuts.helpers({
mapping: [
{
keys: ['W'],
keys: ['w'],
action: 'shortcut-toggle-sidebar',
},
{
keys: ['Q'],
keys: ['q'],
action: 'shortcut-filter-my-cards',
},
{
keys: ['F'],
keys: ['f'],
action: 'shortcut-toggle-filterbar',
},
{
keys: ['X'],
keys: ['x'],
action: 'shortcut-clear-filters',
},
{
@ -129,7 +139,7 @@ Template.keyboardShortcuts.helpers({
action: 'shortcut-assign-self',
},
{
keys: ['C'],
keys: ['c'],
action: 'archive-card',
},
],