fix($compile): don't throw if controller is named

petebacondarwin · petebacondarwin · commit d27954575f8b · 2016-04-04T15:27:09.000+01:00
diff --git a/src/ng/compile.js b/src/ng/compile.js
@@ -1124,7 +1124,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
     forEach(options, function(val, key) {
       if (key.charAt(0) === '$') {
         factory[key] = val;
-        controller[key] = val;
+        // Don't try to copy over annotations to named controller
+        if (isFunction(controller)) controller[key] = val;
       }
     });
 
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
@@ -10509,6 +10509,17 @@ describe('$compile', function() {
       });
     });
 
+    it('should support custom annotations if the controller is named', function() {
+      var myModule = angular.module('my', []).component('myComponent', {
+        $customAnnotation: 'XXX',
+        controller: 'SomeNamedController'
+      });
+      module('my');
+      expect(function() {
+        inject(function(myComponentDirective) {});
+      }).not.toThrow();
+    });
+
     it('should return ddo with reasonable defaults', function() {
       angular.module('my', []).component('myComponent', {});
       module('my');

Original file line number	Diff line number	Diff line change
`@@ -1124,7 +1124,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {`
`1124`	`1124`	`forEach(options, function(val, key) {`
`1125`	`1125`	`if (key.charAt(0) === '$') {`
`1126`	`1126`	`factory[key] = val;`
`1127`		`- controller[key] = val;`
	`1127`	`+ // Don't try to copy over annotations to named controller`
	`1128`	`+ if (isFunction(controller)) controller[key] = val;`
`1128`	`1129`	`}`
`1129`	`1130`	`});`
`1130`	`1131`