Changeset 2670 for sandbox/jabberit_messenger/trophy_expresso

Timestamp:

04/30/10 09:52:49 (14 years ago)

Author:

alexandrecorreia

Message:

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

Location:

sandbox/jabberit_messenger/trophy_expresso

Files:

• inc/jabberit_acl.inc.php (modified) (1 diff)
• js/AddUser.js (modified) (7 diffs)
• js/jscode (added)
• js/jscode/loadIM.js (added)
• js/loadIM.js (modified) (6 diffs)
• js/trophyim.js (modified) (29 diffs)
• js/xtools.js (modified) (1 diff)
• xsl/addUser.xsl (modified) (1 diff)
• xsl/contactsList.xsl (modified) (1 diff)
• xsl/groups.xsl (modified) (1 diff)
• xsl/itensGroup.xsl (modified) (1 diff)

sandbox/jabberit_messenger/trophy_expresso/inc/jabberit_acl.inc.php

@@ -58 +58 @@
                 $js .= "var theme_jabberit='".$theme."';";
 
-                echo "<script type='text/javascript'>".$js."</script>";
-                echo "<script type='text/javascript' src='".$webserver_url . "js/loadIM.js'></script>";
-                echo "<script type='text/javascript'> var loadIM = new LoadIM('".$fullName."'); </script>";
+                //echo "<script type='text/javascript'>".$js."</script>";
+                //echo "<script type='text/javascript' src='".$webserver_url . "js/loadIM.js'></script>";
+                //echo "<script type='text/javascript'> var loadscript = new LoadIM('".$fullName."'); </script>";
+                
+                $GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= "<script type='text/javascript'>".$js."</script>";
+                $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'loadIM', 'jmessenger' );
+                $GLOBALS['phpgw_info']['flags']['java_script'] .= "<script type='text/javascript'> var loadscript = new LoadIM('".$fullName."'); </script>";
+                
 
                 break;

sandbox/jabberit_messenger/trophy_expresso/js/AddUser.js

@@ -8 +8 @@
                         if( arguments.length > 0 )
                         {
-                                var jidFrom             = loadIM.getUserCurrent().jid;
+                                var jidFrom             = loadscript.getUserCurrent().jid;
                                 var jidTo               = arguments[0];
                                 var indexTo             = arguments[1];
@@ -31 +31 @@
                                 
                                 // Remove Element html;
-                                loadIM.removeElement( getElement('itenContact_' + jidTo + '_' + indexTo) );
-                                loadIM.removeElement( getElement('span_show_itenContact_' + jidTo + '_' + indexTo) );
+                                loadscript.removeElement( getElement('itenContact_' + jidTo + '_' + indexTo) );
+                                loadscript.removeElement( getElement('span_show_itenContact_' + jidTo + '_' + indexTo) );
                                 TrophyIM.rosterObj.removeContact(jidTo);
                         }
                         else
                         {       
-                                var jidFrom             = loadIM.getUserCurrent().jid;
+                                var jidFrom             = loadscript.getUserCurrent().jid;
                                 var jidTo               = document.getElementById('user_jid_jabberIM').value;
                                 var name                = document.getElementById('user_name_jabberIM').value;
@@ -97 +97 @@
                                                         }
                                                         
-                                                        loadIM.configEvents(_newUser, 'onclick', showContact);
+                                                        loadscript.configEvents(_newUser, 'onclick', showContact);
                                                         
                                                         _newUser = _newUser.nextSibling;
@@ -169 +169 @@
                                         visible          : "display",
                                         resizable        : true,
-                                        zindex           : loadIM.getZIndex(),
+                                        zindex           : loadscript.getZIndex(),
                                         title            : 'Expresso Messenger - Add Contact',
                                         closeAction  : "remove",
@@ -183 +183 @@
                                 'lang2'                 : 'Fechar',
                                 'onclickClose'  : '_winBuild("' + winAddUser.id_window + '","remove");',
-                                'onclickSubmit' : 'loadIM.addContact(this);'
+                                'onclickSubmit' : 'loadscript.addContact(this);'
                         }; 
 
@@ -190 +190 @@
                         
                         // Select Editable
-                        loadIM.setSelectEditable(document.getElementById('user_group_jabberIM'));
+                        loadscript.setSelectEditable(document.getElementById('user_group_jabberIM'));
                         
                         // Load Photo;
@@ -253 +253 @@
                                         visible          : "display",
                                         resizable        : true,
