Merge branch '2.0' into refactor/searchbar

This commit is contained in:
Brandy Carney
2016-06-14 14:14:49 -04:00
3 changed files with 5 additions and 6 deletions

View File

@@ -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 @>

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();
}

View File

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