Fixed registerControllerDecorator for Angular v1.3.

Added a simple demo
marcj · Nov 5, 2014 · aae933b · aae933b
1 parent 97e8a56
commit aae933b
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 7 deletions.
diff --git a/demo/Makefile b/demo/Makefile
@@ -0,0 +1,2 @@
+app: app.js *
+	traceur app.js controller/* --experimental --out build-script.js
diff --git a/demo/app.js b/demo/app.js
@@ -0,0 +1,4 @@
+import {registerControllerDecorator} from '../registry';
+
+var myApp = window.angular.module('myApp', []);
+registerControllerDecorator(myApp);
diff --git a/demo/bower.json b/demo/bower.json
@@ -0,0 +1,20 @@
+{
+  "name": "demo",
+  "version": "0.0.0",
+  "homepage": "https://github.com/marcj/angular-es6-annotations",
+  "authors": [
+    "Marc J. Schmidt <marc@jarves.io>"
+  ],
+  "license": "MIT",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "traceur-runtime": "~0.0.72"
+  }
+}
diff --git a/demo/controller/MyController.js b/demo/controller/MyController.js
@@ -0,0 +1,8 @@
+import {Inject} from '../../annotations';
+
+@Inject('$scope')
+export default class MyController {
+    constructor($scope) {
+        $scope.name = 'MyController';
+    }
+}
diff --git a/demo/index.html b/demo/index.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html ng-app="myApp">
+<head>
+    <meta charset="utf-8">
+    <title>Demo</title>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.1/angular.js"></script>
+    <script src="./bower_components/traceur-runtime/traceur-runtime.js"></script>
+    <script src="./build-script.js"></script>
+</head>
+<body>
+    <div ng-controller="controller/MyController">
+        Hi my name is {{name}}.
+    </div>
+</body>
+</html>
diff --git a/registry.js b/registry.js
@@ -1,4 +1,4 @@
-import {Field, Label, Filter, Parser, Directive, Inject, InjectAsProperty} from './annotations';
+import {Filter, Parser, Directive, Inject, InjectAsProperty} from './annotations';
 
 /**
  * Prepares a class constructor for angular depency injection.
@@ -152,18 +152,19 @@ export function registerModuleDirective(angularModule, controller) {
 export function registerControllerDecorator(angularModule) {
     angularModule.config(function ($provide) {
         $provide.decorator("$controller", ['$delegate', ($delegate) => {
-            return function (constructor, locals) {
-                if (angular.isString(constructor)) {
+            return function (...args) {
+                if (angular.isString(args[0])) {
                     try {
-                        var moduleClass = System.get(constructor);
+                        var moduleClass = System.get(args[0]);
                         if (moduleClass) {
-                            var preparedConstructor = getPreparedConstructor(System.get(constructor).default);
-                            constructor = preparedConstructor || System.get(constructor).default;
+                            var preparedConstructor = getPreparedConstructor(moduleClass.default);
+                            args[0] = preparedConstructor || moduleClass.default;
                         }
                     } catch (e) {
+                        throw e;
                     }
                 }
-                return $delegate(constructor, locals);
+                return $delegate(...args);
             };
         }]);
     });