Changeset 5615 for trunk/prototype/api

Timestamp:

03/02/12 19:52:21 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Remocao do importe de arquivos da agenda na inicializacao do modulo expressoMail e correcoes de bugs

File:

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

trunk/prototype/api/datalayer.js

@@ -1073 +1073 @@
             result = this.check( concept, id || filter );
         
-        if (bothSides && filter.filter && filter.criteria)
+        if (bothSides && filter.filter)
                 result = false;
 
@@ -1112 +1112 @@
       
         for( var key in base )
-            if( this.storage.filter( base[key], filter ) )
+            if( this.storage.filter( base[key], this.copy( filter ) ) )
                 filtered[ filtered.length ] = key;
 
@@ -1125 +1125 @@
 
     
-    compare: function( operator, base, test ){
+    compare: function( operator, b, t ){
       
-        base = this.converterType(base);
-        test = this.converterType(test);
+        var base = this.converterType(b);
+        var test = this.converterType(t);
          
     switch( operator ){
@@ -1145 +1145 @@
         case '<':  return ( base >  test );
         
-        default: return true;
+        default: return false;
         }
       
@@ -1164 +1164 @@
 
         if( !filter || !result )
-          return( result || false );
-
-        var keys = DataLayer.copy( filter );
-
-        if( notArray = $.type(keys) === "string" )
-            keys = [ keys ];
-        else if( $.type(keys) !== "array" )
-                keys = this.filter( result, keys.filter, keys.criteria );
+          return DataLayer.copy( result || false );
+
+        var keys = [];
+
+        if( notArray = $.type(filter) === "string" )
+            keys = [ filter ];
+        else if( $.type(filter) !== "array" )
+                keys = this.filter( result, filter.filter, filter.criteria );
 
         var res = [];
@@ -1178 +1178 @@
             res[ res.length ] = result[keys[i]];
 
-        return( notArray ? res[0] || false : res.length ? res : false );
+        return DataLayer.copy( notArray ? res[0] || false : res.length ? res : false );
     },
 
@@ -1192 +1192 @@
         get: function( key ){
 
-            return DataLayer.copy( this.cache[key] );
+            return this.cache[key];
 
         },