Fix for ejabberd / style changes

* Removed the "from"-attribute from roster and vCard IQ, because ejabberd
  doesn't like it
* Make friend list look nicer

diff --git a/css/standard.css b/css/standard.css
index 5b260eb3d96656dd3a03e818b37bf1ea6527d7bf..54cbc06aa35c95c2eadefa03526f57b96bb4a7af 100644 (file)
--- a/css/standard.css
+++ b/css/standard.css
@@ -1,3 +1,12 @@
 #login {
   text-align: center;
 }
+
+#log_container {
+  clear: both;
+}
+
+.friend {
+  float: left;
+  margin: 2em;
+}

diff --git a/index.html b/index.html
index 68982c11b07b801ffa5fb27c27edd85ea67089b5..82c688dafa88b8a2d21918984a08ab4c7d865e06 100644 (file)
--- a/index.html
+++ b/index.html
@@ -22,7 +22,6 @@
   </div>
   <div id='friends'>
   </div>
-  <hr />
   <div id='log_container'>
     <a id='log_toggle' href='#'>Status Log :</a>
     <div id='log'></div>

diff --git a/scripts/basic.js b/scripts/basic.js
index 6620d4940790dc7333f95742d413221e43ed65a3..e0d2c38c8dd25ff26b4df61c39aa091a4a707fd1 100644 (file)
--- a/scripts/basic.js
+++ b/scripts/basic.js
@@ -18,24 +18,25 @@ function rawOutput(data) {
 }
 
 function jid2id(jid) {
-    return jid.split('@')[0] + "-" + jid.split('@')[1];
+    return jid.split('@').join('-').split('.').join('-');
 }
 
 function _cbVCard(e) {
     var jid = e.getAttribute('from');
     var avatar = e.getElementsByTagName('PHOTO')[0];
-    var mime = Strophe.getText(avatar.getElementsByTagName('TYPE')[0]);
-    var binval = Strophe.getText(avatar.getElementsByTagName('BINVAL')[0]);
+    if (avatar) {
+       var mime = Strophe.getText(avatar.getElementsByTagName('TYPE')[0]);
+       var binval = Strophe.getText(avatar.getElementsByTagName('BINVAL')[0]);
 
-    $("#"+jid2id(jid)+" img").attr('src', 'data:'+mime+';base64,'+binval);
+       $("#"+jid2id(jid)+" img").attr('src', 'data:'+mime+';base64,'+binval);
+    }
 
     return false;
 }
 
 function getAvatar(jid) {
-    var id = 'getvCard'+jid;
-    var vCardiq = $iq({'from':connection.jid+"/"+connection.resource,
-                       'to':jid,
+    var id = 'getvCard'+jid2id(jid);
+    var vCardiq = $iq({'to':jid,
                        'id':id,
                        'type':'get'}
        ).c('vCard', {'xmlns':NS_VCARD});
@@ -45,7 +46,7 @@ function getAvatar(jid) {
 }
 
 function addFriend(jid, nick) {
-    $('#friends').append('<div id="'+jid2id(jid)+'"><img src="imgs/none.png" /><br /><span class="nick">'+nick+'</span></div>');
+    $('#friends').append('<div class="friend" id="'+jid2id(jid)+'"><img src="imgs/none.png" /><br /><span class="nick">'+nick+'</span></div>');
     $('#'+jid2id(jid)).click(function() {
        getAvatar(jid);
     });
@@ -63,8 +64,7 @@ function _cbRoster(e) {
 function getRoster() {
     var id = 'getRoster';
 
-    var rosteriq = $iq({'from':connection.jid+"/"+connection.resource,
-                       'id':id,
+    var rosteriq = $iq({'id':id,
                        'type':'get'}
        ).c('query', {'xmlns':Strophe.NS.ROSTER});