improve click block, onKeyboardClose

This commit is contained in:
Adam Bradley
2015-09-14 21:06:53 -05:00
parent ca6b562d72
commit 722dddbbb7
5 changed files with 56 additions and 32 deletions

View File

@@ -84,7 +84,7 @@ export class Activator {
touchEnd(ev) {
let self = this;
if (self.tapPolyfill && self.start) {
if (self.tapPolyfill && self.start && !self.app.isTransitioning()) {
let endCoord = pointerCoord(ev);
if (!hasPointerMoved(self.pointerTolerance, self.start, endCoord)) {
@@ -140,7 +140,7 @@ export class Activator {
pointerStart(ev) {
let targetEle = this.getActivatableTarget(ev.target);
if (targetEle) {
if (targetEle && !this.app.isTransitioning()) {
this.start = pointerCoord(ev);
this.queueActivate(targetEle);
@@ -179,6 +179,9 @@ export class Activator {
* @return {boolean} True if click event should be allowed, otherwise false.
*/
allowClick(ev) {
if (this.app.isTransitioning()) {
return false;
}
if (!ev.isIonicTap) {
if (this.isDisabledClick()) {
return false;

View File

@@ -241,7 +241,7 @@ function initApp(window, document, config, platform) {
setTimeout(function() {
// start listening for resizes XXms after the app starts
window.addEventListener('resize', function() {
platform.winResize();
platform.windowResize();
});
}, 2500);