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

Merge pull request #151 from jcass77/develop

Browse Source 
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 2016-01-31 06:44:54 +02:00
commit 2b3ce73a13
9 changed files with 151 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
mopidy_musicbox_webclient/static/css/webclient.css
View File

@ -18,52 +18,58 @@
.header-breakpoint.ui-grid-b .ui-block-a { .header-breakpoint.ui-grid-b .ui-block-a {
width: 30%; width: 30%;
} }
.header-breakpoint.ui-grid-b .ui-block-b { .header-breakpoint.ui-grid-b .ui-block-b {
width: 30%; width: 30%;
} }
.header-breakpoint.ui-grid-b .ui-block-c { .header-breakpoint.ui-grid-b .ui-block-c {
width: 30.1%; width: 30.1%;
} }
/*playlists*/ /*playlists*/
.pl-breakpoint.ui-grid-a .ui-block-a { .pl-breakpoint.ui-grid-a .ui-block-a {
width: 32.95%; width: 32.95%;
} }
.pl-breakpoint.ui-grid-a .ui-block-b { .pl-breakpoint.ui-grid-a .ui-block-b {
width: 65.4%; width: 65.4%;
} }
.pl-breakpoint.ui-grid-a .ui-block-a { .pl-breakpoint.ui-grid-a .ui-block-a {
clear: left; clear: left;
} }
.pl-breakpoint.ui-grid-a .ui-block-a { .pl-breakpoint.ui-grid-a .ui-block-a {
clear: left; clear: left;
} }
#playlisttracksdiv { #playlisttracksdiv {
margin-left: 10px; margin-left: 10px;
} }
#playlisttracksback { #playlisttracksback {
display:none; display:none;
} }
#playlisttracksdiv { #playlisttracksdiv {
display:block; display:block;
} }
#playlistslistdiv { #playlistslistdiv {
display:block; display:block;
} }
/*search*/ /*search*/
.srch-breakpoint.ui-grid-a .ui-block-b { .srch-breakpoint.ui-grid-a .ui-block-b {
margin-left: .5em; margin-left: .5em;
} }
.srch-breakpoint.ui-grid-a .ui-block-a, .srch-breakpoint.ui-grid-a .ui-block-b { .srch-breakpoint.ui-grid-a .ui-block-a, .srch-breakpoint.ui-grid-a .ui-block-b {
width: 49%; width: 49%;
} }
/* .scroll {
overflow-y: auto;
overflow-x: hidden;
}
*/
} }
/* phone landscape */ /* phone landscape */
@media all and (max-width: 960px) { @media all and (max-width: 960px) {
/*header*/ /*header*/
@ -71,45 +77,50 @@
width: 35%; width: 35%;
clear: left; clear: left;
} }
.header-breakpoint.ui-grid-b .ui-block-b { .header-breakpoint.ui-grid-b .ui-block-b {
display: none; display: none;
} }
.header-breakpoint.ui-grid-b .ui-block-c { .header-breakpoint.ui-grid-b .ui-block-c {
width: 33%; width: 33%;
} }
/*playlists*/ /*playlists*/
.pl-breakpoint .ui-block-a, .pl-breakpoint .ui-block-b { .pl-breakpoint .ui-block-a, .pl-breakpoint .ui-block-b {
width: 100%; width: 100%;
} }
/*search*/ /*search*/
.srch-breakpoint.ui-grid-a .ui-block-a, .srch-breakpoint.ui-grid-a .ui-block-b { .srch-breakpoint.ui-grid-a .ui-block-a, .srch-breakpoint.ui-grid-a .ui-block-b {
width: 100%; width: 100%;
} }
/* .scroll {
width: 100%;
heigth: 99%;
}
*/
#playlisttracksback { #playlisttracksback {
display:block; display:block;
} }
#playlisttracksdiv { #playlisttracksdiv {
display:none; display:none;
} }
#playlistslistdiv { #playlistslistdiv {
display:block; display:block;
} }
} }
/*********** /*****************************
* Side Panel and Navigation * Side Panel and Navigation *
*/ *****************************/
.mainNav .fa{ .mainNav .fa{
float: right; float: right;
} }
.mainNav .navtxt{ .mainNav .navtxt{
float: left; float: left;
} }
.mainNav .navtxt:after{ .mainNav .navtxt:after{
clear: left; clear: left;
} }
@ -137,9 +148,9 @@
font-size: 15px; font-size: 15px;
} }
/*********************** /******************
* Track Slider * Track Slider *
***********************/ ******************/
#trackslider { #trackslider {
display: inline; display: inline;
@ -180,9 +191,9 @@
display: inline; display: inline;
} }
/*********** /********************
* pages, content * Pages, content *
*/ ********************/
#page{ #page{
background-color: #fff; background-color: #fff;
} }
@ -195,16 +206,13 @@
display: none; display: none;
} }
#artistviewimage, #albumviewcover { #artistviewimage, #albumviewcover {
float: right; float: right;
heigth: 90px; height: 90px;
max-width: 90%; max-width: 90%;
} }
/*** home ***/ /*** home ***/
#homerows div { #homerows div {
text-align:center; text-align:center;
background-color: #2C3E50; background-color: #2C3E50;
@ -217,9 +225,9 @@
#homerows div i { #homerows div i {
font-size: 28px; font-size: 28px;
} }
/********************* /***************
* listviews * listviews *
********************/ ***************/
.table li a { .table li a {
color: #555 !important; color: #555 !important;
font-size: 80% !important; font-size: 80% !important;
@ -241,22 +249,7 @@
list-style-type:none; 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 { .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; border-bottom: 1px solid #CECECE;
} }
@ -270,7 +263,7 @@
.smalldivider { .smalldivider {
font-size: 25% !important; font-size: 25% !important;
heigth: 5px !important; height: 5px !important;
background-color: #ddd !important; background-color: #ddd !important;
} }
@ -281,7 +274,6 @@
#playlistslist, #playlisttracks { #playlistslist, #playlisttracks {
margin: 0 !important; margin: 0 !important;
padding: 0 !important; padding: 0 !important;
/* border: 1px solid blue; */
} }
.albumli { .albumli {
@ -295,7 +287,7 @@
.artistcover { .artistcover {
float: right; float: right;
width: 30px; width: 30px;
heigth: 30px; height: 30px;
margin-right: 3px; margin-right: 3px;
margin-top: 3px; margin-top: 3px;
} }
@ -327,9 +319,9 @@
} }
/******************* /**********************
* Now Playing area * Now Playing area *
*******************/ **********************/
#nowPlayingFooter{ #nowPlayingFooter{
height: 50px; height: 50px;
@ -346,7 +338,7 @@
.footerControls div span { .footerControls div span {
padding-left: 3px; padding-left: 3px;
padding-right: 3px; padding-right: 3px;
height=100%; height: 100%;
vertical-align: middle; vertical-align: middle;
} }
@ -356,10 +348,9 @@
margin-right: 10px; margin-right: 10px;
} }
/************
/******************* * Popups *
* Popups ************/
*******************/
#modalalbum a, #modalartist a { #modalalbum a, #modalartist a {
color: #444; color: #444;
text-decoration: none; text-decoration: none;
@ -408,13 +399,11 @@
display:block !important; display:block !important;
} }
/****************
/*************** * Common use *
* common use ****************/
***************/
#playlistspane { #playlistspane {
/* height: 90% !important;*/
margin: 0px !important; margin: 0px !important;
} }
@ -448,7 +437,7 @@ a {
float: right; float: right;
} }
/********************** /**********************
* Song information * Song information *
**********************/ **********************/
.ui-footer{ .ui-footer{
border: 0px; border: 0px;
@ -464,7 +453,7 @@ a {
#infoname { #infoname {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
font: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
} }
@ -503,9 +492,7 @@ a {
text-align: center; text-align: center;
} }
/*helper*/ /*helper*/
.hidden{ .hidden{
display: none; display: none;
} }
@ -513,7 +500,6 @@ a {
color: #efefef; color: #efefef;
} }
.settingscoll label { .settingscoll label {
font-size: 120%; font-size: 120%;
font-weight: bold; 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 { .ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal {
margin-right: 17em; 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-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-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-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 { .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; margin: 0 0 0 17em;
} }
.ui-responsive-panel .ui-panel-dismiss-display-reveal { .ui-responsive-panel .ui-panel-dismiss-display-reveal {
display: none; display: none;
} }
@ -543,29 +531,34 @@ a {
#nowPlayingpane{ #nowPlayingpane{
padding: 15px 25px 0px 25px; padding: 15px 25px 0px 25px;
} }
#nowPlayingpane #controlspopupimage{ #nowPlayingpane #controlspopupimage{
max-width:90%; max-width:90%;
max-height:90%; max-height:90%;
} }
.nowPlaying-artistInfo { .nowPlaying-artistInfo {
font-size: 12px; font-size: 12px;
} }
.nowPlaying-artistInfo h4{ .nowPlaying-artistInfo h4{
margin: 0px; margin: 0px;
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
} }
.nowPlaying-artistInfo h3{ .nowPlaying-artistInfo h3{
margin: 0px 0px 3px 00px; margin: 0px 0px 3px 00px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
} }
#controlspopupimage{ #controlspopupimage{
max-width:90%; max-width:90%;
max-height:90%; max-height:90%;
margin-bottom: 3px; margin-bottom: 3px;
} }
#nowPlayingpane #slidercontainer { #nowPlayingpane #slidercontainer {
margin-left: -5px; margin-left: -5px;
margin-right: -5px; margin-right: -5px;
@ -579,7 +572,6 @@ a {
} }
/* disable text selection for mouse swipe */ /* disable text selection for mouse swipe */
body * { body * {
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
@ -587,23 +579,16 @@ body * {
-o-user-select: none; -o-user-select: none;
user-select: none; user-select: none;
} }
/* but fix for text input (safari certainly needs it)*/ /* but fix for text input (safari certainly needs it)*/
input[type=text] { input[type=text] {
-moz-user-select: text;
-webkit-user-select: text; -webkit-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
-o-user-select: text; -o-user-select: text;
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 { .mediaicon {
float: right; float: right;
} }

3
mopidy_musicbox_webclient/static/index.html
View File

@ -4,7 +4,6 @@
<meta charset="utf-8"> <meta charset="utf-8">
<script src="js/jquery-1.11.1.min.js"></script> <script src="js/jquery-1.11.1.min.js"></script>
<link rel="stylesheet" type="text/css" href="css/jquery.mobile.flatui.min.css"/> <link rel="stylesheet" type="text/css" href="css/jquery.mobile.flatui.min.css"/>
<!-- <script type='application/javascript' src='js/fastclick.js'></script> -->
<script> <script>
//configuration //configuration
var isMusicBox = '{{musicbox}}' == 'True'; // Remove MusicBox only content (e.g. settings, system pages) var isMusicBox = '{{musicbox}}' == 'True'; // Remove MusicBox only content (e.g. settings, system pages)
@ -475,10 +474,8 @@
<!-- /page one --> <!-- /page one -->
<script type="text/javascript" src="../mopidy/mopidy.min.js"></script> <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/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.cookie.js"></script>
<script src="js/jquery.truncate.min.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/controls.js"></script>
<script src="js/library.js"></script> <script src="js/library.js"></script>
<script src="js/functionsvars.js"></script> <script src="js/functionsvars.js"></script>

68
mopidy_musicbox_webclient/static/js/controls.js vendored
View File

@ -1,6 +1,6 @@
/******************************************************** /***********************************
* play tracks from a browse list * play tracks from a browse list *
*********************************************************/ ***********************************/
function playBrowsedTracks(action, trackIndex) { function playBrowsedTracks(action, trackIndex) {
$('#popupBrowse').popup('close'); $('#popupBrowse').popup('close');
toast('Loading...'); toast('Loading...');
@ -54,10 +54,9 @@ function playBrowsedTracks(action, trackIndex) {
return false; return false;
} }
/*********************************
/******************************************************** * play an uri from a tracklist *
* play an uri from a tracklist *********************************/
*********************************************************/
function playTrack(action) { function playTrack(action) {
var hash = document.location.hash.split('?'); var hash = document.location.hash.split('?');
var divid = hash[0].substr(1); var divid = hash[0].substr(1);
@ -165,7 +164,6 @@ function playTrackByUri(track_uri, playlist_uri) {
* @returns {boolean} * @returns {boolean}
*/ */
function playTrackQueueByTlid(uri, tlid) { function playTrackQueueByTlid(uri, tlid) {
// console.log('playquuri');
//stop directly, for user feedback //stop directly, for user feedback
mopidy.playback.stop(); mopidy.playback.stop();
$('#popupQueue').popup('close'); $('#popupQueue').popup('close');
@ -191,15 +189,14 @@ function playTrackQueueByTlid(uri, tlid) {
* @returns {boolean} * @returns {boolean}
*/ */
function playTrackQueue() { function playTrackQueue() {
// console.log('playqu');
uri = $('#popupQueue').data("track"); uri = $('#popupQueue').data("track");
tlid = $('#popupQueue').data("tlid"); tlid = $('#popupQueue').data("tlid");
return playTrackQueueByTlid(uri, tlid); return playTrackQueueByTlid(uri, tlid);
} }
/******************************************************** /***********************************
* remove a track from the queue * remove a track from the queue *
*********************************************************/ ***********************************/
function removeTrack() { function removeTrack() {
$('#popupQueue').popup('close'); $('#popupQueue').popup('close');
toast('Deleting...'); toast('Deleting...');
@ -241,15 +238,14 @@ function saveQueue() {
return false; return false;
} }
function refreshPlaylists() { function refreshPlaylists() {
mopidy.playlists.refresh(); mopidy.playlists.refresh();
return false; return false;
} }
/********************** /*************
* Buttons * Buttons *
*/ *************/
function doShuffle() { function doShuffle() {
mopidy.playback.stop(); mopidy.playback.stop();
@ -303,10 +299,9 @@ function backbt() {
return false; return false;
} }
/*************** /*************
* Options * Options *
***************/ *************/
function setTracklistOption(name, new_value) { function setTracklistOption(name, new_value) {
if (!new_value) { if (!new_value) {
$("#"+name+"bt").attr('style', 'color:#2489ce'); $("#"+name+"bt").attr('style', 'color:#2489ce');
@ -357,11 +352,10 @@ function doSingle() {
} }
/********************* /***********************************************
* Track Slider * Track Slider *
* Use a timer to prevent looping of commands * Use a timer to prevent looping of commands *
*********************/ ***********************************************/
function doSeekPos(value) { function doSeekPos(value) {
var val = $("#trackslider").val(); var val = $("#trackslider").val();
newposition = Math.round(val); newposition = Math.round(val);
@ -377,10 +371,7 @@ function doSeekPos(value) {
function triggerPos() { function triggerPos() {
if (mopidy) { if (mopidy) {
posChanging = true; posChanging = true;
// mopidy.playback.pause();
// console.log(newposition);
mopidy.playback.seek(newposition); mopidy.playback.seek(newposition);
// mopidy.playback.resume();
resumePosTimer(); resumePosTimer();
posChanging = false; posChanging = false;
} }
@ -402,10 +393,10 @@ function setPosition(pos) {
$("#songelapsed").html(timeFromSeconds(currentposition / 1000)); $("#songelapsed").html(timeFromSeconds(currentposition / 1000));
} }
/******************** /***********************************************
* Volume slider * Volume slider *
* Use a timer to prevent looping of commands * Use a timer to prevent looping of commands *
*/ ***********************************************/
function setVolume(value) { function setVolume(value) {
if ($("#volumeslider").val() != value) { if ($("#volumeslider").val() != value) {
@ -439,15 +430,14 @@ function doMute() {
mopidy.mixer.setMute(!mute); mopidy.mixer.setMute(!mute);
} }
/******* /**************************
* Track position timer * Track position timer *
*/ **************************/
//timer function to update interface //timer function to update interface
function updatePosTimer() { function updatePosTimer() {
currentposition += TRACK_TIMER; currentposition += TRACK_TIMER;
setPosition(currentposition); setPosition(currentposition);
// $("#songelapsed").html(timeFromSeconds(currentposition / 1000));
} }
function resumePosTimer() { function resumePosTimer() {
@ -467,9 +457,9 @@ function pausePosTimer() {
clearInterval(posTimer); clearInterval(posTimer);
} }
/********************************* /************
* Stream * Stream *
*********************************/ ************/
function streamPressed(key) { function streamPressed(key) {
if (key == 13) { if (key == 13) {
playStreamUri(); playStreamUri();

28
mopidy_musicbox_webclient/static/js/functionsvars.js
View File

@ -28,7 +28,7 @@ var songlength = 0;
var artistshtml = ''; var artistshtml = '';
var artiststext = ''; var artiststext = '';
var songname = ''; var songname = '';
var songdata = {'track':{}, 'tlid':-1}; var songdata = {'track': {}, 'tlid': -1};
var newposition = 0; var newposition = 0;
var playlisttracksScroll; var playlisttracksScroll;
@ -53,7 +53,6 @@ var ua = navigator.userAgent,
//constants //constants
PROGRAM_NAME = 'MusicBox'; PROGRAM_NAME = 'MusicBox';
//PROGRAM_NAME = 'Mopidy';
ARTIST_TABLE = '#artiststable'; ARTIST_TABLE = '#artiststable';
ALBUM_TABLE = '#albumstable'; ALBUM_TABLE = '#albumstable';
PLAYLIST_TABLE = '#playlisttracks'; PLAYLIST_TABLE = '#playlisttracks';
@ -127,10 +126,6 @@ function scrollToTop() {
} }
function scrollToTracklist() { function scrollToTracklist() {
/* if (isMobileWebkit) {
playlistslistScroll.refresh();
}
*/
var divtop = $("#playlisttracksdiv").offset().top - 120; var divtop = $("#playlisttracksdiv").offset().top - 120;
$('body,html').animate({ $('body,html').animate({
scrollTop: divtop scrollTop: divtop
@ -198,12 +193,10 @@ function renderSongLi(song, liID, uri) {
} else { } else {
name = song.name; name = song.name;
} }
// var iconClass = getMediaClass(liID.split('-')[1]);
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-v"></i></a>' + '<i class="fa fa-ellipsis-v"></i></a>' +
'<a href="#" onclick="return playTrackByUri(\'' + song.uri + '\',\'' + uri + '\');">' + '<a href="#" onclick="return playTrackByUri(\'' + song.uri + '\',\'' + uri + '\');">' +
// '<h1 class="trackname"><i class="' + iconClass + '"></i> ' + name + '</h1>' +
'<h1 class="trackname">' + name + '</h1></a>' + '<h1 class="trackname">' + name + '</h1></a>' +
'</li>'; '</li>';
return songLi; return songLi;
@ -217,12 +210,10 @@ function renderQueueSongLi(song, liID, uri, tlid) {
} else { } else {
name = song.name; name = song.name;
} }
// var iconClass = getMediaClass(liID.split('-')[1]);
songLi = '<li class="song albumli" id="' + liID + '" tlid="' + tlid + '">' + songLi = '<li class="song albumli" id="' + liID + '" tlid="' + tlid + '">' +
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\',\'' + tlid + '\');">' + '<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\',\'' + tlid + '\');">' +
'<i class="fa fa-ellipsis-v"></i></a>' + '<i class="fa fa-ellipsis-v"></i></a>' +
'<a href="#" onclick="return playTrackQueueByTlid(\'' + song.uri + '\',\'' + tlid + '\');">' + '<a href="#" onclick="return playTrackQueueByTlid(\'' + song.uri + '\',\'' + tlid + '\');">' +
// '<h1 class="trackname"><i class="' + iconClass + '"></i> ' + name + '</h1>' +
'<h1 class="trackname">' + name + '</h1></a>' + '<h1 class="trackname">' + name + '</h1></a>' +
'</li>'; '</li>';
return songLi; return songLi;
@ -310,7 +301,6 @@ function resultsToTables(results, target, uri) {
'<h1><i class="' + iconClass + '"></i> ' + newalbum[0].name + "</h1><p>"; '<h1><i class="' + iconClass + '"></i> ' + newalbum[0].name + "</h1><p>";
} }
/* '<span style="float: right;">' + timeFromSeconds(newalbum[0].length / 1000) + '</span>'; */
if (newalbum[0].artists) { if (newalbum[0].artists) {
for (j = 0; j < newalbum[0].artists.length; j++) { for (j = 0; j < newalbum[0].artists.length; j++) {
html += newalbum[0].artists[j].name; html += newalbum[0].artists[j].name;
@ -333,7 +323,6 @@ function resultsToTables(results, target, uri) {
newtlids = []; newtlids = [];
} else { //newalbum length } else { //newalbum length
if (results[i].album.uri && results[i].album.name) { if (results[i].album.uri && results[i].album.name) {
// iconClass = getMediaClass(results[i].album.uri);
iconClass = getMediaClass(newalbum[0].uri); iconClass = getMediaClass(newalbum[0].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="' +
@ -353,8 +342,6 @@ function resultsToTables(results, target, uri) {
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];
// html += '<li class="albumli" id="' + targetmin + '-' + newalbum[j].uri + '"><a href="#" onclick="return ' + popupMenu + '(event, \'' + uri + '\',\'' + newalbum[j].uri + '\');">';
//hERE! //hERE!
var liID = targetmin + '-' + newalbum[j].uri; var liID = targetmin + '-' + newalbum[j].uri;
if (target == CURRENT_PLAYLIST_TABLE) { if (target == CURRENT_PLAYLIST_TABLE) {
@ -362,9 +349,6 @@ function resultsToTables(results, target, uri) {
} else { } else {
html += renderSongLi(newalbum[j], liID, uri); 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 = []; newalbum = [];
newtlids = []; newtlids = [];
@ -383,7 +367,6 @@ function resultsToTables(results, target, uri) {
$(target).attr('data', uri); $(target).attr('data', uri);
//retreive albumcovers //retreive albumcovers
for (i = 0; i < coversList.length; i++) { for (i = 0; i < coversList.length; i++) {
// console.log(coversList[i]);
getCover(coversList[i][0], target + '-cover-' + coversList[i][1], 'small'); 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 += '<h1>' + pl[i].name + "</h1>";
child += '<p>'; child += '<p>';
child += '<span style="float: right;">' + timeFromSeconds(pl[i].length / 1000) + '</span>'; child += '<span style="float: right;">' + timeFromSeconds(pl[i].length / 1000) + '</span>';
// <span class="ui-icon ui-icon-arrow-r ui-icon-shadow">&nbsp;</span>
for (var j = 0; j < pl[i].artists.length; j++) { for (var j = 0; j < pl[i].artists.length; j++) {
if (pl[i].artists[j]) { if (pl[i].artists[j]) {
child += pl[i].artists[j].name; 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); return ((h > 0 ? h + ":" : "") + (m > 0 ? (h > 0 && m < 10 ? "0" : "") + m + ":" : "0:") + (s < 10 ? "0" : "") + s);
} }
/******* Toast ***/ /******* Toast ***/
function toast(message, delay, textOnly) { function toast(message, delay, textOnly) {
textOnl = textOnly || false; textOnl = textOnly || false;
@ -482,9 +463,9 @@ function toast(message, delay, textOnly) {
} }
} }
/***************** /******************
* Modal dialogs * Modal dialogs *
*****************/ ******************/
function showLoading(on) { function showLoading(on) {
if (on) { if (on) {
$("body").css("cursor", "progress"); $("body").css("cursor", "progress");
@ -515,7 +496,6 @@ function showOffline(on) {
// from http://dzone.com/snippets/validate-url-regexp // from http://dzone.com/snippets/validate-url-regexp
function validUri(str) { function validUri(str) {
var regexp = /^(mms|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/ var regexp = /^(mms|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/
// return regexp.test(str) || isServiceUri(str);
return regexp.test(str); return regexp.test(str);
} }

38
mopidy_musicbox_webclient/static/js/gui.js
View File

@ -4,7 +4,7 @@
* show- functions do both * show- functions do both
*/ */
/******************** /********************
* Song Info Sreen * Song Info Sreen *
********************/ ********************/
function resetSong() { function resetSong() {
if (!posChanging) { if (!posChanging) {
@ -148,9 +148,9 @@ function setSongInfo(data) {
resizeMb(); resizeMb();
} }
/*************** /******************
* display popups * display popups *
*/ ******************/
function closePopups() { function closePopups() {
$('#popupTracks').popup('close'); $('#popupTracks').popup('close');
$('#artistpopup').popup('close'); $('#artistpopup').popup('close');
@ -159,7 +159,6 @@ function closePopups() {
$('#controlspopup').popup('close'); $('#controlspopup').popup('close');
} }
function popupTracks(e, listuri, trackuri, tlid) { function popupTracks(e, listuri, trackuri, tlid) {
if (!e) if (!e)
var e = window.event; var e = window.event;
@ -222,9 +221,9 @@ function showAlbumPopup(popupId) {
showAlbum(popupData[uri].album.uri); showAlbum(popupData[uri].album.uri);
} }
/********************* /**********************
* initialize sockets * initialize sockets *
*********************/ **********************/
function initSocketevents() { function initSocketevents() {
mopidy.on("state:online", function() { mopidy.on("state:online", function() {
@ -254,7 +253,6 @@ function initSocketevents() {
}); });
mopidy.on("event:trackPlaybackPaused", function(data) { mopidy.on("event:trackPlaybackPaused", function(data) {
//setSongInfo(data.tl_track);
pausePosTimer(); pausePosTimer();
setPlayState(false); setPlayState(false);
}); });
@ -305,9 +303,9 @@ $(document).bind("pageinit", function() {
}); });
/************************ /**************
* gui stuff * gui stuff *
************************/ **************/
function enterFullscreen() { 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(); } 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"); var elem = document.querySelector("#page");
@ -324,6 +322,7 @@ function enterFullscreen() {
} }
} }
} }
function exitFullscreen() { function exitFullscreen() {
document.webkitExitFullscreen(); document.webkitExitFullscreen();
document.mozCancelFullscreen(); document.mozCancelFullscreen();
@ -349,7 +348,6 @@ function switchContent(divid, uri) {
if (uri) { if (uri) {
hash += "?" + uri; hash += "?" + uri;
} }
// $.mobile.changePage("#" + hash);
location.hash = "#" + hash; location.hash = "#" + hash;
} }
@ -364,7 +362,6 @@ function setHeadline(site){
//update timer //update timer
function updateStatusTimer() { function updateStatusTimer() {
// console.log('statustimer');
mopidy.playback.getCurrentTlTrack().then(processCurrenttrack, console.error); mopidy.playback.getCurrentTlTrack().then(processCurrenttrack, console.error);
mopidy.playback.getTimePosition().then(processCurrentposition, console.error); mopidy.playback.getTimePosition().then(processCurrentposition, console.error);
//TODO check offline? //TODO check offline?
@ -447,7 +444,6 @@ function locationHashChanged() {
break; break;
} }
//switch the footer //switch the footer
switch(divid) { switch(divid) {
case 'nowPlaying': case 'nowPlaying':
@ -463,9 +459,9 @@ function locationHashChanged() {
return false; return false;
} }
/********************** /***********************
* initialize software * initialize software *
**********************/ ***********************/
$(document).ready(function(event) { $(document).ready(function(event) {
//check for websockets //check for websockets
if (!window.WebSocket) { if (!window.WebSocket) {
@ -488,8 +484,7 @@ $(document).ready(function(event) {
} else { } else {
mopidy = new Mopidy(); mopidy = new Mopidy();
} }
// mopidy.on(console.log.bind(console)); // Log all events
// mopidy.on(console.error.bind(console));
//initialize events //initialize events
initSocketevents(); initSocketevents();
@ -499,7 +494,6 @@ $(document).ready(function(event) {
switchContent("home"); switchContent("home");
} }
initgui = false; initgui = false;
window.onhashchange = locationHashChanged; 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.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.verticalDistanceThreshold = 50; // (default: 75px) Swipe vertical displacement must be less than this.
// $.event.special.swipe.scrollSupressionThreshold = 20;
$.event.special.swipe.durationThreshold = 500; $.event.special.swipe.durationThreshold = 500;
// swipe songinfo and panel // swipe songinfo and panel
@ -624,6 +617,7 @@ function updatePlayIcons (uri, tlid) {
$(this).removeClass("currenttrack2"); $(this).removeClass("currenttrack2");
} }
}); });
$('#trackresulttable li').each(function() { $('#trackresulttable li').each(function() {
if (this.id == 'trackresulttable-' + uri) { if (this.id == 'trackresulttable-' + uri) {
$(this).addClass('currenttrack2'); $(this).addClass('currenttrack2');

7
mopidy_musicbox_webclient/static/js/images.js
View File

@ -2,14 +2,13 @@
* @author Wouter van Wijk * @author Wouter van Wijk
*/ */
API_KEY= 'b6d34c3af91d62ab0ae00ab1b6fa8733'; API_KEY = 'b6d34c3af91d62ab0ae00ab1b6fa8733';
API_SECRET = '2c631802c2285d5d5d1502462fe42a2b'; API_SECRET = '2c631802c2285d5d5d1502462fe42a2b';
var fmcache; var fmcache;
var lastfm; var lastfm;
$(window).load(function () {
$(window).load(function() {
// create a Cache object // create a Cache object
fmcache = new LastFMCache(); fmcache = new LastFMCache();
// create a LastFM object // create a LastFM object
@ -20,7 +19,6 @@ $(window).load(function() {
}); });
}); });
function getCover(album, images, size) { function getCover(album, images, size) {
var defUrl = 'images/default_cover.png'; var defUrl = 'images/default_cover.png';
$(images).attr('src', defUrl); $(images).attr('src', defUrl);
@ -32,7 +30,6 @@ function getCover(album, images, size) {
if ( album.artists && (album.artists.length > 0) ) { if ( album.artists && (album.artists.length > 0) ) {
artistname = album.artists[0].name; artistname = album.artists[0].name;
} }
// console.log(album, images);
if (album.images && (album.images.length > 0) ) { if (album.images && (album.images.length > 0) ) {
$(images).attr('src', album.images[0]); $(images).attr('src', album.images[0]);
} else { } else {

19
mopidy_musicbox_webclient/static/js/library.js
View File

@ -79,15 +79,6 @@ function processSearchResults(resultArr) {
var results = {'tracks': [], 'artists': [], 'albums': []}; var results = {'tracks': [], 'artists': [], 'albums': []};
var j, emptyResult = true; 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++) { for (var i = 0; i < resultArr.length; i++) {
if (resultArr[i].tracks) { if (resultArr[i].tracks) {
for (j = 0; j < resultArr[i].tracks.length; j++) { 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; customTracklists[URI_SCHEME+':trackresultscache'] = results.tracks;
if (emptyResult) { if (emptyResult) {
@ -196,7 +183,6 @@ function processSearchResults(resultArr) {
$('#expandsearch').show(); $('#expandsearch').show();
// Track results // Track results
// playlisttotable(results.tracks, SEARCH_TRACK_TABLE, URI_SCHEME+':trackresultscache');
resultsToTables(results.tracks, SEARCH_TRACK_TABLE, URI_SCHEME+':trackresultscache'); resultsToTables(results.tracks, SEARCH_TRACK_TABLE, URI_SCHEME+':trackresultscache');
showLoading(false); showLoading(false);
@ -261,7 +247,6 @@ function showTracklist(uri) {
$(this).addClass('playlistactive'); $(this).addClass('playlistactive');
} }
}); });
// scrollToTracklist();
return false; return false;
} }
@ -274,8 +259,7 @@ function showArtist(nwuri) {
$('#popupTracks').popup('close'); $('#popupTracks').popup('close');
$('#controlsmodal').popup('close'); $('#controlsmodal').popup('close');
$(ARTIST_TABLE).empty(); $(ARTIST_TABLE).empty();
//fill from cache
// var pl = getTracksFromUri(nwuri);
//TODO cache //TODO cache
$('#h_artistname').html(''); $('#h_artistname').html('');
showLoading(true); showLoading(true);
@ -308,7 +292,6 @@ function showAlbum(uri) {
resultArr.uri = uri; resultArr.uri = uri;
processAlbumResults(resultArr); processAlbumResults(resultArr);
}, console.error); }, console.error);
// getCover(pl, '#albumviewcover, #coverpopupimage', 'extralarge');
} else { } else {
showLoading(true); showLoading(true);
$('#h_albumname').html(''); $('#h_albumname').html('');

8
mopidy_musicbox_webclient/static/js/process_ws.js
View File

@ -139,14 +139,6 @@ function processBrowseDir(resultArr) {
$('#browselist').html(child); $('#browselist').html(child);
if (browseStack.length > 0 ) { 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); child = getMediaHuman(resultArr[0].uri);
iconClass = getMediaClass(resultArr[0].uri); iconClass = getMediaClass(resultArr[0].uri);
$('#browsepath').html('<i class="' + iconClass + '"></i> ' + child); $('#browsepath').html('<i class="' + iconClass + '"></i> ' + child);

18
mopidy_musicbox_webclient/static/js/streamuris.js
View File

@ -6,12 +6,12 @@
var streamUris = []; var streamUris = [];
//fill with defaults //fill with defaults
streamUris.push(['NPR 24', 'http://nprdmp.ic.llnwd.net/stream/nprdmp_live01_mp3']); 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(['3FM Dutch', 'http://icecast.omroep.nl/3fm-bb-mp3']);
streamUris.push(['BBC WorldService', 'http://vprbbc.streamguys.net:8000/vprbbc24.mp3']); streamUris.push(['BBC WorldService', 'http://vprbbc.streamguys.net:8000/vprbbc24.mp3']);
streamUris.push(['Arrow Jazz', 'http://81.173.3.132:8082']); 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(['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(['Groove Salad - Soma FM', 'http://somafm.com/groovesalad.pls']);
streamUris.push(['Kiss FM Berlin', 'http://stream.kissfm.de/kissfm/mp3-128/internetradio/']); 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(['Muse - Newborn (SoundCloud)', 'sc:https://soundcloud.com/muse/01-new-born']);
streamUris.push(['Pinguin Radio', 'http://pr320.pinguinradio.com/listen.pls']); streamUris.push(['Pinguin Radio', 'http://pr320.pinguinradio.com/listen.pls']);