Author: pyaschenko Date: 2008-10-27 10:31:19 -0400 (Mon, 27 Oct 2008) New Revision: 10910 Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js trunk/framework/impl/src/main/javascript/jquery/patches.js trunk/framework/impl/src/main/javascript/memory.js trunk/framework/impl/src/main/javascript/prototype/patches.js Log: added isAjax parameter to destructor call Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-10-27 13:29:42 UTC (rev 10909) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-10-27 14:31:19 UTC (rev 10910) @@ -345,7 +345,7 @@ // Remove unload prototype events for a removed elements. if (window.RichFaces && window.RichFaces.Memory) { - window.RichFaces.Memory.clean(oldnode); + window.RichFaces.Memory.clean(oldnode, true); } var anchor = oldnode.parentNode; @@ -359,10 +359,9 @@ } oldnode.outerHTML = new XMLSerializer().serializeToString(newnode); } else { - var importednode ; // need to check for firstChild due to opera 8 bug with hasChildNodes Sarissa.clearChildNodes(oldnode); - importednode = window.document.importNode(newnode, true); + var importednode = window.document.importNode(newnode, true); //importednode.innerHTML = importednode.innerHTML; LOG.debug("Replace content of node by replaceChild()"); anchor.replaceChild(importednode,oldnode); Modified: trunk/framework/impl/src/main/javascript/jquery/patches.js =================================================================== --- trunk/framework/impl/src/main/javascript/jquery/patches.js 2008-10-27 13:29:42 UTC (rev 10909) +++ trunk/framework/impl/src/main/javascript/jquery/patches.js 2008-10-27 14:31:19 UTC (rev 10910) @@ -16,7 +16,7 @@ // }; if (window.RichFaces && window.RichFaces.Memory) { - window.RichFaces.Memory.addCleaner("jquery", function(node) { + window.RichFaces.Memory.addCleaner("jquery", function(node, isAjax) { if (node && node[oldJQuery.expando]) { oldJQuery.event.remove(node); } Modified: trunk/framework/impl/src/main/javascript/memory.js =================================================================== --- trunk/framework/impl/src/main/javascript/memory.js 2008-10-27 13:29:42 UTC (rev 10909) +++ trunk/framework/impl/src/main/javascript/memory.js 2008-10-27 14:31:19 UTC (rev 10910) @@ -12,15 +12,15 @@ this.cleaners[name] = cleaner; }, - applyCleaners: function (node) { + applyCleaners: function (node, isAjax) { for (var name in this.cleaners) { - this.cleaners[name](node); + this.cleaners[name](node, isAjax); } }, - clean: function (oldNode) { + clean: function (oldNode, isAjax) { if (oldNode) { - this.applyCleaners(oldNode); + this.applyCleaners(oldNode, isAjax); //node.all is quicker than recursive traversing //window doesn't have "all" attribute @@ -31,12 +31,12 @@ var length = all.length; for (var counter = 0; counter < length; counter++ ) { - this.applyCleaners(all[counter]); + this.applyCleaners(all[counter], isAjax); } } else { var node = oldNode.firstChild; while (node) { - this.clean(node); + this.clean(node, isAjax); node = node.nextSibling; } } @@ -44,7 +44,7 @@ } }; - window.RichFaces.Memory.addCleaner("richfaces", function(node) { + window.RichFaces.Memory.addCleaner("richfaces", function(node, isAjax) { var component = node.component; if (component) { var destructorName = component["rich:destructor"]; @@ -52,7 +52,7 @@ if (destructorName) { var destructor = component[destructorName]; if (destructor) { - destructor.call(component); + destructor.call(component, isAjax); } } } Modified: trunk/framework/impl/src/main/javascript/prototype/patches.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/patches.js 2008-10-27 13:29:42 UTC (rev 10909) +++ trunk/framework/impl/src/main/javascript/prototype/patches.js 2008-10-27 14:31:19 UTC (rev 10910) @@ -63,7 +63,7 @@ }; if (window.RichFaces && window.RichFaces.Memory) { - window.RichFaces.Memory.addCleaner("prototype", function(node) { + window.RichFaces.Memory.addCleaner("prototype", function(node, isAjax) { var eventID = node._prototypeEventID ? node._prototypeEventID[0] : undefined; if (eventID) { var cache = Event.cache[eventID];