Skip to content
Snippets Groups Projects
Commit 945b54bc authored by Agate's avatar Agate :speech_balloon:
Browse files

Merge branch '1183-shortcuts' into 'develop'

Fix #1183: use p instead of space for play/pause

Closes #1183

See merge request funkwhale/funkwhale!1195
parents 3533ba88 9680222c
No related branches found
No related tags found
No related merge requests found
...@@ -70,20 +70,6 @@ export default { ...@@ -70,20 +70,6 @@ export default {
}, },
] ]
}, },
// space.prevent.exact="togglePlay"
// ctrl.shift.left.prevent.exact="previous"
// ctrl.shift.right.prevent.exact="next"
// shift.down.prevent.exact="$store.commit('player/incrementVolume', -0.1)"
// shift.up.prevent.exact="$store.commit('player/incrementVolume', 0.1)"
// right.prevent.exact="seek (5)"
// left.prevent.exact="seek (-5)"
// shift.right.prevent.exact="seek (30)"
// shift.left.prevent.exact="seek (-30)"
// m.prevent.exact="toggleMute"
// l.prevent.exact="$store.commit('player/toggleLooping')"
// s.prevent.exact="shuffle"
// f.prevent.exact="$store.dispatch('favorites/toggle', currentTrack.id)"
// q.prevent.exact="clean"
player () { player () {
return [ return [
...@@ -91,7 +77,7 @@ export default { ...@@ -91,7 +77,7 @@ export default {
title: this.$pgettext('Popup/Keyboard shortcuts/Title', 'Audio player shortcuts'), title: this.$pgettext('Popup/Keyboard shortcuts/Title', 'Audio player shortcuts'),
shortcuts: [ shortcuts: [
{ {
key: 'space', key: 'p',
summary: this.$pgettext('Popup/Keyboard shortcuts/Table.Label/Verb', 'Pause/play the current track') summary: this.$pgettext('Popup/Keyboard shortcuts/Table.Label/Verb', 'Pause/play the current track')
}, },
{ {
......
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
</div> </div>
</div> </div>
<GlobalEvents <GlobalEvents
@keydown.space.prevent.exact="togglePlay" @keydown.p.prevent.exact="togglePlay"
@keydown.ctrl.shift.left.prevent.exact="previous" @keydown.ctrl.shift.left.prevent.exact="previous"
@keydown.ctrl.shift.right.prevent.exact="next" @keydown.ctrl.shift.right.prevent.exact="next"
@keydown.shift.down.prevent.exact="$store.commit('player/incrementVolume', -0.1)" @keydown.shift.down.prevent.exact="$store.commit('player/incrementVolume', -0.1)"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment