Changeset 5376 for trunk/prototype/app

Timestamp:

01/13/12 09:10:28 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Estabilizacao da nova api, correcoes de bug e melhorias na nova agenda

File:

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

trunk/prototype/app/datalayer.js

@@ -391 +391 @@
     remove: function( concept, id, oneSide ){
       
-        var bothSides = (typeof oneSide === "undefined");
-
-        if( bothSides || !oneSide )
-            this.del( concept, id );
-
-        if( bothSides )
-            this.report( concept, id, false );
+        var bothSides = (typeof oneSide === "undefined"),
+
+        links = this.links( concept ), ids = [],
+
+        current = this.check( concept, id );
+
+        if( !current ) return;
+        
+        if( id )
+            current.id = id;
+
+        if( notArray = ( $.type( current ) !== "array" ) )
+            current = [ current ];
+
+        for( var i = 0; i < current.length; i++ )
+        {
+            var currentId = ids[ ids.length ] = current[i].id;
+
+            if( bothSides )
+              this.report( concept, currentId, false );
+
+            if( bothSides || !oneSide )
+              this.del( concept, currentId );
+
+            for( var link in links )
+            {
+                if( !current[i][link] )
+                    continue;
+
+                var nestedLinks = this.links( links[link], true );
+
+                if( isConcept = this.isConcept( concept, link ) )
+                    current[i][link] = [ current[i][link] ];
+
+                $.each( current[i][link], function( ii, el ){
+
+                        el = DataLayer.storage.cache[links[link]][el];
+
+                        if( notArrayNested = ( $.type( el[ nestedLinks[concept] ] ) !== "array" ) )
+                            el[ nestedLinks[concept] ] = [ el[nestedLinks[concept]] ];
+
+                        el[ nestedLinks[concept] ] = $.grep( el[ nestedLinks[concept] ], function( nested, iii ){
+                            return ( currentId !== nested );
+                        });
+
+                        if( notArrayNested )
+                            el[ nestedLinks[concept] ] = el[ nestedLinks[concept] ][0] || false;
+                        if(!el[ nestedLinks[concept] ] || !el[ nestedLinks[concept] ].length)
+                                delete el[ nestedLinks[concept] ];
+                });
+            }
+        }
+
         if( oneSide )
-            this.commit( concept, id );
+            this.commit( concept, ids );
 
         this.broadcast( concept, oneSide ? 'server' : bothSides ? 'serverclient' : 'client', false );
@@ -411 +457 @@
             current[ id ] = this.check( concept, id ) || {};
         
-        this.store( ':current', concept, current[ id ] );
+        this.store( ':current', concept, current );
 
         var diff = this.diff( current[ id ], data );
@@ -640 +686 @@
             
     },
-
-    
+    
+    unique: function( origArr ){ 
+
+        var newArr = [];
+      
+        for ( var x = 0; x < origArr.length; x++ )
+        {
+                var found = false;
+            for ( var y = 0; !found && y < newArr.length; y++ ) 
+                if ( origArr[x] === newArr[y] )  
+                  found = true;
+
+            if ( !found ) 
+                newArr[ newArr.length ] = origArr[x];
+        }
+
+        return newArr;
+    },
 
     merge: function( current, data ){
@@ -752 +814 @@
                             }
 
-                            var thisPass = this;
-
                             // It's now safe to let the comparator recursively deep copy its properties.
-                            comparator.populate( function(source, result) { return thisPass.copy(source, result, depth); }, source, result );
+                            var returned = comparator.populate( function(source, result) { return DataLayer.copy(source, result, depth); }, source, result );
+        
+                                if(returned)
+                                        result = returned;
 
                             depth.depth--;
@@ -1111 +1174 @@
         this.put( concept, newId, this.check( concept, oldId ), false );
 
-        this.del( concept, oldId );
+        this.remove( concept, oldId, false );
     },
     
@@ -1921 +1984 @@
                         result.push( deepCopy(source[i], result[i]) );
                 }
+                result =  DataLayer.unique( result )
                 return result;
         }
@@ -1983 +2047 @@
                       }
               }
+                return result;
       }
 });