-                                        zindex           : loadIM.getZIndex(),
+                                        zindex           : loadscript.getZIndex(),
                                         title            : 'Expresso Messenger - Search users',
                                         closeAction  : "remove",

sandbox/jabberit_messenger/trophy_expresso/js/loadIM.js

@@ -166 +166 @@
         function fastMenu()
         {
+                alert("FastMenu");
+                
                 if( arguments.length > 0 )
                 {
@@ -174 +176 @@
 
                         var _options = [
-                                                ['Adicionar Contato', 'loadIM.addContact();' ],
-                                                ['Ajuda', 'alert("2")' ],
+                                                ['Adicionar Contato OI', 'loadscript.addContact();' ],
+                                                ['Ajuda', 'alert("323535")' ],
                                                 ['Preferências', 'alert("3")'],
                                                    ];
@@ -183 +185 @@
                         for( var i in _options )
                         {
-                                if( typeof(_options) === "object" && _options[i][0] != "undefined" )
-                                {
-                                        _itens += '<img src="'+arrow_right.src+'"/>';
-                                        _itens += '<span style="cursor:pointer; margin:3px;" onclick='+_options[i][1]+'>';
-                                        _itens += _options[i][0] + '</span><br/>';
-                                }
+                                _itens += '<img src="'+arrow_right.src+'"/>';
+                                _itens += '<span style="cursor:pointer; margin:3px;" onclick='+_options[i][1]+'>';
+                                _itens += _options[i][0] + '</span><br/>';
                         }
                         
@@ -391 +390 @@
 
                         var _options = [
-                                                [ action , 'loadIM.setAutorization(\''+jid+'\',\''+index+'\')'],
-                                                ['Remover' , 'loadIM.removeContact(\''+jid+'\',\''+index+'\')'],
-                                                ['Renomear' , 'loadIM.renameContact(\''+jid+'\',\''+index+'\')'],
-                                                ['Trocar grupo' , 'loadIM.renameGroup(\''+jid+'\',\''+index+'\')']
+                                                [ action , 'loadscript.setAutorization(\''+jid+'\',\''+index+'\')'],
+                                                ['Remover' , 'loadscript.removeContact(\''+jid+'\',\''+index+'\')'],
+                                                ['Renomear' , 'loadscript.renameContact(\''+jid+'\',\''+index+'\')'],
+                                                ['Trocar grupo' , 'loadscript.renameGroup(\''+jid+'\',\''+index+'\')']
                                                    ];
 
@@ -611 +610 @@
                                 if( typeof( _status[i]) == "object" )
                                 {
-                                        _itens += '<span style="cursor:pointer;" onclick="TrophyIM.setPresence(\''+_status[i][1]+'\'); loadIM.setStatusJabber(\''+_status[i][0]+'\',\''+_status[i][1]+'\');">';
+                                        _itens += '<span style="cursor:pointer;" onclick="TrophyIM.setPresence(\''+_status[i][1]+'\'); loadscript.setStatusJabber(\''+_status[i][0]+'\',\''+_status[i][1]+'\');">';
                                         _itens += _status[i][2]+ "<span style='margin:3px;'>" + _status[i][0] + "</span></span><br/>";
                                 }
@@ -722 +721 @@
                                 // Add Jabber in StatusBar;
                                 addIcon();
-                                
-                                window.document.oncontextmenu = function()
-                                {
-                                        return true;
-                                };
-                                
+
                         }, 1000);
                 }
         }
         
-        loadIM.prototype.addIcon                        = addIcon;
+        loadIM.prototype.adIcon                         = addIcon;
         loadIM.prototype.actionButton           = actionButton;
         loadIM.prototype.addContact                     = addContact;

sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js

@@ -64 +64 @@
                     return htmlObj;
                 } catch(e) {
-                    alert(
-                    "TrophyIM Error: Cannot add html to page" + e.message);
+                    alert("TrophyIM Error: Cannot add html to page " + e.message);
                 }
             }
@@ -243 +242 @@
         load : function()
         {
-                loadIM.setUserCurrent();
+                loadscript.setUserCurrent();
         
         if (!TrophyIM.statusConn.connected)
@@ -258 +257 @@
                 else
                 {
-                        loadIM.rosterDiv();
+                        loadscript.rosterDiv();
                 }
    },
