Skip to content

Commit 431563f

Browse files
committed
[release] 0.12.15
1 parent 7ce035d commit 431563f

File tree

3 files changed

+30
-10
lines changed

3 files changed

+30
-10
lines changed

dist/vue.js

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v0.12.14
2+
* Vue.js v0.12.15
33
* (c) 2015 Evan You
44
* Released under the MIT License.
55
*/
@@ -4241,7 +4241,7 @@ return /******/ (function(modules) { // webpackBootstrap
42414241
}
42424242

42434243
var tagRE = /<([\w:]+)/
4244-
var entityRE = /&\w+;/
4244+
var entityRE = /&\w+;|&#\d+;|&#x[\dA-F]+;/
42454245

42464246
/**
42474247
* Convert a string template to a DocumentFragment.
@@ -5842,7 +5842,9 @@ return /******/ (function(modules) { // webpackBootstrap
58425842
// CSS transitions.
58435843
document.hidden ||
58445844
// 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)
58465848
) {
58475849
return
58485850
}
@@ -5892,6 +5894,20 @@ return /******/ (function(modules) { // webpackBootstrap
58925894
_.on(el, event, onEnd)
58935895
}
58945896

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+
58955911
module.exports = Transition
58965912

58975913

@@ -6127,7 +6143,11 @@ return /******/ (function(modules) { // webpackBootstrap
61276143
// in IE11 the "compositionend" event fires AFTER
61286144
// the "input" event, so the input handler is blocked
61296145
// 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+
}
61316151
})
61326152
}
61336153

@@ -6411,7 +6431,7 @@ return /******/ (function(modules) { // webpackBootstrap
64116431
op = options[i]
64126432
if (!op.options) {
64136433
el = document.createElement('option')
6414-
if (typeof op === 'string') {
6434+
if (typeof op === 'string' || typeof op === 'number') {
64156435
el.text = el.value = op
64166436
} else {
64176437
if (op.value != null && !_.isObject(op.value)) {

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy