Merge 0.1.2

Author: EmmanuelDemey

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-angular",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "ESLint rules for AngularJS projects",
   "main": "index.js",
   "repository": {

rules/ng_on_watch.js

@@ -14,7 +14,7 @@ module.exports = function(context) {
      * named '$on' or '$watch' on an object named '$scope', '$rootScope' or
      * 'scope'.
      */
-    function isScopeOnOrWatch(node) {
+    function isScopeOnOrWatch(node, scopes) {
         if (node.type !== 'CallExpression') {
             return false;
         }
@@ -39,9 +39,7 @@ module.exports = function(context) {
         var objectName = parentObject.name;
         var functionName = accessedFunction.name;
 
-        return (objectName === '$rootScope' ||
-                objectName === '$scope' ||
-                objectName === 'scope') && (functionName === '$on' ||
+        return scopes.indexOf(objectName) >= 0 && (functionName === '$on' ||
                                             functionName === '$watch');
     }
 
@@ -64,10 +62,10 @@ module.exports = function(context) {
     return {
 
         'CallExpression': function(node) {
-            if (isScopeOnOrWatch(node) && !isFirstArgDestroy(node)) {
+            if (isScopeOnOrWatch(node, ['$rootScope']) && !isFirstArgDestroy(node)) {
                 if (node.parent.type !== 'VariableDeclarator' &&
                     node.parent.type !== 'AssignmentExpression' &&
-                    !(isScopeOnOrWatch(node.parent) &&
+                    !(isScopeOnOrWatch(node.parent, ['$rootScope', '$scope', 'scope']) &&
                      isFirstArgDestroy(node.parent))) {
                     report(node, node.callee.property.name);
                 }

test/ng_on_watch.js

@@ -23,13 +23,14 @@ eslintTester.addRuleTest('rules/ng_on_watch', {
         '$scope.$on("$destroy", $scope.$on())',
         '$rootScope.$on("$destroy", $scope.$on())',
         '$scope.$on("$destroy", $rootScope.$on())',
-        '$rootScope.$on("$destroy", $rootScope.$on())'
+        '$rootScope.$on("$destroy", $rootScope.$on())',
+        'scope.$on()',
+        'scope.$watch()',
+        '$scope.$on()',
+        '$scope.$watch()'
+
     ],
     invalid: [
-        { code: 'scope.$on()', errors: [{ message: 'The "$on" call should be assigned to a variable, in order to be destroyed during the $destroy event'}] },
-        { code: 'scope.$watch()', errors: [{ message: 'The "$watch" call should be assigned to a variable, in order to be destroyed during the $destroy event'}] },
-        { code: '$scope.$on()', errors: [{ message: 'The "$on" call should be assigned to a variable, in order to be destroyed during the $destroy event'}] },
-        { code: '$scope.$watch()', errors: [{ message: 'The "$watch" call should be assigned to a variable, in order to be destroyed during the $destroy event'}] },
         { code: '$rootScope.$on()', errors: [{ message: 'The "$on" call should be assigned to a variable, in order to be destroyed during the $destroy event'}] },
         { code: '$rootScope.$watch()', errors: [{ message: 'The "$watch" call should be assigned to a variable, in order to be destroyed during the $destroy event'}] }
     ]