Skip to content

Commit

Permalink
Add library/favorite/smile/frown buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
@adammw
adammw committed Feb 7, 2012
1 parent b7dbad9 commit a4bcc5a
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 24 deletions.
38 changes: 38 additions & 0 deletions data/css/sharkzapper_popup.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion data/html/sharkzapper_popup.html
View file
Expand Up @@ -48,7 +48,12 @@ <h1>
<div class="scrollable"><a class="albumName"></a></div> <div class="scrollable"><a class="albumName"></a></div>
</div> </div>
<div id="queueDetail" class="hbox"> <div id="queueDetail" class="hbox">
<div class="flex"></div> <div id="queueButtons" class="hbox flex">
<button id="song_library" class="maskIcon library" title="Add to My Music"></button>
<button id="song_favorite" class="maskIcon favorite" title="Add to Favorites"></button>
<button id="song_smile" class="maskIcon smile"></button>
<button id="song_frown" class="maskIcon frown"></button>
</div>
<div id="queuePosition" style="display: none"> <div id="queuePosition" style="display: none">
<span id="queue_current_position"></span> / <span id="queue_current_position"></span> /
<span id="queue_total"></span> <span id="queue_total"></span>
Expand Down
46 changes: 23 additions & 23 deletions data/js/sharkzapper_popup.js
View file
Expand Up @@ -116,10 +116,10 @@ var sharkzapper = new (function SharkZapperPopup(debug){
$('#player_shuffle').bind('click', sharkzapper.ui.listeners.shuffleClick); $('#player_shuffle').bind('click', sharkzapper.ui.listeners.shuffleClick);
$('#player_loop').bind('click', sharkzapper.ui.listeners.loopClick); $('#player_loop').bind('click', sharkzapper.ui.listeners.loopClick);
$('#player_crossfade').bind('click', sharkzapper.ui.listeners.crossfadeClick); $('#player_crossfade').bind('click', sharkzapper.ui.listeners.crossfadeClick);
$('#addToLibraryBtn').bind('click', sharkzapper.ui.listeners.addToLibraryClick); $('#song_library').bind('click', sharkzapper.ui.listeners.addToLibraryClick);
$('#addToFavoritesBtn').bind('click', sharkzapper.ui.listeners.addToFavoritesClick); $('#song_favorite').bind('click', sharkzapper.ui.listeners.addToFavoritesClick);
$('#radioSmileBtn').bind('click', sharkzapper.ui.listeners.radioSmileClick); $('#song_smile').bind('click', sharkzapper.ui.listeners.radioSmileClick);
$('#radioFrownBtn').bind('click', sharkzapper.ui.listeners.radioFrownClick); $('#song_frown').bind('click', sharkzapper.ui.listeners.radioFrownClick);
$('#player_options').bind('click',sharkzapper.ui.listeners.settingsClick); $('#player_options').bind('click',sharkzapper.ui.listeners.settingsClick);
$('#pin').bind('click',sharkzapper.ui.listeners.pinClick); $('#pin').bind('click',sharkzapper.ui.listeners.pinClick);
$('#songDetails').on('click','.songName, .artistName, .albumName',sharkzapper.ui.listeners.songInfoClick); $('#songDetails').on('click','.songName, .artistName, .albumName',sharkzapper.ui.listeners.songInfoClick);
Expand All @@ -146,10 +146,10 @@ var sharkzapper = new (function SharkZapperPopup(debug){
$('#player_shuffle').unbind('click', sharkzapper.ui.listeners.shuffleClick); $('#player_shuffle').unbind('click', sharkzapper.ui.listeners.shuffleClick);
$('#player_loop').unbind('click', sharkzapper.ui.listeners.loopClick); $('#player_loop').unbind('click', sharkzapper.ui.listeners.loopClick);
$('#player_crossfade').unbind('click', sharkzapper.ui.listeners.crossfadeClick); $('#player_crossfade').unbind('click', sharkzapper.ui.listeners.crossfadeClick);
$('#addToLibraryBtn').unbind('click', sharkzapper.ui.listeners.addToLibraryClick); $('#song_library').unbind('click', sharkzapper.ui.listeners.addToLibraryClick);
$('#addToFavoritesBtn').unbind('click', sharkzapper.ui.listeners.addToFavoritesClick); $('#song_favorite').unbind('click', sharkzapper.ui.listeners.addToFavoritesClick);
$('#radioSmileBtn').unbind('click', sharkzapper.ui.listeners.radioSmileClick); $('#song_smile').unbind('click', sharkzapper.ui.listeners.radioSmileClick);
$('#radioFrownBtn').unbind('click', sharkzapper.ui.listeners.radioFrownClick); $('#song_frown').unbind('click', sharkzapper.ui.listeners.radioFrownClick);
$('#player_options').unbind('click',sharkzapper.ui.listeners.settingsClick); $('#player_options').unbind('click',sharkzapper.ui.listeners.settingsClick);
$('#pin').unbind('click',sharkzapper.ui.listeners.pinClick); $('#pin').unbind('click',sharkzapper.ui.listeners.pinClick);
$('#songDetails').off('click','.songName, .artistName, .albumName',sharkzapper.ui.listeners.songInfoClick); $('#songDetails').off('click','.songName, .artistName, .albumName',sharkzapper.ui.listeners.songInfoClick);
Expand Down Expand Up @@ -185,24 +185,24 @@ var sharkzapper = new (function SharkZapperPopup(debug){
$(this).siblings("input").val("").focus(); $(this).siblings("input").val("").focus();
}, },
addToFavoritesClick: function handle_addToFavoritesClick(e) { addToFavoritesClick: function handle_addToFavoritesClick(e) {
if ($('#addToFavoritesBtn').hasClass('selected')) { if ($('#song_favorite').hasClass('selected')) {
sharkzapper.message.send({"command": "removeFromSongFavorites"}); sharkzapper.message.send({"command": "removeFromSongFavorites"});
} else { } else {
sharkzapper.message.send({"command": "addToSongFavorites"}); sharkzapper.message.send({"command": "addToSongFavorites"});
} }
}, },
addToLibraryClick: function handle_addToLibraryClick(e) { addToLibraryClick: function handle_addToLibraryClick(e) {
if ($('#addToLibraryBtn').hasClass('selected')) { if ($('#song_library').hasClass('selected')) {
sharkzapper.message.send({"command": "removeFromLibrary"}); sharkzapper.message.send({"command": "removeFromLibrary"});
} else { } else {
sharkzapper.message.send({"command": "addToLibrary"}); sharkzapper.message.send({"command": "addToLibrary"});
} }
}, },
radioSmileClick: function handle_radioSmileClick(e) { radioSmileClick: function handle_radioSmileClick(e) {
sharkzapper.message.send({"command": "voteSong", "vote": ($('#radioSmileBtn').hasClass('selected')) ? 0 : 1}); sharkzapper.message.send({"command": "voteSong", "vote": ($('#song_smile').hasClass('selected')) ? 0 : 1});
}, },
radioFrownClick: function handle_radioFrownClick(e) { radioFrownClick: function handle_radioFrownClick(e) {
sharkzapper.message.send({"command": "voteSong", "vote": ($('#radioFrownBtn').hasClass('selected')) ? 0 : -1}); sharkzapper.message.send({"command": "voteSong", "vote": ($('#song_frown').hasClass('selected')) ? 0 : -1});
}, },
loopClick: function handle_loopClick(e) { loopClick: function handle_loopClick(e) {
if ($('#player_loop').hasClass("active") && $('#player_loop').hasClass("one")) { if ($('#player_loop').hasClass("active") && $('#player_loop').hasClass("one")) {
Expand Down Expand Up @@ -407,25 +407,25 @@ var sharkzapper = new (function SharkZapperPopup(debug){
} }


if (status.playbackStatus.activeSong.hasOwnProperty('fromLibrary')) { if (status.playbackStatus.activeSong.hasOwnProperty('fromLibrary')) {
$('#addToLibraryBtn').toggleClass('selected',Boolean(status.playbackStatus.activeSong.fromLibrary)); $('#song_library').toggleClass('selected',Boolean(status.playbackStatus.activeSong.fromLibrary));
if ($('#addToLibraryBtn').hasClass('selected')) { if ($('#song_library').hasClass('selected')) {
$('#addToLibraryBtn').attr('title', 'Remove from My Music'); $('#song_library').attr('title', 'Remove from My Music');
} else { } else {
$('#addToLibraryBtn').attr('title', 'Add to My Music'); $('#song_library').attr('title', 'Add to My Music');
} }
} }
if (status.playbackStatus.activeSong.hasOwnProperty('isFavorite')) { if (status.playbackStatus.activeSong.hasOwnProperty('isFavorite')) {
$('#addToFavoritesBtn').toggleClass('selected',Boolean(status.playbackStatus.activeSong.isFavorite)); $('#song_favorite').toggleClass('selected',Boolean(status.playbackStatus.activeSong.isFavorite));
if ($('#addToFavoritesBtn').hasClass('selected')) { if ($('#song_favorite').hasClass('selected')) {
$('#addToFavoritesBtn').attr('title', 'Remove from Favorites'); $('#song_favorite').attr('title', 'Remove from Favorites');
} else { } else {
$('#addToFavoritesBtn').attr('title', 'Add to Favorites'); $('#song_favorite').attr('title', 'Add to Favorites');
} }
} }


if (status.playbackStatus.activeSong.hasOwnProperty('autoplayVote')) { if (status.playbackStatus.activeSong.hasOwnProperty('autoplayVote')) {
$('#radioSmileBtn').toggleClass('selected', status.playbackStatus.activeSong.autoplayVote == 1); $('#song_smile').toggleClass('selected', status.playbackStatus.activeSong.autoplayVote == 1);
$('#radioFrownBtn').toggleClass('selected', status.playbackStatus.activeSong.autoplayVote == -1); $('#song_frown').toggleClass('selected', status.playbackStatus.activeSong.autoplayVote == -1);
} }


if (status.playbackStatus.activeSong.hasOwnProperty('urls')) { if (status.playbackStatus.activeSong.hasOwnProperty('urls')) {
Expand Down Expand Up @@ -497,7 +497,7 @@ var sharkzapper = new (function SharkZapperPopup(debug){
$('#player_loop').toggleClass('one', status.queue.repeatMode == 2); //REPEAT_ONE $('#player_loop').toggleClass('one', status.queue.repeatMode == 2); //REPEAT_ONE
} }
if (status.queue.hasOwnProperty('autoplayEnabled')) { if (status.queue.hasOwnProperty('autoplayEnabled')) {
$('#playerDetails_nowPlaying').toggleClass('radioOn', status.queue.autoplayEnabled); $('body').toggleClass('radio', status.queue.autoplayEnabled);
} }
if (status.queue.hasOwnProperty('previousSong')) { if (status.queue.hasOwnProperty('previousSong')) {
if (status.queue.previousSong) { if (status.queue.previousSong) {
Expand Down

0 comments on commit a4bcc5a

Please sign in to comment.