Fix Diso answers

[socialXMPP.git] / scripts / basic.js

diff --git a/scripts/basic.js b/scripts/basic.js
index 128ba202041f0c9fb8f76ef9d2f23230226173f3..d9a14ce02e77def6b8279eaf528a55c73f01ff80 100644 (file)
--- a/scripts/basic.js
+++ b/scripts/basic.js
@@ -62,9 +62,11 @@ function populateVCard(e, jid) {
     });
 
     $('#vCard').click(function () {
+       $('#box-overlay').hide();
         $('#vCard_container').slideUp("normal");
       });
 
+    $('#box-overlay').show();
     $('#vCard_container').slideDown("normal");
 }
 
@@ -84,10 +86,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];
@@ -122,7 +121,7 @@ function _cbOwnVCard(e) {
 }
 
 function getVCard(jid) {
-    var id = 'getvCard'+jid2id(jid);
+    var id = connection.getUniqueId('vCardGet');
     if (roster[jid2id(jid)].vCard == "") {
        var vCardiq = $iq({'to':jid,
                        'id':id,
@@ -136,10 +135,8 @@ function getVCard(jid) {
 }
 
 function getOwnInfo() {
-    var id = 'getvCard'+jid2id(connection.jid);
-    var vCardiq = $iq({'to': Strophe.getBareJidFromJid(connection.jid),
-               'id': id,
-               'type': 'get'}
+    var id = connection.getUniqueId('vCardGet');
+    var vCardiq = $iq({'id': id, 'type': 'get'}
        ).c('vCard', {'xmlns':NS_VCARD});
     connection.addHandler(_cbOwnVCard, null, 'iq', 'result', id);
     connection.send(vCardiq.tree());
@@ -175,11 +172,13 @@ function _cbRoster(e) {
     var initialPresence = $pres().c('show').t('online').up().c('status').t('Hy, I am an socialXMPP instance').up().c('priority').t('1').up().c('c', {xmlns: NS_CAPS, hash: 'sha-1', node: 'http://jabber.babelmonkeys.de', ver: genCaps()}).up();
     connection.send(initialPresence.tree());
 
+    $('#friends').show();
+
     return false;
 }
 
 function getRoster() {
-    var id = 'getRoster';
+    var id = connection.getUniqueId('roster');
 
     var rosteriq = $iq({'id':id,
                        'type':'get'}
@@ -193,7 +192,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++) {
@@ -329,9 +332,11 @@ function showConnect() {
     var button = $('#connect').get(0); 
 
     $('#log').empty();
+    $('#ownInfo').empty();
     $('#ownInfo').hide();
     $('#vCard_container').empty();
     $('#friends').empty();
+    $('#friends').hide();
     $('.chat').remove();
     $('label').show();
     jid.show();