Merge pull request #423 from Gillespie59/development

1.5.0

Author: EmmanuelDemey

docs/angularelement.md

@@ -5,6 +5,8 @@
 The angular.element method should be used instead of the $ or jQuery object (if you are using jQuery of course).
 If the jQuery library is imported, angular.element will be a wrapper around the jQuery object.
 
+**Rule based on Angular 1.x**
+
 ## Examples
 
 The following patterns are considered problems;

docs/component-limit.md

@@ -7,6 +7,8 @@ The default limit is one.
 
 - The acceptable number of components. (Default: 1)
 
+**Rule based on Angular 1.x**
+
 **Styleguide Reference**
 
 * [y001 by johnpapa - Define 1 component per file](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#style-y001)

docs/component-name.md

@@ -6,14 +6,16 @@ All your components should have a name starting with the parameter you can defin
 The second parameter can be a Regexp wrapped in quotes.
 You can not prefix your components by "ng" (reserved keyword for AngularJS components) ("component-name":  [2, "ng"])
 
+**Rule based on Angular 1.x**
+
 ## Examples
 
 The following patterns are **not** considered problems when configured `"prefix"`:
 
     /*eslint angular/component-name: [2,"prefix"]*/
 
     // valid
-    angular.module('myModule').component('prefixTabs', function () {
+    angular.module('myModule').component('prefixTabs', {
         // ...
     });
 
@@ -22,7 +24,7 @@ The following patterns are considered problems when configured `"/^ui/"`:
     /*eslint angular/component-name: [2,"/^ui/"]*/
 
     // invalid
-    angular.module('myModule').component('navigation', function () {
+    angular.module('myModule').component('navigation', {
         // ...
     }); // error: The navigation component should follow this pattern: /^ui/
 
@@ -31,7 +33,7 @@ The following patterns are **not** considered problems when configured `"/^ui/"`
     /*eslint angular/component-name: [2,"/^ui/"]*/
 
     // valid
-    angular.module('myModule').component('uiNavigation', function () {
+    angular.module('myModule').component('uiNavigation', {
         // ...
     });
 
@@ -40,7 +42,7 @@ The following patterns are considered problems when configured `"ui"`:
     /*eslint angular/component-name: [2,"ui"]*/
 
     // invalid
-    angular.module('myModule').component('tabs', function () {
+    angular.module('myModule').component('tabs', {
         // ...
     }); // error: The tabs component should be prefixed by ui
 

docs/controller-as-route.md

@@ -4,6 +4,8 @@
 
 You should use Angular's controllerAs syntax when defining routes or states.
 
+**Rule based on Angular 1.x**
+
 **Styleguide Reference**
 
 * [y031 by johnpapa - controllerAs Controller Syntax](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#style-y031)

docs/controller-as-vm.md

@@ -8,6 +8,8 @@ The third parameter can be a Regexp for identifying controller functions (when u
 
 - The name that should be used for the view model.
 
+**Rule based on Angular 1.x**
+
 **Styleguide Reference**
 
 * [y032 by johnpapa - controllerAs with vm](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#style-y032)

docs/controller-as.md

@@ -6,6 +6,8 @@ You should not set properties on $scope in controllers.
 Use controllerAs syntax and add data to 'this'.
 The second parameter can be a Regexp for identifying controller functions (when using something like Browserify)
 
+**Rule based on Angular 1.x**
+
 **Styleguide Reference**
 
 * [y031 by johnpapa - controllerAs Controller Syntax](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#style-y031)

docs/controller-name.md

@@ -6,6 +6,8 @@ All your controllers should have a name starting with the parameter you can defi
 The second parameter can be a Regexp wrapped in quotes.
 ("controller-name":  [2, "ng"])
 
+**Rule based on Angular 1.x**
+
 **Styleguide Reference**
 
 * [y123 by johnpapa - Controller Names](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#style-y123)

docs/deferred.md

@@ -5,6 +5,8 @@
 When you want to create a new promise, you should not use the $q.deferred anymore.
 Prefer the new syntax : $q(function(resolve, reject){})
 
+**Rule based on Angular 1.x**
+
 ## Examples
 
 The following patterns are considered problems;

docs/definedundefined.md

@@ -5,6 +5,8 @@
 You should use the angular.isUndefined or angular.isDefined methods instead of using the keyword undefined.
 We also check the use of !angular.isUndefined and !angular.isDefined (should prefer the reverse function)
 
+**Rule based on Angular 1.x**
+
 ## Examples
 
 The following patterns are considered problems;

docs/di-order.md

@@ -3,9 +3,11 @@
 # di-order - require DI parameters to be sorted alphabetically
 
 Injected dependencies should be sorted alphabetically.
-If the second parameter is set to `true`, values which start and end with an underscore those underscores are stripped.
+If the second parameter is set to false, values which start and end with an underscore those underscores are stripped.
 This means for example that `_$httpBackend_` goes before `_$http_`.
 
+**Rule based on Angular 1.x**
+
 ## Examples
 
 The following patterns are considered problems with default config;