Merge pull request #2423 from hypothesis/ng-annotate

tilgovi · tilgovi · commit 306dc790b346 · 2015-07-31T08:28:00.000-07:00
Use browserify-ngannotate to provide injection annotations
diff --git a/h/static/scripts/account/account-controller.js b/h/static/scripts/account/account-controller.js
@@ -1,13 +1,8 @@
 var angular = require('angular');
 
-AccountController.inject = [
-  '$scope', '$filter',
-  'auth', 'flash', 'formRespond', 'identity', 'session'
-];
-function AccountController(
-  $scope,    $filter,
-  auth,    flash,   formRespond,   identity,   session
-) {
+// @ngInject
+function AccountController($scope, $filter, auth, flash, formRespond, identity,
+                           session) {
   var personaFilter = $filter('persona');
 
   $scope.subscriptionDescription = {
diff --git a/h/static/scripts/account/account.js b/h/static/scripts/account/account.js
@@ -1,13 +1,7 @@
 var angular = require('angular');
 
-AuthAppController.$inject = [
-  '$location', '$scope', '$timeout', '$window',
-  'session'
-];
-function AuthAppController(
-  $location,    $scope,   $timeout,   $window,
-  session
-) {
+// @ngInject
+function AuthAppController($location, $scope, $timeout, $window, session) {
   function onlogin() {
     window.location.href = '/stream';
   };
@@ -38,15 +32,15 @@ function AuthAppController(
 }
 
 
-AuthPageController.$inject = ['$routeParams', '$scope'];
-function AuthPageController(   $routeParams,   $scope) {
+// @ngInject
+function AuthPageController($routeParams, $scope) {
   $scope.model.code = $routeParams.code;
   $scope.hasActivationCode = !!$routeParams.code;
 }
 
 
-configure.$inject = ['$httpProvider', '$locationProvider', '$routeProvider'];
-function configure(   $httpProvider,   $locationProvider,   $routeProvider) {
+// @ngInject
+function configure($httpProvider, $locationProvider, $routeProvider) {
   // Use the Pyramid XSRF header name
   $httpProvider.defaults.xsrfHeaderName = 'X-CSRF-Token';
 
diff --git a/h/static/scripts/account/auth-controller.js b/h/static/scripts/account/auth-controller.js
@@ -1,11 +1,5 @@
-AuthController.$inject = [
-  '$scope', '$timeout',
-  'flash', 'session', 'formRespond'
-];
-function AuthController(
-  $scope,    $timeout,
-  flash,    session,   formRespond
-) {
+// @ngInject
+function AuthController($scope, $timeout, flash, session, formRespond) {
   var pendingTimeout = null;
 
   function success(data) {
diff --git a/h/static/scripts/config/accounts.js b/h/static/scripts/config/accounts.js
@@ -1,7 +1,7 @@
 var angular = require('angular');
 
-configure.$inject = ['$httpProvider', 'identityProvider'];
-function configure(   $httpProvider,   identityProvider) {
+// @ngInject
+function configure($httpProvider, identityProvider) {
   // Pending authentication check
   var authCheck = null;
 
diff --git a/h/static/scripts/session.js b/h/static/scripts/session.js
@@ -53,11 +53,12 @@ function sessionActions(options) {
  *
  * In addition, this service also provides helper methods for mutating the
  * session state, by, e.g. logging in, logging out, etc.
+ *
+ * @ngInject
  */
+function session($document, $http, $resource, flash) {
  // TODO: Move accounts data management (e.g. profile, edit_profile,
  // disable_user, etc) into another module with another route.
-session.$inject = ['$document', '$http', '$resource', 'flash'];
-function session(   $document,   $http,   $resource,   flash) {
   var actions = sessionActions({
     transformRequest: prepare,
     transformResponse: process,
diff --git a/h/templates/app.html.jinja2 b/h/templates/app.html.jinja2
@@ -7,7 +7,8 @@
 {% endblock %}
 
 {% block body_tag %}
-<body ng-app="h" ng-controller="AppController" ng-csp="">
+{# ng-strict-di is a (harmless) noop until we upgrade to Angular 1.3 #}
+<body ng-app="h" ng-strict-di ng-controller="AppController" ng-csp="">
 {% endblock %}
 
 {% block content %}
diff --git a/h/templates/auth.html.jinja2 b/h/templates/auth.html.jinja2
@@ -7,7 +7,8 @@
 {% endblock %}
 
 {% block body_tag %}
-<body ng-app="h" ng-controller="AuthAppController">
+{# ng-strict-di is a (harmless) noop until we upgrade to Angular 1.3 #}
+<body ng-app="h" ng-strict-di ng-controller="AuthAppController">
 {% endblock %}
 
 {% block content %}
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
     "babelify": "^6.1.3",
     "base-url": "^1.0.0",
     "browserify": "^9.0.3",
+    "browserify-ngannotate": "^1.0.1",
     "browserify-shim": "^3.8.3",
     "clean-css": "2.2.2",
     "coffee-script": "1.7.1",
@@ -59,6 +60,7 @@
     "transform": [
       "strip-bomify",
       "coffeeify",
+      "browserify-ngannotate",
       "browserify-shim"
     ]
   },
