Changeset 2491

Timestamp:

04/12/10 15:50:03 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #986 - Implementado a parte de autorização ( to, from, both ). Ainda em teste.

Location:

sandbox/jabberit_messenger/trophy_expresso

Files:

• js/loadIM.js (modified) (10 diffs)
• js/trophyim.js (modified) (13 diffs)
• xsl/contactsList.xsl (modified) (1 diff)
• xsl/itensGroup.xsl (modified) (1 diff)

sandbox/jabberit_messenger/trophy_expresso/js/loadIM.js

@@ -32 +32 @@
                                 var e = window.event;
                         
-                        ( ( e.target ) ? e.target : e.srcElement ).oncontextmenu = function(e)
+                        ( ( e.target ) ? e.target : e.srcElement ).parentNode.oncontextmenu = function(e)
                         {
                                 return false;
@@ -40 +40 @@
                                 optionsItensContact(jid, index);
                         else
-                                TrophyIM.rosterClick(jid);
+                        {
+                                if ( e.target.id )
+                                        TrophyIM.rosterClick(jid);
+                        }
                 }
         }
@@ -299 +302 @@
         }
 
-        
         function optionsItensContact()
         {
@@ -312 +314 @@
 
                         var _options = [
-                                                ['Autorizar', 'TrophyIM.setAutorization(\''+jid+'\')'],
-                                                ['Remover', 'loadIM.removeContact(\''+jid+'\')'],
+                                                ['Autorizar', 'loadIM.setAutorization(\''+jid+'\',\''+index+'\')'],
+                                                ['Remover', 'loadIM.removeContact(\''+jid+'\',\''+index+'\')'],
                                                 ['Renomear', 'Renomear : ' + jid],
                                                 ['Trocar grupo', 'Trocar grupo : ' + jid],
@@ -323 +325 @@
                         {
                                 _itens += '<img src="'+arrow_right.src+'"/>';
-                                _itens += '<span style="cursor:pointer; margin:3px; font-weight:normal;" onclick='+_options[i][1]+'>';
+                                _itens += '<span style="cursor:pointer;margin:3px;font-weight:normal;" onclick='+_options[i][1]+'>';
                                 _itens += _options[i][0] + '</span><br/>';
                         }
                         
                         var _optionsItens = document.createElement("div");
-                                _optionsItens.setAttribute("style", "margin: -5px 0px 0px 20px;");
+                                _optionsItens.setAttribute("style", "margin: -10px 0px 0px 20px;");
                                 _optionsItens.className         = "x-menu";
                                 _optionsItens.style.zIndex      = '99999';
                                 _optionsItens.innerHTML         = _itens;  
-                                _optionsItens.onclick           = function(){ showhidden.hiddenObject(false); };                                          
+                                _optionsItens.onmouseout        = function(){ showhidden.hiddenObject(false); };        
+                                _optionsItens.onmouseover       = function(){ showhidden.hiddenObject(true); };
                                 
                                 showhidden.action('onmouseover', 'onmouseout', _optionsItens);
                                 
-                        element.onmouseout      = function(){ showhidden.hiddenObject(false); };
-                        element.onmouseover     = function(){ showhidden.hiddenObject(true); };
-                        element.appendChild( _optionsItens );
-                }
-                
+                        element.appendChild(_optionsItens);
+                }
         }
 
@@ -352 +352 @@
         }
         
-        function removeContact(jid)
+        function removeContact(jid, index)
         {
                 setTimeout(function()
                 {
-                        TrophyIM.removeContact(jid);
-                        
-                }, 500);
+                        TrophyIM.removeContact(jid, index);
+                        
+                },300);
         }
         
@@ -367 +367 @@
                 if( _parent.childNodes.length <= 2 )
                         _parent.parentNode.removeChild(_parent);
-                
         }
         
@@ -407 +406 @@
         }
         
