mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
Merge branch '2.0' into refactor/searchbar
This commit is contained in:
7
scripts/docs/templates/common.template.html
vendored
7
scripts/docs/templates/common.template.html
vendored
@@ -158,6 +158,9 @@ angular_controller: APIDemoCtrl <@ endif @>
|
||||
<$ doc.name | dashCase $>
|
||||
<@ else @>
|
||||
<$ doc.name $>
|
||||
<@- if doc.directiveInfo @>
|
||||
<h3><code><$ doc.directiveInfo.properties[0].values $></code></h3>
|
||||
<@ endif -@>
|
||||
<@ endif @>
|
||||
|
||||
<@ if doc.parent @>
|
||||
@@ -191,10 +194,6 @@ Improve this doc
|
||||
<@ endblock @>
|
||||
|
||||
|
||||
<@- if doc.directiveInfo @>
|
||||
<h2><a class="anchor" name="<$ doc.directiveInfo.type $>" href="#<$ doc.directiveInfo.type $>"></a><$ doc.directiveInfo.type $></h2>
|
||||
<h3><$ doc.directiveInfo.properties[0].name $>: <code><$ doc.directiveInfo.properties[0].values $></code></h3>
|
||||
<@ endif -@>
|
||||
|
||||
<!-- @usage tag -->
|
||||
<@ if doc.usage @>
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ Platform.register({
|
||||
name: 'core',
|
||||
settings: {
|
||||
mode: 'md',
|
||||
keyboardHeight: 290,
|
||||
keyboardHeight: 290
|
||||
}
|
||||
});
|
||||
Platform.setDefault('core');
|
||||
|
||||
Reference in New Issue
Block a user