Refactoring and improvements in the back-end client-side memory manag…

…ement.
octobercms · Apr 29, 2015 · 20fb98d · 20fb98d
1 parent 57777c0
commit 20fb98d
Show file tree

Hide file tree

Showing 16 changed files with 654 additions and 357 deletions.
diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
diff --git a/modules/backend/assets/js/october.foundation.controlutils.js b/modules/backend/assets/js/october.foundation.controlutils.js
@@ -29,11 +29,22 @@
         disposeControls: function(container) {
             var controls = container.querySelectorAll('[data-disposable]')
 
-            for (var i=0, len=controls.length; i<len; i++) {
+            for (var i=0, len=controls.length; i<len; i++)
                 $(controls[i]).triggerHandler('dispose-control')
-            }
+
+            if (container.hasAttribute('data-disposable'))
+                $(container).triggerHandler('dispose-control')
         }
     }
 
     $.oc.foundation.controlUtils = ControlUtils;
+
+    $(document).on('ajaxBeforeReplace', function(ev){
+        // Automatically displose controls in an element
+        // before the element contents is replaced.
+        // The ajaxBeforeReplace event is triggered in 
+        // framework.js
+
+        $.oc.foundation.controlUtils.disposeControls(ev.target)
+    })
 }(window.jQuery);