GreenPolyProducts/polymer
5
0
Fork 0
mirror of https://github.com/Polymer/polymer.git synced 2026-08-19 01:14:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4962 from Polymer/passive-touch-no-touchend

Browse Source 
Do not set touchend listeners to passive
This commit is contained in:
Daniel Freedman
2017-12-04 14:12:00 -08:00
committed by GitHub
parent 1fbb5041d9 c5407a8bea
commit b311a77338
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/utils/gestures.html
+7 -5
View File
@@ -62,9 +62,13 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
/**
* Generate settings for event listeners, dependant on `Polymer.passiveTouchGestures`
*
* @param {string} eventName Event name to determine if `{passive}` option is needed
* @return {{passive: boolean} | undefined} Options to use for addEventListener and removeEventListener
*/
function PASSIVE_TOUCH() {
function PASSIVE_TOUCH(eventName) {
if (isMouseEvent(eventName) || eventName === 'touchend') {
return;
}
if (HAS_NATIVE_TA && SUPPORTS_PASSIVE && Polymer.passiveTouchGestures) {
return {passive: true};
} else {
@@ -485,8 +489,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
gobj[dep] = gd = {_count: 0};
}
if (gd._count === 0) {
let options = !isMouseEvent(dep) && PASSIVE_TOUCH();
node.addEventListener(dep, this._handleNative, options);
node.addEventListener(dep, this._handleNative, PASSIVE_TOUCH(dep));
}
gd[name] = (gd[name] || 0) + 1;
gd._count = (gd._count || 0) + 1;
@@ -520,8 +523,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
gd[name] = (gd[name] || 1) - 1;
gd._count = (gd._count || 1) - 1;
if (gd._count === 0) {
let options = !isMouseEvent(dep) && PASSIVE_TOUCH();
node.removeEventListener(dep, this._handleNative, options);
node.removeEventListener(dep, this._handleNative, PASSIVE_TOUCH(dep));
}
}
}
test/smoke/passive-gestures.html
+8 -2
View File
@@ -40,11 +40,17 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
is: 'x-passive',
listeners: {
'down': 'prevent',
'move': 'prevent'
'move': 'prevent',
'up': 'prevent',
'tap': 'allowed',
'click': 'allowed'
},
prevent(e) {
e.preventDefault();
console.log('prevented!');
console.log('prevented?: ' + e.type + ' ' + e.defaultPrevented);
},
allowed(e) {
console.log(e.type + ' allowed');
}
});
</script>