Make PEP support a bit more flexible

[socialXMPP.git] / scripts / basic.js

diff --git a/scripts/basic.js b/scripts/basic.js
index e4a63cf114cbf309b0d4cccee1ce78beef3481ad..fbb8d859f5d33db21c200164c9a53856dc7f90f5 100644 (file)
--- a/scripts/basic.js
+++ b/scripts/basic.js
@@ -61,11 +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 () {
-        $('#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) {
@@ -84,10 +95,7 @@ function _cbVCard(e) {
 
 function _cbOwnVCard(e) {
     $('#ownInfo').empty();
-    $('#ownInfo').load('vCard.html #vCard', function() {
-    $('#ownInfo').find('div').each(function() {
-       $(this).attr('id', 'own' + $(this).attr('id'));
-    });
+    $('#ownInfo').load('vCard.html #ownvCard', function() {
     var easy_cases = new Array('FN', 'FAMILY', 'MIDDLE', 'GIVEN', 'NICKNAME', 'BDAY', 'CTRY', 'USERID');
     for (var i=0; i<easy_cases.length; i++) {
        var text = e.getElementsByTagName(easy_cases[i])[0];
@@ -137,13 +145,12 @@ function getVCard(jid) {
 
 function getOwnInfo() {
     var id = connection.getUniqueId('vCardGet');
-    var vCardiq = $iq({'to': Strophe.getBareJidFromJid(connection.jid),
-               'id': id,
-               'type': 'get'}
+    var vCardiq = $iq({'id': id, 'type': 'get'}
        ).c('vCard', {'xmlns':NS_VCARD});
     connection.addHandler(_cbOwnVCard, null, 'iq', 'result', id);
     connection.send(vCardiq.tree());
 }
+
 function addFriend(jid, nick) {
     roster[jid2id(jid)] = new Buddy(nick, jid);
     $('#friends').append('<div class="friend" id="'+jid2id(jid)+'"><img src="imgs/none.png" /><br /><a class="nick">'+nick+'</a></div>');
@@ -194,7 +201,11 @@ function _cbDisco(e) {
     var id = e.getAttribute('id');
     var jid = e.getAttribute('from');
 
-    var response = $iq({id: id, type: 'result', to: jid});
+    if (jid) {
+       var response = $iq({id: id, type: 'result', to: jid});
+    } else {
+       var response = $iq({id: id, type: 'result'});
+    }
     var query = response.c('query', {xmlns: Strophe.NS.DISCO_INFO})
     query.c('identity', {category: 'client', type: 'web', name: appName}).up();
     for (var i = 0; i < features.length; i++) {
@@ -266,6 +277,33 @@ function genCaps() {
     return b64_sha1(S);
 }
 
+function handleTune(jid, tuneXML) {
+    var tune = new Tune();
+    if (tuneXML.childNodes.length > 0) {
+       tune.artist = Strophe.getText(tuneXML.getElementsByTagName('artist')[0]);
+       tune.length= Strophe.getText(tuneXML.getElementsByTagName('length')[0]);
+       tune.rating= Strophe.getText(tuneXML.getElementsByTagName('rating')[0]);
+       tune.source= Strophe.getText(tuneXML.getElementsByTagName('source')[0]);
+       tune.title= Strophe.getText(tuneXML.getElementsByTagName('title')[0]);
+       tune.track= Strophe.getText(tuneXML.getElementsByTagName('track')[0]);
+       tune.uri= Strophe.getText(tuneXML.getElementsByTagName('uri')[0]);
+       if (roster[jid2id(jid)].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 {
+       $('#tune').remove();
+    }
+    roster[jid2id(jid)].tune = tune;
+}
+
 function _cbPEP(e) {
     var from = e.getAttribute('from');
     if (Strophe.getBareJidFromJid(from) == Strophe.getBareJidFromJid(connection.jid)) {
@@ -274,27 +312,7 @@ function _cbPEP(e) {
     var items = e.getElementsByTagName('items')[0];
     // Handle Tune
     if (items.getAttribute('node') == NS_TUNE) {
-       var tune = new Tune();
-       if (items.getElementsByTagName('tune')[0].childNodes.length > 0) {
-           tune.artist = Strophe.getText(items.getElementsByTagName('artist')[0]);
-           tune.length= Strophe.getText(items.getElementsByTagName('length')[0]);
-           tune.rating= Strophe.getText(items.getElementsByTagName('rating')[0]);
-           tune.source= Strophe.getText(items.getElementsByTagName('source')[0]);
-           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>');
-           }
-       } else {
-           if ( $('#'+jid2id(from)+' .tune').length > 0 ) {
-               $('#'+jid2id(from)+' .tune').empty();
-           }
-       }
-       roster[jid2id(from)].tune = tune;
+       handleTune(from, items.getElementsByTagName('tune')[0]);
     }
     return true;
 }
@@ -330,8 +348,10 @@ function showConnect() {
     var button = $('#connect').get(0); 
 
     $('#log').empty();
+    $('#ownInfo').empty();
     $('#ownInfo').hide();
     $('#vCard_container').empty();
+    $('#friends').empty();
     $('#friends').hide();
     $('.chat').remove();
     $('label').show();