+=======
+
+>>>>>>> develop
-
@@ -84,6 +88,13 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
-
@@ -322,7 +333,11 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
diff --git a/flatclient/js/controls.js b/flatclient/js/controls.js index 5a98519..fff562c 100755 --- a/flatclient/js/controls.js +++ b/flatclient/js/controls.js @@ -65,7 +65,11 @@ function playTrack(addtoqueue) { } mopidy.playback.play(); //tracks[selected]); +<<<<<<< HEAD console.log(selected); +======= + //console.log(selected); +>>>>>>> develop return false; } @@ -75,6 +79,10 @@ function playTrack(addtoqueue) { * @returns {boolean} */ function playTrackByUri(uri, playlisturi){ +<<<<<<< HEAD +======= + //console.log('playuri'); +>>>>>>> develop //stop directly, for user feedback mopidy.playback.stop(true); mopidy.tracklist.clear(); @@ -111,7 +119,11 @@ function playTrackByUri(uri, playlisturi){ } mopidy.playback.play(); //tracks[selected]); +<<<<<<< HEAD console.log(selected); +======= +// console.log(selected); +>>>>>>> develop return false; } @@ -126,6 +138,10 @@ function playTrackByUri(uri, playlisturi){ * @returns {boolean} */ function playTrackQueueByUri(uri, playlisturi){ +<<<<<<< HEAD +======= + //console.log('playqu'); +>>>>>>> develop //stop directly, for user feedback //console.log('qu'); mopidy.playback.stop(true); @@ -144,7 +160,11 @@ function playTrackQueueByUri(uri, playlisturi){ } mopidy.playback.play(); //currentplaylist[track]); +<<<<<<< HEAD console.log(track, currentplaylist[track]); +======= + //console.log(track, currentplaylist[track]); +>>>>>>> develop return false; } @@ -262,8 +282,15 @@ function setRandom(nwrandom) { function doRandom() { if (random == false) { +<<<<<<< HEAD mopidy.playback.setRandom(true).then(); } else { +======= +// mopidy.tracklist.setRandom(true).then(); + mopidy.playback.setRandom(true).then(); + } else { + //mopidy.tracklist.setRandom(false).then(); +>>>>>>> develop mopidy.playback.setRandom(false).then(); } setRandom(!random); @@ -271,8 +298,15 @@ function doRandom() { function doRepeat() { if (repeat == false) { +<<<<<<< HEAD mopidy.playback.setRepeat(true).then(); } else { +======= + //mopidy.tracklist.setRepeat(true).then(); + mopidy.playback.setRepeat(true).then(); + } else { + //mopidy.tracklist.setRepeat(false).then(); +>>>>>>> develop mopidy.playback.setRepeat(false).then(); } setRepeat(!repeat); @@ -520,3 +554,17 @@ function saveRadioStations() { $.cookie('radioStations', radioStations); } +<<<<<<< HEAD +======= +function haltSystem() { + window.history.back(); + $.post("/haltSystem"); + toast('Stopping system...', 3000); +} + +function rebootSystem() { + window.history.back(); + $.post("/rebootSystem"); + toast('Rebooting...', 3000); +} +>>>>>>> develop diff --git a/flatclient/js/functionsvars.js b/flatclient/js/functionsvars.js index a7bdaf5..edded35 100755 --- a/flatclient/js/functionsvars.js +++ b/flatclient/js/functionsvars.js @@ -135,7 +135,11 @@ function albumTracksToTable(pl, target, uri) { for (var i = 0; i < pl.length; i++) { popupData[pl[i].uri] = pl[i]; liID = targetmin + '-' + pl[i].uri; +<<<<<<< HEAD tmp += renderSongLi(pl[i], liID, uri); +======= + tmp += renderSongLi(pl[i], liID, uri, 'playTrackByUri'); +>>>>>>> develop //child = '- '; // child += '
'; @@ -146,6 +150,7 @@ function albumTracksToTable(pl, target, uri) { $(target).attr('data', uri); } +<<<<<<< HEAD function renderSongLi(song, liID, uri){ var hash = document.location.hash.split('?'); //this is so dirty... ... ... @@ -159,6 +164,9 @@ function renderSongLi(song, liID, uri){ // console.log(playlistType); // songLi = ''; +======= +function renderSongLi(song, liID, uri, playlistType){ +>>>>>>> develop songLi = '' + timeFromSeconds(pl[i].length / 1000) + '
' + pl[i].name + '
- ' + '' + '' + @@ -171,14 +179,22 @@ function renderSongLi(song, liID, uri){ } function resultsToTables(results, target, uri) { +<<<<<<< HEAD var hash = document.location.hash.split('?'); var divid = hash[0].substr(1), playlistType; if (divid == 'current') { +======= +// console.log(target); + if (target == '#currenttable') { +>>>>>>> develop playlistType = 'playTrackQueueByUri'; } else { playlistType = 'playTrackByUri'; } +<<<<<<< HEAD // console.log(playlistType); +======= +>>>>>>> develop var newalbum = []; var nexturi = ''; @@ -241,6 +257,7 @@ function resultsToTables(results, target, uri) { html += '
- '; html += '
'; for (j = 0; j < newalbum.length; j++) { popupData[newalbum[j].uri] = newalbum[j]; @@ -257,7 +287,11 @@ function resultsToTables(results, target, uri) { //hERE! var liID = targetmin + '-' + newalbum[j].uri; +<<<<<<< HEAD html+= renderSongLi(newalbum[j], liID, uri); +======= + html+= renderSongLi(newalbum[j], liID, uri, playlistType); +>>>>>>> develop //html += '' + results[i].album.name + '
'; +<<<<<<< HEAD for (j = 0; j < results[i].album.artists.length; j++) { html += results[i].album.artists[j].name; html += (j == results[i].album.artists.length - 1) ? '' : ' / '; @@ -250,6 +267,19 @@ function resultsToTables(results, target, uri) { break; } } +======= + if (results[i].album.artists) { + for (j = 0; j < results[i].album.artists.length; j++) { + html += results[i].album.artists[j].name; + html += (j == results[i].album.artists.length - 1) ? '' : ' / '; + //stop after 3 + if (j > 2) { + child += '...'; + break; + } + } + } +>>>>>>> develop html += '
- '; //html += '
'; diff --git a/flatclient/js/gui.js b/flatclient/js/gui.js index f9d41c2..1b07075 100755 --- a/flatclient/js/gui.js +++ b/flatclient/js/gui.js @@ -380,6 +380,12 @@ function updateStatusOfAll() { mopidy.playback.getTimePosition().then(processCurrentposition, console.error); mopidy.playback.getState().then(processPlaystate, console.error); +<<<<<<< HEAD +======= +// mopidy.tracklist.getRepeat().then(processRepeat, console.error); +// mopidy.tracklist.getRandom().then(processRandom, console.error); + +>>>>>>> develop mopidy.playback.getRepeat().then(processRepeat, console.error); mopidy.playback.getRandom().then(processRandom, console.error); @@ -484,6 +490,10 @@ $(document).ready(function(event) { switchContent("playlists"); } +<<<<<<< HEAD +======= + +>>>>>>> develop initgui = false; window.onhashchange = locationHashChanged; // Log all events @@ -505,6 +515,7 @@ $(document).ready(function(event) { //navigation temporary, rewrite this! +<<<<<<< HEAD $('#normalFooter').click( function() { if(!$(event.target).is("#playimg")) @@ -513,6 +524,14 @@ $(document).ready(function(event) { $('#nowPlayingpane, #controlspopupimage').click( function() {return switchContent('current')} ); +======= + $('#songinfo').click( + function() + {return switchContent('nowPlaying')} ); + $('#controlspopupimage').click( + function() { + return switchContent('current')} ); +>>>>>>> develop $('#navEnterFullscreen').click(function(){ enterFullscreen(); }); @@ -555,14 +574,45 @@ $(document).ready(function(event) { $('#navExitFullscreen').hide(); } +<<<<<<< HEAD $.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. +>>>>>>> develop $.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; // swipe songinfo and panel +<<<<<<< HEAD $( "#normalFooter" ).on( "swiperight", doPrevious ); $( "#normalFooter" ).on( "swipeleft", doNext ); $( "#page, #header, #panel, .pane" ).on( "swiperight", function() { $("#panel").panel("open") } ); $( "#page, #header, #panel, .pane" ).on( "swipeleft", function() { $("#panel").panel("close") }); }); +======= + $( "#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")) { + $("#panel").panel("open"); + 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(); } + } ); + +//mopidy.on("state:online", debug); + +}); + +function debug() { + if (mopidy.tracklist === undefined) { + alert('Broke at ' + new Date()); + } else { + setTimeout(debug, 100); + } +} +>>>>>>> develop diff --git a/flatclient/js/library.js b/flatclient/js/library.js index 29814d8..c72277d 100755 --- a/flatclient/js/library.js +++ b/flatclient/js/library.js @@ -46,7 +46,11 @@ function processSearchResults(resultArr) { var results = {'tracks': [], 'artists': [], 'albums': []}; var emptyResult = true; +<<<<<<< HEAD console.log(resultArr, 'resultArr'); +======= +// console.log(resultArr, 'resultArr'); +>>>>>>> develop for (var i = 0; i < resultArr.length; ++i) { for (var prop in results) { @@ -134,7 +138,12 @@ function processSearchResults(resultArr) { $('#expandsearch').show(); // Track results +<<<<<<< HEAD playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache'); +======= +// playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache'); + resultsToTables(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache'); +>>>>>>> develop setSongInfo(); showLoading(false); diff --git a/flatclient/settings/favicon.png b/flatclient/settings/favicon.png new file mode 100644 index 0000000..a214c91 Binary files /dev/null and b/flatclient/settings/favicon.png differ diff --git a/flatclient/settings/index.html b/flatclient/settings/index.html new file mode 100644 index 0000000..367e4fc --- /dev/null +++ b/flatclient/settings/index.html @@ -0,0 +1,29 @@ + + + + +' + timeFromSeconds(newalbum[j].length / 1000) + '
' + newalbum[j].name + '
Mopidy Settings + + + +++ + diff --git a/flatclient/settings/mopidy.css b/flatclient/settings/mopidy.css new file mode 100644 index 0000000..c504276 --- /dev/null +++ b/flatclient/settings/mopidy.css @@ -0,0 +1,75 @@ +html { + background: #e8ecef; + color: #555; + font-family: "Droid Serif", "Georgia", "Times New Roman", "Palatino", + "Hoefler Text", "Baskerville", serif; + font-size: 150%; + line-height: 1.4em; +} +body { + max-width: 20em; + margin: 0 auto; +} +div.box { + background: white; + border-radius: 5px; + box-shadow: 5px 5px 5px #d8dcdf; + margin: 2em 0; + padding: 1em; +} +div.box.focus { + background: #465158; + color: #e8ecef; +} +div.icon { + float: right; +} +h1, h2 { + font-family: "Ubuntu", "Arial", "Helvetica", "Lucida Grande", + "Verdana", "Gill Sans", sans-serif; + line-height: 1.1em; +} +h2 { + margin: 0.2em 0 0; +} +p.next { + text-align: right; +} +a { + color: #555; + text-decoration: none; + border-bottom: 1px dotted; +} +img { + border: 0; +} +code, pre { + font-family: "Droid Sans Mono", Menlo, Courier New, Courier, Mono, monospace; + font-size: 9pt; + line-height: 1.2em; + padding: 0.5em 1em; + margin: 1em 0; + white-space: pre; + overflow: auto; +} +.box code, +.box pre { + background: #e8ecef; + color: #555; +} +.box a { + color: #465158; +} +.box a:hover { + opacity: 0.8; +} +.box.focus a { + color: #e8ecef; +} +.center { + text-align: center; +} +#ws-console { + height: 200px; + overflow: auto; +} diff --git a/flatclient/system.html b/flatclient/system.html new file mode 100755 index 0000000..ad78bf0 --- /dev/null +++ b/flatclient/system.html @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + +Settings
+Spotify
+Please provide your username, password to enable playing music from Spotify.
+ + - '; // child += '