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
+28 -10
View File
@@ -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';
import { Observable } from 'rxjs/Observable';
export interface ToastOptions {
@@ -82,14 +82,18 @@ export class Toast extends IonicNativePlugin {
observable: true,
clearFunction: 'hide'
})
show(message: string, duration: string, position: string): Observable<any> { return; }
show(message: string, duration: string, position: string): Observable<any> {
return;
}
/**
* Manually hide any currently visible toast.
* @returns {Promise<any>} Returns a Promise that resolves on success.
*/
@Cordova()
hide(): Promise<any> { return; }
hide(): Promise<any> {
return;
}
/**
* Show a native toast with the given options.
@@ -106,7 +110,9 @@ export class Toast extends IonicNativePlugin {
observable: true,
clearFunction: 'hide'
})
showWithOptions(options: ToastOptions): Observable<any> { return; }
showWithOptions(options: ToastOptions): Observable<any> {
return;
}
/**
* Shorthand for `show(message, 'short', 'top')`.
@@ -117,7 +123,9 @@ export class Toast extends IonicNativePlugin {
observable: true,
clearFunction: 'hide'
})
showShortTop(message: string): Observable<any> { return; }
showShortTop(message: string): Observable<any> {
return;
}
/**
* Shorthand for `show(message, 'short', 'center')`.
@@ -128,7 +136,9 @@ export class Toast extends IonicNativePlugin {
observable: true,
clearFunction: 'hide'
})
showShortCenter(message: string): Observable<any> { return; }
showShortCenter(message: string): Observable<any> {
return;
}
/**
@@ -140,7 +150,9 @@ export class Toast extends IonicNativePlugin {
observable: true,
clearFunction: 'hide'
})
showShortBottom(message: string): Observable<any> { return; }
showShortBottom(message: string): Observable<any> {
return;
}
/**
@@ -152,7 +164,9 @@ export class Toast extends IonicNativePlugin {
observable: true,
clearFunction: 'hide'
})
showLongTop(message: string): Observable<any> { return; }
showLongTop(message: string): Observable<any> {
return;
}
/**
@@ -164,7 +178,9 @@ export class Toast extends IonicNativePlugin {
observable: true,
clearFunction: 'hide'
})
showLongCenter(message: string): Observable<any> { return; }
showLongCenter(message: string): Observable<any> {
return;
}
/**
@@ -176,6 +192,8 @@ export class Toast extends IonicNativePlugin {
observable: true,
clearFunction: 'hide'
})
showLongBottom(message: string): Observable<any> { return; }
showLongBottom(message: string): Observable<any> {
return;
}
}