fix(Module): allow passing template/templateUrl in array notation

Shahar Talmi · lgalfaso · commit 99d601a048ac · 2015-12-20T21:06:17.000+01:00
Close: angular#13485
diff --git a/src/loader.js b/src/loader.js
@@ -405,7 +405,7 @@ function setupModuleLoader(window) {
           component: function(name, options) {
             function factory($injector) {
               function makeInjectable(fn) {
-                if (angular.isFunction(fn)) {
+                if (isFunction(fn) || Array.isArray(fn)) {
                   return function(tElement, tAttrs) {
                     return $injector.invoke(fn, this, {$element: tElement, $attrs: tAttrs});
                   };
diff --git a/test/loaderSpec.js b/test/loaderSpec.js
@@ -174,6 +174,24 @@ describe('component', function() {
     });
   });
 
+  it('should allow passing injectable arrays as template/templateUrl', function() {
+    var log = '';
+    window.angular.module('my', []).component('myComponent', {
+      template: ['$element', '$attrs', 'myValue', function($element, $attrs, myValue) {
+        log += 'template,' + $element + ',' + $attrs + ',' + myValue + '\n';
+      }],
+      templateUrl: ['$element', '$attrs', 'myValue', function($element, $attrs, myValue) {
+        log += 'templateUrl,' + $element + ',' + $attrs + ',' + myValue + '\n';
+      }]
+    }).value('myValue', 'blah');
+    module('my');
+    inject(function(myComponentDirective) {
+      myComponentDirective[0].template('a', 'b');
+      myComponentDirective[0].templateUrl('c', 'd');
+      expect(log).toEqual('template,a,b,blah\ntemplateUrl,c,d,blah\n');
+    });
+  });
+
   it('should allow passing transclude as object', function() {
     window.angular.module('my', []).component('myComponent', {
       transclude: {}
