Changeset 3091

Timestamp:

07/26/10 16:21:27 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1091 - Implementado a busca de salas para bate-papo no novo modulo Expresso messenger XEP-0045-MUC.

Location:

trunk/jabberit_messenger/jmessenger

Files:

• js/jscode/loadIM.js (modified) (1 diff)
• js/lang/i18n_pt_Br.js (modified) (1 diff)
• js/trophyim.js (modified) (10 diffs)
• xsl/chatRoom.xsl (modified) (2 diffs)

trunk/jabberit_messenger/jmessenger/js/jscode/loadIM.js

@@ -1417 +1417 @@
             TrophyIM.makeChatRoom( jidRoom , nameRoom );
             
-            TrophyIM.joinRoom( room_nick );
+            TrophyIM.joinChatRoom( room_nick );
         }
         

trunk/jabberit_messenger/jmessenger/js/lang/i18n_pt_Br.js

@@ -12 +12 @@
         COMPOSING : ' está digitando...',
         GONE : ' saiu da conversa.',
+        LEAVE_CHATROOM : 'Sair da Sala',
         PAUSED : ' está parado.',
+        SEND : 'Enviar',
         STATUS_ANAVAILABLE : 'Desconectado',
         STATUS_AVAILABLE : 'Disponível',

trunk/jabberit_messenger/jmessenger/js/trophyim.js

@@ -902 +902 @@
         var barejid             = Strophe.getBareJidFromJid(fulljid);
         var titleWindow = "";
-                
+
         var paramsChatBox =
         {
@@ -941 +941 @@
                 var _chatStateOnOff     = _content.getElementsByTagName( 'input' ).item( 1 );
 
-        function _send_message( )
+        var _send_message = function( )
         {
                 if ( ! TrophyIM.sendMessage( barejid, _textarea.value ) )
@@ -954 +954 @@
                 _textarea.value = '';
                 _textarea.focus( );
-        }
+        };
                 
                 var composingTimer_ = 0;
@@ -960 +960 @@
                 var timeCounter;
 
-                function setComposing()
+                var setComposing = function( )
                 {
                         var checkComposing = function()
@@ -981 +981 @@
                 }
                 isComposing_ = 1;
-        }
+        };
 
         loadscript.configEvents( _send, 'onclick', _send_message );
@@ -1038 +1038 @@
         var titleWindow = "ChatRoom - " + arguments[1];
         
-        
         var paramsChatRoom =
         {
                         'idChatRoom'    : jidChatRoom + "__roomChat",
                         'jidTo'                 : jidChatRoom,
+                        'lang_Send'             : i18n.SEND,
+                        'lang_Leave_ChatRoom' : i18n.LEAVE_CHATROOM,
                                 'path_jabberit' : path_jabberit
         };
@@ -1061 +1062 @@
         
         var _messages           = _content.firstChild.firstChild;
+        var _textarea           = _content.getElementsByTagName( 'textarea' ).item( 0 );
+        var _send                       = _content.getElementsByTagName( 'input' ).item( 0 );
+        var _leaveChatRoom      = _content.getElementsByTagName( 'input' ).item( 1 );
+        
+        var _send_message = function( )
+        {
+                if ( ! TrophyIM.sendMessageChatRoom( jidChatRoom, _textarea.value ) )
+                        return false;
+                
+                _textarea.value = '';
+                
+                _textarea.focus( );
+        };
+        
+        loadscript.configEvents( _send, 'onclick', _send_message );
+        loadscript.configEvents( _leaveChatRoom, 'onclick', function( )
+        {
+                TrophyIM.leaveChatRoom( jidChatRoom );
+                
+                //alert( jidChatRoom );
+        });
+        
+                loadscript.configEvents( _textarea, 'onkeyup', function( e )
+                {
+                        if ( e.keyCode == 13 )
+                        {
+                                _send_message( );
+                        }
+                });        
         
         var winChatRoom = 
@@ -1201 +1231 @@
      */
     
-    joinRoom : function( roomName )
+    joinChatRoom : function( roomName )
     {
-        var msg = $pres({from: TrophyIM.connection.jid, to: roomName}).c("x",{xmlns: Strophe.NS.MUC});
+        var presence = $pres({from: TrophyIM.connection.jid, to: roomName}).c("x",{xmlns: Strophe.NS.MUC});
         
-                TrophyIM.connection.send(msg);
+                TrophyIM.connection.send( presence );
+    },
+    
+    /** Function : Leave Chat Room
+     * 
+     * 
+     */
+    
+    leaveChatRoom : function( roomName)
+    {
+        var room_nick = roomName;        
+        var presenceid = TrophyIM.connection.getUniqueId();
+        //var presence = $pres( {type: "unavailable", id: presenceid, to: room_nick} ).c("x",{ xmlns: Strophe.NS.MUC } );
+        //TrophyIM.connection.send( presence );
     },
     
@@ -1774 +1817 @@
     sendMessage : function()
     {
-                if (arguments.length > 0) {
+                if (arguments.length > 0)
+                {
                         var jidTo = arguments[0];
                         var message_input = arguments[1];
@@ -1803 +1847 @@
                 return false;
     },
-        
+
+        /** Function: sendMessage
+    *
+    *  Send message to ChatRoom
+    */
+    
+    sendMessageChatRoom : function( room )
+    {
+        if( arguments.length > 0 ) 
+        {
+                var room_nick   = arguments[0];
+                var message             = arguments[1];
+                var msgid               = TrophyIM.connection.getUniqueId();
+                var msg                 = $msg({to: room_nick, type: "groupchat", id: msgid}).c("body",{xmlns: Strophe.NS.CLIENT}).t(message);
+                
+                msg.up();//.c("x", {xmlns: "jabber:x:event"}).c("composing");
+                
+                TrophyIM.connection.send(msg);
+                
+                return true;
+        }
+    },
+    
         /** Function: sendContentMessage
      *

trunk/jabberit_messenger/jmessenger/xsl/chatRoom.xsl

@@ -5 +5 @@
         <xsl:param name="idChatRoom" />
         <xsl:param name="jidTo" />
+        <xsl:param name="lang_Send" />
+        <xsl:param name="lang_Leave_ChatRoom" />
         <xsl:param name="path_jabberit" />
 
@@ -15 +17 @@
                                         <textarea id="{$jidTo}__sendRoomChat" style="height:80px; width:325px;"></textarea>
                                         <div style="margin: 5px;">
-                                                <input type="button" value="Send"/>
+                                                <input type="button" value="{$lang_Send}" style="margin-right: 5px;"/>
+                                                <input type="button" value="{$lang_Leave_ChatRoom}"/>
                                         </div>
+                                        
+                                        
                                 </div>
                         </div>