revert: fix($compile): Resolve leak with asynchronous compilation

petebacondarwin · petebacondarwin · commit 1f182853d44a · 2014-09-29T22:19:25.000+01:00
This reverts commit 5c9c197. This "fix" is not yet ready for 1.2.x as it has lots of issues when JQuery is loaded.
diff --git a/src/ng/compile.js b/src/ng/compile.js
@@ -976,11 +976,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
     function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn) {
 
-      var boundTranscludeFn = function(transcludedScope, cloneFn, controllers, containingScope) {
+      var boundTranscludeFn = function(transcludedScope, cloneFn, controllers) {
         var scopeCreated = false;
 
         if (!transcludedScope) {
-          transcludedScope = scope.$new(false, containingScope);
+          transcludedScope = scope.$new();
           transcludedScope.$$transcluded = true;
           scopeCreated = true;
         }
@@ -1592,7 +1592,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
             transcludeControllers = elementControllers;
           }
 
-          return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers, scopeToChild);
+          return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers);
         }
       }
     }
@@ -1754,8 +1754,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
                 boundTranscludeFn = linkQueue.shift(),
                 linkNode = $compileNode[0];
 
-            if (scope.$$destroyed) continue;
-
             if (beforeTemplateLinkNode !== beforeTemplateCompileNode) {
               var oldClasses = beforeTemplateLinkNode.className;
 
@@ -1786,7 +1784,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
       return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) {
         var childBoundTranscludeFn = boundTranscludeFn;
-        if (scope.$$destroyed) return;
         if (linkQueue) {
           linkQueue.push(scope);
           linkQueue.push(node);
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
@@ -182,17 +182,12 @@ function $RootScopeProvider(){
        *         When creating widgets, it is useful for the widget to not accidentally read parent
        *         state.
        *
-       * @param {Scope} [parent=this] The {@link ng.$rootScope.Scope `Scope`} that will contain this
-       *                              the newly created scope. Defaults to `this` scope if not provided.
-       *                              This is used to ensure that $destroy events are handled correctly.
-       *
        * @returns {Object} The newly created child scope.
        *
        */
-      $new: function(isolate, parent) {
-        var child;
-
-        parent = parent || this;
+      $new: function(isolate) {
+        var ChildScope,
+            child;
 
         if (isolate) {
           child = new Scope();
@@ -225,19 +220,6 @@ function $RootScopeProvider(){
         } else {
           this.$$childHead = this.$$childTail = child;
         }
-
-        // When the new scope is not isolated or we inherit from `this`, and
-        // the parent scope is destroyed, the property `$$destroyed` is inherited
-        // prototypically. In all other cases, this property needs to be set
-        // when the parent scope is destroyed.
-        // The listener needs to be added after the parent is set
-        if (isolate || parent != this) child.$on('$destroy', destroyChild);
-
-
-        function destroyChild() {
-          child.$$destroyed = true;
-        }
-
         return child;
       },
 
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
