Merged
Show file tree
Hide file tree
Changes from all commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Failed to load files.
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ export class AngularFireMessaging {
})
);

const notificationPermission$ = new Observable<string>(emitter => {
const notificationPermission$ = new Observable<void>(emitter => {
navigator.permissions.query({ name: 'notifications' }).then(notificationPerm => {
notificationPerm.onchange = () => emitter.next();
});
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -465,7 +465,7 @@ or the new Firebase App Hosting product https://firebase.google.com/docs/app-hos
open(plainText.split(': ')[1]);
}
}
return [info.message, ...(info[tripleBeam.SPLAT as any] || [])]
return [info.message, ...(info[tripleBeam.SPLAT as any] || []) as any]
.filter((chunk) => typeof chunk === 'string')
.join(' ');
})
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,13 +169,15 @@ export const ɵzoneWrap = <T= unknown>(it: T, blockUntilFirst: boolean, logLevel
} else if (ret instanceof Promise) {
// eslint-disable-next-line @typescript-eslint/no-misused-promises
return run(
() =>
new Promise((resolve, reject) => {
pendingTasks.run(() => ret).then(
() => {
pendingTasks.run(() => ret);
return new Promise((resolve, reject) => {
ret.then(
(it) => runInInjectionContext(injector, () => run(() => resolve(it))),
(reason) => runInInjectionContext(injector, () => run(() => reject(reason)))
);
}));
)
});
});
} else if (typeof ret === 'function' && taskDone) {
// Handle unsubscribe
// function() is needed for the arguments object
Expand Down