Skip to content

Commit 6005807

Browse files
committed
[release] 0.12.14
1 parent 8dd6da9 commit 6005807

File tree

3 files changed

+16
-17
lines changed

3 files changed

+16
-17
lines changed

dist/vue.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*!
2-
* Vue.js v0.12.13
2+
* Vue.js v0.12.14
33
* (c) 2015 Evan You
44
* Released under the MIT License.
55
*/
66
(function webpackUniversalModuleDefinition(root, factory) {
77
if(typeof exports === 'object' && typeof module === 'object')
88
module.exports = factory();
99
else if(typeof define === 'function' && define.amd)
10-
define(factory);
10+
define([], factory);
1111
else if(typeof exports === 'object')
1212
exports["Vue"] = factory();
1313
else
@@ -170,7 +170,7 @@ return /******/ (function(modules) { // webpackBootstrap
170170
/***/ function(module, exports) {
171171

172172
/**
173-
* Check is a string starts with $ or _
173+
* Check if a string starts with $ or _
174174
*
175175
* @param {String} str
176176
* @return {Boolean}
@@ -6366,7 +6366,13 @@ return /******/ (function(modules) { // webpackBootstrap
63666366
while (i--) {
63676367
var option = el.options[i]
63686368
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+
}
63706376
}
63716377
}
63726378
buildOptions(el, value)
@@ -7410,7 +7416,7 @@ return /******/ (function(modules) { // webpackBootstrap
74107416
},
74117417

74127418
getContainedComponents: function () {
7413-
var vm = this.vm
7419+
var vm = this._host || this.vm
74147420
var start = this.start.nextSibling
74157421
var end = this.end
74167422

@@ -8498,13 +8504,6 @@ return /******/ (function(modules) { // webpackBootstrap
84988504
!value._isVue
84998505
) {
85008506
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-
}
85088507
}
85098508
if (ob && vm) {
85108509
ob.addVm(vm)

0 commit comments

Comments
 (0)