Merge pull request vuejs#1498 from vprimachenko/dev

fix `(k,v) in o` bugs with falsy values
jasonkying · Oct 28, 2015 · 09d2685 · 09d2685
2 parents aed6625 + 125b655
commit 09d2685
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/directives/public/for.js b/src/directives/public/for.js
@@ -122,9 +122,9 @@ module.exports = {
  if (key) {
  frag.scope.$key = key
  }
- // update interator
+ // update iterator
  if (iterator) {
- frag.scope[iterator] = key || i
+ frag.scope[iterator] = key !== null ? key : i
  }
  // update data for track-by, object repeat &
  // primitive values.
@@ -218,7 +218,7 @@ module.exports = {
  _.define(scope, '$key', null)
  }
  if (this.iterator) {
- _.defineReactive(scope, this.iterator, key || index)
+ _.defineReactive(scope, this.iterator, key !== null ? key : index)
  }
  var frag = this.factory.create(host, scope, this._frag)
  frag.forId = this.id