Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions plugin/src/web.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ export class CapacitorBarcodeScannerWeb

const caposbarcodescannercontainerdialoginnerclose =
document.createElement("span");
caposbarcodescannercontainerdialoginnerclose.id =
"cap-os-barcode-scanner-close-button";
caposbarcodescannercontainerdialoginnerclose.className = "close-button";
caposbarcodescannercontainerdialoginnerclose.innerHTML = "×";
caposbarcodescannercontainerdialoginner.appendChild(
Expand Down Expand Up @@ -95,9 +97,6 @@ export class CapacitorBarcodeScannerWeb
caposbarcodescannercontainer.appendChild(
caposbarcodescannercontainerdialog,
);

caposbarcodescannercontainerdialoginnerclose.onclick =
this.stopAndHideScanner;
}

/**
Expand Down Expand Up @@ -134,6 +133,19 @@ export class CapacitorBarcodeScannerWeb
scannerFPS: options.web?.scannerFPS ? options.web.scannerFPS : 50,
};

let alreadyCancelled = false;
const closeButton = document.getElementById(
"cap-os-barcode-scanner-close-button",
);
if (closeButton) {
closeButton.onclick = async () => {
if (alreadyCancelled) return;
alreadyCancelled = true;
await this.stopAndHideScanner();
reject(new Error("Couldn’t scan because the process was cancelled."));
};
}

// Set up and start the scanner
const scannerElement = document.getElementById(
"cap-os-barcode-scanner-container-scanner",
Expand Down