Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed swapped text b/w file based and camera based scanning #212

Merged
merged 1 commit into from
May 28, 2021
Merged
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### Version 2.0.6
- [Issue#211](https://github.com/mebjas/html5-qrcode/issues/211) fixed - swapped text for file based scanning and camera scanning during typescript migration.

### Version 2.0.5
- [Issue#202](https://github.com/mebjas/html5-qrcode/issues/202) fixed - error logs dumped to console even if verbose flag is not set in `Html5Qrcode`.

Expand Down
2 changes: 1 addition & 1 deletion dist/html5-qrcode.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "html5-qrcode",
"version": "2.0.5",
"version": "2.0.6",
"description": "A cross platform HTML5 QR Code & bar code scanner",
"main": "minified/html5-qrcode.min.js",
"scripts": {
Expand Down
15 changes: 12 additions & 3 deletions src/strings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,21 @@ export class Html5QrcodeScannerStrings {
return "Start Scanning";
}

/**
* Text to show when camera scan is selected.
*
* This will be used to switch to file based scanning.
*/
public static textIfCameraScanSelected(): string {
return "Scan using camera directly";
return "Scan an Image File";
}

// TODO(mebjas): be mindful of where this text occurs, verify this.
/**
* Text to show when file based scan is selected.
*
* This will be used to switch to camera based scanning.
*/
public static textIfFileScanSelected(): string {
return "Scan an Image File";
return "Scan using camera directly";
}
}