Mirrors/koel
2
0
Fork 0
mirror of https://github.com/koel/koel synced 2024-11-10 06:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 1.1

Browse source
This commit is contained in:
An Phan 2015-12-24 17:03:00 +07:00
commit 32d9afedc7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resources/assets/js/app.vue
View file

@ -67,7 +67,7 @@
/**
* Toggle playback when user presses Space key.
*
* @param object e The keydown event
* @param {Object} e The keydown event
*/
togglePlayback(e) {
if ($(e.target).is('input,textarea,button,select')) {
@ -82,7 +82,7 @@
/**
* Play the prev song when user presses K.
*
* @param object e The keydown event
* @param {Object} e The keydown event
*/
playPrev(e) {
if ($(e.target).is('input,textarea')) {
@ -96,7 +96,7 @@
/**
* Play the next song when user presses J.
*
* @param object e The keydown event
* @param {Object} e The keydown event
*/
playNext(e) {
if ($(e.target).is('input,textarea')) {
@ -110,10 +110,10 @@
/**
* Put focus into the search field when user presses F.
*
* @param object e The keydown event
* @param {Object} e The keydown event
*/
search(e) {
if ($(e.target).is('input,textarea')) {
if ($(e.target).is('input,textarea') || e.metaKey || e.ctrlKey) {
return true;
}
@ -146,7 +146,7 @@
/**
* Load a playlist into the main panel.
*
* @param object playlist The playlist object
* @param {Object} playlist The playlist object
*/
loadPlaylist(playlist) {
this.$broadcast('playlist:load', playlist);