WIP: make broken tests pass, yeah

Author: caitp

src/ng/compile.js

@@ -979,7 +979,15 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       var lastCompileNode;
       return function publicLinkFn(scope, cloneConnectFn, transcludeControllers, parentBoundTranscludeFn, futureParentElement){
         assertArg(scope, 'scope');
+        var shouldReplace = false;
         if (!namespace) {
+          // If there's no namespace, and no futureParentElement, then we're probably compiling
+          // nodes in-place, so we should use the $compileNode's parent element in order to figure
+          // out the namespace.
+          if (!futureParentElement && !cloneConnectFn) {
+            if (futureParentElement = $compileNodes[0].parentNode)
+              shouldReplace = true;
+          }
           namespace = detectNamespaceForChildElements(futureParentElement);
         }
         if (namespace !== 'html' && $compileNodes[0] !== lastCompileNode) {
@@ -1008,7 +1016,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
         }
 
         compile.$$addScopeInfo($linkNode, scope);
-
+        // If we need to replace $compileNodes due to in-place compilation which resulted in
+        // namespace adaptation, then append them to the parent node. (For whatever reason, the
+        // $compileNodes are no longer children of the parent, so replacing is not possible)
+        if (shouldReplace && namespace !== 'html')
+          futureParentElement.append($linkNode);
         if (cloneConnectFn) cloneConnectFn($linkNode, scope);
         if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode, parentBoundTranscludeFn);
         return $linkNode;
@@ -1017,7 +1029,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
     function detectNamespaceForChildElements(parentElement) {
       // TODO: Make this detect MathML as well...
-      var node = parentElement && parentElement[0];
+      var node = (parentElement && parentElement[0]) || parentElement;
       if (!node) {
         return 'html';
       } else {

src/ng/directive/ngInclude.js

@@ -267,10 +267,8 @@ var ngIncludeFillContentDirective = ['$compile',
       priority: -400,
       require: 'ngInclude',
       link: function(scope, $element, $attr, ctrl) {
-        $element.empty();
-        $compile(ctrl.template)(scope, function namespaceAdaptedClone(clone) {
-          $element.append(clone);
-        }, undefined, undefined, $element);
+        $element.html(ctrl.template);
+        $compile($element.contents())(scope);
       }
     };
   }];

test/ng/directive/ngIncludeSpec.js

@@ -490,7 +490,7 @@ describe('ngInclude', function() {
   });
 });
 
-ddescribe('ngInclude and transcludes', function() {
+describe('ngInclude and transcludes', function() {
   var element, directive;
 
   beforeEach(module(function($compileProvider) {
@@ -592,7 +592,7 @@ ddescribe('ngInclude and transcludes', function() {
   });
 
 
-  it('should correctly work with SVG content', function() {
+  it('should construct SVG template elements with correct namespace', function() {
     if (!window.SVGRectElement) return;
     module(function() {
       directive('test', valueFn({