git could be a bit more user friendly imho
This commit is contained in:
woutervanwijk
parent
63400a7fca
commit
75c6a535ea
@ -316,21 +316,13 @@
|
||||
.currenttrack2 {
|
||||
background-image: url('../images/icons/play_alt_12x12.png');
|
||||
background-repeat: no-repeat;
|
||||
<<<<<<< HEAD
|
||||
background-position: 4px center;
|
||||
=======
|
||||
background-position: 4px 51%;
|
||||
>>>>>>> develop
|
||||
}
|
||||
.currenttrack {
|
||||
background-image: url('../images/icons/play_alt_16x16.png');
|
||||
background-repeat: no-repeat;
|
||||
background-color: #eee;
|
||||
<<<<<<< HEAD
|
||||
background-position: 6px center;
|
||||
=======
|
||||
background-position: 4px 50%;
|
||||
>>>>>>> develop
|
||||
}
|
||||
|
||||
.currenttrack2 a {
|
||||
@ -592,18 +584,13 @@ a {
|
||||
}
|
||||
|
||||
/* disable text selection for mouse swipe */
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> develop
|
||||
body * {
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
-o-user-select: none;
|
||||
user-select: none;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
}
|
||||
/* but fix for text input (safari certainly needs it)*/
|
||||
input[type=text] {
|
||||
@ -611,5 +598,4 @@ input[type=text] {
|
||||
-webkit-user-select: text;
|
||||
-o-user-select: text;
|
||||
user-select: text;
|
||||
>>>>>>> develop
|
||||
}
|
||||
@ -51,11 +51,7 @@
|
||||
|
||||
<body>
|
||||
<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">
|
||||
>>>>>>> develop
|
||||
|
||||
|
||||
<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>
|
||||
</li>
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<li id="navshutdown" data-icon="false">
|
||||
<a href="system.html" data-rel="dialog" data-transition="slidedown">
|
||||
<span class="navtxt">System </span><i class="fa fa-power-off"></i></a>
|
||||
</li>
|
||||
>>>>>>> develop
|
||||
<li id="" data-icon="false">
|
||||
<div><!-- slider for volume -->
|
||||
<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 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>
|
||||
>>>>>>> develop
|
||||
|
||||
<div class="songinfo-text">
|
||||
<div id="infoname"></div>
|
||||
|
||||
33
flatclient/js/controls.js
vendored
33
flatclient/js/controls.js
vendored
@ -65,11 +65,7 @@ function playTrack(addtoqueue) {
|
||||
}
|
||||
|
||||
mopidy.playback.play(); //tracks[selected]);
|
||||
<<<<<<< HEAD
|
||||
console.log(selected);
|
||||
=======
|
||||
//console.log(selected);
|
||||
>>>>>>> develop
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -79,10 +75,7 @@ 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();
|
||||
@ -119,11 +112,7 @@ function playTrackByUri(uri, playlisturi){
|
||||
}
|
||||
|
||||
mopidy.playback.play(); //tracks[selected]);
|
||||
<<<<<<< HEAD
|
||||
console.log(selected);
|
||||
=======
|
||||
// console.log(selected);
|
||||
>>>>>>> develop
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -138,10 +127,7 @@ 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);
|
||||
@ -160,11 +146,7 @@ function playTrackQueueByUri(uri, playlisturi){
|
||||
}
|
||||
|
||||
mopidy.playback.play(); //currentplaylist[track]);
|
||||
<<<<<<< HEAD
|
||||
console.log(track, currentplaylist[track]);
|
||||
=======
|
||||
//console.log(track, currentplaylist[track]);
|
||||
>>>>>>> develop
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -282,15 +264,10 @@ 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);
|
||||
@ -298,15 +275,10 @@ 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);
|
||||
@ -554,8 +526,6 @@ function saveRadioStations() {
|
||||
$.cookie('radioStations', radioStations);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
function haltSystem() {
|
||||
window.history.back();
|
||||
$.post("/haltSystem");
|
||||
@ -566,5 +536,4 @@ function rebootSystem() {
|
||||
window.history.back();
|
||||
$.post("/rebootSystem");
|
||||
toast('Rebooting...', 3000);
|
||||
}
|
||||
>>>>>>> develop
|
||||
}
|
||||
@ -135,11 +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;
|
||||
<<<<<<< HEAD
|
||||
tmp += renderSongLi(pl[i], liID, uri);
|
||||
=======
|
||||
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 += '<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);
|
||||
}
|
||||
|
||||
<<<<<<< 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){
|
||||
>>>>>>> develop
|
||||
songLi = '<li class="song albumli" id="' + liID + '">' +
|
||||
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\');">' +
|
||||
'<i class="fa fa-ellipsis-vertical"></i>' +
|
||||
@ -179,22 +159,12 @@ function renderSongLi(song, liID, uri, playlistType){
|
||||
}
|
||||
|
||||
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 = '';
|
||||
@ -257,17 +227,6 @@ function resultsToTables(results, target, uri) {
|
||||
html += '<li class="albumdivider">';
|
||||
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>';
|
||||
<<<<<<< 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) {
|
||||
for (j = 0; j < results[i].album.artists.length; j++) {
|
||||
html += results[i].album.artists[j].name;
|
||||
@ -279,7 +238,6 @@ function resultsToTables(results, target, uri) {
|
||||
}
|
||||
}
|
||||
}
|
||||
>>>>>>> develop
|
||||
html += '</p></a></li>';
|
||||
for (j = 0; j < newalbum.length; j++) {
|
||||
popupData[newalbum[j].uri] = newalbum[j];
|
||||
@ -287,11 +245,7 @@ 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 += '<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>';
|
||||
|
||||
@ -380,12 +380,9 @@ 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);
|
||||
|
||||
@ -490,10 +487,7 @@ $(document).ready(function(event) {
|
||||
switchContent("playlists");
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> develop
|
||||
initgui = false;
|
||||
window.onhashchange = locationHashChanged;
|
||||
// Log all events
|
||||
@ -515,23 +509,12 @@ $(document).ready(function(event) {
|
||||
|
||||
|
||||
//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(
|
||||
function()
|
||||
{return switchContent('nowPlaying')} );
|
||||
$('#controlspopupimage').click(
|
||||
function() {
|
||||
return switchContent('current')} );
|
||||
>>>>>>> develop
|
||||
$('#navEnterFullscreen').click(function(){
|
||||
enterFullscreen();
|
||||
});
|
||||
@ -574,23 +557,12 @@ $(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() {
|
||||
@ -615,4 +587,3 @@ function debug() {
|
||||
setTimeout(debug, 100);
|
||||
}
|
||||
}
|
||||
>>>>>>> develop
|
||||
|
||||
@ -46,11 +46,7 @@ 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) {
|
||||
@ -138,12 +134,8 @@ 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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user