feat($compile): exponse isSlotFilled() method on $transclude function

Author: petebacondarwin

src/ng/compile.js

@@ -2152,7 +2152,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           transcludeFn = controllersBoundTransclude;
           transcludeFn.$$boundTransclude = boundTranscludeFn;
           // expose the slots on the `$transclude` function
-          transcludeFn.$slots = boundTranscludeFn.$$slots;
+          transcludeFn.isSlotFilled = function(slotName) {
+            return !!boundTranscludeFn.$$slots[slotName];
+          };
         }
 
         if (controllerDirectives) {

src/ng/directive/ngTransclude.js

@@ -139,9 +139,7 @@ var ngTranscludeDirective = ngDirective({
     // If there is no slot name defined or the slot name is not optional
     // then transclude the slot
     var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
-    if (!slotName || $transclude.$slots[slotName] !== null) {
-      $transclude(ngTranscludeCloneAttachFn, null, slotName);
-    }
+    $transclude(ngTranscludeCloneAttachFn, null, slotName);
   }
 });
 

test/ng/compileSpec.js

@@ -7948,7 +7948,7 @@ ddescribe('$compile', function() {
     });
 
 
-    it('should provide the elements marked with matching transclude elements as additional transclude functions on the $slots property', function() {
+    it('should return true from `isSlotFilled(slotName) for slots that have content in the transclusion', function() {
       var capturedTranscludeFn;
       module(function() {
         directive('minionComponent', function() {
@@ -7957,7 +7957,7 @@ ddescribe('$compile', function() {
             scope: {},
             transclude: {
               minionSlot: 'minion',
-              bossSlot: 'boss'
+              bossSlot: '?boss'
             },
             template:
               '<div class="boss" ng-transclude="bossSlot"></div>' +
@@ -7975,59 +7975,14 @@ ddescribe('$compile', function() {
           '  <minion>stuart</minion>' +
           '  <minion>bob</minion>' +
           '  <span>dorothy</span>' +
-          '  <boss>gru</boss>' +
           '</minion-component>')($rootScope);
         $rootScope.$apply();
 
-        var minionTranscludeFn = capturedTranscludeFn.$slots['minionSlot'];
-        var minions = minionTranscludeFn();
-        expect(minions[0].outerHTML).toEqual('<minion class="ng-scope">stuart</minion>');
-        expect(minions[1].outerHTML).toEqual('<minion class="ng-scope">bob</minion>');
-
-        var scope = element.scope();
-
-        var minionScope = jqLite(minions[0]).scope();
-        expect(minionScope.$parent).toBe(scope);
-
-        var bossTranscludeFn = capturedTranscludeFn.$slots['bossSlot'];
-        var boss = bossTranscludeFn();
-        expect(boss[0].outerHTML).toEqual('<boss class="ng-scope">gru</boss>');
-
-        var bossScope = jqLite(boss[0]).scope();
-        expect(bossScope.$parent).toBe(scope);
-
-        expect(bossScope).not.toBe(minionScope);
-
-        dealoc(boss);
-        dealoc(minions);
-      });
-    });
+        var hasMinions = capturedTranscludeFn.isSlotFilled('minionSlot');
+        var hasBosses = capturedTranscludeFn.isSlotFilled('bossSlot');
 
-    it('should set unfilled optional transclude slots to `null` in the $transclude.$slots property', function() {
-      var capturedTranscludeFn;
-      module(function() {
-        directive('minionComponent', function() {
-          return {
-            restrict: 'E',
-            scope: {},
-            transclude: {
-              minionSlot: 'minion',
-              bossSlot: '?boss'
-            },
-            link: function(s, e, a, c, transcludeFn) {
-              capturedTranscludeFn = transcludeFn;
-            }
-          };
-        });
-      });
-      inject(function($rootScope, $compile) {
-        element = $compile(
-          '<minion-component>' +
-            '<minion>stuart</minion>' +
-            '<span>dorothy</span>' +
-          '</minion-component>')($rootScope);
-        expect(capturedTranscludeFn.$slots.minionSlot).toEqual(jasmine.any(Function));
-        expect(capturedTranscludeFn.$slots.bossSlot).toBe(null);
+        expect(hasMinions).toBe(true);
+        expect(hasBosses).toBe(false);
       });
     });