fix($controller): allow identifiers containing $

As discussed in #13664 (comment).

Closes #13736

Author: gkalpak

src/ng/controller.js

@@ -3,7 +3,7 @@
 var $controllerMinErr = minErr('$controller');
 
 
-var CNTRL_REG = /^(\S+)(\s+as\s+(\w+))?$/;
+var CNTRL_REG = /^(\S+)(\s+as\s+([\w$]+))?$/;
 function identifierForController(controller, ident) {
   if (ident && isString(ident)) return ident;
   if (isString(controller)) {

test/ng/controllerSpec.js

@@ -209,5 +209,16 @@ describe('$controller', function() {
                        "Badly formed controller string 'ctrl as'. " +
                        "Must match `__name__ as __id__` or `__name__`.");
     });
+
+
+    it('should allow identifiers containing `$`', function() {
+      var scope = {};
+
+      $controllerProvider.register('FooCtrl', function() { this.mark = 'foo'; });
+
+      var foo = $controller('FooCtrl as $foo', {$scope: scope});
+      expect(scope.$foo).toBe(foo);
+      expect(scope.$foo.mark).toBe('foo');
+    });
   });
 });