Changeset 2629 for sandbox/jabberit_messenger/trophy_expresso

Timestamp:

04/26/10 17:18:32 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #986 - Correcao para compatibilizar o carregamento do script para o IE.

Location:

sandbox/jabberit_messenger/trophy_expresso

Files:

• js/loadIM.js (modified) (5 diffs)
• js/show_hidden.js (modified) (5 diffs)
• js/trophyim.js (modified) (5 diffs)
• templates/default/images/loading.gif (added)
• xsl/contactsList.xsl (modified) (2 diffs)

sandbox/jabberit_messenger/trophy_expresso/js/loadIM.js

@@ -26 +26 @@
                 if( arguments.length > 0 )
                 {
-                        var e           = arguments[0];
+                        var e                   = arguments[0];
+                        var _element    = ( e.target ) ? e.target : e.srcElement;
                         var jid         = arguments[1];
                         var index       = arguments[2];
@@ -38 +39 @@
                                 
                         coord = { X : _X, Y : _Y };
-                        
-                        window.document.oncontextmenu = function()
+                
+
+                        var _onContextMenu = function()
                         {
                                 return false;
                         };
+                        
+                        window.document.oncontextmenu   = _onContextMenu;
                         
                         if( e.button )
@@ -179 +183 @@
                         for( var i in _options )
                         {
-                                if( typeof(_options) == "object" )
+                                if( typeof(_options) === "object" && _options[i][0] != "undefined" )
                                 {
                                         _itens += '<img src="'+arrow_right.src+'"/>';
@@ -188 +192 @@
                         
                         var _optionsItens = document.createElement("div");
+                                _optionsItens.id        = "fastMenu_Jabber";                            
                                 _optionsItens.style.marginTop   = "19px";
                                 _optionsItens.style.marginLeft  = "-8px";
                                 _optionsItens.className         = "x-menu";
                                 _optionsItens.style.zIndex      = '999999';
-                                _optionsItens.innerHTML         = _itens;  
+                                _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.parentNode.onmouseout   = function(){ showhidden.hiddenObject(false); };
-                        element.parentNode.onmouseover  = function(){ showhidden.hiddenObject(true); };
                         element.parentNode.appendChild( _optionsItens );
-                        
                 }
         }
@@ -719 +724 @@
                                 addIcon();
                                 
+                                window.document.oncontextmenu = function()
+                                {
+                                        return true;
+                                };
+                                
                         }, 1000);
                 }

sandbox/jabberit_messenger/trophy_expresso/js/show_hidden.js

@@ -1 +1 @@
 (function()
 {
+        
         var _delay;
+        var _event_show         = false;
+        var _event_hidden       = false;
 
         var _last_displayed;
-        var _timeout = false;
-
-        var _event_show = false;
-        var _event_hidden = false;
-        var count = 0;
+        var _timeout            = false;
 
         function _config(pObj, pEvent, pHandler)
@@ -38 +37 @@
                 {
                         if( arguments[0] )
-                                clearTimeout(_timeout);
+                                clearTimeout( _timeout );
                         else
+                        {
                                 _timeout = setTimeout( hdObject, _delay);
+                        }
                 }
         }
@@ -46 +47 @@
         function _show(_element)
         {
-                _element.style.display = 'block';
-                _last_displayed = _element;
+                if( !(_last_displayed && ( _last_displayed.id == _element.id )))
+                {
+                        _element.style.display = 'block';
+                        _last_displayed = _element;
+                }
         }
 
@@ -77 +81 @@
                         {
                                 var _element = false;
+                                
                                 switch ( typeof arguments[2] )
                                 {
@@ -82 +87 @@
                                                 _element = arguments[2];
                                         break;
+                                        
                                         case 'string' :
                                                 _element = document.getElementById(arguments[2]);

sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js

@@ -413 +413 @@
     onConnect : function(status)
         {
-                if( status == Strophe.Status.CONNECTING )
+                var loading_gif = document.getElementById("JabberIMRosterLoadingGif");
+                
+                loading_gif.style.display = "block";
+                
+        if( status == Strophe.Status.CONNECTING )
                 {
                         Strophe.info('Strophe is connecting.');
@@ -420 +424 @@
                 if( status == Strophe.Status.CONNFAIL )
                 {
-            TrophyIM.delCookie('trophyim_bosh_xid');
+                        TrophyIM.delCookie('trophyim_bosh_xid');
             TrophyIM.statusConn.connected = false;
         }
@@ -431 +435 @@
                 if( status == Strophe.Status.DISCONNECTED )
                 {
-            TrophyIM.delCookie('trophyim_bosh_xid');
+                        TrophyIM.delCookie('trophyim_bosh_xid');
             
             TrophyIM.statusConn.connected = false;
@@ -438 +442 @@
                         {
                     TrophyIM.showLogin();
-                    
                     
                         },10000);
@@ -840 +843 @@
                 {
                         var users = new Array();
+                        
+                        var loading_gif = document.getElementById("JabberIMRosterLoadingGif");
+                        
+                        if( loading_gif.style.display == "block" )
+                                loading_gif.style.display = "none";
+                                
+                        //      loading_gif.parentNode.removeChild(loading_gif);
                         
                         for( var user in TrophyIM.rosterObj.roster )

sandbox/jabberit_messenger/trophy_expresso/xsl/contactsList.xsl

@@ -10 +10 @@
         <xsl:template match="contacts_list">
                 
-                <fieldset style="margin:2px; border:1px dotted #000000; height: 90px;">
+                <fieldset style="margin:2px; border:1px dotted #000000; height: 74pt;">
                         <div id="{$idUser}__photo" style="position: absolute; left: 5px; top: 5px; width:60px; height:80px; background-image:url('{$path_jabberit}/templates/default/images/photo.png');"/>
 
@@ -24 +24 @@
                                 <div id="statusJabberImg" style="background: url('{$path_jabberit}/templates/default/images/available.gif'); margin-left: 13px;width:15px; height:15px;"></div>
                                 <div id="statusJabberText" style="margin-top: -13px; margin-left: 30px;"> Disponível </div>
-                                <div style="background-image: url('{$path_jabberit}/templates/default/images/arrow_down.gif'); margin-top: -13px; margin-left: 0px; width:15px; height:15px;"/> 
+                                <div style="background-image: url('{$path_jabberit}/templates/default/images/arrow_down.gif'); margin-top: -13px; margin-left: 0px; width:15px; height:15px;"/>
+                        </div>
+                        
+                        <div id="JabberIMRosterLoadingGif" style="position:absolute; left:80px; top:72px; display:block;">
+                                        <img src='{$path_jabberit}/templates/default/images/loading.gif' style="width:20px; height:20px;"/>
+                                        <span style="color:red;">Carregando...</span>
                         </div>
 
                 </fieldset>
                                 
-                <div id="JabberIMRoster" style="margin-top:3px;overflow-y: auto; height: 267px; z-index:{$zIndex_};"></div>
+                <div id="JabberIMRoster" style="margin-top:3px;overflow-y: auto; height: 262px; z-index:{$zIndex_};">
+                </div>
                  
         </xsl:template>