From b5af198f0d5b0f2b3ddb31ea12f700f3e0616271 Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Thu, 7 Nov 2013 16:18:06 -0800
Subject: fix($compile): don't leak isolate scope state when replaced directive
 is used multiple times

When an isolate scope directive is also a "replace" directive and at the root of its template
it has other directives, we need to keep track remember to use isolate scope when linking
these.

This commit fixes the leakage of this state when this directive is used again later inside
or outside of the isolate directive template.
---
 src/ng/compile.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/ng/compile.js')

diff --git a/src/ng/compile.js b/src/ng/compile.js
index 5fefdaaa..7513fc7e 100644
--- a/src/ng/compile.js
+++ b/src/ng/compile.js
@@ -1303,13 +1303,17 @@ function $CompileProvider($provide) {
         if (pre) {
           if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd);
           pre.require = directive.require;
-          if (newIsolateScopeDirective === directive || directive.$$isolateScope) pre.isolateScope = true;
+          if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
+            pre = cloneAndAnnotateFn(pre, {isolateScope: true});
+          }
           preLinkFns.push(pre);
         }
         if (post) {
           if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd);
           post.require = directive.require;
-          if (newIsolateScopeDirective === directive || directive.$$isolateScope) post.isolateScope = true;
+          if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
+            post = cloneAndAnnotateFn(post, {isolateScope: true});
+          }
           postLinkFns.push(post);
         }
       }
@@ -1830,6 +1834,11 @@ function $CompileProvider($provide) {
       elementsToRemove[0] = newNode;
       elementsToRemove.length = 1;
     }
+
+
+    function cloneAndAnnotateFn(fn, annotation) {
+      return extend(function() { return fn.apply(null, arguments); }, fn, annotation);
+    }
   }];
 }
 
-- 
cgit v1.2.3