Merge branch 'master' of https://github.com/olov/ng-annotate

* 'master' of https://github.com/olov/ng-annotate:
  support for angular-dashboard-framework apply method
  Add ng-annotate-loader mention as webpack integration tool

Author: olov

README.md

@@ -98,7 +98,7 @@ AngularJS 1.3 or later.
 * [Broccoli](https://github.com/broccolijs/broccoli): [broccoli-ng-annotate](https://www.npmjs.org/package/broccoli-ng-annotate) by [Gilad Peleg](https://github.com/pgilad)
 * [Rails asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html): [ngannotate-rails](https://rubygems.org/gems/ngannotate-rails) by [Kari Ikonen](https://github.com/kikonen)
 * [Grails asset pipeline](https://github.com/bertramdev/asset-pipeline): [angular-annotate-asset-pipeline](https://github.com/craigburke/angular-annotate-asset-pipeline) by [Craig Burke](https://github.com/craigburke)
-* [Webpack](http://webpack.github.io/): [ng-annotate-webpack-plugin](https://www.npmjs.org/package/ng-annotate-webpack-plugin) by [Chris Liechty](https://github.com/cliechty)
+* [Webpack](http://webpack.github.io/): [ng-annotate-webpack-plugin](https://www.npmjs.org/package/ng-annotate-webpack-plugin) by [Chris Liechty](https://github.com/cliechty), [ng-annotate-loader](https://www.npmjs.org/package/ng-annotate-loader) by [Andrey Skladchikov](https://github.com/huston007)
 * [Middleman](http://middlemanapp.com/): [middleman-ngannotate](http://rubygems.org/gems/middleman-ngannotate) by [Michael Siebert](https://github.com/siebertm)
 * [ENB](http://enb-make.info/) (Russian): [enb-ng-techs](https://www.npmjs.org/package/enb-ng-techs#ng-annotate) by [Alexey Gurianov](https://github.com/guria)
 

optionals/angular-dashboard-framework.js

@@ -52,11 +52,12 @@ module.exports = {
         // {resolve: ..}
         res.push.apply(res, ctx.matchResolve(props));
 
-        // edit: {controller: function(), resolve: {}}
+        // edit: {controller: function(), resolve: {}, apply: function()}
         const edit = ctx.matchProp('edit', props);
         if (edit && edit.type === "ObjectExpression") {
             const editProps = edit.properties;
             res.push(ctx.matchProp('controller', editProps));
+            res.push(ctx.matchProp('apply', editProps));
             res.push.apply(res, ctx.matchResolve(editProps));
         }
 

tests/optionals/angular-dashboard-framework.annotated.js

@@ -83,6 +83,9 @@ angular.module('myMod', ['adf.provider'])
           controller: ["$http", function($http){
             // control something
           }],
+          apply: ["$http", "config", function($http, config){
+            // apply configuration
+          }],
           resolve: {
             editone: ["$http", "config", function($http, config){
               // resolve something

tests/optionals/angular-dashboard-framework.js

@@ -83,6 +83,9 @@ angular.module('myMod', ['adf.provider'])
           controller: function($http){
             // control something
           },
+          apply: function($http, config){
+            // apply configuration
+          },
           resolve: {
             editone: function($http, config){
               // resolve something