@@ -309 +308 @@
             {
                 // List Contact
-                                loadIM.rosterDiv();
+                                loadscript.rosterDiv();
                                 
-                                if ( loadIM.getUserCurrent() != null )
+                                if ( loadscript.getUserCurrent() != null )
                                 {
-                                        TrophyIM.login( Base64.decode(loadIM.getUserCurrent().jid), Base64.decode(loadIM.getUserCurrent().password));
+                                        TrophyIM.login( Base64.decode(loadscript.getUserCurrent().jid), Base64.decode(loadscript.getUserCurrent().password));
                                 }
                                 else
                                 {
-                                        loadIM.loginPage();
+                                        loadscript.loginPage();
                                 }
             }
@@ -401 +400 @@
                         var button              = document.getElementById('trophyimconnect');
                         
-                        loadIM.setUserCurrent( barejid, password);
+                        loadscript.setUserCurrent( barejid, password);
                         
                         if ( button.value == 'connect' )
@@ -475 +474 @@
                                 },10000);
                                 
-                    loadIM.clrAllContacts();    
+                    loadscript.clrAllContacts();        
                     
-                    loadIM.setStatusJabber("Desconectado","unavailable");
+                    loadscript.setStatusJabber("Desconectado","unavailable");
                     
                     delete TrophyIM.rosterObj.roster;
@@ -486 +485 @@
                 if( status == Strophe.Status.CONNECTED )
                 {
-                        loadIM.setStatusJabber('Disponível','available');
+                        loadscript.setStatusJabber('Disponível','available');
                         TrophyIM.statusConn.connected = true;
             TrophyIM.showClient();
@@ -511 +510 @@
         TrophyIM.connection.send($iq({type: 'get', xmlns: Strophe.NS.CLIENT}).c('query', {xmlns: Strophe.NS.ROSTER}).tree());
         TrophyIM.connection.send($pres().tree());
-                setTimeout("TrophyIM.renderRoster()", 1000);
+                setTimeout( TrophyIM.renderRoster, 1000);
     },
         
@@ -640 +639 @@
             }
 
-            var message = 
-            { 
-                contact : "<font style='font-weight:bold; color:black;'>" + contact + "</font>",
-                msg             : Strophe.getText(elems[0])     
-            };
-
-            TrophyIM.makeChat(from); //Make sure we have a chat window
-            TrophyIM.addMessage(message, jid_lower);
+                var _message = document.createElement("div");
+                _message.innerHTML = Strophe.getText(elems[0]);
+
+                var scripts = _message.getElementsByTagName( 'script' );
+
+                for ( var i = 0; i < scripts.length; i++ )
+                        _message.removeChild( scripts[ i-- ] );
+                
+                _message.innerHTML = _message.innerHTML.trim( );
+
+                if ( _message.hasChildNodes( ) )
+                {
+                    var message = 
+                    { 
+                        contact : "<font style='font-weight:bold; color:black;'>" + contact + "</font>",
+                        msg             : _message.innerHTML
+                    };
+        
+                    TrophyIM.makeChat(from); //Make sure we have a chat window
+                    TrophyIM.addMessage(message, jid_lower);
+                }
         }
         
@@ -702 +714 @@
                          visible                : "display",
                          resizable              : true,
-                         zindex                 : loadIM.getZIndex(),
+                         zindex                 : loadscript.getZIndex(),
                          title                  : titleWindow,
                          closeAction    : "hidden",
-                         content                : loadIM.parse("chat_box","chatBox.xsl", paramsChatBox) 
+                         content                : loadscript.parse("chat_box","chatBox.xsl", paramsChatBox)     
         }
         
@@ -711 +723 @@
 
         // Notification New Message
-        loadIM.notification();
+        loadscript.notification();
         
         // Photo User;
-                loadIM.getPhotoUser(barejid);
+                loadscript.getPhotoUser(barejid);
                 
