Skip to content

Commit

Permalink
Revert "fixed typo in the comment (mebjas#637)"
Browse files Browse the repository at this point in the history
This reverts commit 128c0b4.

Revert "Bump decode-uri-component from 0.2.0 to 0.2.2 (mebjas#647)"

This reverts commit d28c09a.

Revert "add await to this.surface.play() (mebjas#648)"

This reverts commit 4d384a0.

Revert "Bump json5 from 1.0.1 to 1.0.2 (mebjas#667)"

This reverts commit 7f57cad.

Revert "Fixes/657 (mebjas#671)"

This reverts commit 4a9a039.
  • Loading branch information
Michael Kroll committed Feb 14, 2023
1 parent 16a5423 commit 84fec6b
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 33 deletions.
2 changes: 1 addition & 1 deletion minified/html5-qrcode.min.js

Large diffs are not rendered by default.

48 changes: 27 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/camera/core-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ class RenderedCameraImpl implements RenderedCamera {

this.surface.addEventListener("playing", onVideoStart);
this.surface.srcObject = this.mediaStream;
return this.surface.play();
this.surface.play();
}

static async create(
Expand All @@ -205,7 +205,7 @@ class RenderedCameraImpl implements RenderedCamera {
aspectRatioConstraint);
}

await renderedCamera.setupSurface();
renderedCamera.setupSurface();
return renderedCamera;
}

Expand Down
14 changes: 6 additions & 8 deletions src/html5-qrcode-scanner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1032,15 +1032,13 @@ export class Html5QrcodeScanner {
}

private showHideScanTypeSwapLink(shouldDisplay?: boolean) {
if (this.scanTypeSelector.hasMoreThanOneScanType()) {
if (shouldDisplay !== true) {
shouldDisplay = false;
}

this.sectionSwapAllowed = shouldDisplay;
this.getDashboardSectionSwapLink().style.display
= shouldDisplay ? "inline-block" : "none";
if (shouldDisplay !== true) {
shouldDisplay = false;
}

this.sectionSwapAllowed = shouldDisplay;
this.getDashboardSectionSwapLink().style.display
= shouldDisplay ? "inline-block" : "none";
}

private insertCameraScanImageToScanRegion() {
Expand Down
2 changes: 1 addition & 1 deletion src/state-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
export enum Html5QrcodeScannerState {
// Invalid internal state, do not set to this state.
UNKNOWN = 0,
// Indicates the scanning is not running or user is using file based
// Indicates the sanning is not running or user is using file based
// scanning.
NOT_STARTED = 1,
// Camera scan is running.
Expand Down

0 comments on commit 84fec6b

Please sign in to comment.