Merge pull request #151 from jcass77/develop
Reformatting and cleanup of source files. Merging this as there should be no material change to any functionality.
This commit is contained in:
John Cass
commit
2b3ce73a13
@ -18,52 +18,58 @@
|
||||
.header-breakpoint.ui-grid-b .ui-block-a {
|
||||
width: 30%;
|
||||
}
|
||||
|
||||
.header-breakpoint.ui-grid-b .ui-block-b {
|
||||
width: 30%;
|
||||
}
|
||||
|
||||
.header-breakpoint.ui-grid-b .ui-block-c {
|
||||
width: 30.1%;
|
||||
}
|
||||
|
||||
/*playlists*/
|
||||
.pl-breakpoint.ui-grid-a .ui-block-a {
|
||||
width: 32.95%;
|
||||
}
|
||||
|
||||
.pl-breakpoint.ui-grid-a .ui-block-b {
|
||||
width: 65.4%;
|
||||
}
|
||||
|
||||
.pl-breakpoint.ui-grid-a .ui-block-a {
|
||||
clear: left;
|
||||
}
|
||||
|
||||
.pl-breakpoint.ui-grid-a .ui-block-a {
|
||||
clear: left;
|
||||
}
|
||||
|
||||
#playlisttracksdiv {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
#playlisttracksback {
|
||||
display:none;
|
||||
}
|
||||
|
||||
#playlisttracksdiv {
|
||||
display:block;
|
||||
}
|
||||
|
||||
#playlistslistdiv {
|
||||
display:block;
|
||||
}
|
||||
|
||||
/*search*/
|
||||
.srch-breakpoint.ui-grid-a .ui-block-b {
|
||||
margin-left: .5em;
|
||||
}
|
||||
|
||||
.srch-breakpoint.ui-grid-a .ui-block-a, .srch-breakpoint.ui-grid-a .ui-block-b {
|
||||
width: 49%;
|
||||
}
|
||||
/* .scroll {
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
/* phone landscape */
|
||||
@media all and (max-width: 960px) {
|
||||
/*header*/
|
||||
@ -71,45 +77,50 @@
|
||||
width: 35%;
|
||||
clear: left;
|
||||
}
|
||||
|
||||
.header-breakpoint.ui-grid-b .ui-block-b {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.header-breakpoint.ui-grid-b .ui-block-c {
|
||||
width: 33%;
|
||||
}
|
||||
|
||||
/*playlists*/
|
||||
.pl-breakpoint .ui-block-a, .pl-breakpoint .ui-block-b {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/*search*/
|
||||
.srch-breakpoint.ui-grid-a .ui-block-a, .srch-breakpoint.ui-grid-a .ui-block-b {
|
||||
width: 100%;
|
||||
}
|
||||
/* .scroll {
|
||||
width: 100%;
|
||||
heigth: 99%;
|
||||
}
|
||||
*/
|
||||
|
||||
#playlisttracksback {
|
||||
display:block;
|
||||
}
|
||||
|
||||
#playlisttracksdiv {
|
||||
display:none;
|
||||
}
|
||||
|
||||
#playlistslistdiv {
|
||||
display:block;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/***********
|
||||
* Side Panel and Navigation
|
||||
*/
|
||||
/*****************************
|
||||
* Side Panel and Navigation *
|
||||
*****************************/
|
||||
.mainNav .fa{
|
||||
float: right;
|
||||
}
|
||||
|
||||
.mainNav .navtxt{
|
||||
float: left;
|
||||
}
|
||||
|
||||
.mainNav .navtxt:after{
|
||||
clear: left;
|
||||
}
|
||||
@ -137,9 +148,9 @@
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
/***********************
|
||||
* Track Slider
|
||||
***********************/
|
||||
/******************
|
||||
* Track Slider *
|
||||
******************/
|
||||
|
||||
#trackslider {
|
||||
display: inline;
|
||||
@ -180,9 +191,9 @@
|
||||
display: inline;
|
||||
}
|
||||
|
||||
/***********
|
||||
* pages, content
|
||||
*/
|
||||
/********************
|
||||
* Pages, content *
|
||||
********************/
|
||||
#page{
|
||||
background-color: #fff;
|
||||
}
|
||||
@ -195,16 +206,13 @@
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#artistviewimage, #albumviewcover {
|
||||
float: right;
|
||||
heigth: 90px;
|
||||
height: 90px;
|
||||
max-width: 90%;
|
||||
}
|
||||
|
||||
/*** home ***/
|
||||
|
||||
#homerows div {
|
||||
text-align:center;
|
||||
background-color: #2C3E50;
|
||||
@ -217,9 +225,9 @@
|
||||
#homerows div i {
|
||||
font-size: 28px;
|
||||
}
|
||||
/*********************
|
||||
* listviews
|
||||
********************/
|
||||
/***************
|
||||
* listviews *
|
||||
***************/
|
||||
.table li a {
|
||||
color: #555 !important;
|
||||
font-size: 80% !important;
|
||||
@ -241,22 +249,7 @@
|
||||
list-style-type:none;
|
||||
}
|
||||
|
||||
/*.table li:first-child { */
|
||||
/*-moz-border-radius-topleft: 2px;*/
|
||||
/*-moz-border-radius-topright: 2px;*/
|
||||
/*-webkit-border-top-left-radius: 2px;*/
|
||||
/*-webkit-border-top-right-radius: 2px;*/
|
||||
/*border-top-right-radius: 2px;*/
|
||||
/*border-top-left-radius: 2px;*/
|
||||
/*}*/
|
||||
|
||||
.table li:last-child {
|
||||
/*-moz-border-radius-bottomleft: 2px;*/
|
||||
/*-moz-border-radius-bottomright: 2px;*/
|
||||
/*-webkit-border-bottom-left-radius: 2px;*/
|
||||
/*-webkit-border-bottom-right-radius: 2px;*/
|
||||
/*border-bottom-left-radius: 2px;*/
|
||||
/*border-bottom-right-radius: 2px;*/
|
||||
border-bottom: 1px solid #CECECE;
|
||||
}
|
||||
|
||||
@ -270,7 +263,7 @@
|
||||
|
||||
.smalldivider {
|
||||
font-size: 25% !important;
|
||||
heigth: 5px !important;
|
||||
height: 5px !important;
|
||||
background-color: #ddd !important;
|
||||
}
|
||||
|
||||
@ -281,7 +274,6 @@
|
||||
#playlistslist, #playlisttracks {
|
||||
margin: 0 !important;
|
||||
padding: 0 !important;
|
||||
/* border: 1px solid blue; */
|
||||
}
|
||||
|
||||
.albumli {
|
||||
@ -295,7 +287,7 @@
|
||||
.artistcover {
|
||||
float: right;
|
||||
width: 30px;
|
||||
heigth: 30px;
|
||||
height: 30px;
|
||||
margin-right: 3px;
|
||||
margin-top: 3px;
|
||||
}
|
||||
@ -327,9 +319,9 @@
|
||||
}
|
||||
|
||||
|
||||
/*******************
|
||||
* Now Playing area
|
||||
*******************/
|
||||
/**********************
|
||||
* Now Playing area *
|
||||
**********************/
|
||||
|
||||
#nowPlayingFooter{
|
||||
height: 50px;
|
||||
@ -346,7 +338,7 @@
|
||||
.footerControls div span {
|
||||
padding-left: 3px;
|
||||
padding-right: 3px;
|
||||
height=100%;
|
||||
height: 100%;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
@ -356,10 +348,9 @@
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
|
||||
/*******************
|
||||
* Popups
|
||||
*******************/
|
||||
/************
|
||||
* Popups *
|
||||
************/
|
||||
#modalalbum a, #modalartist a {
|
||||
color: #444;
|
||||
text-decoration: none;
|
||||
@ -408,13 +399,11 @@
|
||||
display:block !important;
|
||||
}
|
||||
|
||||
|
||||
/***************
|
||||
* common use
|
||||
***************/
|
||||
/****************
|
||||
* Common use *
|
||||
****************/
|
||||
|
||||
#playlistspane {
|
||||
/* height: 90% !important;*/
|
||||
margin: 0px !important;
|
||||
}
|
||||
|
||||
@ -448,7 +437,7 @@ a {
|
||||
float: right;
|
||||
}
|
||||
/**********************
|
||||
* Song information
|
||||
* Song information *
|
||||
**********************/
|
||||
.ui-footer{
|
||||
border: 0px;
|
||||
@ -464,7 +453,7 @@ a {
|
||||
#infoname {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
font: bold;
|
||||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
@ -503,9 +492,7 @@ a {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
||||
/*helper*/
|
||||
|
||||
.hidden{
|
||||
display: none;
|
||||
}
|
||||
@ -513,7 +500,6 @@ a {
|
||||
color: #efefef;
|
||||
}
|
||||
|
||||
|
||||
.settingscoll label {
|
||||
font-size: 120%;
|
||||
font-weight: bold;
|
||||
@ -528,12 +514,14 @@ a {
|
||||
.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal {
|
||||
margin-right: 17em;
|
||||
}
|
||||
|
||||
.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-open.ui-panel-content-wrap-display-push.ui-panel-content-fixed-toolbar-position-right,
|
||||
.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-open.ui-panel-content-wrap-display-reveal.ui-panel-content-fixed-toolbar-position-right,
|
||||
.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-open.ui-panel-content-wrap-display-push.ui-panel-content-wrap-position-right,
|
||||
.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal.ui-panel-content-wrap-position-right {
|
||||
margin: 0 0 0 17em;
|
||||
}
|
||||
|
||||
.ui-responsive-panel .ui-panel-dismiss-display-reveal {
|
||||
display: none;
|
||||
}
|
||||
@ -543,29 +531,34 @@ a {
|
||||
#nowPlayingpane{
|
||||
padding: 15px 25px 0px 25px;
|
||||
}
|
||||
|
||||
#nowPlayingpane #controlspopupimage{
|
||||
max-width:90%;
|
||||
max-height:90%;
|
||||
}
|
||||
|
||||
.nowPlaying-artistInfo {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.nowPlaying-artistInfo h4{
|
||||
margin: 0px;
|
||||
font-weight: normal;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.nowPlaying-artistInfo h3{
|
||||
margin: 0px 0px 3px 00px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
|
||||
}
|
||||
|
||||
#controlspopupimage{
|
||||
max-width:90%;
|
||||
max-height:90%;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
|
||||
#nowPlayingpane #slidercontainer {
|
||||
margin-left: -5px;
|
||||
margin-right: -5px;
|
||||
@ -579,7 +572,6 @@ a {
|
||||
}
|
||||
|
||||
/* disable text selection for mouse swipe */
|
||||
|
||||
body * {
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
@ -587,23 +579,16 @@ body * {
|
||||
-o-user-select: none;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
/* but fix for text input (safari certainly needs it)*/
|
||||
input[type=text] {
|
||||
-moz-user-select: text;
|
||||
-webkit-user-select: text;
|
||||
-moz-user-select: text;
|
||||
-ms-user-select: text;
|
||||
-o-user-select: text;
|
||||
user-select: text;
|
||||
}
|
||||
|
||||
/* type/source of media in listviews */
|
||||
/*a[id^="spotify"] {
|
||||
margin-left:20px;
|
||||
background-image: url('../images/icons/play_alt_12x12.png');
|
||||
border: 2px solid black;
|
||||
display:block;
|
||||
}
|
||||
*/
|
||||
|
||||
.mediaicon {
|
||||
float: right;
|
||||
}
|
||||
@ -4,7 +4,6 @@
|
||||
<meta charset="utf-8">
|
||||
<script src="js/jquery-1.11.1.min.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="css/jquery.mobile.flatui.min.css"/>
|
||||
<!-- <script type='application/javascript' src='js/fastclick.js'></script> -->
|
||||
<script>
|
||||
//configuration
|
||||
var isMusicBox = '{{musicbox}}' == 'True'; // Remove MusicBox only content (e.g. settings, system pages)
|
||||
@ -475,10 +474,8 @@
|
||||
<!-- /page one -->
|
||||
<script type="text/javascript" src="../mopidy/mopidy.min.js"></script>
|
||||
<script type="text/javascript" src="js/iscroll-lite.js"></script>
|
||||
<!-- <script type="text/javascript" src="js/jquery.mobile.iscrollview-closure-min.js"></script> -->
|
||||
<script src="js/jquery.cookie.js"></script>
|
||||
<script src="js/jquery.truncate.min.js"></script>
|
||||
<!-- <script type="text/javascript" src="js/add2home.js" charset="utf-8"></script> -->
|
||||
<script src="js/controls.js"></script>
|
||||
<script src="js/library.js"></script>
|
||||
<script src="js/functionsvars.js"></script>
|
||||
|
||||
68
mopidy_musicbox_webclient/static/js/controls.js
vendored
68
mopidy_musicbox_webclient/static/js/controls.js
vendored
@ -1,6 +1,6 @@
|
||||
/********************************************************
|
||||
* play tracks from a browse list
|
||||
*********************************************************/
|
||||
/***********************************
|
||||
* play tracks from a browse list *
|
||||
***********************************/
|
||||
function playBrowsedTracks(action, trackIndex) {
|
||||
$('#popupBrowse').popup('close');
|
||||
toast('Loading...');
|
||||
@ -54,10 +54,9 @@ function playBrowsedTracks(action, trackIndex) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/********************************************************
|
||||
* play an uri from a tracklist
|
||||
*********************************************************/
|
||||
/*********************************
|
||||
* play an uri from a tracklist *
|
||||
*********************************/
|
||||
function playTrack(action) {
|
||||
var hash = document.location.hash.split('?');
|
||||
var divid = hash[0].substr(1);
|
||||
@ -165,7 +164,6 @@ function playTrackByUri(track_uri, playlist_uri) {
|
||||
* @returns {boolean}
|
||||
*/
|
||||
function playTrackQueueByTlid(uri, tlid) {
|
||||
// console.log('playquuri');
|
||||
//stop directly, for user feedback
|
||||
mopidy.playback.stop();
|
||||
$('#popupQueue').popup('close');
|
||||
@ -191,15 +189,14 @@ function playTrackQueueByTlid(uri, tlid) {
|
||||
* @returns {boolean}
|
||||
*/
|
||||
function playTrackQueue() {
|
||||
// console.log('playqu');
|
||||
uri = $('#popupQueue').data("track");
|
||||
tlid = $('#popupQueue').data("tlid");
|
||||
return playTrackQueueByTlid(uri, tlid);
|
||||
}
|
||||
|
||||
/********************************************************
|
||||
* remove a track from the queue
|
||||
*********************************************************/
|
||||
/***********************************
|
||||
* remove a track from the queue *
|
||||
***********************************/
|
||||
function removeTrack() {
|
||||
$('#popupQueue').popup('close');
|
||||
toast('Deleting...');
|
||||
@ -241,15 +238,14 @@ function saveQueue() {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
function refreshPlaylists() {
|
||||
mopidy.playlists.refresh();
|
||||
return false;
|
||||
}
|
||||
|
||||
/**********************
|
||||
* Buttons
|
||||
*/
|
||||
/*************
|
||||
* Buttons *
|
||||
*************/
|
||||
|
||||
function doShuffle() {
|
||||
mopidy.playback.stop();
|
||||
@ -303,10 +299,9 @@ function backbt() {
|
||||
return false;
|
||||
}
|
||||
|
||||
/***************
|
||||
* Options
|
||||
***************/
|
||||
|
||||
/*************
|
||||
* Options *
|
||||
*************/
|
||||
function setTracklistOption(name, new_value) {
|
||||
if (!new_value) {
|
||||
$("#"+name+"bt").attr('style', 'color:#2489ce');
|
||||
@ -357,11 +352,10 @@ function doSingle() {
|
||||
}
|
||||
|
||||
|
||||
/*********************
|
||||
* Track Slider
|
||||
* Use a timer to prevent looping of commands
|
||||
*********************/
|
||||
|
||||
/***********************************************
|
||||
* Track Slider *
|
||||
* Use a timer to prevent looping of commands *
|
||||
***********************************************/
|
||||
function doSeekPos(value) {
|
||||
var val = $("#trackslider").val();
|
||||
newposition = Math.round(val);
|
||||
@ -377,10 +371,7 @@ function doSeekPos(value) {
|
||||
function triggerPos() {
|
||||
if (mopidy) {
|
||||
posChanging = true;
|
||||
// mopidy.playback.pause();
|
||||
// console.log(newposition);
|
||||
mopidy.playback.seek(newposition);
|
||||
// mopidy.playback.resume();
|
||||
resumePosTimer();
|
||||
posChanging = false;
|
||||
}
|
||||
@ -402,10 +393,10 @@ function setPosition(pos) {
|
||||
$("#songelapsed").html(timeFromSeconds(currentposition / 1000));
|
||||
}
|
||||
|
||||
/********************
|
||||
* Volume slider
|
||||
* Use a timer to prevent looping of commands
|
||||
*/
|
||||
/***********************************************
|
||||
* Volume slider *
|
||||
* Use a timer to prevent looping of commands *
|
||||
***********************************************/
|
||||
|
||||
function setVolume(value) {
|
||||
if ($("#volumeslider").val() != value) {
|
||||
@ -439,15 +430,14 @@ function doMute() {
|
||||
mopidy.mixer.setMute(!mute);
|
||||
}
|
||||
|
||||
/*******
|
||||
* Track position timer
|
||||
*/
|
||||
/**************************
|
||||
* Track position timer *
|
||||
**************************/
|
||||
|
||||
//timer function to update interface
|
||||
function updatePosTimer() {
|
||||
currentposition += TRACK_TIMER;
|
||||
setPosition(currentposition);
|
||||
// $("#songelapsed").html(timeFromSeconds(currentposition / 1000));
|
||||
}
|
||||
|
||||
function resumePosTimer() {
|
||||
@ -467,9 +457,9 @@ function pausePosTimer() {
|
||||
clearInterval(posTimer);
|
||||
}
|
||||
|
||||
/*********************************
|
||||
* Stream
|
||||
*********************************/
|
||||
/************
|
||||
* Stream *
|
||||
************/
|
||||
function streamPressed(key) {
|
||||
if (key == 13) {
|
||||
playStreamUri();
|
||||
|
||||
@ -28,7 +28,7 @@ var songlength = 0;
|
||||
var artistshtml = '';
|
||||
var artiststext = '';
|
||||
var songname = '';
|
||||
var songdata = {'track':{}, 'tlid':-1};
|
||||
var songdata = {'track': {}, 'tlid': -1};
|
||||
var newposition = 0;
|
||||
|
||||
var playlisttracksScroll;
|
||||
@ -53,7 +53,6 @@ var ua = navigator.userAgent,
|
||||
|
||||
//constants
|
||||
PROGRAM_NAME = 'MusicBox';
|
||||
//PROGRAM_NAME = 'Mopidy';
|
||||
ARTIST_TABLE = '#artiststable';
|
||||
ALBUM_TABLE = '#albumstable';
|
||||
PLAYLIST_TABLE = '#playlisttracks';
|
||||
@ -127,10 +126,6 @@ function scrollToTop() {
|
||||
}
|
||||
|
||||
function scrollToTracklist() {
|
||||
/* if (isMobileWebkit) {
|
||||
playlistslistScroll.refresh();
|
||||
}
|
||||
*/
|
||||
var divtop = $("#playlisttracksdiv").offset().top - 120;
|
||||
$('body,html').animate({
|
||||
scrollTop: divtop
|
||||
@ -198,12 +193,10 @@ function renderSongLi(song, liID, uri) {
|
||||
} else {
|
||||
name = song.name;
|
||||
}
|
||||
// var iconClass = getMediaClass(liID.split('-')[1]);
|
||||
songLi = '<li class="song albumli" id="' + liID + '">' +
|
||||
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\');">' +
|
||||
'<i class="fa fa-ellipsis-v"></i></a>' +
|
||||
'<a href="#" onclick="return playTrackByUri(\'' + song.uri + '\',\'' + uri + '\');">' +
|
||||
// '<h1 class="trackname"><i class="' + iconClass + '"></i> ' + name + '</h1>' +
|
||||
'<h1 class="trackname">' + name + '</h1></a>' +
|
||||
'</li>';
|
||||
return songLi;
|
||||
@ -217,12 +210,10 @@ function renderQueueSongLi(song, liID, uri, tlid) {
|
||||
} else {
|
||||
name = song.name;
|
||||
}
|
||||
// var iconClass = getMediaClass(liID.split('-')[1]);
|
||||
songLi = '<li class="song albumli" id="' + liID + '" tlid="' + tlid + '">' +
|
||||
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\',\'' + tlid + '\');">' +
|
||||
'<i class="fa fa-ellipsis-v"></i></a>' +
|
||||
'<a href="#" onclick="return playTrackQueueByTlid(\'' + song.uri + '\',\'' + tlid + '\');">' +
|
||||
// '<h1 class="trackname"><i class="' + iconClass + '"></i> ' + name + '</h1>' +
|
||||
'<h1 class="trackname">' + name + '</h1></a>' +
|
||||
'</li>';
|
||||
return songLi;
|
||||
@ -310,7 +301,6 @@ function resultsToTables(results, target, uri) {
|
||||
'<h1><i class="' + iconClass + '"></i> ' + newalbum[0].name + "</h1><p>";
|
||||
}
|
||||
|
||||
/* '<span style="float: right;">' + timeFromSeconds(newalbum[0].length / 1000) + '</span>'; */
|
||||
if (newalbum[0].artists) {
|
||||
for (j = 0; j < newalbum[0].artists.length; j++) {
|
||||
html += newalbum[0].artists[j].name;
|
||||
@ -333,7 +323,6 @@ function resultsToTables(results, target, uri) {
|
||||
newtlids = [];
|
||||
} else { //newalbum length
|
||||
if (results[i].album.uri && results[i].album.name) {
|
||||
// iconClass = getMediaClass(results[i].album.uri);
|
||||
iconClass = getMediaClass(newalbum[0].uri);
|
||||
html += '<li class="albumdivider">';
|
||||
html += '<a href="#" onclick="return showAlbum(\'' + results[i].album.uri + '\');"><img id="' +
|
||||
@ -353,8 +342,6 @@ function resultsToTables(results, target, uri) {
|
||||
html += '</p></a></li>';
|
||||
for (j = 0; j < newalbum.length; j++) {
|
||||
popupData[newalbum[j].uri] = newalbum[j];
|
||||
// html += '<li class="albumli" id="' + targetmin + '-' + newalbum[j].uri + '"><a href="#" onclick="return ' + popupMenu + '(event, \'' + uri + '\',\'' + newalbum[j].uri + '\');">';
|
||||
|
||||
//hERE!
|
||||
var liID = targetmin + '-' + newalbum[j].uri;
|
||||
if (target == CURRENT_PLAYLIST_TABLE) {
|
||||
@ -362,9 +349,6 @@ function resultsToTables(results, target, uri) {
|
||||
} else {
|
||||
html += renderSongLi(newalbum[j], liID, 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>';
|
||||
}
|
||||
newalbum = [];
|
||||
newtlids = [];
|
||||
@ -383,7 +367,6 @@ function resultsToTables(results, target, uri) {
|
||||
$(target).attr('data', uri);
|
||||
//retreive albumcovers
|
||||
for (i = 0; i < coversList.length; i++) {
|
||||
// console.log(coversList[i]);
|
||||
getCover(coversList[i][0], target + '-cover-' + coversList[i][1], 'small');
|
||||
}
|
||||
}
|
||||
@ -401,7 +384,6 @@ function playlisttotable(pl, target, uri) {
|
||||
child += '<h1>' + pl[i].name + "</h1>";
|
||||
child += '<p>';
|
||||
child += '<span style="float: right;">' + timeFromSeconds(pl[i].length / 1000) + '</span>';
|
||||
// <span class="ui-icon ui-icon-arrow-r ui-icon-shadow"> </span>
|
||||
for (var j = 0; j < pl[i].artists.length; j++) {
|
||||
if (pl[i].artists[j]) {
|
||||
child += pl[i].artists[j].name;
|
||||
@ -463,7 +445,6 @@ function timeFromSeconds(length) {
|
||||
return ((h > 0 ? h + ":" : "") + (m > 0 ? (h > 0 && m < 10 ? "0" : "") + m + ":" : "0:") + (s < 10 ? "0" : "") + s);
|
||||
}
|
||||
|
||||
|
||||
/******* Toast ***/
|
||||
function toast(message, delay, textOnly) {
|
||||
textOnl = textOnly || false;
|
||||
@ -482,9 +463,9 @@ function toast(message, delay, textOnly) {
|
||||
}
|
||||
}
|
||||
|
||||
/*****************
|
||||
* Modal dialogs
|
||||
*****************/
|
||||
/******************
|
||||
* Modal dialogs *
|
||||
******************/
|
||||
function showLoading(on) {
|
||||
if (on) {
|
||||
$("body").css("cursor", "progress");
|
||||
@ -515,7 +496,6 @@ function showOffline(on) {
|
||||
// from http://dzone.com/snippets/validate-url-regexp
|
||||
function validUri(str) {
|
||||
var regexp = /^(mms|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/
|
||||
// return regexp.test(str) || isServiceUri(str);
|
||||
return regexp.test(str);
|
||||
}
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* show- functions do both
|
||||
*/
|
||||
/********************
|
||||
* Song Info Sreen
|
||||
* Song Info Sreen *
|
||||
********************/
|
||||
function resetSong() {
|
||||
if (!posChanging) {
|
||||
@ -148,9 +148,9 @@ function setSongInfo(data) {
|
||||
resizeMb();
|
||||
}
|
||||
|
||||
/***************
|
||||
* display popups
|
||||
*/
|
||||
/******************
|
||||
* display popups *
|
||||
******************/
|
||||
function closePopups() {
|
||||
$('#popupTracks').popup('close');
|
||||
$('#artistpopup').popup('close');
|
||||
@ -159,7 +159,6 @@ function closePopups() {
|
||||
$('#controlspopup').popup('close');
|
||||
}
|
||||
|
||||
|
||||
function popupTracks(e, listuri, trackuri, tlid) {
|
||||
if (!e)
|
||||
var e = window.event;
|
||||
@ -222,9 +221,9 @@ function showAlbumPopup(popupId) {
|
||||
showAlbum(popupData[uri].album.uri);
|
||||
}
|
||||
|
||||
/*********************
|
||||
* initialize sockets
|
||||
*********************/
|
||||
/**********************
|
||||
* initialize sockets *
|
||||
**********************/
|
||||
|
||||
function initSocketevents() {
|
||||
mopidy.on("state:online", function() {
|
||||
@ -254,7 +253,6 @@ function initSocketevents() {
|
||||
});
|
||||
|
||||
mopidy.on("event:trackPlaybackPaused", function(data) {
|
||||
//setSongInfo(data.tl_track);
|
||||
pausePosTimer();
|
||||
setPlayState(false);
|
||||
});
|
||||
@ -305,9 +303,9 @@ $(document).bind("pageinit", function() {
|
||||
|
||||
});
|
||||
|
||||
/************************
|
||||
* gui stuff
|
||||
************************/
|
||||
/**************
|
||||
* gui stuff *
|
||||
**************/
|
||||
function enterFullscreen() {
|
||||
if (isMobileSafari) { alert ("To get this app in Full Screen, you have to add it to your home-screen using the Share button."); exit(); }
|
||||
var elem = document.querySelector("#page");
|
||||
@ -324,6 +322,7 @@ function enterFullscreen() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function exitFullscreen() {
|
||||
document.webkitExitFullscreen();
|
||||
document.mozCancelFullscreen();
|
||||
@ -349,7 +348,6 @@ function switchContent(divid, uri) {
|
||||
if (uri) {
|
||||
hash += "?" + uri;
|
||||
}
|
||||
// $.mobile.changePage("#" + hash);
|
||||
location.hash = "#" + hash;
|
||||
}
|
||||
|
||||
@ -364,7 +362,6 @@ function setHeadline(site){
|
||||
|
||||
//update timer
|
||||
function updateStatusTimer() {
|
||||
// console.log('statustimer');
|
||||
mopidy.playback.getCurrentTlTrack().then(processCurrenttrack, console.error);
|
||||
mopidy.playback.getTimePosition().then(processCurrentposition, console.error);
|
||||
//TODO check offline?
|
||||
@ -447,7 +444,6 @@ function locationHashChanged() {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
//switch the footer
|
||||
switch(divid) {
|
||||
case 'nowPlaying':
|
||||
@ -463,9 +459,9 @@ function locationHashChanged() {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**********************
|
||||
* initialize software
|
||||
**********************/
|
||||
/***********************
|
||||
* initialize software *
|
||||
***********************/
|
||||
$(document).ready(function(event) {
|
||||
//check for websockets
|
||||
if (!window.WebSocket) {
|
||||
@ -488,8 +484,7 @@ $(document).ready(function(event) {
|
||||
} else {
|
||||
mopidy = new Mopidy();
|
||||
}
|
||||
// mopidy.on(console.log.bind(console)); // Log all events
|
||||
// mopidy.on(console.error.bind(console));
|
||||
|
||||
//initialize events
|
||||
initSocketevents();
|
||||
|
||||
@ -499,7 +494,6 @@ $(document).ready(function(event) {
|
||||
switchContent("home");
|
||||
}
|
||||
|
||||
|
||||
initgui = false;
|
||||
window.onhashchange = locationHashChanged;
|
||||
|
||||
@ -585,7 +579,6 @@ $(document).ready(function(event) {
|
||||
|
||||
$.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;
|
||||
|
||||
// swipe songinfo and panel
|
||||
@ -624,6 +617,7 @@ function updatePlayIcons (uri, tlid) {
|
||||
$(this).removeClass("currenttrack2");
|
||||
}
|
||||
});
|
||||
|
||||
$('#trackresulttable li').each(function() {
|
||||
if (this.id == 'trackresulttable-' + uri) {
|
||||
$(this).addClass('currenttrack2');
|
||||
|
||||
@ -2,14 +2,13 @@
|
||||
* @author Wouter van Wijk
|
||||
*/
|
||||
|
||||
API_KEY= 'b6d34c3af91d62ab0ae00ab1b6fa8733';
|
||||
API_KEY = 'b6d34c3af91d62ab0ae00ab1b6fa8733';
|
||||
API_SECRET = '2c631802c2285d5d5d1502462fe42a2b';
|
||||
|
||||
var fmcache;
|
||||
var lastfm;
|
||||
|
||||
|
||||
$(window).load(function() {
|
||||
$(window).load(function () {
|
||||
// create a Cache object
|
||||
fmcache = new LastFMCache();
|
||||
// create a LastFM object
|
||||
@ -20,7 +19,6 @@ $(window).load(function() {
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
function getCover(album, images, size) {
|
||||
var defUrl = 'images/default_cover.png';
|
||||
$(images).attr('src', defUrl);
|
||||
@ -32,7 +30,6 @@ function getCover(album, images, size) {
|
||||
if ( album.artists && (album.artists.length > 0) ) {
|
||||
artistname = album.artists[0].name;
|
||||
}
|
||||
// console.log(album, images);
|
||||
if (album.images && (album.images.length > 0) ) {
|
||||
$(images).attr('src', album.images[0]);
|
||||
} else {
|
||||
|
||||
@ -79,15 +79,6 @@ function processSearchResults(resultArr) {
|
||||
var results = {'tracks': [], 'artists': [], 'albums': []};
|
||||
var j, emptyResult = true;
|
||||
|
||||
/* for (var i = 0; i < resultArr.length; ++i) {
|
||||
for (var prop in results) {
|
||||
if (resultArr[i][prop] && resultArr[i][prop].length) {
|
||||
results[prop] = results[prop].concat(resultArr[i][prop]);
|
||||
emptyResult = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
for (var i = 0; i < resultArr.length; i++) {
|
||||
if (resultArr[i].tracks) {
|
||||
for (j = 0; j < resultArr[i].tracks.length; j++) {
|
||||
@ -109,10 +100,6 @@ function processSearchResults(resultArr) {
|
||||
}
|
||||
}
|
||||
|
||||
// console.log(resultArr, results);
|
||||
|
||||
|
||||
|
||||
customTracklists[URI_SCHEME+':trackresultscache'] = results.tracks;
|
||||
|
||||
if (emptyResult) {
|
||||
@ -196,7 +183,6 @@ function processSearchResults(resultArr) {
|
||||
$('#expandsearch').show();
|
||||
|
||||
// Track results
|
||||
// playlisttotable(results.tracks, SEARCH_TRACK_TABLE, URI_SCHEME+':trackresultscache');
|
||||
resultsToTables(results.tracks, SEARCH_TRACK_TABLE, URI_SCHEME+':trackresultscache');
|
||||
|
||||
showLoading(false);
|
||||
@ -261,7 +247,6 @@ function showTracklist(uri) {
|
||||
$(this).addClass('playlistactive');
|
||||
}
|
||||
});
|
||||
// scrollToTracklist();
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -274,8 +259,7 @@ function showArtist(nwuri) {
|
||||
$('#popupTracks').popup('close');
|
||||
$('#controlsmodal').popup('close');
|
||||
$(ARTIST_TABLE).empty();
|
||||
//fill from cache
|
||||
// var pl = getTracksFromUri(nwuri);
|
||||
|
||||
//TODO cache
|
||||
$('#h_artistname').html('');
|
||||
showLoading(true);
|
||||
@ -308,7 +292,6 @@ function showAlbum(uri) {
|
||||
resultArr.uri = uri;
|
||||
processAlbumResults(resultArr);
|
||||
}, console.error);
|
||||
// getCover(pl, '#albumviewcover, #coverpopupimage', 'extralarge');
|
||||
} else {
|
||||
showLoading(true);
|
||||
$('#h_albumname').html('');
|
||||
|
||||
@ -139,14 +139,6 @@ function processBrowseDir(resultArr) {
|
||||
|
||||
$('#browselist').html(child);
|
||||
if (browseStack.length > 0 ) {
|
||||
/* child = '';
|
||||
for (var i = 0; i < browseStack.length; i++) {
|
||||
child += browseStack[i] + ' / ';
|
||||
}
|
||||
|
||||
child = getMediaHuman(browseStack[0]);
|
||||
iconClass = getMediaClass(browseStack[0]);
|
||||
*/
|
||||
child = getMediaHuman(resultArr[0].uri);
|
||||
iconClass = getMediaClass(resultArr[0].uri);
|
||||
$('#browsepath').html('<i class="' + iconClass + '"></i> ' + child);
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
var streamUris = [];
|
||||
//fill with defaults
|
||||
streamUris.push(['NPR 24', 'http://nprdmp.ic.llnwd.net/stream/nprdmp_live01_mp3']);
|
||||
streamUris.push(['3FM Dutch', 'http://icecast.omroep.nl/3fm-bb-mp3']);
|
||||
streamUris.push(['BBC WorldService', 'http://vprbbc.streamguys.net:8000/vprbbc24.mp3']);
|
||||
streamUris.push(['Arrow Jazz', 'http://81.173.3.132:8082']);
|
||||
streamUris.push(['Queen Live Aid at Wembley (YouTube)', 'yt:http://www.youtube.com/watch?v=eQsM6u0a038']);
|
||||
streamUris.push(['Groove Salad - Soma FM', 'http://somafm.com/groovesalad.pls']);
|
||||
streamUris.push(['Kiss FM Berlin', 'http://stream.kissfm.de/kissfm/mp3-128/internetradio/']);
|
||||
streamUris.push(['Muse - Newborn (SoundCloud)', 'sc:https://soundcloud.com/muse/01-new-born']);
|
||||
streamUris.push(['Pinguin Radio', 'http://pr320.pinguinradio.com/listen.pls']);
|
||||
streamUris.push(['NPR 24', 'http://nprdmp.ic.llnwd.net/stream/nprdmp_live01_mp3']);
|
||||
streamUris.push(['3FM Dutch', 'http://icecast.omroep.nl/3fm-bb-mp3']);
|
||||
streamUris.push(['BBC WorldService', 'http://vprbbc.streamguys.net:8000/vprbbc24.mp3']);
|
||||
streamUris.push(['Arrow Jazz', 'http://81.173.3.132:8082']);
|
||||
streamUris.push(['Queen Live Aid at Wembley (YouTube)', 'yt:http://www.youtube.com/watch?v=eQsM6u0a038']);
|
||||
streamUris.push(['Groove Salad - Soma FM', 'http://somafm.com/groovesalad.pls']);
|
||||
streamUris.push(['Kiss FM Berlin', 'http://stream.kissfm.de/kissfm/mp3-128/internetradio/']);
|
||||
streamUris.push(['Muse - Newborn (SoundCloud)', 'sc:https://soundcloud.com/muse/01-new-born']);
|
||||
streamUris.push(['Pinguin Radio', 'http://pr320.pinguinradio.com/listen.pls']);
|
||||
Loading…
Reference in New Issue
Block a user