From 3d67ee62dee58afdabd194fa318e57094fabc5d1 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 11 Dec 2019 10:18:21 +0100 Subject: [PATCH] MOBILE-2159 geolocation: Replace type guard with simpler code --- src/addon/mod/data/fields/latlong/component/latlong.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/addon/mod/data/fields/latlong/component/latlong.ts b/src/addon/mod/data/fields/latlong/component/latlong.ts index 013c4586e..e322abf07 100644 --- a/src/addon/mod/data/fields/latlong/component/latlong.ts +++ b/src/addon/mod/data/fields/latlong/component/latlong.ts @@ -117,7 +117,7 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo this.form.controls['f_' + this.field.id + '_0'].setValue(result.coords.latitude); this.form.controls['f_' + this.field.id + '_1'].setValue(result.coords.longitude); }).catch((error) => { - if (this.isPositionError(error) && error.code === error.PERMISSION_DENIED) { + if (this.isPermissionDeniedError(error)) { this.domUtils.showErrorModal('addon.mod_data.locationpermissiondenied', true); return; @@ -129,7 +129,7 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo }); } - protected isPositionError(error?: any): error is PositionError { - return error && 'code' in error && 'PERMISSION_DENIED' in error; + protected isPermissionDeniedError(error?: any): boolean { + return error && 'code' in error && 'PERMISSION_DENIED' in error && error.code === error.PERMISSION_DENIED; } }