Changeset 3317 for branches/2.2/jabberit_messenger/jmessenger/js/strophe.js

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.

File:

• branches/2.2/jabberit_messenger/jmessenger/js/strophe.js (modified) (5 diffs)

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);
             }