fix #1299, correct the loop counter

evantre · yyx990803 · commit 315f9a7e078c · 2015-09-11T13:33:47.000-04:00
diff --git a/src/directives/model/select.js b/src/directives/model/select.js
@@ -106,6 +106,7 @@ function initOptions (expression) {
             parentNode.removeChild(option)
           } else {
             el.removeChild(parentNode)
+            i = el.options.length
           }
         }
       }
diff --git a/test/unit/specs/directives/model_spec.js b/test/unit/specs/directives/model_spec.js
@@ -427,10 +427,10 @@ if (_.inBrowser) {
       _.nextTick(function () {
         expect(el.firstChild.innerHTML).toBe(
           '<optgroup label="X">' +
-          '<option value="x">x</option><option value="y">y</option>' +
+            '<option value="x">x</option><option value="y">y</option>' +
           '</optgroup>' +
           '<optgroup label="Y">' +
-          '<option value="z">z</option>' +
+            '<option value="z">z</option>' +
           '</optgroup>'
         )
         var opts = el.firstChild.options
@@ -441,6 +441,33 @@ if (_.inBrowser) {
       })
     })
 
+    it('select + options + optgroup + default option', function (done) {
+      var vm = new Vue({
+        el: el,
+        data: {
+          test: '',
+          opts: [
+            { label: 'A', options: ['a', 'b'] },
+            { label: 'B', options: ['c'] }
+          ]
+        },
+        template: '<select v-model="test" options="opts"><option value=""></option></select>'
+      })
+      var opts = el.firstChild.options
+      expect(opts[0].selected).toBe(true)
+      expect(el.firstChild.value).toBe('')
+      vm.opts = [
+        { label: 'X', options: ['x', 'y'] },
+        { label: 'Y', options: ['z'] }
+      ]
+      _.nextTick(function () {
+        var opts = el.firstChild.options
+        expect(opts[0].selected).toBe(true)
+        expect(el.firstChild.value).toBe('')
+        done()
+      })
+    })
+
     it('select + options with Object value', function (done) {
       var vm = new Vue({
         el: el,

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ function initOptions (expression) {`
`106`	`106`	`parentNode.removeChild(option)`
`107`	`107`	`} else {`
`108`	`108`	`el.removeChild(parentNode)`
	`109`	`+ i = el.options.length`
`109`	`110`	`}`
`110`	`111`	`}`
`111`	`112`	`}`