revert: feat($compile): Allow ES6 classes as controllers with bindToController: true

petebacondarwin · petebacondarwin · commit bca0a1f786c1 · 2016-01-04T21:48:19.000Z
This change caused IE9 to run out of memory. This is reverted from commit b0248b7
diff --git a/src/auto/injector.js b/src/auto/injector.js
@@ -821,10 +821,6 @@ function createInjector(modulesToLoad, strictDi) {
       return args;
     }
 
-    function isClass(func) {
-      return typeof func === 'function'
-        && /^class\s/.test(Function.prototype.toString.call(func));
-    }
 
     function invoke(fn, self, locals, serviceName) {
       if (typeof locals === 'string') {
@@ -837,16 +833,9 @@ function createInjector(modulesToLoad, strictDi) {
         fn = fn[fn.length - 1];
       }
 
-      if (!isClass(fn)) {
-        // http://jsperf.com/angularjs-invoke-apply-vs-switch
-        // #5388
-        return fn.apply(self, args);
-      } else {
-        args.unshift(null);
-        /*jshint -W058 */ // Applying a constructor without immediate parentheses is the point here.
-        return new (Function.prototype.bind.apply(fn, args));
-        /*jshint +W058 */
-      }
+      // http://jsperf.com/angularjs-invoke-apply-vs-switch
+      // #5388
+      return fn.apply(self, args);
     }
 
 
@@ -856,7 +845,7 @@ function createInjector(modulesToLoad, strictDi) {
       var ctor = (isArray(Type) ? Type[Type.length - 1] : Type);
       var args = injectionArgs(Type, locals, serviceName);
       // Empty object at position 0 is ignored for invocation with `new`, but required.
-      args.unshift(null);
+      args.unshift({});
       /*jshint -W058 */ // Applying a constructor without immediate parentheses is the point here.
       return new (Function.prototype.bind.apply(ctor, args));
       /*jshint +W058 */
diff --git a/src/ng/compile.js b/src/ng/compile.js
@@ -214,7 +214,7 @@
  * #### `bindToController`
  * When an isolate scope is used for a component (see above), and `controllerAs` is used, `bindToController: true` will
  * allow a component to have its properties bound to the controller, rather than to scope. When the controller
- * is instantiated, the initial values of the isolate scope bindings will be available if the controller is not an ES6 class.
+ * is instantiated, the initial values of the isolate scope bindings are already available.
  *
  * #### `controller`
  * Controller constructor function. The controller is instantiated before the
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
@@ -4235,53 +4235,6 @@ describe('$compile', function() {
     });
 
 
-    it('should eventually expose isolate scope variables on ES6 class controller with controllerAs when bindToController is true', function() {
-      if (!/chrome/i.test(navigator.userAgent)) return;
-      /*jshint -W061 */
-      var controllerCalled = false;
-      module(function($compileProvider) {
-        $compileProvider.directive('fooDir', valueFn({
-          template: '<p>isolate</p>',
-          scope: {
-            'data': '=dirData',
-            'str': '@dirStr',
-            'fn': '&dirFn'
-          },
-          controller: eval(
-            "class Foo {" +
-            "  constructor($scope) {}" +
-            "  check() {" +
-            "    expect(this.data).toEqualData({" +
-            "      'foo': 'bar'," +
-            "      'baz': 'biz'" +
-            "    });" +
-            "    expect(this.str).toBe('Hello, world!');" +
-            "    expect(this.fn()).toBe('called!');" +
-            "    controllerCalled = true;" +
-            "  }" +
-            "}"
-          ),
-          controllerAs: 'test',
-          bindToController: true
-        }));
-      });
-      inject(function($compile, $rootScope) {
-        $rootScope.fn = valueFn('called!');
-        $rootScope.whom = 'world';
-        $rootScope.remoteData = {
-          'foo': 'bar',
-          'baz': 'biz'
-        };
-        element = $compile('<div foo-dir dir-data="remoteData" ' +
-                                 'dir-str="Hello, {{whom}}!" ' +
-                                 'dir-fn="fn()"></div>')($rootScope);
-        element.data('$fooDirController').check();
-        expect(controllerCalled).toBe(true);
-      });
-      /*jshint +W061 */
-    });
-
-
     it('should update @-bindings on controller when bindToController and attribute change observed', function() {
       module(function($compileProvider) {
         $compileProvider.directive('atBinding', valueFn({

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@`
`214`	`214`	* #### `bindToController`
`215`	`215`	* When an isolate scope is used for a component (see above), and `controllerAs` is used, `bindToController: true` will
`216`	`216`	`* allow a component to have its properties bound to the controller, rather than to scope. When the controller`
`217`		`- * is instantiated, the initial values of the isolate scope bindings will be available if the controller is not an ES6 class.`
	`217`	`+ * is instantiated, the initial values of the isolate scope bindings are already available.`
`218`	`218`	`*`
`219`	`219`	* #### `controller`
`220`	`220`	`* Controller constructor function. The controller is instantiated before the`