Merge pull request vuejs#1299 from evantre/dev

yyx990803 · yyx990803 · commit 318e77b36863 · 2015-09-11T09:52:16.000-04:00
fix select element can't removeChild optgroup's option
diff --git a/src/directives/model/select.js b/src/directives/model/select.js
@@ -98,7 +98,12 @@ function initOptions (expression) {
       while (i--) {
         var option = el.options[i]
         if (option !== defaultOption) {
-          el.removeChild(option)
+          var parentNode = option.parentNode
+          if (parentNode === el) {
+            parentNode.removeChild(option)
+          } else {
+            el.removeChild(parentNode)
+          }
         }
       }
       buildOptions(el, value)
diff --git a/test/unit/specs/directives/model_spec.js b/test/unit/specs/directives/model_spec.js
@@ -341,8 +341,8 @@ if (_.inBrowser) {
       expect(opts[2].selected).toBe(true)
     })
 
-    it('select + options + optgroup', function () {
-      new Vue({
+    it('select + options + optgroup', function (done) {
+      var vm = new Vue({
         el: el,
         data: {
           test: 'b',
@@ -365,6 +365,26 @@ if (_.inBrowser) {
       expect(opts[0].selected).toBe(false)
       expect(opts[1].selected).toBe(true)
       expect(opts[2].selected).toBe(false)
+      vm.opts = [
+        { label: 'X', options: ['x', 'y'] },
+        { label: 'Y', options: ['z'] }
+      ]
+      vm.test = 'y'
+      _.nextTick(function () {
+        expect(el.firstChild.innerHTML).toBe(
+          '<optgroup label="X">' +
+          '<option value="x">x</option><option value="y">y</option>' +
+          '</optgroup>' +
+          '<optgroup label="Y">' +
+          '<option value="z">z</option>' +
+          '</optgroup>'
+        )
+        var opts = el.firstChild.options
+        expect(opts[0].selected).toBe(false)
+        expect(opts[1].selected).toBe(true)
+        expect(opts[2].selected).toBe(false)
+        done()
+      })
     })
 
     it('select + options with Object value', function (done) {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,12 @@ function initOptions (expression) {`
`98`	`98`	`while (i--) {`
`99`	`99`	`var option = el.options[i]`
`100`	`100`	`if (option !== defaultOption) {`
`101`		`- el.removeChild(option)`
	`101`	`+ var parentNode = option.parentNode`
	`102`	`+ if (parentNode === el) {`
	`103`	`+ parentNode.removeChild(option)`
	`104`	`+ } else {`
	`105`	`+ el.removeChild(parentNode)`
	`106`	`+ }`
`102`	`107`	`}`
`103`	`108`	`}`
`104`	`109`	`buildOptions(el, value)`