Skip to content

Commit 21eff59

Browse files
authored
Merge pull request #790 from jnpdx/fix/emitter-warnings
Pass empty callbacks to emitters in the event of no parameters
2 parents 2813657 + 2d8af72 commit 21eff59

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

FS.common.js

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -499,17 +499,11 @@ var RNFS = {
499499
var jobId = getJobId();
500500
var subscriptions = [];
501501

502-
if (options.begin) {
503-
subscriptions.push(RNFS_NativeEventEmitter.addListener('DownloadBegin', options.begin));
504-
}
502+
subscriptions.push(RNFS_NativeEventEmitter.addListener('DownloadBegin', options.begin || function() {}));
505503

506-
if (options.progress) {
507-
subscriptions.push(RNFS_NativeEventEmitter.addListener('DownloadProgress', options.progress));
508-
}
504+
subscriptions.push(RNFS_NativeEventEmitter.addListener('DownloadProgress', options.progress || function() {}));
509505

510-
if (options.resumable) {
511-
subscriptions.push(RNFS_NativeEventEmitter.addListener('DownloadResumable', options.resumable));
512-
}
506+
subscriptions.push(RNFS_NativeEventEmitter.addListener('DownloadResumable', options.resumable || function() {}));
513507

514508
var bridgeOptions = {
515509
jobId: jobId,
@@ -554,17 +548,16 @@ var RNFS = {
554548
if (options.fields && typeof options.fields !== 'object') throw new Error('uploadFiles: Invalid value for property `fields`');
555549
if (options.method && typeof options.method !== 'string') throw new Error('uploadFiles: Invalid value for property `method`');
556550

557-
if (options.begin) {
558-
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadBegin', options.begin));
559-
}
551+
552+
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadBegin', options.begin || function() {}));
553+
560554
if (options.beginCallback && options.beginCallback instanceof Function) {
561555
// Deprecated
562556
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadBegin', options.beginCallback));
563557
}
564558

565-
if (options.progress) {
566-
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadProgress', options.progress));
567-
}
559+
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadProgress', options.progress || function() {}));
560+
568561
if (options.progressCallback && options.progressCallback instanceof Function) {
569562
// Deprecated
570563
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadProgress', options.progressCallback));

0 commit comments

Comments
 (0)