Add support for bindWatchToClass option

Author: davej

angular-classy.js

@@ -428,8 +428,10 @@ angular.module('classy.register', ['classy.core']).classy.plugin.controller({
 });
 
 angular.module('classy.watch', ['classy.core']).classy.plugin.controller({
+  localInject: ['$parse'],
   options: {
     enabled: true,
+    bindWatchToClass: false,
     _watchKeywords: {
       normal: [],
       objectEquality: ['{object}', '{deep}'],
@@ -456,6 +458,12 @@ angular.module('classy.watch', ['classy.core']).classy.plugin.controller({
       return deps.$scope.$watchCollection(expression, angular.bind(klass, fn));
     }
   },
+  convertToFunctionExpression: function(expression, context) {
+    var parse = this.$parse;
+    return function() {
+      return parse(expression)(context);
+    };
+  },
   postInit: function(klass, deps, module) {
     if (!this.isActive(klass, deps)) {
       return;
@@ -482,16 +490,26 @@ angular.module('classy.watch', ['classy.core']).classy.plugin.controller({
           var keywords = watchKeywords[watchType];
           for (var i = 0; i < keywords.length; i++) {
             var keyword = keywords[i];
+
             if (expression.indexOf(keyword) !== -1) {
-              watchFn(klass, expression.replace(keyword, ''), fn, deps);
+              var normalizedExpression = expression.replace(keyword, '');
+
+              var exp = this.options.bindWatchToClass ?
+                this.convertToFunctionExpression(normalizedExpression, klass) :
+                normalizedExpression;
+
+              watchFn(klass, exp, fn, deps);
               watchRegistered = true;
               break;
             }
           }
         }
         if (!watchRegistered) {
           // If no keywords have been found then register it as a normal watch
-          this.watchFns.normal(klass, expression, fn, deps);
+          var exp = this.options.bindWatchToClass ?
+            this.convertToFunctionExpression(expression, klass) :
+            expression;
+          this.watchFns.normal(klass, exp, fn, deps);
         }
       }
     }

angular-classy.min.js

@@ -12,6 +12,7 @@ todomvc.classy.controller({
 	name: 'TodoAsControllerCtrl',
 	inject: ['$scope', '$location', 'todoStorage'],
 	__options: {
+		bindWatchToClass: true,
 		addToScope: false // shorthand for commented out code below
 
 		// 'bindData': {
@@ -38,12 +39,12 @@ todomvc.classy.controller({
 	},
 
 	watch: {
-		'todoCtrl.location.path()': function(path) {
+		'location.path()': function(path) {
 			this.statusFilter = (path === '/active') ?
 				{ completed: false } : (path === '/completed') ?
 				{ completed: true } : null;
 		},
-		'{object}todoCtrl.todos': '_onTodoChange'
+		'{object}todos': '_onTodoChange'
 	},
 
 	methods: {

examples/todomvc/js/controllers/todoCtrl-asController.js

@@ -1,6 +1,8 @@
 angular.module('classy.watch', ['classy.core']).classy.plugin.controller({
+  localInject: ['$parse'],
   options: {
     enabled: true,
+    bindWatchToClass: false,
     _watchKeywords: {
       normal: [],
       objectEquality: ['{object}', '{deep}'],
@@ -27,6 +29,12 @@ angular.module('classy.watch', ['classy.core']).classy.plugin.controller({
       return deps.$scope.$watchCollection(expression, angular.bind(klass, fn));
     }
   },
+  convertToFunctionExpression: function(expression, context) {
+    var parse = this.$parse;
+    return function() {
+      return parse(expression)(context);
+    };
+  },
   postInit: function(klass, deps, module) {
     if (!this.isActive(klass, deps)) {
       return;
@@ -53,16 +61,26 @@ angular.module('classy.watch', ['classy.core']).classy.plugin.controller({
           var keywords = watchKeywords[watchType];
           for (var i = 0; i < keywords.length; i++) {
             var keyword = keywords[i];
+
             if (expression.indexOf(keyword) !== -1) {
-              watchFn(klass, expression.replace(keyword, ''), fn, deps);
+              var normalizedExpression = expression.replace(keyword, '');
+
+              var exp = this.options.bindWatchToClass ?
+                this.convertToFunctionExpression(normalizedExpression, klass) :
+                normalizedExpression;
+
+              watchFn(klass, exp, fn, deps);
               watchRegistered = true;
               break;
             }
           }
         }
         if (!watchRegistered) {
           // If no keywords have been found then register it as a normal watch
-          this.watchFns.normal(klass, expression, fn, deps);
+          var exp = this.options.bindWatchToClass ?
+            this.convertToFunctionExpression(expression, klass) :
+            expression;
+          this.watchFns.normal(klass, exp, fn, deps);
         }
       }
     }