X-Git-Url: http://git.babelmonkeys.de/?a=blobdiff_plain;f=scripts%2Fbasic.js;h=4b306950714a66569ba9b888097a2b0ed55d4f51;hb=13b28a1b50a2a84366f5781e9434d7f46c0ceed1;hp=d9a14ce02e77def6b8279eaf528a55c73f01ff80;hpb=4d2c76c2c6d32a6934e01ffc2ecdb991fe742ef5;p=socialXMPP.git

diff --git a/scripts/basic.js b/scripts/basic.js
index d9a14ce..4b30695 100644
--- a/scripts/basic.js
+++ b/scripts/basic.js
@@ -61,13 +61,22 @@ function populateVCard(e, jid) {
         $('#EMAILWORK').append(Strophe.xmlTextNode($(this).find('USERID').text()));
     });
 
+    if (!roster[jid2id(jid)].tune.isEmpty()) {
+	$('#vCard ul').append('<li id="tune"><span class="vCardName">Tune: </span>Listening to '+
+			roster[jid2id(jid)].tune.title + ' by ' + roster[jid2id(jid)].tune.artist +
+			' from ' + roster[jid2id(jid)].tune.source + '</li>')
+    }
+
     $('#vCard').click(function () {
-	$('#box-overlay').hide();
-        $('#vCard_container').slideUp("normal");
+        $('#vCard_container').slideUp("normal", function() {
+		$('#box-overlay').hide();
+	});
+	roster[jid2id(jid)].visible = false;
       });
 
     $('#box-overlay').show();
     $('#vCard_container').slideDown("normal");
+    roster[jid2id(jid)].visible = true;
 }
 
 function _cbVCard(e) {
@@ -285,16 +294,19 @@ function _cbPEP(e) {
 	    tune.title= Strophe.getText(items.getElementsByTagName('title')[0]);
 	    tune.track= Strophe.getText(items.getElementsByTagName('track')[0]);
 	    tune.uri= Strophe.getText(items.getElementsByTagName('uri')[0]);
-	    if ( $('#'+jid2id(from)+' .tune').length > 0 ) {
-		$('#'+jid2id(from)+' .tune').empty();
-		$('#'+jid2id(from)+' .tune').append(Strophe.xmlTextNode('Listening to '+ tune.title + ' by ' + tune.artist + ' from ' + tune.source));
-	    } else {
-		$('#'+jid2id(from)).append('<br /><span class="tune">Listening to '+ tune.title + ' by ' + tune.artist + ' from ' + tune.source + '</span>');
+	    if (roster[jid2id(from)].visible == true) {
+		if ( $('#tune').length > 0) {
+		    $('#tune').empty();
+		    $('#tune').append('<span class="vCardName">Tune: </span>');
+		    $('#tune').append(Strophe.xmlTextNode('Listening to '+ tune.title +
+				' by ' + tune.artist + ' from ' + tune.source));
+		} else {
+		    $('#vCard ul').append('<li id="tune"><span class="vCardName">Tune: </span>Listening to '+ tune.title +
+				' by ' + tune.artist + ' from ' + tune.source + '</li>')
+		}
 	    }
 	} else {
-	    if ( $('#'+jid2id(from)+' .tune').length > 0 ) {
-		$('#'+jid2id(from)+' .tune').empty();
-	    }
+	    $('#tune').remove();
 	}
 	roster[jid2id(from)].tune = tune;
     }