Merge PR mebjas#908 from upstream

Author: mokalovesoulmate

src/core.ts

@@ -253,6 +253,9 @@ export type QrcodeSuccessCallback
 export type QrcodeErrorCallback
     = (errorMessage: string, error: Html5QrcodeError) => void;
 
+export type StartErrorCallback
+    = (error: Html5QrcodeError) => void;
+
 /** Code decoder interface. */
 export interface QrcodeDecoderAsync {
     /**

src/html5-qrcode-scanner.ts

@@ -12,6 +12,7 @@ import {
     Html5QrcodeConstants,
     Html5QrcodeScanType,
     QrcodeSuccessCallback,
+    StartErrorCallback,
     QrcodeErrorCallback,
     Html5QrcodeResult,
     Html5QrcodeError,
@@ -194,6 +195,11 @@ export class Html5QrcodeScanner {
     private cameraScanImage: HTMLImageElement | null = null;
     private fileScanImage: HTMLImageElement | null = null;
     private fileSelectionUi: FileSelectionUi | null = null;
+
+    public startErrorCallback: StartErrorCallback;
+    public torchButtonErrorCallback: StartErrorCallback;
+    public getCamaraErrorCallback: StartErrorCallback;
+    public clickListenerErrorCallback: StartErrorCallback;
     //#endregion
 
     /**
@@ -226,6 +232,17 @@ export class Html5QrcodeScanner {
         if (config!.rememberLastUsedCamera !== true) {
             this.persistedDataManager.reset();
         }
+        const $this = this;
+
+        const warnUserViaHeader : StartErrorCallback = (error) => {
+               $this.setHeaderMessage(
+                   error.toString(), Html5QrcodeScannerStatus.STATUS_WARNING);
+            };
+
+        this.startErrorCallback = warnUserViaHeader;
+        this.torchButtonErrorCallback = warnUserViaHeader;
+        this.getCamaraErrorCallback = warnUserViaHeader;
+        this.clickListenerErrorCallback = warnUserViaHeader;
     }
 
     /**
@@ -582,8 +599,7 @@ export class Html5QrcodeScanner {
                 // time.
                 createPermissionButtonIfNotExists();
             }
-            $this.setHeaderMessage(
-                error, Html5QrcodeScannerStatus.STATUS_WARNING);
+            $this.getCamaraErrorCallback(error);
             $this.showHideScanTypeSwapLink(true);
         });
     }
@@ -763,6 +779,7 @@ export class Html5QrcodeScanner {
 
         // Optional torch button support.
         let torchButton: TorchButton;
+
         const createAndShowTorchButtonIfSupported
             = (cameraCapabilities: CameraCapabilities) => {
             if (!cameraCapabilities.torchFeature().isSupported()) {
@@ -780,9 +797,7 @@ export class Html5QrcodeScanner {
                     { display: "none", marginLeft: "5px" },
                     // Callback in case of torch action failure.
                     (errorMessage) => {
-                        $this.setHeaderMessage(
-                            errorMessage,
-                            Html5QrcodeScannerStatus.STATUS_WARNING);
+                        $this.torchButtonErrorCallback(Html5QrcodeErrorFactory.createFrom(errorMessage));
                     }
                 );
             } else {
@@ -850,8 +865,7 @@ export class Html5QrcodeScanner {
                     $this.showHideScanTypeSwapLink(true);
                     cameraSelectUi.enable();
                     resetCameraActionStartButton(/* shouldShow= */ true);
-                    $this.setHeaderMessage(
-                        error, Html5QrcodeScannerStatus.STATUS_WARNING);
+                    $this.startErrorCallback(error);
                 });
         });
 
@@ -887,8 +901,7 @@ export class Html5QrcodeScanner {
                     $this.insertCameraScanImageToScanRegion();
                 }).catch((error) => {
                     cameraActionStopButton.disabled = false;
-                    $this.setHeaderMessage(
-                        error, Html5QrcodeScannerStatus.STATUS_WARNING);
+                    $this.clickListenerErrorCallback(error);
                 });
         });
 
@@ -993,13 +1006,14 @@ export class Html5QrcodeScanner {
         }
     }
 
-    private resetHeaderMessage() {
+    public resetHeaderMessage() {
         const messageDiv = document.getElementById(
             this.getHeaderMessageContainerId())!;
         messageDiv.style.display = "none";
     }
 
-    private setHeaderMessage(
+    /*eslint complexity: ["error", 5]*/
+    public setHeaderMessage(
         messageText: string, scannerStatus?: Html5QrcodeScannerStatus) {
         if (!scannerStatus) {
             scannerStatus = Html5QrcodeScannerStatus.STATUS_DEFAULT;