From 00f9611e716a8744540b44ee6cf5663100ffbd56 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 19 Nov 2015 11:23:38 -0600 Subject: [PATCH] feat(clickBlock): enable click block only on iOS --- ionic/components/app/app.ts | 7 +++++-- ionic/config/bootstrap.ts | 3 ++- ionic/platform/registry.ts | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ionic/components/app/app.ts b/ionic/components/app/app.ts index 2589e3a829..95b73b3579 100644 --- a/ionic/components/app/app.ts +++ b/ionic/components/app/app.ts @@ -10,7 +10,8 @@ import {ScrollTo} from '../../animations/scroll-to'; */ export class IonicApp { - constructor(fastdom) { + constructor(config, fastdom) { + this._config = config; this._fastdom = fastdom; this._titleSrv = new Title(); this._title = ''; @@ -47,7 +48,9 @@ export class IonicApp { */ setEnabled(isEnabled, fallback=700) { this._disTime = (isEnabled ? 0 : Date.now() + fallback); - ClickBlock(!isEnabled, fallback + 100); + if (this._config.get('clickBlock')) { + ClickBlock(!isEnabled, fallback + 100); + } } /** diff --git a/ionic/config/bootstrap.ts b/ionic/config/bootstrap.ts index 5f3e8a522f..598d4a6ee7 100644 --- a/ionic/config/bootstrap.ts +++ b/ionic/config/bootstrap.ts @@ -24,7 +24,6 @@ import * as dom from '../util/dom'; export function ionicProviders(args={}) { let fastdom = new FastDom(); - let app = new IonicApp(fastdom); let platform = new Platform(); let navRegistry = new NavRegistry(args.pages); @@ -40,6 +39,8 @@ export function ionicProviders(args={}) { platform.load(); config.setPlatform(platform); + let app = new IonicApp(config, fastdom); + let events = new Events(); initTapClick(window, document, app, config, fastdom); let featureDetect = new FeatureDetect(); diff --git a/ionic/platform/registry.ts b/ionic/platform/registry.ts index 2c45772102..28bd5b4e0c 100644 --- a/ionic/platform/registry.ts +++ b/ionic/platform/registry.ts @@ -70,6 +70,7 @@ Platform.register({ 'iphone' ], settings: { + clickBlock: true, hoverCSS: false, keyboardHeight: 300, mode: 'ios',