Evan You 12 лет назад
Родитель
Сommit
9255cbae59

+ 1 - 1
src/directives/html.js

@@ -13,7 +13,7 @@ module.exports = {
   },
 
   update: function (value) {
-    value = _.guard(value)
+    value = _.toString(value)
     if (this.nodes) {
       this.swap(value)
     } else {

+ 1 - 1
src/directives/text.js

@@ -9,7 +9,7 @@ module.exports = {
   },
 
   update: function (value) {
-    this.el[this.attr] = _.guard(value)
+    this.el[this.attr] = _.toString(value)
   }
   
 }

+ 3 - 1
src/directives/with.js

@@ -1,3 +1,5 @@
+var _ = require('../util')
+
 module.exports = {
 
   priority: 900,
@@ -6,7 +8,7 @@ module.exports = {
     var self = this
     var path = this.arg || '$data'
     this.vm.$watch(path, function (val) {
-      self.set(val)
+      self.set(_.toNumber(val))
     })
   },
 

+ 5 - 4
src/util/lang.js

@@ -6,10 +6,11 @@
  * @return {String}
  */
 
-exports.guard = function (value) {
-  return value === undefined
+exports.toString = function (value) {
+  /* jshint eqeqeq:false */
+  return value == null
     ? ''
-    : value
+    : value.toString()
 }
 
 /**
@@ -20,7 +21,7 @@ exports.guard = function (value) {
  * @return {*|Number}
  */
 
-exports.guardNumber = function (value) {
+exports.toNumber = function (value) {
   return (
     isNaN(value) ||
     value === null ||

+ 0 - 9
test/unit/specs/batcher_spec.js

@@ -53,13 +53,4 @@ describe('Batcher', function () {
     })
   })
 
-  it('preFlush hook', function (done) {
-    batcher._preFlush = spy
-    batcher.push({ run: function () {}})
-    nextTick(function () {
-      expect(spy.calls.count()).toBe(1)
-      done()
-    })
-  })
-
 })

+ 12 - 11
test/unit/specs/util/lang_spec.js

@@ -2,19 +2,20 @@ var _ = require('../../../../src/util')
 
 describe('Util - Language Enhancement', function () {
 
-  it('guard', function () {
-    expect(_.guard(1)).toBe(1)
-    expect(_.guard(null)).toBe(null)
-    expect(_.guard(undefined)).toBe('')
+  it('toString', function () {
+    expect(_.toString('hi')).toBe('hi')
+    expect(_.toString(1.234)).toBe('1.234')
+    expect(_.toString(null)).toBe('')
+    expect(_.toString(undefined)).toBe('')
   })
 
-  it('guardNumber', function () {
-    expect(_.guardNumber('12')).toBe(12)
-    expect(_.guardNumber('1e5')).toBe(1e5)
-    expect(_.guardNumber('0x2F')).toBe(0x2F)
-    expect(_.guardNumber(null)).toBe(null)
-    expect(_.guardNumber(true)).toBe(true)
-    expect(_.guardNumber('hello')).toBe('hello')
+  it('toNumber', function () {
+    expect(_.toNumber('12')).toBe(12)
+    expect(_.toNumber('1e5')).toBe(1e5)
+    expect(_.toNumber('0x2F')).toBe(0x2F)
+    expect(_.toNumber(null)).toBe(null)
+    expect(_.toNumber(true)).toBe(true)
+    expect(_.toNumber('hello')).toBe('hello')
   })
 
   it('strip quotes', function () {