MOBILE-4410 core: Fix return param in timeoutPromise
parent
44468276ae
commit
cf30ac392a
|
@ -260,7 +260,7 @@ export class CoreUtilsProvider {
|
||||||
try {
|
try {
|
||||||
const response = await this.timeoutPromise(window.fetch(url, initOptions), CoreWS.getRequestTimeout());
|
const response = await this.timeoutPromise(window.fetch(url, initOptions), CoreWS.getRequestTimeout());
|
||||||
|
|
||||||
return !!response && response.redirected;
|
return response.redirected;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error.timeout && controller) {
|
if (error.timeout && controller) {
|
||||||
// Timeout, abort the request.
|
// Timeout, abort the request.
|
||||||
|
@ -1547,14 +1547,14 @@ export class CoreUtilsProvider {
|
||||||
* @param time Number of milliseconds of the timeout.
|
* @param time Number of milliseconds of the timeout.
|
||||||
* @returns Promise with the timeout.
|
* @returns Promise with the timeout.
|
||||||
*/
|
*/
|
||||||
timeoutPromise<T>(promise: Promise<T>, time: number): Promise<T | void> {
|
timeoutPromise<T>(promise: Promise<T>, time: number): Promise<T> {
|
||||||
return new Promise((resolve, reject): void => {
|
return new Promise((resolve, reject): void => {
|
||||||
let timedOut = false;
|
let timedOut = false;
|
||||||
const resolveBeforeTimeout = () => {
|
const resolveBeforeTimeout = (value: T) => {
|
||||||
if (timedOut) {
|
if (timedOut) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
resolve();
|
resolve(value);
|
||||||
};
|
};
|
||||||
const timeout = setTimeout(
|
const timeout = setTimeout(
|
||||||
() => {
|
() => {
|
||||||
|
|
Loading…
Reference in New Issue