Merge branch 'master' of github.com:driftyco/ionic-native

This commit is contained in:
Ibby 2017-03-23 15:59:42 -04:00
commit 0e2d5ac1de
6 changed files with 15 additions and 10 deletions

View File

@ -26,8 +26,8 @@ module.exports = function jekyll(renderDocsProcessor) {
});
docs.push({
docType: 'native_menu-menu',
id: 'native_menu-menu',
docType: 'nativeMenu',
id: 'native_menu',
template: 'native_menu.template.html',
outputPath: 'content/_includes/v2_fluid/native_menu.html'
});

View File

@ -2,7 +2,7 @@ module.exports = function npmId(renderDocsProcessor) {
return {
name: 'npm-id',
$runAfter: ['paths-computed'],
$runBefore: ['rendering-docs'],
$runBefore: ['jekyll'],
$process: function(docs) {
var currentVersion = renderDocsProcessor.extraData.version.current.name;

View File

@ -1,9 +1,14 @@
<@ for doc in docs @><@ if doc.URL and doc.private != true and doc.beta != true @>
<li class="capitalize {% if page.id == 'overview' %}active{% endif %}">
<a href="/docs/v2/native/">Overview</a>
</li>
<li class="capitalize {% if page.id == 'mocking' %}active{% endif %}">
<a href="/docs/v2/native/browser.html">Browser Usage</a>
</li>
<@- for doc in docs @><@ if doc.URL and doc.private != true and doc.beta != true @>
<li class="capitalize {% if page.id == '<$ doc.name|lower|dashify $>' %}active{% endif %}">
<a href="/<$ doc.URL $>"><$ doc.name $></a>
</li><@ endif @><@ endfor @>
<@ for doc in docs @><@ if doc.URL and doc.private != true and doc.beta == true @>
<@- for doc in docs @><@ if doc.URL and doc.private != true and doc.beta == true @>
<li class="capitalize {% if page.id == '<$ doc.name|lower|dashify $>' %}active{% endif %}">
<a href="/<$ doc.URL $>"><$ doc.name $> <span class="beta">&beta;</span></a>
</li><@ endif @><@ endfor @>

View File

@ -17,7 +17,7 @@ import { Injectable } from '@angular/core';
*
* if (isAvailable) {
*
* browserTab.open('https://ionic.io');
* browserTab.openUrl('https://ionic.io');
*
* } else {
*

View File

@ -101,10 +101,10 @@ export interface CameraPopoverOptions {
* ...
*
*
* constant options: CameraOptions = {
* const options: CameraOptions = {
* quality: 100,
* destinationType: this.camera.DestinationType.DATA_URL,
* enodingType: this.camera.EncodingType.JPEG,
* encodingType: this.camera.EncodingType.JPEG,
* mediaType: this.camera.MediaType.PICTURE
* }
*

View File

@ -53,7 +53,7 @@ export class SecureStorageObject {
* @usage
*
* ```typescript
* import { SecureStorage, SecureStorageOBject } from '@ionic-native/secure-storage';
* import { SecureStorage, SecureStorageObject } from '@ionic-native/secure-storage';
*
* constructor(private secureStorage: SecureStorage) { }
*