mirror of
https://gitee.com/vuejs/vue.git
synced 2024-12-02 12:07:39 +08:00
parent
1780b1f07b
commit
6e41679a96
@ -1,7 +1,6 @@
|
||||
/* @flow */
|
||||
/* globals MutationObserver */
|
||||
/* globals MessageChannel */
|
||||
|
||||
import { noop } from 'shared/util'
|
||||
import { handleError } from './error'
|
||||
|
||||
// can we use __proto__?
|
||||
@ -80,41 +79,29 @@ export const nextTick = (function () {
|
||||
}
|
||||
}
|
||||
|
||||
// the nextTick behavior leverages the microtask queue, which can be accessed
|
||||
// via either native Promise.then or MutationObserver.
|
||||
// MutationObserver has wider support, however it is seriously bugged in
|
||||
// UIWebView in iOS >= 9.3.3 when triggered in touch event handlers. It
|
||||
// completely stops working after triggering a few times... so, if native
|
||||
// Promise is available, we will use it:
|
||||
/* istanbul ignore if */ // $flow-disable-line
|
||||
if (typeof Promise !== 'undefined' && isNative(Promise)) {
|
||||
var p = Promise.resolve()
|
||||
var logError = err => { handleError(err, null, 'nextTick') }
|
||||
// An asynchronous deferring mechanism.
|
||||
// In pre 2.4, we used to use microtasks (Promise/MutationObserver)
|
||||
// but microtasks actually has too high a priority and fires in between
|
||||
// supposedly sequential events (e.g. #4521, #6690) or even between
|
||||
// bubbling of the same event (#6566). Technically setImmediate should be
|
||||
// the ideal choice, but it's not available everywhere; and the only polyfill
|
||||
// that consistently queues the callback after all DOM events triggered in the
|
||||
// same loop is by using MessageChannel.
|
||||
/* istanbul ignore if */
|
||||
if (typeof setImmediate !== 'undefined' && isNative(setImmediate)) {
|
||||
timerFunc = () => {
|
||||
p.then(nextTickHandler).catch(logError)
|
||||
// in problematic UIWebViews, Promise.then doesn't completely break, but
|
||||
// it can get stuck in a weird state where callbacks are pushed into the
|
||||
// microtask queue but the queue isn't being flushed, until the browser
|
||||
// needs to do some other work, e.g. handle a timer. Therefore we can
|
||||
// "force" the microtask queue to be flushed by adding an empty timer.
|
||||
if (isIOS) setTimeout(noop)
|
||||
setImmediate(nextTickHandler)
|
||||
}
|
||||
} else if (!isIE && typeof MutationObserver !== 'undefined' && (
|
||||
isNative(MutationObserver) ||
|
||||
// PhantomJS and iOS 7.x
|
||||
MutationObserver.toString() === '[object MutationObserverConstructor]'
|
||||
} else if (typeof MessageChannel !== 'undefined' && (
|
||||
isNative(MessageChannel) ||
|
||||
// PhantomJS
|
||||
MessageChannel.toString() === '[object MessageChannelConstructor]'
|
||||
)) {
|
||||
// use MutationObserver where native Promise is not available,
|
||||
// e.g. PhantomJS, iOS7, Android 4.4
|
||||
var counter = 1
|
||||
var observer = new MutationObserver(nextTickHandler)
|
||||
var textNode = document.createTextNode(String(counter))
|
||||
observer.observe(textNode, {
|
||||
characterData: true
|
||||
})
|
||||
const channel = new MessageChannel()
|
||||
const port = channel.port2
|
||||
channel.port1.onmessage = nextTickHandler
|
||||
timerFunc = () => {
|
||||
counter = (counter + 1) % 2
|
||||
textNode.data = String(counter)
|
||||
port.postMessage(1)
|
||||
}
|
||||
} else {
|
||||
// fallback to setTimeout
|
||||
|
@ -9,7 +9,6 @@ let warn
|
||||
// in some cases, the event used has to be determined at runtime
|
||||
// so we used some reserved tokens during compile.
|
||||
export const RANGE_TOKEN = '__r'
|
||||
export const CHECKBOX_RADIO_TOKEN = '__c'
|
||||
|
||||
export default function model (
|
||||
el: ASTElement,
|
||||
@ -86,7 +85,7 @@ function genCheckboxModel (
|
||||
: `:_q(${value},${trueValueBinding})`
|
||||
)
|
||||
)
|
||||
addHandler(el, CHECKBOX_RADIO_TOKEN,
|
||||
addHandler(el, 'change',
|
||||
`var $$a=${value},` +
|
||||
'$$el=$event.target,' +
|
||||
`$$c=$$el.checked?(${trueValueBinding}):(${falseValueBinding});` +
|
||||
@ -109,7 +108,7 @@ function genRadioModel (
|
||||
let valueBinding = getBindingAttr(el, 'value') || 'null'
|
||||
valueBinding = number ? `_n(${valueBinding})` : valueBinding
|
||||
addProp(el, 'checked', `_q(${value},${valueBinding})`)
|
||||
addHandler(el, CHECKBOX_RADIO_TOKEN, genAssignmentCode(value, valueBinding), null, true)
|
||||
addHandler(el, 'change', genAssignmentCode(value, valueBinding), null, true)
|
||||
}
|
||||
|
||||
function genSelect (
|
||||
|
@ -2,28 +2,21 @@
|
||||
|
||||
import { isDef, isUndef } from 'shared/util'
|
||||
import { updateListeners } from 'core/vdom/helpers/index'
|
||||
import { isChrome, isIE, supportsPassive } from 'core/util/env'
|
||||
import { RANGE_TOKEN, CHECKBOX_RADIO_TOKEN } from 'web/compiler/directives/model'
|
||||
import { isIE, supportsPassive } from 'core/util/env'
|
||||
import { RANGE_TOKEN } from 'web/compiler/directives/model'
|
||||
|
||||
// normalize v-model event tokens that can only be determined at runtime.
|
||||
// it's important to place the event as the first in the array because
|
||||
// the whole point is ensuring the v-model callback gets called before
|
||||
// user-attached handlers.
|
||||
function normalizeEvents (on) {
|
||||
let event
|
||||
/* istanbul ignore if */
|
||||
if (isDef(on[RANGE_TOKEN])) {
|
||||
// IE input[type=range] only supports `change` event
|
||||
event = isIE ? 'change' : 'input'
|
||||
const event = isIE ? 'change' : 'input'
|
||||
on[event] = [].concat(on[RANGE_TOKEN], on[event] || [])
|
||||
delete on[RANGE_TOKEN]
|
||||
}
|
||||
if (isDef(on[CHECKBOX_RADIO_TOKEN])) {
|
||||
// Chrome fires microtasks in between click/change, leads to #4521
|
||||
event = isChrome ? 'click' : 'change'
|
||||
on[event] = [].concat(on[CHECKBOX_RADIO_TOKEN], on[event] || [])
|
||||
delete on[CHECKBOX_RADIO_TOKEN]
|
||||
}
|
||||
}
|
||||
|
||||
let target: HTMLElement
|
||||
|
54
test/e2e/specs/async-edge-cases.html
Normal file
54
test/e2e/specs/async-edge-cases.html
Normal file
@ -0,0 +1,54 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title></title>
|
||||
<script src="../../../dist/vue.min.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<!-- #4510 click and change event on checkbox -->
|
||||
<div id="case-1">
|
||||
<div @click="num++">
|
||||
{{ num }}
|
||||
<input type="checkbox" v-model="checked">
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
var vm1 = new Vue({
|
||||
el: '#case-1',
|
||||
data: {
|
||||
num: 1,
|
||||
checked: false
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<!-- #6566 click event bubbling -->
|
||||
<div id="case-2">
|
||||
<div v-if="expand">
|
||||
<button @click="expand = false, countA++">Expand is True</button>
|
||||
</div>
|
||||
<div class="header" v-if="!expand" @click="expand = true, countB++">
|
||||
<button>Expand is False</button>
|
||||
</div>
|
||||
<div class="count-a">
|
||||
countA: {{countA}}
|
||||
</div>
|
||||
<div class="count-b">
|
||||
countB: {{countB}}
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
var vm2 = new Vue({
|
||||
el: '#case-2',
|
||||
data: {
|
||||
expand: true,
|
||||
countA: 0,
|
||||
countB: 0,
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
34
test/e2e/specs/async-edge-cases.js
Normal file
34
test/e2e/specs/async-edge-cases.js
Normal file
@ -0,0 +1,34 @@
|
||||
module.exports = {
|
||||
'async edge cases': function (browser) {
|
||||
browser
|
||||
.url('http://localhost:8080/test/e2e/specs/async-edge-cases.html')
|
||||
// #4510
|
||||
.assert.containsText('#case-1', '1')
|
||||
.assert.checked('#case-1 input', false)
|
||||
|
||||
.click('#case-1 input')
|
||||
.assert.containsText('#case-1', '2')
|
||||
.assert.checked('#case-1 input', true)
|
||||
|
||||
.click('#case-1 input')
|
||||
.assert.containsText('#case-1', '3')
|
||||
.assert.checked('#case-1 input', false)
|
||||
|
||||
// #6566
|
||||
.assert.containsText('#case-2 button', 'Expand is True')
|
||||
.assert.containsText('.count-a', 'countA: 0')
|
||||
.assert.containsText('.count-b', 'countB: 0')
|
||||
|
||||
.click('#case-2 button')
|
||||
.assert.containsText('#case-2 button', 'Expand is False')
|
||||
.assert.containsText('.count-a', 'countA: 1')
|
||||
.assert.containsText('.count-b', 'countB: 0')
|
||||
|
||||
.click('#case-2 button')
|
||||
.assert.containsText('#case-2 button', 'Expand is True')
|
||||
.assert.containsText('.count-a', 'countA: 1')
|
||||
.assert.containsText('.count-b', 'countB: 1')
|
||||
|
||||
.end()
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user