-                loadIM.configEvents( document.getElementById( barejid + '__sendBox'),
+                loadscript.configEvents( document.getElementById( barejid + '__sendBox'),
                         'onkeyup', function(e)
                         {
@@ -828 +840 @@
         {
                 for( var i in presence )
+                {
+                        if ( presence[ i ].constructor == Function )
+                                continue;
+                                
                         TrophyIM.rosterObj.setPresence( jid, presence[i].priority, presence[i].show, presence[i].status);
+                }
         },500);
     },
@@ -849 +866 @@
                 spanShow.parentNode.removeChild(spanShow);
                 
-                loadIM.removeGroup( divItenContact.parentNode );
+                loadscript.removeGroup( divItenContact.parentNode );
                 
                 divItenContact.parentNode.removeChild(divItenContact);
@@ -892 +909 @@
                         for( var user in TrophyIM.rosterObj.roster )
                         {
+                                if ( TrophyIM.rosterObj.roster[ user ].constructor == Function )
+                                        continue;
+
                                 users[users.length] = TrophyIM.rosterObj.roster[user].contact.jid;
                         }
@@ -902 +922 @@
                         for (var group in TrophyIM.rosterObj.groups)
                         {
+                                if ( TrophyIM.rosterObj.groups[ group ].constructor == Function )
+                                        continue;
+                                
                                 if( group )
                                         groups[groups.length] = group;
@@ -943 +966 @@
                         }
                         
-                        _element.innerHTML += loadIM.parse("group","groups.xsl", paramsGroup);
+                        _element.innerHTML += loadscript.parse("group","groups.xsl", paramsGroup);
                 }
 
@@ -992 +1015 @@
 
                                 var itensJid    = document.getElementById( 'itenContact_' + objContact.contact.jid + '_' + index );
-                                
+
                                 if( itensJid == null )
                                 {
@@ -1015 +1038 @@
                                                 for (var resource in objContact.presence)
                                                 {
+                                                        if ( objContact.presence[resource].constructor == Function )
+                                                                continue;
+
                                                         if( objContact.presence[resource].show != 'invisible' )
                                                                 presence = objContact.presence[resource].show;
@@ -1034 +1060 @@
                                                 jid                             : objContact.contact.jid,       
                                                 id                              : 'itenContact_' + objContact.contact.jid + '_' + index ,
-                                                index                   : index,
+                                                index                   : ((index == 0 ) ? "0" : index),
                                                 path_jabberit   : path_jabberit,
                                                 presence                : presence,
@@ -1042 +1068 @@
                                                 subscription    : objContact.contact.subscription
                                         }
-                                        
-
                                         
                                         // Authorization        
@@ -1096 +1120 @@
                                                                 if( _NodeChild.childNodes[0].childNodes[0].nodeValue === group )
                                                                 {
-                                                                        _NodeChild.innerHTML += loadIM.parse("itens_group", "itensGroup.xsl", paramsContact);
+                                                                        _NodeChild.innerHTML += loadscript.parse("itens_group", "itensGroup.xsl", paramsContact);
                                                                 }
                                                         }
