address review comments

Author: thorn0

src/auto/injector.js

@@ -914,19 +914,6 @@ function createInjector(modulesToLoad, strictDi) {
       return args;
     }
 
-    function isClass(func) {
-      // Support: IE 9-11 only
-      // IE 9-11 do not support classes and IE9 leaks with the code below.
-      if (msie || typeof func !== 'function') {
-        return false;
-      }
-      var result = func.$$ngIsClass;
-      if (!isBoolean(result)) {
-        result = func.$$ngIsClass = /^class\b/.test(stringifyFn(func));
-      }
-      return result;
-    }
-
     function invoke(fn, self, locals, serviceName) {
       if (typeof locals === 'string') {
         serviceName = locals;
@@ -938,12 +925,6 @@ function createInjector(modulesToLoad, strictDi) {
         fn = fn[fn.length - 1];
       }
 
-      if (isClass(fn)) {
-        // This code path was used by $controller previously and is not really needed any more.
-        args.unshift(null);
-        return new (Function.prototype.bind.apply(fn, args))();
-      }
-
       // http://jsperf.com/angularjs-invoke-apply-vs-switch
       // #5388
       return fn.apply(self, args);

src/ng/compile.js

@@ -2819,7 +2819,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
               controllerConstructor = attrs[name];
             }
 
-            var instance = $controller(controllerConstructor, locals, false, directive.controllerAs);
+            var instance = $controller(controllerConstructor, locals, directive.controllerAs);
 
             $element.data('$' + name + 'Controller', instance);
 

src/ng/controller.js

@@ -81,9 +81,8 @@ function $ControllerProvider() {
      * It's just a simple call to {@link auto.$injector $injector}, but extracted into
      * a service, so that one can override this service with [BC version](https://gist.github.com/1649788).
      */
-    return function $controller(expression, locals, _ignored, ident) {
+    return function $controller(expression, locals, ident) {
       // PRIVATE API:
-      //   param `_ignored` --- not used, kept for compatibility with the $controller decorator in ngMock
       //   param `ident` --- An optional label which overrides the label parsed from the controller
       //                     expression, if any.
       var instance, match, constructor, identifier;

src/ngMock/angular-mocks.js

@@ -2333,7 +2333,8 @@ angular.mock.$RootElementProvider = function() {
 function createControllerDecorator() {
   angular.mock.$ControllerDecorator = ['$delegate', function($delegate) {
     return function(expression, locals, bindings, ident) {
-      var instance = $delegate(expression, locals, false, ident);
+      if (angular.isString(bindings)) ident = bindings;
+      var instance = $delegate(expression, locals, ident);
       angular.extend(instance, bindings);
       return instance;
     };

test/auto/injectorSpec.js

@@ -482,25 +482,6 @@ describe('injector', function() {
           expect(instance).toEqual(new Clazz('a-value'));
           expect(instance.aVal()).toEqual('a-value');
         });
-
-        they('should detect ES6 classes regardless of whitespace/comments ($prop)', [
-          'class Test {}',
-          'class Test{}',
-          'class //<--ES6 stuff\nTest {}',
-          'class//<--ES6 stuff\nTest {}',
-          'class {}',
-          'class{}',
-          'class //<--ES6 stuff\n {}',
-          'class//<--ES6 stuff\n {}',
-          'class/* Test */{}',
-          'class /* Test */ {}'
-        ], function(classDefinition) {
-          // eslint-disable-next-line no-eval
-          var Clazz = eval('(' + classDefinition + ')');
-          var instance = injector.invoke(Clazz);
-
-          expect(instance).toEqual(jasmine.any(Clazz));
-        });
       }
     });