+
Cannot connect to the server. Please wait...
+ 
-
+
@@ -245,6 +239,7 @@
Getting data from Spotify. This could take a while if you just started Mopidy. Please wait...
+
diff --git a/webclient/js/functionsvars.js b/webclient/js/functionsvars.js
index 189fb94..4bad9b2 100755
--- a/webclient/js/functionsvars.js
+++ b/webclient/js/functionsvars.js
@@ -76,18 +76,24 @@ function playlisttotable(pl, table, uri) {
*/
var tmp = '';
$(table).empty();
+// console.log(pl);
for (var i = 0; i < pl.length; i++) {
- // console.log(pl[i]);
var child = '
| ' + pl[i].name + " | ";
for (var j = 0; j < pl[i].artists.length; j++) {
- //console.log(j);
+ // console.log(j);
child += '' + pl[i].artists[j].name + "";
+ //stop after 3
+ if (j > 1) {
+ child += '...';
+ break;
+ }
}
child += ' | ' + pl[i].album.name + ' | ' + timeFromSeconds(pl[i].length / 1000) + ' |
';
tmp += child;
};
$(table).html(tmp);
$(table).attr('data', uri);
+// console.log(tmp);
//set click handlers
$(table + ' .name').click(function() {
return playtrack(this.id, uri)
@@ -109,7 +115,6 @@ function albumtrackstotable(pl, table, uri) {
var tmp = '';
$(table).empty();
for (var i = 0; i < pl.length; i++) {
- // console.log(pl[i]);
var child = '
| ' + pl[i].name + " | ";
child += ' | ' + timeFromSeconds(pl[i].length / 1000) + ' |
';
tmp += child;
diff --git a/webclient/js/gui.js b/webclient/js/gui.js
index abfd012..0777cb8 100755
--- a/webclient/js/gui.js
+++ b/webclient/js/gui.js
@@ -9,7 +9,6 @@ function showartist(nwuri) {
$(ARTIST_TABLE).empty();
//fill from cache
var pl = getTracksFromUri(nwuri);
- //console.log(pl);
if (pl) {
playlisttotable(pl, ARTIST_TABLE, nwuri)
$('#h_artistname').html(getArtist(pl));
@@ -28,7 +27,6 @@ function showalbum(uri) {
$(ALBUM_TABLE).empty();
//fill from cache
var pl = getTracksFromUri(uri);
- console.log(pl);
if (pl) {
playlisttotable(pl, ALBUM_TABLE, uri)
$('#h_albumname').html(getAlbum(pl));
@@ -139,28 +137,28 @@ function doPlayPause() {
/* Initialise search */
function searchPressed(key) {
var value = $('#searchinput').val();
- // console.log(value);
- // console.log(key);
switchContent('search');
if (key == 13) {
- $('#artistresultloader').show();
- $('#allresultloader').show();
- $('#albumresultloader').show();
-
- $('#artistresulttable').empty();
- $('#albumresulttable').empty();
- $('#trackresulttable').empty();
-
- initSearch(value);
+ initSearch();
return false;
}
return true;
}
//init search
-function initSearch(value) {
+function initSearch() {
+ var value = $('#searchinput').val();
+
if ((value.length < 100) && (value.length > 0)) {
+ $('#artistresultloader').show();
+ $('#allresultloader').show();
+ $('#albumresultloader').show();
+
+ $('#artistresulttable').empty();
+ $('#albumresulttable').empty();
+ $('#trackresulttable').empty();
+
delete customTracklists['allresultscache'];
delete customTracklists['artistresultscache'];
delete customTracklists['albumresultscache'];
@@ -243,7 +241,6 @@ function doRepeat() {
}
function doVolume(value) {
- console.log(value);
if (!initgui) {
mopidy.playback.setVolume(value);
}
@@ -284,12 +281,17 @@ function showTracklist(uri) {
$('#playlistloader').show();
var pl = getPlaylistFromUri(uri);
- console.log (pl);
+// console.log (pl);
//load from cache
if (pl) {
playlisttotable(pl.tracks, PLAYLIST_TABLE, uri);
- $('body,html').scrollTop($("#playlistspane").offset().top - 100);
}
+
+ //scroll to tracklist
+ var divtop = $("#playlisttablediv").offset().top - 80;
+ $('body,html').animate({scrollTop: divtop}, 250);
+
+ //lookup recent tracklist
mopidy.playlists.lookup(uri).then(processGetTracklist, console.error);
return false;
}
@@ -465,7 +467,7 @@ $(document).ready(function() {
}
// Set the page title based on the hash.
- //document.title = PROGRAM_NAME + ' - ' + divid;
+ //document.title = PROGRAM_NAME;
$('.content').hide();
$('.nav li').removeClass('active');
diff --git a/webclient/js/jquery.touchwipe.min.js b/webclient/js/jquery.touchwipe.min.js
new file mode 100644
index 0000000..fe2d407
--- /dev/null
+++ b/webclient/js/jquery.touchwipe.min.js
@@ -0,0 +1,10 @@
+/**
+ * jQuery Plugin to obtain touch gestures from iPhone, iPod Touch and iPad, should also work with Android mobile phones (not tested yet!)
+ * Common usage: wipe images (left and right to show the previous or next image)
+ *
+ * @author Andreas Waltl, netCU Internetagentur (http://www.netcu.de)
+ * @version 1.1.1 (9th December 2010) - fix bug (older IE's had problems)
+ * @version 1.1 (1st September 2010) - support wipe up and wipe down
+ * @version 1.0 (15th July 2010)
+ */
+(function($){$.fn.touchwipe=function(settings){var config={min_move_x:20,min_move_y:20,wipeLeft:function(){},wipeRight:function(){},wipeUp:function(){},wipeDown:function(){},preventDefaultEvents:true};if(settings)$.extend(config,settings);this.each(function(){var startX;var startY;var isMoving=false;function cancelTouch(){this.removeEventListener('touchmove',onTouchMove);startX=null;isMoving=false}function onTouchMove(e){if(config.preventDefaultEvents){e.preventDefault()}if(isMoving){var x=e.touches[0].pageX;var y=e.touches[0].pageY;var dx=startX-x;var dy=startY-y;if(Math.abs(dx)>=config.min_move_x){cancelTouch();if(dx>0){config.wipeLeft()}else{config.wipeRight()}}else if(Math.abs(dy)>=config.min_move_y){cancelTouch();if(dy>0){config.wipeDown()}else{config.wipeUp()}}}}function onTouchStart(e){if(e.touches.length==1){startX=e.touches[0].pageX;startY=e.touches[0].pageY;isMoving=true;this.addEventListener('touchmove',onTouchMove,false)}}if('ontouchstart'in document.documentElement){this.addEventListener('touchstart',onTouchStart,false)}});return this}})(jQuery);
\ No newline at end of file
diff --git a/webclient/js/ws.js b/webclient/js/ws.js
index 165e069..b82155f 100755
--- a/webclient/js/ws.js
+++ b/webclient/js/ws.js
@@ -12,8 +12,8 @@ function playtrack(uri, playlisturi) {
var trackslist = new Array();
var track;
switchContent('current', uri);
+ mopidy.playback.stop(true);
var tracks = getTracksFromUri(playlisturi);
- console.log(tracks);
if (tracks) {
$(CURRENT_PLAYLIST_TABLE).empty();
mopidy.tracklist.clear();
@@ -21,6 +21,7 @@ function playtrack(uri, playlisturi) {
} else {
tracks = currentplaylist;
}
+
for (var i = 0; i < tracks.length; i++) {
if (tracks[i].uri == uri) {
track = i + 1;
@@ -28,13 +29,11 @@ function playtrack(uri, playlisturi) {
}
}
console.log(track);
-
- mopidy.playback.stop(true);
for (var i = 0; i < track; i++) {
mopidy.playback.next();
}
mopidy.playback.play();
- //(track);
+
return false;
}
@@ -65,14 +64,14 @@ function processRandom(data) {
function processCurrentposition(data) {
var pos = parseInt(data);
setPosition(pos);
- console.log('pos:' + pos);
+ // console.log('pos:' + pos);
}
/********************************************************
* process results playstate
*********************************************************/
function processPlaystate(data) {
- console.log(data);
+ // console.log(data);
if (data == 'playing') {
setPlayState(true);
resumeTimer();
@@ -110,7 +109,6 @@ function processGetTracklist(resultArr) {
//cache result
var newplaylisturi = resultArr.uri;
playlists[newplaylisturi] = resultArr;
- console.log(playlists[newplaylisturi]);
playlisttotable(playlists[newplaylisturi].tracks, PLAYLIST_TABLE, newplaylisturi);
$('body,html').scrollTop($("#playlistspane").offset().top - 100);
@@ -184,7 +182,6 @@ function processArtistResults(resultArr) {
var newalbum = [];
var nexturi = '';
for (var i = 0; i < resultArr.length; i++) {
- //console.log(i);
newalbum.push(resultArr[i]);
nexturi = '';
if (i < resultArr.length - 1) {
@@ -193,11 +190,6 @@ function processArtistResults(resultArr) {
if (resultArr[i].album.uri != nexturi) {
var tableid = 'art' + i;
var html = '
' + resultArr[i].album.name + '
';
-/* for (var j = 0; j < resultArr[i].album.artists.length; j++) {
- //console.log(j);
- html += '
' + resultArr[i].album.artists[j].name + "";
- }
-*/
html += '
';
$(ARTIST_TABLE).append(html);
@@ -210,11 +202,11 @@ function processArtistResults(resultArr) {
$('#artistsloader').hide();
}
+
/********************************************************
* process results of an album lookup
*********************************************************/
function processAlbumResults(resultArr) {
- console.log(resultArr);
customTracklists[resultArr.uri] = resultArr;
playlisttotable(resultArr, ALBUM_TABLE, resultArr.uri);
$('#h_albumname').html(getAlbum(resultArr));
@@ -48,33 +47,24 @@
Search
- 
-
+