|
1 | 1 | /*! |
2 | | - * Vue.js v0.12.14 |
| 2 | + * Vue.js v0.12.15 |
3 | 3 | * (c) 2015 Evan You |
4 | 4 | * Released under the MIT License. |
5 | 5 | */ |
@@ -4241,7 +4241,7 @@ return /******/ (function(modules) { // webpackBootstrap |
4241 | 4241 | } |
4242 | 4242 |
|
4243 | 4243 | var tagRE = /<([\w:]+)/ |
4244 | | - var entityRE = /&\w+;/ |
| 4244 | + var entityRE = /&\w+;|&#\d+;|&#x[\dA-F]+;/ |
4245 | 4245 |
|
4246 | 4246 | /** |
4247 | 4247 | * Convert a string template to a DocumentFragment. |
@@ -5842,7 +5842,9 @@ return /******/ (function(modules) { // webpackBootstrap |
5842 | 5842 | // CSS transitions. |
5843 | 5843 | document.hidden || |
5844 | 5844 | // explicit js-only transition |
5845 | | - (this.hooks && this.hooks.css === false) |
| 5845 | + (this.hooks && this.hooks.css === false) || |
| 5846 | + // element is hidden |
| 5847 | + isHidden(this.el) |
5846 | 5848 | ) { |
5847 | 5849 | return |
5848 | 5850 | } |
@@ -5892,6 +5894,20 @@ return /******/ (function(modules) { // webpackBootstrap |
5892 | 5894 | _.on(el, event, onEnd) |
5893 | 5895 | } |
5894 | 5896 |
|
| 5897 | + /** |
| 5898 | + * Check if an element is hidden - in that case we can just |
| 5899 | + * skip the transition alltogether. |
| 5900 | + * |
| 5901 | + * @param {Element} el |
| 5902 | + * @return {Boolean} |
| 5903 | + */ |
| 5904 | + |
| 5905 | + function isHidden (el) { |
| 5906 | + return el.style.display === 'none' || |
| 5907 | + el.style.visibility === 'hidden' || |
| 5908 | + el.hidden |
| 5909 | + } |
| 5910 | + |
5895 | 5911 | module.exports = Transition |
5896 | 5912 |
|
5897 | 5913 |
|
@@ -6127,7 +6143,11 @@ return /******/ (function(modules) { // webpackBootstrap |
6127 | 6143 | // in IE11 the "compositionend" event fires AFTER |
6128 | 6144 | // the "input" event, so the input handler is blocked |
6129 | 6145 | // at the end... have to call it here. |
6130 | | - self.listener() |
| 6146 | + // |
| 6147 | + // #1327: in lazy mode this is unecessary. |
| 6148 | + if (!lazy) { |
| 6149 | + self.listener() |
| 6150 | + } |
6131 | 6151 | }) |
6132 | 6152 | } |
6133 | 6153 |
|
@@ -6411,7 +6431,7 @@ return /******/ (function(modules) { // webpackBootstrap |
6411 | 6431 | op = options[i] |
6412 | 6432 | if (!op.options) { |
6413 | 6433 | el = document.createElement('option') |
6414 | | - if (typeof op === 'string') { |
| 6434 | + if (typeof op === 'string' || typeof op === 'number') { |
6415 | 6435 | el.text = el.value = op |
6416 | 6436 | } else { |
6417 | 6437 | if (op.value != null && !_.isObject(op.value)) { |
|
0 commit comments