From 13c024464388fed85d060edbfe746926f1353a37 Mon Sep 17 00:00:00 2001 From: jcass Date: Fri, 9 Jan 2015 12:19:57 +0200 Subject: [PATCH 1/3] Only block keyboard actions that Pi-MusicBox overrides, instead of all. --- mopidy_musicbox_webclient/static/js/gui.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js index cbbf178..d4dcef7 100644 --- a/mopidy_musicbox_webclient/static/js/gui.js +++ b/mopidy_musicbox_webclient/static/js/gui.js @@ -508,17 +508,19 @@ $(document).ready(function(event) { $(document).keypress( function (event) { //console.log('kp: '+event); - if (event.target.tagName != 'INPUT') { - event.preventDefault(); + if (event.target.tagName != 'INPUT') { switch(event.which) { case 32: doPlay(); + event.preventDefault(); break; case '>': doNext(); + event.preventDefault(); break; case '<': doPrevious(); + event.preventDefault(); break; } return true; From 11b11a855dec5f20f6a79ba226f007b27aa8475b Mon Sep 17 00:00:00 2001 From: jcass Date: Fri, 9 Jan 2015 13:01:29 +0200 Subject: [PATCH 2/3] Translate unicode keys to actual characters to ensure better handling of shortcut keys. --- mopidy_musicbox_webclient/static/js/gui.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js index d4dcef7..2ef16c1 100644 --- a/mopidy_musicbox_webclient/static/js/gui.js +++ b/mopidy_musicbox_webclient/static/js/gui.js @@ -509,8 +509,10 @@ $(document).ready(function(event) { $(document).keypress( function (event) { //console.log('kp: '+event); if (event.target.tagName != 'INPUT') { - switch(event.which) { - case 32: + var unicode=event.keyCode? event.keyCode : event.charCode; + var actualkey=String.fromCharCode(unicode); + switch(actualkey) { + case ' ': doPlay(); event.preventDefault(); break; From cba4e2af62b838bddfc65d93f1d33c6795a241db Mon Sep 17 00:00:00 2001 From: jcass Date: Fri, 9 Jan 2015 15:27:52 +0200 Subject: [PATCH 3/3] Update 'removeTrack' function to use new Mopidy filter format for finding tracks to remove from the tracklist. --- mopidy_musicbox_webclient/static/js/controls.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js index 2a2f6f2..407ef92 100644 --- a/mopidy_musicbox_webclient/static/js/controls.js +++ b/mopidy_musicbox_webclient/static/js/controls.js @@ -236,7 +236,7 @@ function removeTrack() { } var track = {}; track.uri = [currentplaylist[i].uri]; - mopidy.tracklist.remove(track); + mopidy.tracklist.remove({'uri':track.uri}); // console.log(currentplaylist[i].uri); }