Changeset 2293 for sandbox/jabberit_messenger

Timestamp:

03/18/10 11:43:53 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #986 - Implementado recebimento das mensagens dentro das janelas.

Location:

sandbox/jabberit_messenger/trophy

Files:

• js/loadIM.js (modified) (1 diff)
• js/trophyim.js (modified) (4 diffs)
• xsl/chatBox.xsl (modified) (1 diff)

sandbox/jabberit_messenger/trophy/js/loadIM.js

@@ -165 +165 @@
         }
         
-        function parse(pXml, pXsl)
-        {
-                return _xtools.parse(_xtools.xml(pXml), pXsl);  
+        function parse()
+        {
+                if( arguments.length == 2 )
+                        return _xtools.parse(_xtools.xml(arguments[0]), arguments[1] );
+                
+                if( arguments.length === 3 )
+                        return _xtools.parse(_xtools.xml(arguments[0]), arguments[1], arguments[2] );
         }
         

sandbox/jabberit_messenger/trophy/js/trophyim.js

@@ -592 +592 @@
      *  Message handler
      */
-    onMessage : function(msg) {
+    onMessage : function(msg)
+    {
         Strophe.debug("Message handler");
+    
         var from = msg.getAttribute('from');
         var type = msg.getAttribute('type');
         var elems = msg.getElementsByTagName('body');
 
-        if ((type == 'chat' || type == 'normal') && elems.length > 0) {
-            var barejid = Strophe.getBareJidFromJid(from);
-            var jid_lower = barejid.toLowerCase();
-            var contact = TrophyIM.rosterObj.roster[barejid.toLowerCase()]['contact'];
-            if (contact) { //Do we know you?
-                if (contact['name'] != null) {
+        if ( (type == 'chat' || type == 'normal') && elems.length > 0 )
+        {
+            var barejid         = Strophe.getBareJidFromJid(from);
+            var jid_lower       = barejid.toLowerCase();
+            var contact = "";
+                
+            if( TrophyIM.rosterObj.roster[barejid.toLowerCase()] )
+            {
+                contact = TrophyIM.rosterObj.roster[barejid.toLowerCase()]['contact']['name'];
+            }
+            else
+            {
+                contact = barejid.toLowerCase();
+                contact = contact.substring(0, contact.indexOf('@'));
+            }   
+            
+            var message = 
+            { 
+                contact : contact,
+                msg             : Strophe.getText(elems[0])     
+            };
+
+            TrophyIM.makeChat(from); //Make sure we have a chat window
+            TrophyIM.addMessage(message, jid_lower);
+
+            /*  
+            if ( contact )
+            { 
+
+                //Do we know you?
+                if ( contact['name'] != null )
+                {
                     message  = contact['name'] + " (" + barejid + "): ";
-                } else {
+                }
+                else
+                {
                     message = contact['jid'] + ": ";
                 }
-                message += Strophe.getText(elems[0]);
-                TrophyIM.makeChat(from); //Make sure we have a chat window
+                
+                message += Strophe.getText(elems[0]);
+                
+                TrophyIM.makeChat(from); //Make sure we have a chat window
                 TrophyIM.addMessage(message, jid_lower);
                 
-                /*
-                if (TrophyIM.activeChats['current'] != jid_lower) {
-                    TrophyIM.activeChats['divs'][jid_lower][
-                    'tab'].className = "trophyimchattab trophyimchattab_a";
-                    TrophyIM.setTabPresence(from,
-                    TrophyIM.activeChats['divs'][jid_lower]['tab']);
-                }
-                */
-            }
+               
+                //if (TrophyIM.activeChats['current'] != jid_lower) {
+                //    TrophyIM.activeChats['divs'][jid_lower][
+                //    'tab'].className = "trophyimchattab trophyimchattab_a";
+                //    TrophyIM.setTabPresence(from,
+                //    TrophyIM.activeChats['divs'][jid_lower]['tab']);
+                //}
+            }*/
         }
         return true;
@@ -633 +664 @@
         
         var barjid = Strophe.getBareJidFromJid(fulljid);
+        
+        var paramsChatBox =
+        {
+                        'idChatBox' : barjid + "__chatBox",
+        };
+        
         
         var winChatBox = 
@@ -647 +684 @@
                          title                  : barjid.substring(0, barjid.indexOf('@')),
                          closeAction    : "hidden",
-                         content                : loadIM.parse("chat_box","chatBox.xsl")        
+                         content                : loadIM.parse("chat_box","chatBox.xsl", paramsChatBox) 
         }
         
@@ -747 +784 @@
     addMessage : function(msg, jid)
     {
-        alert(jid + " : " + msg);
-         
+        var chatBox             = document.getElementById(jid + "__chatBox");
+        var messageDiv  = document.createElement("div");
+                messageDiv.style.margin = "3px 0px 3px 3px";
+                messageDiv.innerHTML    = "<font style='font-weight:bold;'>" + msg.contact + "</font> : " + msg.msg ;
+                
+        chatBox.appendChild(messageDiv);
+        chatBox.scrollTop = chatBox.scrollHeight;
+        
         /*
          * Codigo Original Comentado 

sandbox/jabberit_messenger/trophy/xsl/chatBox.xsl

@@ -3 +3 @@
         <xsl:output method="html" omit-xml-declaration="yes"/>
         
+        <xsl:param name="idChatBox" />
+
         <xsl:template match="chat_box">
                 
-                        <div id="trophyimchat">
-                                <div style="height:190px; width:370px; overflow-y:scroll"></div>
+                        <div>
+                                <div id="{$idChatBox}" style="height:190px; width:370px; overflow-y:scroll"></div>
                                 <div style="margin:2px;">
                                         <form name="chat" onsubmit="TrophyIM.sendMessage(this); return(false);">