Merge in v5 code

This commit is contained in:
Ibby Hadeed
2017-12-28 07:28:44 -05:00
parent d43fe72f7b
commit 0f9c21ab42
255 changed files with 11473 additions and 6501 deletions
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
export interface WheelSelectorItem {
description?: string;
@@ -55,7 +55,7 @@ export interface WheelSelectorOptions {
* key/value to be displayed
* Default: description
*/
displayKey?: string;
displayKey?: string;
}
export interface WheelSelectorData {
@@ -101,7 +101,7 @@ export interface WheelSelectorData {
* { name: "Gordon", id: '103' },
* { name: "Smith", id: '104' }
* ]
* };
* }
*
* ...
*
@@ -155,7 +155,7 @@ export interface WheelSelectorData {
* ],
* displayKey: 'name',
* defaultItems: [
* {index:0, value: this.jsonData.firstNames[2].name},
* {index:0, value: this.jsonData.firstNames[2].name},
* {index: 0, value: this.jsonData.lastNames[3].name}
* ]
* }).then(
@@ -200,5 +200,7 @@ export class WheelSelector extends IonicNativePlugin {
@Cordova({
platforms: ['iOS']
})
hideSelector(): Promise<void> { return; }
hideSelector(): Promise<void> {
return;
}
}