@@ -1117 +1141 @@
                                                 for ( var resource in objContact.presence )
                                                 {
+                                                        if ( objContact.presence[resource].constructor == Function )
+                                                                continue;
+
                                                         if( objContact.presence[resource].show != 'invisible' )
                                                                 presence = objContact.presence[resource].show;
@@ -1193 +1220 @@
                 for( var i = 0 ; i < users.length; i++ )
                 {
-                        if( TrophyIM.rosterObj.roster[users[i]].contact.jid != Base64.decode(loadIM.getUserCurrent().jid) )
+                        if( TrophyIM.rosterObj.roster[users[i]].contact.jid != Base64.decode(loadscript.getUserCurrent().jid) )
                         {
                                 if( TrophyIM.rosterObj.roster[users[i]].contact.groups )
@@ -1202 +1229 @@
                                         {
                                                 for( var j = 0; j < groups.length; j++ )
+                                                {
                                                         addItem( TrophyIM.rosterObj.roster[users[i]], groups[j], element, j );
+                                                }
                                         }
                                         else
@@ -1264 +1293 @@
                                 TrophyIM.logout();
                                 
-                        loadIM.clrAllContacts();
+                        loadscript.clrAllContacts();
                         
                         delete TrophyIM.rosterObj.roster;
@@ -1293 +1322 @@
                         if (( _status = prompt("Digite sua mensagem !") ))
                         {
-                                for(var resource in TrophyIM.rosterObj.roster[Base64.decode(loadIM.getUserCurrent().jid)].presence )
-                                {       
+                                for(var resource in TrophyIM.rosterObj.roster[Base64.decode(loadscript.getUserCurrent().jid)].presence )
+                                {
+                                if ( TrophyIM.rosterObj.roster[Base64.decode(loadscript.getUserCurrent().jid)].presence[ resource ].constructor == Function )
+                                        continue;
+                                
                                         if ( TROPHYIM_RESOURCE === ("/" + resource) )
-                                                _show = TrophyIM.rosterObj.roster[Base64.decode(loadIM.getUserCurrent().jid)].presence[resource].show;
+                                                _show = TrophyIM.rosterObj.roster[Base64.decode(loadscript.getUserCurrent().jid)].presence[resource].show;
                                 }
 
@@ -1478 +1510 @@
                         for (var resource in this.roster[jid.toLowerCase()]['presence'])
                         {
+                        if ( this.roster[jid.toLowerCase()]['presence'][ resource ].constructor == Function )
+                                continue;
+                        
                                 var presence = this.roster[jid.toLowerCase()]['presence'][resource];
                                 if (current == null)
@@ -1540 +1575 @@
                                         var contacts = 0;
                                         for ( var contact in this.groups[ groups[ i ] ] )
+                                        {
+                                        if ( this.groups[ groups[ i ] ][ contact ].constructor == Function )
+                                                continue;
+                                        
                                                 contacts++;
+                                        }
                 
                                         if ( ! contacts )
@@ -1686 +1726 @@
         if (typeof(obj) == "object") {
             for (var i in obj) {
+                        if ( obj[i].constructor == Function )
+                                continue;
+                        
                 if (i == '_empty_') {
                     obj[""] = this.emptyFix(obj['_empty_']);

sandbox/jabberit_messenger/trophy_expresso/js/xtools.js

@@ -90 +90 @@
                                 var params = arguments[2];
                                 for (var i in params )
-                                         xslProc.setParameter(null, i, params[i]);
+                                        if ( params[ i ] && params[ i ].constructor != Function )
+                                                xslProc.setParameter(null, i, params[i]);
                         }
 

sandbox/jabberit_messenger/trophy_expresso/xsl/addUser.xsl

@@ -18 +18 @@
                         <div style="margin:5px 0px 5px 5px;">
                                 <span><xsl:value-of select="$lang_name_contact" /> .: </span> 
-                                <input id="search_user_jabber" type="text" size="30" onclick="this.select();" onkeypress="loadIM.keyPressSearch(event, this);" />
-                                <button style="position:absolute; top:5px; left:305px;" onclick="loadIM.searchUser()"><img src="{$path}templates/default/images/users.png"/></button>
+                                <input id="search_user_jabber" type="text" size="30" onclick="this.select();" onkeypress="loadscript.keyPressSearch(event, this);" />
+                                <button style="position:absolute; top:5px; left:305px;" onclick="loadscript.searchUser()"><img src="{$path}templates/default/images/users.png"/></button>
                         </div>
 

sandbox/jabberit_messenger/trophy_expresso/xsl/contactsList.xsl

@@ -16 +16 @@
 
                         <div style="position: absolute; top: 30px; left: 80px;">
-                                <button style="width:35px;" alt="Adicionar Contatos" title="Adicionar Contatos" onclick="loadIM.addContact();">
+                                <button style="width:35px;" alt="Adicionar Contatos" title="Adicionar Contatos" onclick="loadscript.addContact();">
                                         <img src="{$path_jabberit}/templates/default/images/users.png"/>
                                 </button>
                         </div>
 
-                        <div style="position: absolute; left: 80px; top: 55px; cursor: pointer;" onclick="loadIM.setPresence(this);">
+                        <div style="position: absolute; left: 80px; top: 55px; cursor: pointer;" onclick="loadscript.setPresence(this);">
                                 <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>

sandbox/jabberit_messenger/trophy_expresso/xsl/groups.xsl

@@ -9 +9 @@
 
                         <div style="margin-bottom: 3px;">
-                                <span  onclick="loadIM.groupsHidden(this);" style="background: url('{$path_jabberit}/templates/default/images/arrow_down.gif') no-repeat center left; font-weight:bold; padding-left: 16px; cursor: pointer;">
+                                <span  onclick="loadscript.groupsHidden(this);" style="background: url('{$path_jabberit}/templates/default/images/arrow_down.gif') no-repeat center left; font-weight:bold; padding-left: 16px; cursor: pointer;">
                                         <xsl:value-of select="$nameGroup"/>
                                 </span>

sandbox/jabberit_messenger/trophy_expresso/xsl/itensGroup.xsl

@@ -16 +16 @@
         <xsl:template match="itens_group">
 
-                        <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;">
+                        <div id="{$id}" subscription="{$subscription}" onmousedown="loadscript.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>