Changeset 3317

Timestamp:

10/01/10 17:17:49 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #986 - Refeito metodo indexOf para nao conflitar com as chamadas dentro do Expresso.

Location:

branches/2.2/jabberit_messenger/jmessenger/js

Files:

• strophe.js (modified) (5 diffs)
• strophe.mini.js (modified) (3 diffs)
• trophyim.js (modified) (2 diffs)
• trophyim.mini.js (modified) (1 diff)

branches/2.2/jabberit_messenger/jmessenger/js/strophe.js

@@ -458 +458 @@
  */
 
+/*
 if (!Array.prototype.indexOf)
 {
@@ -479 +480 @@
     };
 }
+*/
 
 /* All of the Strophe globals are defined in this special function below so
@@ -2735 +2737 @@
     _dataRecv: function (req)
     {
-        try {
+        var arrayIndexOf = function( pArray, pInd)
+        {
+                var len = pArray.length;
+                
+                for( var i = 0 ; i < len; i++ )
+                {
+                        if( pArray[i] == pInd )
+                                return i;
+                }
+                
+                return -1;
+        };
+        
+        try {
             var elem = req.getResponse();
         } catch (e) {
@@ -2748 +2763 @@
         // remove handlers scheduled for deletion
         var i, hand;
-        while (this.removeHandlers.length > 0) {
+        while (this.removeHandlers.length > 0)
+        {
             hand = this.removeHandlers.pop();
-            i = this.handlers.indexOf(hand);
-            if (i >= 0) {
+            //i = this.handlers.indexOf(hand);
+            i = arrayIndexOf( this.handlers, hand );
+            
+            if ( i >= 0 )
+            {
                 this.handlers.splice(i, 1);
             }
@@ -3438 +3457 @@
     _onIdle: function ()
     {
-        var i, thand, since, newList;
+        var arrayIndexOf = function( pArray, pInd)
+        {
+                var len = pArray.length;
+                
+                for( var i = 0 ; i < len; i++ )
+                {
+                        if( pArray[i] == pInd )
+                                return i;
+                }
+                
+                return -1;
+        };
+        
+        var i, thand, since, newList;
 
         // remove timed handlers that have been scheduled for deletion
-        while (this.removeTimeds.length > 0) {
+        while (this.removeTimeds.length > 0)
+        {
             thand = this.removeTimeds.pop();
-            i = this.timedHandlers.indexOf(thand);
-            if (i >= 0) {
+            //i = this.timedHandlers.indexOf(thand);
+            i = arrayIndexOf( this.timedHandlers, thand );
+            
+            if (i >= 0)
+            {
                 this.timedHandlers.splice(i, 1);
             }

branches/2.2/jabberit_messenger/jmessenger/js/strophe.mini.js

@@ -24 +24 @@
 {var func=this;return function(){var newargs=[arg];for(var i=0;i<arguments.length;i++){newargs.push(arguments[i]);}
 return func.apply(this,newargs);};};}
-if(!Array.prototype.indexOf)
-{Array.prototype.indexOf=function(elt)
-{var len=this.length;var from=Number(arguments[1])||0;from=(from<0)?Math.ceil(from):Math.floor(from);if(from<0){from+=len;}
-for(;from<len;from++){if(from in this&&this[from]===elt){return from;}}
-return-1;};}
 (function(callback){var Strophe;function $build(name,attrs){return new Strophe.Builder(name,attrs);}
 function $msg(attrs){return new Strophe.Builder("message",attrs);}
@@ -183 +178 @@
 {Strophe.info("_doDisconnect was called");this.authenticated=false;this.disconnecting=false;this.sid=null;this.streamId=null;this.rid=Math.floor(Math.random()*4294967295);if(this.connected){this._changeConnectStatus(Strophe.Status.DISCONNECTED,null);this.connected=false;}
 this.handlers=[];this.timedHandlers=[];this.removeTimeds=[];this.removeHandlers=[];this.addTimeds=[];this.addHandlers=[];},_dataRecv:function(req)
-{try{var elem=req.getResponse();}catch(e){if(e!="parsererror"){throw e;}
+{var arrayIndexOf=function(pArray,pInd)
+{var len=pArray.length;for(var i=0;i<len;i++)
+{if(pArray[i]==pInd)
+return i;}
+return-1;};try{var elem=req.getResponse();}catch(e){if(e!="parsererror"){throw e;}
 this.disconnect("strophe-parsererror");}
 if(elem===null){return;}
-this.xmlInput(elem);this.rawInput(Strophe.serialize(elem));var i,hand;while(this.removeHandlers.length>0){hand=this.removeHandlers.pop();i=this.handlers.indexOf(hand);if(i>=0){this.handlers.splice(i,1);}}
+this.xmlInput(elem);this.rawInput(Strophe.serialize(elem));var i,hand;while(this.removeHandlers.length>0)
+{hand=this.removeHandlers.pop();i=arrayIndexOf(this.handlers,hand);if(i>=0)
+{this.handlers.splice(i,1);}}
 while(this.addHandlers.length>0){this.handlers.push(this.addHandlers.pop());}
 if(this.disconnecting&&this._requests.length===0){this.deleteTimedHandler(this._disconnectTimeout);this._disconnectTimeout=null;this._doDisconnect();return;}
@@ -236 +237 @@
 {Strophe.info("_onDisconnectTimeout was called");var req;while(this._requests.length>0){req=this._requests.pop();req.abort=true;req.xhr.abort();req.xhr.onreadystatechange=function(){};}
 this._doDisconnect();return false;},_onIdle:function()
-{var i,thand,since,newList;while(this.removeTimeds.length>0){thand=this.removeTimeds.pop();i=this.timedHandlers.indexOf(thand);if(i>=0){this.timedHandlers.splice(i,1);}}
+{var arrayIndexOf=function(pArray,pInd)
+{var len=pArray.length;for(var i=0;i<len;i++)
+{if(pArray[i]==pInd)
+return i;}
+return-1;};var i,thand,since,newList;while(this.removeTimeds.length>0)
+{thand=this.removeTimeds.pop();i=arrayIndexOf(this.timedHandlers,thand);if(i>=0)
+{this.timedHandlers.splice(i,1);}}
 while(this.addTimeds.length>0){this.timedHandlers.push(this.addTimeds.pop());}
 var now=new Date().getTime();newList=[];for(i=0;i<this.timedHandlers.length;i++){thand=this.timedHandlers[i];if(this.authenticated||!thand.user){since=thand.lastCalled+thand.period;if(since-now<=0){if(thand.run()){newList.push(thand);}}else{newList.push(thand);}}}

branches/2.2/jabberit_messenger/jmessenger/js/trophyim.js

@@ -813 +813 @@
                         _message.innerHTML = Strophe.getText(elems[0]);
                         
+                        // Delete Tags <SCRIPT>
                         var scripts = _message.getElementsByTagName('script');
                         
@@ -818 +819 @@
                                 _message.removeChild(scripts[i--]);
                         
+                        // Delete Tags <IMG>
+                        var _imgSrc = _message.getElementsByTagName('img');
+                        
+                        for (var i = 0; i < _imgSrc.length; i++) 
+                                _message.removeChild( _imgSrc[i--] );
+
                         _message.innerHTML = _message.innerHTML.replace(/^\s+|\s+$|^\n|\n$/g, "");
                         

branches/2.2/jabberit_messenger/jmessenger/js/trophyim.mini.js

@@ -131 +131 @@
 {chatStateOnOff.value='on';}
 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.replace(/^\s+|\s+$|^\n|\n$/g,"");_message.innerHTML=loadscript.getSmiles(_message.innerHTML);if(type=='chat'||type=='normal')
+_message.removeChild(scripts[i--]);var _imgSrc=_message.getElementsByTagName('img');for(var i=0;i<_imgSrc.length;i++)
+_message.removeChild(_imgSrc[i--]);_message.innerHTML=_message.innerHTML.replace(/^\s+|\s+$|^\n|\n$/g,"");_message.innerHTML=loadscript.getSmiles(_message.innerHTML);if(type=='chat'||type=='normal')
 {if(_message.hasChildNodes())
 {var message={contact:"["+stamp+"] <font style='font-weight:bold; color:black;'>"+contact+"</font>",msg:"</br>"+_message.innerHTML};TrophyIM.addMessage(TrophyIM.makeChat(from),jid_lower,message);}}