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

Timestamp:

09/06/07 10:39:16 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

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

trunk/instant_messenger/js/im_functions.js

@@ -55 +55 @@
                         _this.vcards = true;
                     }
-              }
-              catch(e)
-              {
-                                //alert("listen\n\n" + e + "\n\n" + e.description)
-              }
+              }catch(e){}
+
               _this._listen = true;
               setTimeout('IM.listen()', 3000);
@@ -131 +128 @@
                          this.atalho();
               }
-           }
-           catch (e)
-           {
-              //alert('getContacts()' + e);
-           }
+           }catch(e){}
 
         };
@@ -256 +249 @@
               }
               _this.Contacts_Offline();
-           }
-           catch(e)
-           {
-           }
+           }catch(e){}
         };
 
@@ -320 +310 @@
                                                     nickname = func.trim(nickname);
                                    }
+                                   else
+                                      var nickname = from;
 
                        var win = document.getElementById(from + '_chatMessages');
@@ -335 +327 @@
 
                           var label = document.createElement('strong');
-                              if(nickname)
-                                  label.appendChild(document.createTextNode(nickname));
-                                          else
-                                  label.appendChild(document.createTextNode(from));
+                          label.appendChild(document.createTextNode(nickname));
+
                           win.appendChild(label);
                           win.appendChild(document.createElement('br'));
-                          win.innerHTML += XMLTools.transform(el, xsl);
-                          win.innerHTML = this.emotions_icons(win.innerHTML);
+                          var msg = XMLTools.transform(el, xsl);
+                          win.innerHTML += this.emotions_icons(msg);
                           win.appendChild(document.createElement('br'));
                           win.appendChild(document.createElement('br'));
@@ -359 +349 @@
                  }
               }
-           }
-           catch (e)
-           {
-                        //alert(e.description)
-           }
+           }catch(e){}
         }
 
@@ -372 +358 @@
            var envio = name_document.contentWindow.document.getElementsByTagName('body').item(0);
 
-           envio.innerHTML = func.trim(envio.innerHTML.replace(/^(&nbsp;|<br>| )*|(&nbsp;|<br>| )*$/g, ''));
+           var imgs = envio.getElementsByTagName('img');
+           var cod;
+           var emotion_regexp;
+
+           for ( i = imgs.length - 1; i > -1; i--)
+           {
+              if ( (cod = imgs[i].getAttribute('emotion')) )
+                  {
+                         emotion_regexp = new RegExp('<img[^>]*?emotion="' + cod_emotions[cod][1] + '"[^>]*?>', "i");
+             envio.innerHTML = envio.innerHTML.replace(emotion_regexp, cod);
+          }
+              else
+                 imgs[i].parentNode.removeChild(imgs[i]);
+           }
+
+           envio.innerHTML = func.trim(envio.innerHTML.replace(/&nbsp;| +/g, ' '));
+           envio.innerHTML = func.trim(envio.innerHTML.replace(/<br>/g, '<br/>'));
+           envio.innerHTML = func.trim(envio.innerHTML);
 
            if ( envio.innerHTML != "" )
@@ -398 +401 @@
 
               message_element.innerHTML += '<strong>' + nickname + ' ';
-              message_element.innerHTML += ' ' + _this.get_lang('speak') + ':</strong><br/>';
-                  message_element.innerHTML += message_text + '<br/>';
+              message_element.innerHTML += ' ' + _this.get_lang('speak') + ':</strong><br />';
+                  message_element.innerHTML += this.emotions_icons(message_text) + '<br />';
               message_element.scrollTop = message_element.scrollHeight;
 
@@ -480 +483 @@
            {
               im_win.windowMaximizeRestore('contacts_im');
-              //this.load_im();
            }
         };
@@ -490 +492 @@
     IM.prototype.emotions_icons = function(pEmotion)
     {
-       for ( i = 1; i < cod_emotions.length; i++ )
+           var emotion_regexp;
+           for ( i in cod_emotions )
        {
-          var image = eval('smile_' + i + '.src.substr(smile_' + i + '.src.indexOf(im_path))')
-          pEmotion  = pEmotion.replace(cod_emotions[i], '<img emotion="' + pEmotion + '" src="' + image + '">');
+                  try
+                  {
+                         emotion_regexp = new RegExp(cod_emotions[i][1], 'gi');
+             if ( emotion_regexp.test(pEmotion) )
+             {
+                var image = eval('smile_' + cod_emotions[i][0] + '.src.substr(smile_' +cod_emotions[i][0]  + '.src.indexOf(im_path))');
+                            emotion_regexp = new RegExp(cod_emotions[i][1], 'gi');
+                pEmotion = pEmotion.replace(emotion_regexp, '<img emotion="' + i + '" src="' + image + '">');
+             }
+                  }
+                  catch(e)
+                  {
+                          //alert(e.description)
+                  }
        }
-
        return pEmotion;
     }
@@ -574 +588 @@
 
                   }catch(e){}
-
-
         };
 
@@ -607 +619 @@
                                 if ( func.byId(pJid).firstChild.src != img_unavailable.src )
                                         this.open_chat(pJid);
-                }
-                catch(e)
-                {
-                        //alert("action_button\n\n" + e)
-                }
+                }catch(e){}
         };
 
@@ -683 +691 @@
                                 Child[i].firstChild.insertBefore(img, Child[i].firstChild.firstChild);
                         }
-                }catch (e){}
+                }catch(e){}
         }
 
@@ -803 +811 @@
                                 this.ImgStatus(pStatus);
                                 pStatus = 'show=' + pStatus;
-                 }
-                 catch(e){}
-                 }
+                 }catch(e){}
+                }
               }
                   XMLTools.request('$this.Ujabber.setPresence', 'POST', handler, pStatus);