andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git could be a bit more user friendly imho

Browse Source
This commit is contained in:
woutervanwijk 2013-12-28 16:26:52 +01:00
parent 63400a7fca
commit 75c6a535ea
6 changed files with 1 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flatclient/css/webclient.css
View File

@ -316,21 +316,13 @@
.currenttrack2 { .currenttrack2 {
background-image: url('../images/icons/play_alt_12x12.png'); background-image: url('../images/icons/play_alt_12x12.png');
background-repeat: no-repeat; background-repeat: no-repeat;
<<<<<<< HEAD
background-position: 4px center;
=======
background-position: 4px 51%; background-position: 4px 51%;
>>>>>>> develop
} }
.currenttrack { .currenttrack {
background-image: url('../images/icons/play_alt_16x16.png'); background-image: url('../images/icons/play_alt_16x16.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-color: #eee; background-color: #eee;
<<<<<<< HEAD
background-position: 6px center;
=======
background-position: 4px 50%; background-position: 4px 50%;
>>>>>>> develop
} }
.currenttrack2 a { .currenttrack2 a {
@ -592,18 +584,13 @@ a {
} }
/* disable text selection for mouse swipe */ /* disable text selection for mouse swipe */
<<<<<<< HEAD
=======
>>>>>>> develop
body * { body * {
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
-o-user-select: none; -o-user-select: none;
user-select: none; user-select: none;
<<<<<<< HEAD
=======
} }
/* but fix for text input (safari certainly needs it)*/ /* but fix for text input (safari certainly needs it)*/
input[type=text] { input[type=text] {
@ -611,5 +598,4 @@ input[type=text] {
-webkit-user-select: text; -webkit-user-select: text;
-o-user-select: text; -o-user-select: text;
user-select: text; user-select: text;
>>>>>>> develop
} }

11
flatclient/index.html
View File

@ -51,11 +51,7 @@
<body> <body>
<div data-role="page" id="page" class="ui-responsive-panel" data-theme="c"> <div data-role="page" id="page" class="ui-responsive-panel" data-theme="c">
<<<<<<< HEAD
<div data-role="panel" id="panel" data-position="left" data-theme="a" data-display="reveal"> <!-- data-position-fixed="true"> -->
=======
<div data-role="panel" id="panel" data-position="left" data-theme="a" data-display="reveal" data-position-fixed="true"> <div data-role="panel" id="panel" data-position="left" data-theme="a" data-display="reveal" data-position-fixed="true">
>>>>>>> develop
<ul class="ui-listview mainNav" data-role="listview" data-theme="a"> <ul class="ui-listview mainNav" data-role="listview" data-theme="a">
@ -88,13 +84,10 @@
<span class="navtxt"> Exit Fullscreen </span><i class="fa fa-desktop"></i></a> <span class="navtxt"> Exit Fullscreen </span><i class="fa fa-desktop"></i></a>
</li> </li>
<<<<<<< HEAD
=======
<li id="navshutdown" data-icon="false"> <li id="navshutdown" data-icon="false">
<a href="system.html" data-rel="dialog" data-transition="slidedown"> <a href="system.html" data-rel="dialog" data-transition="slidedown">
<span class="navtxt">System </span><i class="fa fa-power-off"></i></a> <span class="navtxt">System </span><i class="fa fa-power-off"></i></a>
</li> </li>
>>>>>>> develop
<li id="" data-icon="false"> <li id="" data-icon="false">
<div><!-- slider for volume --> <div><!-- slider for volume -->
<a href="#" onclick="doMute(); return false;"><img id="mutebt" src="images/icons/volume_16x12.png" alt=""/></a> <a href="#" onclick="doMute(); return false;"><img id="mutebt" src="images/icons/volume_16x12.png" alt=""/></a>
@ -333,11 +326,7 @@
<div data-role="footer" data-tap-toggle="false" data-position="fixed" id="normalFooter"> <div data-role="footer" data-tap-toggle="false" data-position="fixed" id="normalFooter">
<div id="songinfo" class=""> <div id="songinfo" class="">
<<<<<<< HEAD
<img id="infocover" src="images/icons/cd_32x32.png" width="36" height="36"/>
=======
<a href="#"><img id="infocover" src="images/icons/cd_32x32.png" width="36" height="36"/></a> <a href="#"><img id="infocover" src="images/icons/cd_32x32.png" width="36" height="36"/></a>
>>>>>>> develop
<div class="songinfo-text"> <div class="songinfo-text">
<div id="infoname"></div> <div id="infoname"></div>

31
flatclient/js/controls.js vendored
View File

@ -65,11 +65,7 @@ function playTrack(addtoqueue) {
} }
mopidy.playback.play(); //tracks[selected]); mopidy.playback.play(); //tracks[selected]);
<<<<<<< HEAD
console.log(selected);
=======
//console.log(selected); //console.log(selected);
>>>>>>> develop
return false; return false;
} }
@ -79,10 +75,7 @@ function playTrack(addtoqueue) {
* @returns {boolean} * @returns {boolean}
*/ */
function playTrackByUri(uri, playlisturi){ function playTrackByUri(uri, playlisturi){
<<<<<<< HEAD
=======
//console.log('playuri'); //console.log('playuri');
>>>>>>> develop
//stop directly, for user feedback //stop directly, for user feedback
mopidy.playback.stop(true); mopidy.playback.stop(true);
mopidy.tracklist.clear(); mopidy.tracklist.clear();
@ -119,11 +112,7 @@ function playTrackByUri(uri, playlisturi){
} }
mopidy.playback.play(); //tracks[selected]); mopidy.playback.play(); //tracks[selected]);
<<<<<<< HEAD
console.log(selected);
=======
// console.log(selected); // console.log(selected);
>>>>>>> develop
return false; return false;
} }
@ -138,10 +127,7 @@ function playTrackByUri(uri, playlisturi){
* @returns {boolean} * @returns {boolean}
*/ */
function playTrackQueueByUri(uri, playlisturi){ function playTrackQueueByUri(uri, playlisturi){
<<<<<<< HEAD
=======
//console.log('playqu'); //console.log('playqu');
>>>>>>> develop
//stop directly, for user feedback //stop directly, for user feedback
//console.log('qu'); //console.log('qu');
mopidy.playback.stop(true); mopidy.playback.stop(true);
@ -160,11 +146,7 @@ function playTrackQueueByUri(uri, playlisturi){
} }
mopidy.playback.play(); //currentplaylist[track]); mopidy.playback.play(); //currentplaylist[track]);
<<<<<<< HEAD
console.log(track, currentplaylist[track]);
=======
//console.log(track, currentplaylist[track]); //console.log(track, currentplaylist[track]);
>>>>>>> develop
return false; return false;
} }
@ -282,15 +264,10 @@ function setRandom(nwrandom) {
function doRandom() { function doRandom() {
if (random == false) { if (random == false) {
<<<<<<< HEAD
mopidy.playback.setRandom(true).then();
} else {
=======
// mopidy.tracklist.setRandom(true).then(); // mopidy.tracklist.setRandom(true).then();
mopidy.playback.setRandom(true).then(); mopidy.playback.setRandom(true).then();
} else { } else {
//mopidy.tracklist.setRandom(false).then(); //mopidy.tracklist.setRandom(false).then();
>>>>>>> develop
mopidy.playback.setRandom(false).then(); mopidy.playback.setRandom(false).then();
} }
setRandom(!random); setRandom(!random);
@ -298,15 +275,10 @@ function doRandom() {
function doRepeat() { function doRepeat() {
if (repeat == false) { if (repeat == false) {
<<<<<<< HEAD
mopidy.playback.setRepeat(true).then();
} else {
=======
//mopidy.tracklist.setRepeat(true).then(); //mopidy.tracklist.setRepeat(true).then();
mopidy.playback.setRepeat(true).then(); mopidy.playback.setRepeat(true).then();
} else { } else {
//mopidy.tracklist.setRepeat(false).then(); //mopidy.tracklist.setRepeat(false).then();
>>>>>>> develop
mopidy.playback.setRepeat(false).then(); mopidy.playback.setRepeat(false).then();
} }
setRepeat(!repeat); setRepeat(!repeat);
@ -554,8 +526,6 @@ function saveRadioStations() {
$.cookie('radioStations', radioStations); $.cookie('radioStations', radioStations);
} }
<<<<<<< HEAD
=======
function haltSystem() { function haltSystem() {
window.history.back(); window.history.back();
$.post("/haltSystem"); $.post("/haltSystem");
@ -567,4 +537,3 @@ function rebootSystem() {
$.post("/rebootSystem"); $.post("/rebootSystem");
toast('Rebooting...', 3000); toast('Rebooting...', 3000);
} }
>>>>>>> develop

46
flatclient/js/functionsvars.js
View File

@ -135,11 +135,7 @@ function albumTracksToTable(pl, target, uri) {
for (var i = 0; i < pl.length; i++) { for (var i = 0; i < pl.length; i++) {
popupData[pl[i].uri] = pl[i]; popupData[pl[i].uri] = pl[i];
liID = targetmin + '-' + pl[i].uri; liID = targetmin + '-' + pl[i].uri;
<<<<<<< HEAD
tmp += renderSongLi(pl[i], liID, uri);
=======
tmp += renderSongLi(pl[i], liID, uri, 'playTrackByUri'); tmp += renderSongLi(pl[i], liID, uri, 'playTrackByUri');
>>>>>>> develop
//child = '<li id="' + targetmin + '-' + pl[i].uri + '"><a href="#" onclick="return popupTracks(event, \'' + uri + '\',\'' + pl[i].uri + '\');">'; //child = '<li id="' + targetmin + '-' + pl[i].uri + '"><a href="#" onclick="return popupTracks(event, \'' + uri + '\',\'' + pl[i].uri + '\');">';
// child += '<p style="float:right; display: inline;">' + timeFromSeconds(pl[i].length / 1000) + '</p><h1>' + pl[i].name + '</h1></a></li>'; // child += '<p style="float:right; display: inline;">' + timeFromSeconds(pl[i].length / 1000) + '</p><h1>' + pl[i].name + '</h1></a></li>';
@ -150,23 +146,7 @@ function albumTracksToTable(pl, target, uri) {
$(target).attr('data', uri); $(target).attr('data', uri);
} }
<<<<<<< HEAD
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){ function renderSongLi(song, liID, uri, playlistType){
>>>>>>> develop
songLi = '<li class="song albumli" id="' + liID + '">' + songLi = '<li class="song albumli" id="' + liID + '">' +
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\');">' + '<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\');">' +
'<i class="fa fa-ellipsis-vertical"></i>' + '<i class="fa fa-ellipsis-vertical"></i>' +
@ -179,22 +159,12 @@ function renderSongLi(song, liID, uri, playlistType){
} }
function resultsToTables(results, target, 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); // console.log(target);
if (target == '#currenttable') { if (target == '#currenttable') {
>>>>>>> develop
playlistType = 'playTrackQueueByUri'; playlistType = 'playTrackQueueByUri';
} else { } else {
playlistType = 'playTrackByUri'; playlistType = 'playTrackByUri';
} }
<<<<<<< HEAD
// console.log(playlistType);
=======
>>>>>>> develop
var newalbum = []; var newalbum = [];
var nexturi = ''; var nexturi = '';
@ -257,17 +227,6 @@ function resultsToTables(results, target, uri) {
html += '<li class="albumdivider">'; html += '<li class="albumdivider">';
html += '<a href="#" onclick="return showAlbum(\'' + results[i].album.uri + '\');"><img id="' + html += '<a href="#" onclick="return showAlbum(\'' + results[i].album.uri + '\');"><img id="' +
targetmin + '-cover-' + i + '" class="artistcover" width="30" height="30" /><h1>' + results[i].album.name + '</h1><p>'; targetmin + '-cover-' + i + '" class="artistcover" width="30" height="30" /><h1>' + results[i].album.name + '</h1><p>';
<<<<<<< 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) ? '' : ' / ';
//stop after 3
if (j > 2) {
child += '...';
break;
}
}
=======
if (results[i].album.artists) { if (results[i].album.artists) {
for (j = 0; j < results[i].album.artists.length; j++) { for (j = 0; j < results[i].album.artists.length; j++) {
html += results[i].album.artists[j].name; html += results[i].album.artists[j].name;
@ -279,7 +238,6 @@ function resultsToTables(results, target, uri) {
} }
} }
} }
>>>>>>> develop
html += '</p></a></li>'; html += '</p></a></li>';
for (j = 0; j < newalbum.length; j++) { for (j = 0; j < newalbum.length; j++) {
popupData[newalbum[j].uri] = newalbum[j]; popupData[newalbum[j].uri] = newalbum[j];
@ -287,11 +245,7 @@ function resultsToTables(results, target, uri) {
//hERE! //hERE!
var liID = targetmin + '-' + newalbum[j].uri; var liID = targetmin + '-' + newalbum[j].uri;
<<<<<<< HEAD
html+= renderSongLi(newalbum[j], liID, uri);
=======
html+= renderSongLi(newalbum[j], liID, uri, playlistType); html+= renderSongLi(newalbum[j], liID, uri, playlistType);
>>>>>>> develop
//html += '<li class="albumli" id="' + targetmin + '-' + newalbum[j].uri + '"><a href="#" onclick="return popupTracks(event, \'' + uri + '\',\'' + newalbum[j].uri + '\');">'; //html += '<li class="albumli" id="' + targetmin + '-' + newalbum[j].uri + '"><a href="#" onclick="return popupTracks(event, \'' + uri + '\',\'' + newalbum[j].uri + '\');">';
//html += '<p class="pright">' + timeFromSeconds(newalbum[j].length / 1000) + '</p><h1>' + newalbum[j].name + '</h1></a></li>'; //html += '<p class="pright">' + timeFromSeconds(newalbum[j].length / 1000) + '</p><h1>' + newalbum[j].name + '</h1></a></li>';

29
flatclient/js/gui.js
View File

@ -380,12 +380,9 @@ function updateStatusOfAll() {
mopidy.playback.getTimePosition().then(processCurrentposition, console.error); mopidy.playback.getTimePosition().then(processCurrentposition, console.error);
mopidy.playback.getState().then(processPlaystate, console.error); mopidy.playback.getState().then(processPlaystate, console.error);
<<<<<<< HEAD
=======
// mopidy.tracklist.getRepeat().then(processRepeat, console.error); // mopidy.tracklist.getRepeat().then(processRepeat, console.error);
// mopidy.tracklist.getRandom().then(processRandom, console.error); // mopidy.tracklist.getRandom().then(processRandom, console.error);
>>>>>>> develop
mopidy.playback.getRepeat().then(processRepeat, console.error); mopidy.playback.getRepeat().then(processRepeat, console.error);
mopidy.playback.getRandom().then(processRandom, console.error); mopidy.playback.getRandom().then(processRandom, console.error);
@ -490,10 +487,7 @@ $(document).ready(function(event) {
switchContent("playlists"); switchContent("playlists");
} }
<<<<<<< HEAD
=======
>>>>>>> develop
initgui = false; initgui = false;
window.onhashchange = locationHashChanged; window.onhashchange = locationHashChanged;
// Log all events // Log all events
@ -515,23 +509,12 @@ $(document).ready(function(event) {
//navigation temporary, rewrite this! //navigation temporary, rewrite this!
<<<<<<< HEAD
$('#normalFooter').click(
function() {
if(!$(event.target).is("#playimg"))
{return switchContent('nowPlaying')} }
);
$('#nowPlayingpane, #controlspopupimage').click(
function() {return switchContent('current')}
);
=======
$('#songinfo').click( $('#songinfo').click(
function() function()
{return switchContent('nowPlaying')} ); {return switchContent('nowPlaying')} );
$('#controlspopupimage').click( $('#controlspopupimage').click(
function() { function() {
return switchContent('current')} ); return switchContent('current')} );
>>>>>>> develop
$('#navEnterFullscreen').click(function(){ $('#navEnterFullscreen').click(function(){
enterFullscreen(); enterFullscreen();
}); });
@ -574,23 +557,12 @@ $(document).ready(function(event) {
$('#navExitFullscreen').hide(); $('#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. $.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.verticalDistanceThreshold = 50; // (default: 75px) Swipe vertical displacement must be less than this.
// $.event.special.swipe.scrollSupressionThreshold = 20; // $.event.special.swipe.scrollSupressionThreshold = 20;
$.event.special.swipe.durationThreshold = 500; $.event.special.swipe.durationThreshold = 500;
// swipe songinfo and panel // 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( "swiperight", doPrevious );
$( "#normalFooter, #nowPlayingFooter" ).on( "swipeleft", doNext ); $( "#normalFooter, #nowPlayingFooter" ).on( "swipeleft", doNext );
$( "#nowPlayingpane, .ui-body-c, #header, #panel, .pane" ).on( "swiperight", function() { $( "#nowPlayingpane, .ui-body-c, #header, #panel, .pane" ).on( "swiperight", function() {
@ -615,4 +587,3 @@ function debug() {
setTimeout(debug, 100); setTimeout(debug, 100);
} }
} }
>>>>>>> develop

8
flatclient/js/library.js
View File

@ -46,11 +46,7 @@ function processSearchResults(resultArr) {
var results = {'tracks': [], 'artists': [], 'albums': []}; var results = {'tracks': [], 'artists': [], 'albums': []};
var emptyResult = true; var emptyResult = true;
<<<<<<< HEAD
console.log(resultArr, 'resultArr');
=======
// console.log(resultArr, 'resultArr'); // console.log(resultArr, 'resultArr');
>>>>>>> develop
for (var i = 0; i < resultArr.length; ++i) { for (var i = 0; i < resultArr.length; ++i) {
for (var prop in results) { for (var prop in results) {
@ -138,12 +134,8 @@ function processSearchResults(resultArr) {
$('#expandsearch').show(); $('#expandsearch').show();
// Track results // Track results
<<<<<<< HEAD
playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
=======
// playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache'); // playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
resultsToTables(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache'); resultsToTables(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
>>>>>>> develop
setSongInfo(); setSongInfo();
showLoading(false); showLoading(false);