Index: sandbox/jabberit_messenger/trophy_expresso/xsl/contactsList.xsl
===================================================================
--- sandbox/jabberit_messenger/trophy_expresso/xsl/contactsList.xsl (revision 2626)
+++ sandbox/jabberit_messenger/trophy_expresso/xsl/contactsList.xsl (revision 2629)
@@ -10,5 +10,5 @@
-
Index: sandbox/jabberit_messenger/trophy_expresso/js/loadIM.js
===================================================================
--- sandbox/jabberit_messenger/trophy_expresso/js/loadIM.js (revision 2626)
+++ sandbox/jabberit_messenger/trophy_expresso/js/loadIM.js (revision 2629)
@@ -26,5 +26,6 @@
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,9 +39,12 @@
coord = { X : _X, Y : _Y };
-
- window.document.oncontextmenu = function()
+
+
+ var _onContextMenu = function()
{
return false;
};
+
+ window.document.oncontextmenu = _onContextMenu;
if( e.button )
@@ -179,5 +183,5 @@
for( var i in _options )
{
- if( typeof(_options) == "object" )
+ if( typeof(_options) === "object" && _options[i][0] != "undefined" )
{
_itens += '';
@@ -188,16 +192,17 @@
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,4 +724,9 @@
addIcon();
+ window.document.oncontextmenu = function()
+ {
+ return true;
+ };
+
}, 1000);
}
Index: sandbox/jabberit_messenger/trophy_expresso/js/show_hidden.js
===================================================================
--- sandbox/jabberit_messenger/trophy_expresso/js/show_hidden.js (revision 2397)
+++ sandbox/jabberit_messenger/trophy_expresso/js/show_hidden.js (revision 2629)
@@ -1,12 +1,11 @@
(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,7 +37,9 @@
{
if( arguments[0] )
- clearTimeout(_timeout);
+ clearTimeout( _timeout );
else
+ {
_timeout = setTimeout( hdObject, _delay);
+ }
}
}
@@ -46,6 +47,9 @@
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,4 +81,5 @@
{
var _element = false;
+
switch ( typeof arguments[2] )
{
@@ -82,4 +87,5 @@
_element = arguments[2];
break;
+
case 'string' :
_element = document.getElementById(arguments[2]);
Index: sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js
===================================================================
--- sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js (revision 2626)
+++ sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js (revision 2629)
@@ -413,5 +413,9 @@
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,5 +424,5 @@
if( status == Strophe.Status.CONNFAIL )
{
- TrophyIM.delCookie('trophyim_bosh_xid');
+ TrophyIM.delCookie('trophyim_bosh_xid');
TrophyIM.statusConn.connected = false;
}
@@ -431,5 +435,5 @@
if( status == Strophe.Status.DISCONNECTED )
{
- TrophyIM.delCookie('trophyim_bosh_xid');
+ TrophyIM.delCookie('trophyim_bosh_xid');
TrophyIM.statusConn.connected = false;
@@ -438,5 +442,4 @@
{
TrophyIM.showLogin();
-
},10000);
@@ -840,4 +843,11 @@
{
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 )