diff --git a/flatclient/index.html b/flatclient/index.html index 8e85f5d..1f85dc3 100755 --- a/flatclient/index.html +++ b/flatclient/index.html @@ -51,7 +51,7 @@
-
+
    @@ -322,7 +322,7 @@
    - +
    diff --git a/flatclient/js/controls.js b/flatclient/js/controls.js index 5a98519..2295923 100755 --- a/flatclient/js/controls.js +++ b/flatclient/js/controls.js @@ -65,7 +65,7 @@ function playTrack(addtoqueue) { } mopidy.playback.play(); //tracks[selected]); - console.log(selected); + //console.log(selected); return false; } @@ -75,6 +75,7 @@ function playTrack(addtoqueue) { * @returns {boolean} */ function playTrackByUri(uri, playlisturi){ + //console.log('playuri'); //stop directly, for user feedback mopidy.playback.stop(true); mopidy.tracklist.clear(); @@ -111,7 +112,7 @@ function playTrackByUri(uri, playlisturi){ } mopidy.playback.play(); //tracks[selected]); - console.log(selected); +// console.log(selected); return false; } @@ -126,6 +127,7 @@ function playTrackByUri(uri, playlisturi){ * @returns {boolean} */ function playTrackQueueByUri(uri, playlisturi){ + //console.log('playqu'); //stop directly, for user feedback //console.log('qu'); mopidy.playback.stop(true); @@ -144,7 +146,7 @@ function playTrackQueueByUri(uri, playlisturi){ } mopidy.playback.play(); //currentplaylist[track]); - console.log(track, currentplaylist[track]); + //console.log(track, currentplaylist[track]); return false; } diff --git a/flatclient/js/functionsvars.js b/flatclient/js/functionsvars.js index a7bdaf5..39ac52b 100755 --- a/flatclient/js/functionsvars.js +++ b/flatclient/js/functionsvars.js @@ -135,7 +135,7 @@ function albumTracksToTable(pl, target, uri) { for (var i = 0; i < pl.length; i++) { popupData[pl[i].uri] = pl[i]; liID = targetmin + '-' + pl[i].uri; - tmp += renderSongLi(pl[i], liID, uri); + tmp += renderSongLi(pl[i], liID, uri, target); //child = '
  • '; // child += '

    ' + timeFromSeconds(pl[i].length / 1000) + '

    ' + pl[i].name + '

    • '; @@ -146,19 +146,7 @@ function albumTracksToTable(pl, target, uri) { $(target).attr('data', uri); } -function renderSongLi(song, liID, uri){ - var hash = document.location.hash.split('?'); - //this is so dirty... ... ... - var playlistType = ''; - var divid = hash[0].substr(1); - if (divid == 'current') { - playlistType = 'playTrackQueueByUri'; - } else { - playlistType = 'playTrackByUri'; - } -// console.log(playlistType); - -// songLi = ''; +function renderSongLi(song, liID, uri, playlistType){ songLi = '
  • ' + '' + '' + @@ -171,14 +159,12 @@ function renderSongLi(song, liID, uri){ } function resultsToTables(results, target, uri) { - var hash = document.location.hash.split('?'); - var divid = hash[0].substr(1), playlistType; - if (divid == 'current') { +// console.log(target); + if (target == '#currenttable') { playlistType = 'playTrackQueueByUri'; } else { playlistType = 'playTrackByUri'; } -// console.log(playlistType); var newalbum = []; var nexturi = ''; @@ -257,7 +243,7 @@ function resultsToTables(results, target, uri) { //hERE! var liID = targetmin + '-' + newalbum[j].uri; - html+= renderSongLi(newalbum[j], liID, uri); + html+= renderSongLi(newalbum[j], liID, uri, playlistType); //html += '
  • '; //html += '

    ' + timeFromSeconds(newalbum[j].length / 1000) + '

    ' + newalbum[j].name + '

    • '; diff --git a/flatclient/js/gui.js b/flatclient/js/gui.js index 3779d91..bbcb3de 100755 --- a/flatclient/js/gui.js +++ b/flatclient/js/gui.js @@ -505,16 +505,12 @@ $(document).ready(function(event) { //navigation temporary, rewrite this! - $('#normalFooter').click( - function() { - if(!$(event.target).is("#playimg")) - {return switchContent('nowPlaying')} } - ); - $('#nowPlayingpane, #nowPlayingFooter, #controlspopupimage').click( + $('#songinfo').click( + function() + {return switchContent('nowPlaying')} ); + $('#controlspopupimage').click( function() { - if(!$(event.target).is("#trackslider")) - return switchContent('current')} - ); + return switchContent('current')} ); $('#navEnterFullscreen').click(function(){ enterFullscreen(); }); @@ -557,7 +553,7 @@ $(document).ready(function(event) { $('#navExitFullscreen').hide(); } - $.event.special.swipe.horizontalDistanceThreshold = 150; // (default: 30px) Swipe horizontal displacement must be more than this. + $.event.special.swipe.horizontalDistanceThreshold = 125; // (default: 30px) Swipe horizontal displacement must be more than this. $.event.special.swipe.verticalDistanceThreshold = 50; // (default: 75px) Swipe vertical displacement must be less than this. // $.event.special.swipe.scrollSupressionThreshold = 20; $.event.special.swipe.durationThreshold = 500; @@ -566,13 +562,13 @@ $(document).ready(function(event) { $( "#normalFooter, #nowPlayingFooter" ).on( "swiperight", doPrevious ); $( "#normalFooter, #nowPlayingFooter" ).on( "swipeleft", doNext ); $( "#nowPlayingpane, .ui-body-c, #header, #panel, .pane" ).on( "swiperight", function() { - if(!$(event.target).is("#normalFooter") && !$(event.target).is("#nowPlayingFooter")) + if(!$(event.target).is("#normalFooter") && !$(event.target).is("#nowPlayingFooter")) { $("#panel").panel("open"); - event.stopImmediatePropagation(); + event.stopImmediatePropagation(); } } ); $( "#nowPlayingpane, .ui-body-c, #header, #panel, .pane" ).on( "swipeleft", function() { - if(!$(event.target).is("#normalFooter") && !$(event.target).is("#nowPlayingFooter")) - $("#panel").panel("close"); - event.stopImmediatePropagation(); + if(!$(event.target).is("#normalFooter") && !$(event.target).is("#nowPlayingFooter")) { + $("#panel").panel("close"); + event.stopImmediatePropagation(); } } ); }); diff --git a/webclient/js/controls.js b/webclient/js/controls.js index e01ed06..df3cf99 100755 --- a/webclient/js/controls.js +++ b/webclient/js/controls.js @@ -45,8 +45,18 @@ function playTrack(addtoqueue) { return false; } -// first add track to be played, then the other tracks + mopidy.tracklist.add(tracks); + + for (var i = 0; i <= selected; i++) { + mopidy.playback.next(); + } + + mopidy.playback.play(); + + +// first add track to be played, then the other tracks +/* // mopidy.tracklist.add(null, 0, playlisturi); mopidy.tracklist.add( tracks.slice(selected, selected + 1) ); //wait .5 second before adding the rest to give server the time to start playing @@ -64,6 +74,7 @@ function playTrack(addtoqueue) { } mopidy.playback.play(); //tracks[selected]); +*/ console.log(selected); return false; }