-        function setSelectEditable(element)
-        {
-                if( document.getElementById('selectBox0') == null )
-                        selectEditable.create(element);
+        function setAutorization(jidTo, indexTo)
+        {
+        var divItenContact = null;
+        
+        if( ( divItenContact = document.getElementById('itenContact_' + jidTo + '_' + indexTo )))
+        {       
+                var subscription = divItenContact.getAttribute('subscription');
+                
+                switch(subscription)
+                {
+                        case 'from':
+                        case 'not-in-roster':
+                                        TrophyIM.setAutorization( jidTo, this.getUserCurrent().jid, 'subscribe');
+                                        break;
+                        case 'to' :
+                                        TrophyIM.setAutorization( jidTo, this.getUserCurrent().jid, 'subscribed');
+                                break;
+                }
+        }       
         }
         
@@ -452 +466 @@
                 }
         }
-        
+
+        function setSelectEditable(element)
+        {
+                if( document.getElementById('selectBox0') == null )
+                        selectEditable.create(element);
+        }
+
         function setStatusJabber()
         {
@@ -538 +558 @@
         loadIM.prototype.parse                          = parse;
         loadIM.prototype.searchUser                     = searchUser
+        loadIM.prototype.setAutorization        = setAutorization;
         loadIM.prototype.setPresence            = setPresence;
         loadIM.prototype.setStatusJabber        = setStatusJabber;

sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js

@@ -615 +615 @@
             var jid_lower       = barejid.toLowerCase();
             var contact         = "";
-                
+            contact                     = barejid.toLowerCase();
+                contact                 = contact.substring(0, contact.indexOf('@'));
+            
             if( TrophyIM.rosterObj.roster[barejid] )
             {
@@ -623 +625 @@
                     }
             }
-            else
-            {
-                contact = barejid.toLowerCase();
-                contact = contact.substring(0, contact.indexOf('@'));
-            }   
-            
+
             var message = 
             { 
@@ -670 +667 @@
         {
                 titleWindow = barejid.toLowerCase();
-                titleWindow = contact.substring(0, contact.indexOf('@'));
+                titleWindow = titleWindow.substring(0, titleWindow.indexOf('@'));
         }       
 
@@ -721 +718 @@
         
         // Add Contact
-        var _id = TrophyIM.connection.getUniqueId(); 
+        var _id = TrophyIM.connection.getUniqueId('add'); 
                 var newContact = $iq({type: 'set', id: _id });
                         newContact = newContact.c('query').attrs({xmlns : 'jabber:iq:roster'});
@@ -755 +752 @@
      */
     
-    removeContact : function(jidTo)
+    removeContact : function(jidTo, indexTo)
     {
-        var divItenContact = null;
+        var divItenContact       = null;
+        var spanShow             = null;
         
-        if( ( divItenContact = document.getElementById('itenContact_' + jidTo)))
+        if( ( divItenContact = document.getElementById('itenContact_' + jidTo + '_' + indexTo )))
         {       
+                spanShow = document.getElementById('span_show_itenContact_' + jidTo + '_' + indexTo )
+                
+                spanShow.parentNode.removeChild(spanShow);
+                
                 loadIM.removeGroup( divItenContact.parentNode );
                 
@@ -766 +768 @@
                 
                 // Remove Contact
-                        var _id = TrophyIM.connection.getUniqueId();    
+                        var _id = TrophyIM.connection.getUniqueId('del');       
                 var delContact  = $iq({type: 'set', id: _id})
                         delContact      = delContact.c('query').attrs({xmlns : 'jabber:iq:roster'});
@@ -808 +810 @@
             }
             
-                        if( !flagGeral )
+                        if( !flagGeral && users.length > 0 )
                                 groups[groups.length] = "Geral";
                                 
@@ -889 +891 @@
                                 var element             = arguments[2];
                                 var index               = arguments[3];
-                                
+
                                 var itensJid    = document.getElementById( 'itenContact_' + objContact.contact.jid + '_' + index );
                                 
@@ -934 +936 @@
                                                 'presence'              : presence,
                                                 'status'                : status,
-                                                'statusDisplay' : statusDisplay
+                                                'statusDisplay' : statusDisplay,
+                                                'subscription'  : objContact.contact.subscription
                                         }
                                         
@@ -966 +969 @@
                                                 for ( var resource in objContact.presence )
                                                 {
-                                                        presence = objContact.presence[resource].show;
-                                                        
+                                                        if( objContact.presence[resource].show != 'invisible' )
+                                                                presence = objContact.presence[resource].show;
+
                                                         if( objContact.presence[resource].status )
                                                         {
@@ -990 +994 @@
                                         itensJid.style.background       = "url('"+path_jabberit+"templates/default/images/" + presence + ".gif')no-repeat center left";
                                 }
-                                
                         }
                 }
