Changeset 6412

Timestamp:

06/04/12 16:56:48 (12 years ago)

Author:

acoutinho

Message:

Ticket #2834 - Inconsistência com lixo no javaScript

Location:

trunk/prototype

Files:

• api/datalayer.js (modified) (1 diff)
• modules/calendar/js/helpers.js (modified) (4 diffs)

trunk/prototype/api/datalayer.js

@@ -625 +625 @@
     rollback: function( concept, ids ){
       
-        var queue = this.prepareQ( 'current', concept, ids );
-
-        ids = [];
-
-        for( var id in queue )
-        {
-             this.put( concept, id, queue[id], false );
-
-             ids[ ids.length ] = id;
+        if(concept){
+                if(ids){
+                        ids = !$.isArray(ids) ? [ids] : ids;
+                        for (var i in ids)
+                                delete DataLayer.storage.cache[':diff'][concept][ids[i]];
+                }else
+                        delete DataLayer.storage.cache[':diff'][concept];
+        }else{
+
+                var queue = this.prepareQ( 'current', concept, ids );
+
+                ids = [];
+
+                for( var id in queue )
+                {
+                         this.put( concept, id, queue[id], false );
+
+                         ids[ ids.length ] = id;
+                }
+
+                for(var link in ids)
+                        delete DataLayer.storage.cache[':diff'][ids[link]];
+
         }
-
-        this.clearQ( concept, ( ids.length ? ids : false ) );
-
-        this.broadcast( concept, 'revert' );
-      
     },
     

trunk/prototype/modules/calendar/js/helpers.js

@@ -371 +371 @@
         close: function(event, ui) {
             /**
-                                         * Remove tooltip possivelmente existente
-                                         */
+                 * Remove tooltip possivelmente existente
+                 */
             if ($('dd.attendee-list li:last').data('qtip'))
                 $('dd.attendee-list li:last').qtip('destroy');
@@ -392 +392 @@
                                 canDiscardEventDialog = true;
                                 /**
-                                                                                *Remoção dos anexos do eventos caso seja cancelado a edição
-                                                                                */
-                                var ids = [];
+                                *Remoção dos anexos do eventos caso seja cancelado a edição
+                                */
+                                DataLayer.rollback();
+
+                                var ids = false;
                                 $.each($('.attachment-list input'), function (i, input) {
-                                    ids.push(input.value);
+                                    DataLayer.put('attachment', {id: ''+input.value});
+                                    DataLayer.remove('attachment', ''+input.value);
+                                        ids = true;
                                 });
-                                if(ids.length > 0)
-                                    DataLayer.remove('attachment', {
-                                        filter: ['IN', 'id', ids]
-                                        });
-                                                                                
-                                DataLayer.rollback();
+                                if(ids)
+                                        DataLayer.commit();
+                        
+                                
                                                                                 
                                 UI.dialogs.addEvent.dialog('close');
@@ -427 +429 @@
 
             }
+            //DataLayer.rollback();
             return canDiscardEventDialog;
         }
@@ -784 +787 @@
             
 .children(".cancel").click(function(){
-    DataLayer.rollback('participant');
     UI.dialogs.addEvent.dialog("close");
 }).end()