From 8a7b44f9d14bdce29a4a1779c704b083685b7756 Mon Sep 17 00:00:00 2001 From: js Date: Thu, 21 Jun 2018 23:30:08 +0200 Subject: [PATCH 01/14] Fixed typo leading to unterminated recursion in restartScan --- src/app/modules/zxing-scanner/zxing-scanner.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/zxing-scanner/zxing-scanner.component.ts b/src/app/modules/zxing-scanner/zxing-scanner.component.ts index 4320ea45..37ad3e17 100644 --- a/src/app/modules/zxing-scanner/zxing-scanner.component.ts +++ b/src/app/modules/zxing-scanner/zxing-scanner.component.ts @@ -422,7 +422,7 @@ export class ZXingScannerComponent implements AfterViewInit, OnDestroy, OnChange * Stops and starts back the scan. */ restartScan(): void { - this.restartScan(); + this.resetScan(); this.startScan(this.device); } From 9125f349770c415585012f210ce5050848a9c290 Mon Sep 17 00:00:00 2001 From: js Date: Thu, 21 Jun 2018 23:30:08 +0200 Subject: [PATCH 02/14] Fixed typo leading to unterminated recursion in restartScan --- src/app/modules/zxing-scanner/zxing-scanner.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/zxing-scanner/zxing-scanner.component.ts b/src/app/modules/zxing-scanner/zxing-scanner.component.ts index 6d0815f8..4d40d5fd 100644 --- a/src/app/modules/zxing-scanner/zxing-scanner.component.ts +++ b/src/app/modules/zxing-scanner/zxing-scanner.component.ts @@ -481,7 +481,7 @@ export class ZXingScannerComponent implements AfterViewInit, OnDestroy, OnChange * Stops and starts back the scan. */ restartScan(): void { - this.restartScan(); + this.resetScan(); this.startScan(this.device); } From 7074de21a3abeeaaec6862a11186b3570f6661b4 Mon Sep 17 00:00:00 2001 From: js Date: Sat, 30 Jun 2018 14:21:17 +0200 Subject: [PATCH 03/14] Added VS Code tasks --- .vscode/tasks.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 44542431..d6331f76 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -12,7 +12,7 @@ }, { "label": "ngserve", - "type":"shell", + "type": "shell", "command": "ng", "args": [ "serve" @@ -35,6 +35,20 @@ } } ] + }, + { + "type": "npm", + "script": "lint", + "problemMatcher": [ + "$eslint-stylish" + ] + }, + { + "type": "npm", + "script": "build:packagr", + "problemMatcher": [ + "$tsc" + ] } ] } From 5fc8806a92cfd0b8cb4a4bdcff4db7e091543e23 Mon Sep 17 00:00:00 2001 From: js Date: Thu, 21 Jun 2018 23:32:01 +0200 Subject: [PATCH 04/14] Add multi format barcode reading support --- README.md | 1 - src/app/app.component.html | 2 +- .../zxing-scanner/browser-code-reader.ts | 7 +++ .../browser-multi-format-reader.ts | 22 ++++++++++ .../zxing-scanner/zxing-scanner.component.ts | 43 +++++++++++++++++-- 5 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 src/app/modules/zxing-scanner/browser-multi-format-reader.ts diff --git a/README.md b/README.md index 219a18fd..9a94c376 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,6 @@ Read our performance notes on the wiki: [Performance Considerations](https://git ## Limitations -- The component relies on [ZXing typescript port](https://github.com/zxing-js/library) which currently supports most common barcode formats, **but we didn't implement them here _yet_**. - On iOS <= 11.2 devices camera access works only in native Safari. **This is limited WebRTC support by Apple.** diff --git a/src/app/app.component.html b/src/app/app.component.html index 7c3e801b..7cebef4f 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -7,7 +7,7 @@ - +