From d7cdba82dbcf13786e2ec7f375cbdde5bc6cecc5 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Mon, 13 Jun 2016 15:28:32 -0500 Subject: [PATCH 1/3] refactor(click-block): update to config for click-block update to config for click-block --- src/config/bootstrap.ts | 4 +++- src/platform/registry.ts | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/config/bootstrap.ts b/src/config/bootstrap.ts index 467f0755f2..07179dd7d4 100644 --- a/src/config/bootstrap.ts +++ b/src/config/bootstrap.ts @@ -183,7 +183,9 @@ function setupDom(window: Window, document: Document, config: Config, platform: bodyEle.classList.add('enable-hover'); } - if ( config.get('clickBlock') !== false ) { + let original = config.get('clickBlock'); + let bool = config.getBoolean('clickBlock'); + if ( bool !== false ) { clickBlock.enable(); } diff --git a/src/platform/registry.ts b/src/platform/registry.ts index 4011c668a3..16288208b2 100644 --- a/src/platform/registry.ts +++ b/src/platform/registry.ts @@ -11,13 +11,17 @@ Platform.register({ settings: { mode: 'md', keyboardHeight: 290, + clickBlock: true } }); Platform.setDefault('core'); Platform.register({ - name: 'mobile' + name: 'mobile', + settings: { + clickBlock: true + } }); From b20647c16eefb380876c1a1b04c87ac94e241f94 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Mon, 13 Jun 2016 15:53:51 -0500 Subject: [PATCH 2/3] refactor(click-block): reversing previous change, making getBoolean use fallback of true reversing previous change, making getBoolean use fallback of true --- src/config/bootstrap.ts | 4 +--- src/platform/registry.ts | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/config/bootstrap.ts b/src/config/bootstrap.ts index 07179dd7d4..4dc0fa8a1b 100644 --- a/src/config/bootstrap.ts +++ b/src/config/bootstrap.ts @@ -183,9 +183,7 @@ function setupDom(window: Window, document: Document, config: Config, platform: bodyEle.classList.add('enable-hover'); } - let original = config.get('clickBlock'); - let bool = config.getBoolean('clickBlock'); - if ( bool !== false ) { + if ( config.getBoolean('clickBlock', true) !== false ) { clickBlock.enable(); } diff --git a/src/platform/registry.ts b/src/platform/registry.ts index 16288208b2..83ead15af9 100644 --- a/src/platform/registry.ts +++ b/src/platform/registry.ts @@ -10,18 +10,14 @@ Platform.register({ name: 'core', settings: { mode: 'md', - keyboardHeight: 290, - clickBlock: true + keyboardHeight: 290 } }); Platform.setDefault('core'); Platform.register({ - name: 'mobile', - settings: { - clickBlock: true - } + name: 'mobile' }); From efa0c7b8f7811d8c93b642a8f9c4b3c4848df9c1 Mon Sep 17 00:00:00 2001 From: mhartington Date: Mon, 13 Jun 2016 17:08:29 -0400 Subject: [PATCH 3/3] docs(): update API template Ref https://github.com/driftyco/ionic-site/issues/607 --- scripts/docs/templates/common.template.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html index 2de20a476e..d986312b9c 100644 --- a/scripts/docs/templates/common.template.html +++ b/scripts/docs/templates/common.template.html @@ -158,6 +158,9 @@ angular_controller: APIDemoCtrl <@ endif @> <$ doc.name | dashCase $> <@ else @> <$ doc.name $> +<@- if doc.directiveInfo @> +

<$ doc.directiveInfo.properties[0].values $>

+<@ endif -@> <@ endif @> <@ if doc.parent @> @@ -191,10 +194,6 @@ Improve this doc <@ endblock @> -<@- if doc.directiveInfo @> -

<$ doc.directiveInfo.type $>

-

<$ doc.directiveInfo.properties[0].name $>: <$ doc.directiveInfo.properties[0].values $>

-<@ endif -@> <@ if doc.usage @>