vm.$watch: support filters

yyx990803 · yyx990803 · commit cac637006dc5 · 2015-09-23T22:53:40.000-04:00
diff --git a/src/api/data.js b/src/api/data.js
@@ -62,7 +62,7 @@ exports.$delete = function (key) {
  * Watch an expression, trigger callback when its
  * value changes.
  *
- * @param {String} exp
+ * @param {String|Function} expOrFn
  * @param {Function} cb
  * @param {Object} [options]
  *                 - {Boolean} deep
@@ -71,11 +71,17 @@ exports.$delete = function (key) {
  * @return {Function} - unwatchFn
  */
 
-exports.$watch = function (exp, cb, options) {
+exports.$watch = function (expOrFn, cb, options) {
   var vm = this
-  var watcher = new Watcher(vm, exp, cb, {
+  var parsed
+  if (typeof expOrFn === 'string') {
+    parsed = dirParser.parse(expOrFn)[0]
+    expOrFn = parsed.expression
+  }
+  var watcher = new Watcher(vm, expOrFn, cb, {
     deep: options && options.deep,
-    user: !options || options.user !== false
+    user: !options || options.user !== false,
+    filters: parsed && parsed.filters
   })
   if (options && options.immediate) {
     cb.call(vm, watcher.value)
diff --git a/test/unit/specs/api/data_spec.js b/test/unit/specs/api/data_spec.js
@@ -143,6 +143,16 @@ describe('Data API', function () {
     })
   })
 
+  it('$watch with filters', function (done) {
+    var spy = jasmine.createSpy()
+    vm.$watch('a | double', spy)
+    vm.a = 2
+    nextTick(function () {
+      expect(spy).toHaveBeenCalledWith(4, 2)
+      done()
+    })
+  })
+
   it('$eval', function () {
     expect(vm.$eval('a')).toBe(1)
     expect(vm.$eval('b.c')).toBe(2)
