Skip to content

Commit

Permalink
Fully included zxing-typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
David Werth committed Nov 10, 2017
1 parent 4d3939e commit 11e73e6
Show file tree
Hide file tree
Showing 80 changed files with 12,262 additions and 20 deletions.
9 changes: 0 additions & 9 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@ gulp.task('copy:source', function () {
.pipe(gulp.dest(tmpFolder));
});

/**
* 2.5. Copy zxing-typescript source files for compilation
*/
gulp.task('copy:source:lib', function () {
return gulp.src([`node_modules/zxing-typescript/src/**/*`])
.pipe(gulp.dest(`${tmpFolder}/zxing-typescript/src/`));
});

/**
* 3. Inline template (.html) and style (.css) files into the the component .ts files.
* We do this on the /.tmp folder to avoid editing the original /src files
Expand Down Expand Up @@ -195,7 +187,6 @@ gulp.task('compile', function () {
runSequence(
'clean:dist',
'copy:source',
'copy:source:lib',
'inline-resources',
'ngc',
'rollup:fesm',
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-zxing",
"version": "0.1.5",
"version": "0.2.0",
"scripts": {
"build": "gulp build",
"build:watch": "gulp",
Expand Down Expand Up @@ -39,6 +39,7 @@
"@compodoc/compodoc": "^1.0.0-beta.10",
"@types/jasmine": "2.5.38",
"@types/node": "~6.0.60",
"@types/text-encoding": "0.0.30",
"angular-in-memory-web-api": "^0.3.2",
"codelyzer": "~2.0.0",
"concurrently": "^3.4.0",
Expand All @@ -64,6 +65,7 @@
"run-sequence": "^1.2.2",
"rxjs": "^5.1.0",
"systemjs": "^0.20.12",
"text-encoding": "^0.6.4",
"ts-node": "~2.0.0",
"tslint": "~4.5.0",
"typescript": "~2.2.0",
Expand Down
15 changes: 7 additions & 8 deletions src/browser-qr-code-reader-ext.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import Reader from "zxing-typescript/src/core/Reader";
import BinaryBitmap from "zxing-typescript/src/core/BinaryBitmap";
import HybridBinarizer from "zxing-typescript/src/core/common/HybridBinarizer";
import Result from "zxing-typescript/src/core/Result";
import Exception from "zxing-typescript/src/core/Exception";
import HTMLCanvasElementLuminanceSource from "zxing-typescript/src/browser/HTMLCanvasElementLuminanceSource";
import QRCodeReader from "zxing-typescript/src/core/qrcode/QRCodeReader";

import Reader from "./zxing-typescript/src/core/Reader";
import BinaryBitmap from "./zxing-typescript/src/core/BinaryBitmap";
import HybridBinarizer from "./zxing-typescript/src/core/common/HybridBinarizer";
import Result from "./zxing-typescript/src/core/Result";
import Exception from "./zxing-typescript/src/core/Exception";
import HTMLCanvasElementLuminanceSource from "./zxing-typescript/src/browser/HTMLCanvasElementLuminanceSource";
import QRCodeReader from "./zxing-typescript/src/core/qrcode/QRCodeReader";

/**
* Based on Zxing-typescript BrowserCodeReader
Expand Down
5 changes: 3 additions & 2 deletions src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-zxing",
"version": "0.1.5",
"version": "0.2.0",
"repository": {
"type": "git",
"url": "https://github.com/werthdavid/ngx-zxing"
Expand Down Expand Up @@ -30,6 +30,7 @@
"peerDependencies": {
"@angular/core": "^4.0.0",
"rxjs": "^5.1.0",
"zone.js": "^0.8.4"
"zone.js": "^0.8.4",
"text-encoding": "^0.6.4"
}
}
Loading

0 comments on commit 11e73e6

Please sign in to comment.