Skip to content

Commit d822e1c

Browse files
committed
[build] 2.0.7
1 parent d830924 commit d822e1c

File tree

13 files changed

+8303
-2563
lines changed

13 files changed

+8303
-2563
lines changed

dist/vue.common.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.0.6
2+
* Vue.js v2.0.7
33
* (c) 2014-2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -1596,7 +1596,9 @@ function normalizeChildren (
15961596
}
15971597
} else if (c instanceof VNode) {
15981598
if (c.text && last && last.text) {
1599-
last.text += c.text;
1599+
if (!last.isCloned) {
1600+
last.text += c.text;
1601+
}
16001602
} else {
16011603
// inherit parent namespace
16021604
if (ns) {
@@ -3416,7 +3418,7 @@ Object.defineProperty(Vue$2.prototype, '$isServer', {
34163418
get: function () { return config._isServer; }
34173419
});
34183420

3419-
Vue$2.version = '2.0.6';
3421+
Vue$2.version = '2.0.7';
34203422

34213423
/* */
34223424

dist/vue.js

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.0.6
2+
* Vue.js v2.0.7
33
* (c) 2014-2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -1598,7 +1598,9 @@ function normalizeChildren (
15981598
}
15991599
} else if (c instanceof VNode) {
16001600
if (c.text && last && last.text) {
1601-
last.text += c.text;
1601+
if (!last.isCloned) {
1602+
last.text += c.text;
1603+
}
16021604
} else {
16031605
// inherit parent namespace
16041606
if (ns) {
@@ -3416,7 +3418,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
34163418
get: function () { return config._isServer; }
34173419
});
34183420

3419-
Vue$3.version = '2.0.6';
3421+
Vue$3.version = '2.0.7';
34203422

34213423
/* */
34223424

@@ -5749,17 +5751,12 @@ var shouldDecodeNewlines = inBrowser ? shouldDecode('\n', '
') : false;
57495751

57505752
/* */
57515753

5752-
var decode;
5754+
var decoder;
57535755

5754-
/* istanbul ignore else */
5755-
if (inBrowser) {
5756-
var decoder = document.createElement('div');
5757-
decode = function (html) {
5758-
decoder.innerHTML = html;
5759-
return decoder.textContent
5760-
};
5761-
} else {
5762-
decode = require('he').decode;
5756+
function decode (html) {
5757+
decoder = decoder || document.createElement('div');
5758+
decoder.innerHTML = html;
5759+
return decoder.textContent
57635760
}
57645761

57655762
/**

dist/vue.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)