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

click block updates

Browse Source
This commit is contained in:
Adam Bradley
2015-05-06 10:35:40 -05:00
parent 604a11cd7a
commit e36d48fdfc
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ionic/components/content/content.js
View File

@ -19,5 +19,6 @@ import {
export class Content { export class Content {
constructor() { constructor() {
this.contentClass = true; this.contentClass = true;
console.log('Content!');
} }
} }

2
ionic/components/nav/nav-base.js
View File

@ -195,8 +195,6 @@ export class NavBase {
// allow clicks again // allow clicks again
ClickBlock(false); ClickBlock(false);
console.log('transition, canSwipeBack()', this.canSwipeBack());
// resolve that this push has completed // resolve that this push has completed
resolve(); resolve();
}); });

25
ionic/util/click-block.js
View File

@ -1,5 +1,8 @@
import {raf} from './dom'
const CSS_CLICK_BLOCK = 'click-block-active'; const CSS_CLICK_BLOCK = 'click-block-active';
const DEFAULT_EXPIRE = 330;
let cbEle, fallbackTimerId, pendingShow; let cbEle, fallbackTimerId, pendingShow;
function preventClick(ev) { function preventClick(ev) {
@ -8,8 +11,20 @@ function preventClick(ev) {
} }
function show(expire) { function show(expire) {
pendingShow = true;
clearTimeout(fallbackTimerId); clearTimeout(fallbackTimerId);
fallbackTimerId = setTimeout(hide, expire || 320); fallbackTimerId = setTimeout(hide, expire || DEFAULT_EXPIRE);
raf(addBlock);
}
function hide() {
pendingShow = false;
clearTimeout(fallbackTimerId);
raf(removeBlock);
}
function addBlock() {
if (pendingShow) {
if (cbEle) { if (cbEle) {
cbEle.classList.add(CSS_CLICK_BLOCK); cbEle.classList.add(CSS_CLICK_BLOCK);
@ -21,13 +36,15 @@ function show(expire) {
cbEle.addEventListener('touchstart', preventClick); cbEle.addEventListener('touchstart', preventClick);
cbEle.addEventListener('mousedown', preventClick); cbEle.addEventListener('mousedown', preventClick);
} }
pendingShow = false;
}
} }
function hide() { function removeBlock() {
clearTimeout(fallbackTimerId); if (!pendingShow) {
cbEle && cbEle.classList.remove(CSS_CLICK_BLOCK); cbEle && cbEle.classList.remove(CSS_CLICK_BLOCK);
} }
}
export let ClickBlock = function(shouldShow, expire) { export let ClickBlock = function(shouldShow, expire) {