javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into refactor/searchbar

Browse Source
This commit is contained in:
Brandy Carney
2016-06-14 14:14:49 -04:00
parent 9a9aa5e018 efa0c7b8f7
commit fef6a5fa43
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/bootstrap.ts
View File

@@ -183,7 +183,7 @@ function setupDom(window: Window, document: Document, config: Config, platform:
bodyEle.classList.add('enable-hover');
}
if ( config.get('clickBlock') !== false ) {
if ( config.getBoolean('clickBlock', true) !== false ) {
clickBlock.enable();
}

2
src/platform/registry.ts
View File

@@ -10,7 +10,7 @@ Platform.register({
name: 'core',
settings: {
mode: 'md',
keyboardHeight: 290,
keyboardHeight: 290
}
});
Platform.setDefault('core');