Merge branch 'jcass77-master' into develop

This commit is contained in:
kingosticks 2015-03-04 21:18:18 +00:00
commit 3913ab5947
2 changed files with 9 additions and 5 deletions

View File

@ -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);
}

View File

@ -508,17 +508,21 @@ $(document).ready(function(event) {
$(document).keypress( function (event) {
//console.log('kp: '+event);
if (event.target.tagName != 'INPUT') {
event.preventDefault();
switch(event.which) {
case 32:
if (event.target.tagName != 'INPUT') {
var unicode=event.keyCode? event.keyCode : event.charCode;
var actualkey=String.fromCharCode(unicode);
switch(actualkey) {
case ' ':
doPlay();
event.preventDefault();
break;
case '>':
doNext();
event.preventDefault();
break;
case '<':
doPrevious();
event.preventDefault();
break;
}
return true;