Changeset 6008

Timestamp:

04/23/12 23:29:06 (12 years ago)

Author:

natan

Message:

Ticket #2648 - Problema de sincronizacao de dados nos filtros de mensagens - Correcao no diff

File:

• trunk/prototype/api/datalayer.js (modified) (4 diffs)

trunk/prototype/api/datalayer.js

@@ -967 +967 @@
           this.comparators.unshift( comparator );
     },
+    
+    escapedJSON: function(text)
+    {
+          return JSON.stringify( text ).replace( /[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&" );
+    },
  
     diff: function( base, toDiff ){
@@ -987 +992 @@
               break;
               case 'array':
-                if( base[key] && !(toDiff[key] = $.grep( toDiff[key], function( el, i ){ return( $.inArray( el, base[key] ) === -1 ); } )).length )
+                if( base[key] && !(toDiff[key] = $.grep( toDiff[key], function( el, i ){ return( $.isArray( el ) || $.isPlainObject( el ) ? !RegExp( DataLayer.escapedJSON( el ) ).test( JSON.stringify(base[key]) ) : $.inArray( el, base[key] ) === -1 ); } )).length )
                   delete toDiff[key];
               break;
@@ -1981 +1986 @@
         var timer = function(){
 
-              setTimeout( timer, 1 );
+              setTimeout( timer, 1000 );
 
               var now = parseInt( $.now() / 1000 );
@@ -2000 +2005 @@
         };
 
-        setTimeout( timer, 1 );
+        setTimeout( timer, 1000 );
     },