nuvola-player-devel team mailing list archive
-
nuvola-player-devel team
-
Mailing list archive
-
Message #00094
[Merge] lp:~carlos.ribeiro/nuvola-player/nuvola-player into lp:nuvola-player
Jiří Janoušek has proposed merging lp:~carlos.ribeiro/nuvola-player/nuvola-player into lp:nuvola-player.
Requested reviews:
Jiří Janoušek (fenryxo)
Michał Pawłowski (minchal)
Related bugs:
Bug #1222872 in Nuvola Player: "deezer control buttons not work"
https://bugs.launchpad.net/nuvola-player/+bug/1222872
For more details, see:
https://code.launchpad.net/~carlos.ribeiro/nuvola-player/nuvola-player/+merge/185252
Bug: Service deezer loading, but toolbar actions not working.
Fixed implementation.js
--
https://code.launchpad.net/~carlos.ribeiro/nuvola-player/nuvola-player/+merge/185252
Your team Nuvola Player Development is subscribed to branch lp:nuvola-player.
=== modified file 'data/nuvolaplayer/services/deezer/integration.js'
--- data/nuvolaplayer/services/deezer/integration.js 2012-10-02 17:43:51 +0000
+++ data/nuvolaplayer/services/deezer/integration.js 2013-09-12 12:53:24 +0000
@@ -46,8 +46,8 @@
var can_thumbs_down;
try{
- var play = $('#h_play a');
- var pause = $('#h_pause a');
+ var play = window.playercontrol.$btnPlay;
+ var pause = window.playercontrol.$btnPause;
if (play.is(':visible')) {
state = Nuvola.STATE_PAUSED;
@@ -56,8 +56,8 @@
}
if(state != Nuvola.STATE_NONE){
- can_prev = !$('#h_previous a').hasClass('disabled');
- can_next = !$('#h_next a').hasClass('disabled');
+ can_prev = !window.playercontrol.$btnPrevious.hasClass('disabled');
+ can_next = !window.playercontrol.$btnNext.hasClass('disabled');
var td_btn = $('#like_track.bad-song');
can_thumbs_down = td_btn.length>0 && td_btn.is(':visible');
@@ -70,8 +70,8 @@
can_prev = can_next = can_thumbs_down = false;
}
- var song = $('#current-track').text();
- var artist = $('#current-artist').text();
+ var song = window.playercontrol.$labelSongTitle.text();
+ var artist = window.playercontrol.$labelArtName.text();
var last_song = song + '-' + artist;
// album art - only on radio mode
@@ -84,7 +84,7 @@
this.last_song = last_song;
try {
- var img = $('#radio_thumbs li img').first();
+ var img = $('#thumb_0 img').first();
if (img.length) {
this.last_art = img.attr('src');
@@ -115,7 +115,7 @@
try {
switch(message){
case Nuvola.ACTION_TOGGLE_PLAY:
- if ($('#h_play a').is(':visible')) {
+ if (window.playercontrol.$btnPlay.is(':visible')) {
window.playercontrol.doAction('play');
} else {
window.playercontrol.doAction('pause');
@@ -146,4 +146,4 @@
}
Nuvola.integration = new Integration(); // Singleton
-})(this);
+})(this);
\ No newline at end of file