Import fixes, opera layout fixes, player improvements
This commit is contained in:
@@ -4,8 +4,11 @@
|
||||
border: none;
|
||||
}
|
||||
|
||||
body {
|
||||
html, body {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: Helvetica, Arial, sans-serif;
|
||||
font-size: 14px;
|
||||
-moz-user-select: none;
|
||||
@@ -14,6 +17,7 @@ body {
|
||||
user-select: none;
|
||||
cursor: default;
|
||||
min-width: 1000px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#header-container {
|
||||
|
||||
@@ -41,6 +41,7 @@ var Player = {
|
||||
},
|
||||
|
||||
addTrack: function(artist, track, length) {
|
||||
var initial_count = $('.playlist-tracks li').length;
|
||||
$('.playlist-tracks').append('\
|
||||
<li id="i'+ Math.round(Math.random() * 999999) +'">\
|
||||
<div class="item">\
|
||||
@@ -54,6 +55,10 @@ var Player = {
|
||||
|
||||
$('#playlist').html($('.playlist-tracks')).scrollbar();
|
||||
$('.playlist-tracks').sortable();
|
||||
|
||||
if (initial_count === 0 && !Player.hasTrack()) {
|
||||
Player.setTrack($('.playlist-tracks li').first().attr('id').split('i')[1]);
|
||||
}
|
||||
},
|
||||
|
||||
setTrack: function(id) {
|
||||
@@ -71,6 +76,16 @@ var Player = {
|
||||
Player.updateNowListening(tmp[0], tmp[1]);
|
||||
},
|
||||
|
||||
hasTrack: function() {
|
||||
if ($('#jplayer audio').length > 0) {
|
||||
return typeof $('#jplayer audio').attr('src') !== 'undefined';
|
||||
} else if ($('#jplayer audio').length > 0) {
|
||||
$('#jplayer').jPlayer('play');
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
|
||||
playSource: function(url) {
|
||||
$('#jplayer').jPlayer('setMedia', {mp3: url}).jPlayer('play');
|
||||
Player.scrobbled = false;
|
||||
@@ -132,6 +147,12 @@ $('.add-track').live('click', function(){
|
||||
Player.addTrack(artist, track_name, length);
|
||||
});
|
||||
|
||||
$('#player .play').live('click', function(){
|
||||
if ($('.playlist-tracks li').length > 0 && !Player.hasTrack()) {
|
||||
Player.setTrack($('.playlist-tracks li').first().attr('id').split('i')[1]);
|
||||
}
|
||||
});
|
||||
|
||||
$('.tracklist li').live('mouseover mouseout', function(e){
|
||||
if (e.type == 'mouseover') {
|
||||
$(this).find('.add-track').show();
|
||||
|
||||
Reference in New Issue
Block a user