merge master into v5

This commit is contained in:
Daniel
2018-08-16 22:43:50 +02:00
parent 2f560d619a
commit f2728f26fe
18 changed files with 1846 additions and 130 deletions
+3 -17
View File
@@ -341,27 +341,13 @@ export class Ndef extends IonicNativePlugin {
}
@Cordova({ sync: true })
textRecord(
text: string,
languageCode: string,
id: number[] | string
): NdefRecord {
return;
}
textRecord(text: string, languageCode?: string, id?: number[] | string): NdefRecord { return; }
@Cordova({ sync: true })
uriRecord(uri: string, id: number[] | string): NdefRecord {
return;
}
uriRecord(uri: string, id?: number[] | string): NdefRecord { return; }
@Cordova({ sync: true })
absoluteUriRecord(
uri: string,
payload: number[] | string,
id: number[] | string
): NdefRecord {
return;
}
absoluteUriRecord(uri: string, payload: number[] | string, id?: number[] | string): NdefRecord { return; }
@Cordova({ sync: true })
mimeMediaRecord(mimeType: string, payload: string): NdefRecord {