Changeset 68 for trunk/instant_messenger/js/im_functions.js

Timestamp:

09/14/07 17:43:09 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/instant_messenger/js/im_functions.js (modified) (9 diffs)

trunk/instant_messenger/js/im_functions.js

@@ -7 +7 @@
            this.UsersNot        = [];
            this.userPrefe   = false;
+           this.count_Vcard = 0;
         }
 
         IM.prototype.load_im = function()
         {
-                IM.listen();
-            IM.requireContacts();
+                this.listen();
+            this.requireContacts();
+            this.atalho();
 
             var handler_Status = function(XmlData)
@@ -51 +53 @@
                 if(!_this.vcards)
                 {
-                        _this.requireVcard();
+                        _this.Vcard();
                         _this.vcards = true;
                     }
@@ -125 +127 @@
                                         group = group.nextSibling;
                  }
-                         this.atalho();
+                         //this.atalho();
               }
            }catch(e){}
@@ -309 +311 @@
                                                     nickname = nickname.substr(0,nickname.indexOf('|'));
                                                     nickname = nickname.substr(nickname.indexOf(':') + 1 , nickname.length);
-                                                    nickname = func.trim(nickname);
+                                                    nickname = ( func.trim(nickname) != "" ) ? nickname : from ;
                                    }
                                    else
@@ -374 +376 @@
            }
 
-           envio.innerHTML = func.trim(envio.innerHTML.replace(/ | +/g, ' '));
-           envio.innerHTML = func.trim(envio.innerHTML.replace(/<br>/g, '<br/>'));
            envio.innerHTML = func.trim(envio.innerHTML);
+           envio.innerHTML = envio.innerHTML.replace(/&nbsp;| +/gi, ' ');
+           envio.innerHTML = envio.innerHTML.replace(/<br[^>]*>/gi, '<br />');
 
            if ( envio.innerHTML != "" )
@@ -389 +391 @@
               message_text += envio.innerHTML + "</div>";
 
+                  message_text = message_text.replace(/&nbsp;| +/gi, ' ');
+                  message_text = message_text.replace(/<br[^>]*>/gi, '<br />');
+
               envio.innerHTML = '';
 
@@ -399 +404 @@
                           nickname = nickname.substr(0,nickname.indexOf('|'));
                           nickname = nickname.substr(nickname.indexOf(':') + 1 , nickname.length);
+                          nickname = (func.trim(nickname) != "") ? nickname : IM_Preferences.jid;       
                   }
 
@@ -559 +565 @@
          */
 
-        IM.prototype.requireVcard = function()
+        IM.prototype.Vcard = function()
         {
                 var _this = this;
-                var handler_getVcard = function(_XMLdata)
+                if( _this.count_Vcard < 3)
                 {
-                        var data = _XMLdata.getElementsByTagName('retorno').item(0);
-                        data = eval(data.firstChild.nodeValue);
-                        if(!data)
-                                setTimeout("IM.requireVcard()",2000);
-                };
-                XMLTools.request('$this.Ujabber.requireVcard','GET',handler_getVcard);
-        }
+                        var handler_getVcard = function(_XMLdata)
+                        {
+                                var data = _XMLdata.getElementsByTagName('retorno').item(0);
+                                data = eval(data.firstChild.nodeValue);
+                                if(!data)
+                                        setTimeout("IM.Vcard()",2000);
+                                _this.count_Vcard++;
+                        };
+                        XMLTools.request('$this.Ujabber.Vcard','GET',handler_getVcard);
+                }else{
+                        var handler_getVcardUser = function(XMLdata)
+                        {
+                        };
+                        XMLTools.request('$this.Ujabber.VcardUser','GET',handler_getVcardUser);
+                }
+
+        };
 
         IM.prototype.getVcard = function(data)
@@ -585 +601 @@
                                  div.innerHTML = "";
                                  div.innerHTML += XMLTools.transform(data, xsl);
-                                 IM_Preferences.vCardInit();
+                                 IM_Preferences.vCardInit();                             
                                  }
+
 
                   }catch(e){}