javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixing merge-conflict from master

Browse Source
This commit is contained in:
Brandy Carney
2015-11-10 10:27:33 -05:00
parent 5074f7bcb7
commit a86eeb8dd5
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ionic/components/tap-click/tap-click.ts
View File

@ -144,15 +144,12 @@ function moveListeners(shouldAdd) {
} }
} }
<<<<<<< HEAD
=======
function setDisableNativeClick() { function setDisableNativeClick() {
if (isTapPolyfill) { if (isTapPolyfill) {
disableNativeClickTime = Date.now() + disableNativeClickLimit; disableNativeClickTime = Date.now() + disableNativeClickLimit;
} }
} }
>>>>>>> master
function isDisabledNativeClick() { function isDisabledNativeClick() {
return disableNativeClickUntil > Date.now(); return disableNativeClickUntil > Date.now();
} }