|
1 | 1 | /*!
|
2 |
| - * Vue.js v0.12.13 |
| 2 | + * Vue.js v0.12.14 |
3 | 3 | * (c) 2015 Evan You
|
4 | 4 | * Released under the MIT License.
|
5 | 5 | */
|
6 | 6 | (function webpackUniversalModuleDefinition(root, factory) {
|
7 | 7 | if(typeof exports === 'object' && typeof module === 'object')
|
8 | 8 | module.exports = factory();
|
9 | 9 | else if(typeof define === 'function' && define.amd)
|
10 |
| - define(factory); |
| 10 | + define([], factory); |
11 | 11 | else if(typeof exports === 'object')
|
12 | 12 | exports["Vue"] = factory();
|
13 | 13 | else
|
@@ -170,7 +170,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
170 | 170 | /***/ function(module, exports) {
|
171 | 171 |
|
172 | 172 | /**
|
173 |
| - * Check is a string starts with $ or _ |
| 173 | + * Check if a string starts with $ or _ |
174 | 174 | *
|
175 | 175 | * @param {String} str
|
176 | 176 | * @return {Boolean}
|
@@ -6366,7 +6366,13 @@ return /******/ (function(modules) { // webpackBootstrap
|
6366 | 6366 | while (i--) {
|
6367 | 6367 | var option = el.options[i]
|
6368 | 6368 | if (option !== defaultOption) {
|
6369 |
| - el.removeChild(option) |
| 6369 | + var parentNode = option.parentNode |
| 6370 | + if (parentNode === el) { |
| 6371 | + parentNode.removeChild(option) |
| 6372 | + } else { |
| 6373 | + el.removeChild(parentNode) |
| 6374 | + i = el.options.length |
| 6375 | + } |
6370 | 6376 | }
|
6371 | 6377 | }
|
6372 | 6378 | buildOptions(el, value)
|
@@ -7410,7 +7416,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
7410 | 7416 | },
|
7411 | 7417 |
|
7412 | 7418 | getContainedComponents: function () {
|
7413 |
| - var vm = this.vm |
| 7419 | + var vm = this._host || this.vm |
7414 | 7420 | var start = this.start.nextSibling
|
7415 | 7421 | var end = this.end
|
7416 | 7422 |
|
@@ -8498,13 +8504,6 @@ return /******/ (function(modules) { // webpackBootstrap
|
8498 | 8504 | !value._isVue
|
8499 | 8505 | ) {
|
8500 | 8506 | ob = new Observer(value)
|
8501 |
| - } else if (true) { |
8502 |
| - if (_.isObject(value) && !_.isArray(value) && !_.isPlainObject(value)) { |
8503 |
| - _.warn( |
8504 |
| - 'Unobservable object found in data: ' + |
8505 |
| - Object.prototype.toString.call(value) |
8506 |
| - ) |
8507 |
| - } |
8508 | 8507 | }
|
8509 | 8508 | if (ob && vm) {
|
8510 | 8509 | ob.addVm(vm)
|
|
0 commit comments