@@ -1032 +1035 @@
          */
 
-        setAutorization : function( jid )
-        {
-           TrophyIM.connection.send($pres( ).attrs( {to: jid, from: loadIM.getUserCurrent().jid, type:'subscribed'}).tree());
+        setAutorization : function( jidTo, jidFrom, _typeSubscription )
+        {
+        var _id = TrophyIM.connection.getUniqueId();
+        
+        TrophyIM.connection.send($pres( ).attrs( {to: jidTo, from: jidFrom, type: _typeSubscription, id: _id}).tree());
         },
     
@@ -1268 +1273 @@
                 var groups = this.roster[ jid ].contact.groups;
                 
-                for ( var i = 0; i < groups.length; i++ )
-                {
-                        delete this.groups[ groups[ i ] ][ jid ];
-                }
-
-                for ( var i = 0; i < groups.length; i++ )
-                {
-                        var contacts = 0;
-                        for ( var contact in this.groups[ groups[ i ] ] )
-                                contacts++;
-
-                        if ( ! contacts )
-                                delete this.groups[ groups[ i ] ];
+                if( groups )
+                {
+                        
+                        for ( var i = 0; i < groups.length; i++ )
+                        {
+                                delete this.groups[ groups[ i ] ][ jid ];
+                        }
+
+                        for ( var i = 0; i < groups.length; i++ )
+                        {
+                                var contacts = 0;
+                                for ( var contact in this.groups[ groups[ i ] ] )
+                                        contacts++;
+        
+                                if ( ! contacts )
+                                        delete this.groups[ groups[ i ] ];
+                        }
                 }
 

sandbox/jabberit_messenger/trophy_expresso/xsl/contactsList.xsl

@@ -25 +25 @@
                 </fieldset>
                                 
-                <div id="JabberIMRoster" style="margin-top:3px; overflow-y: auto;"></div>
+                <div id="JabberIMRoster" style="margin-top:3px;overflow-y: auto; height: 267px;"></div>
                  
         </xsl:template>

sandbox/jabberit_messenger/trophy_expresso/xsl/itensGroup.xsl

@@ -11 +11 @@
         <xsl:param name="status"/>
         <xsl:param name="statusDisplay"/>
+        <xsl:param name="subscription" />
         
         <xsl:template match="itens_group">
 
-                        <div id="{$id}" onmousedown="loadIM.actionButton(event,'{$jid}','{$index}');" style="background: url('{$path_jabberit}templates/default/images/{$presence}.gif')no-repeat center left; padding-left: 20px; margin:2px 0px 0px 10px; cursor:pointer; font-weight:normal;">
+                        <div id="{$id}" subscription="{$subscription}" onmousedown="loadIM.actionButton(event,'{$jid}','{$index}');" style="background: url('{$path_jabberit}templates/default/images/{$presence}.gif')no-repeat center left; padding-left: 20px; margin:2px 0px 0px 10px; cursor:pointer; font-weight:normal;">
                                 <xsl:value-of select="$nameContact"/>
                         </div>
                         <span id="span_show_{$id}" style="margin:2px 0px 0px 10px; font-size: 8pt; font-style:italic; display:{$statusDisplay};"><xsl:value-of select="$status"/></span>
+                        
         </xsl:template>