Skip to content

Commit

Permalink
Merge pull request #17 from zxing-js/develop
Browse files Browse the repository at this point in the history
Code 128 Release
  • Loading branch information
odahcam authored Apr 27, 2018
2 parents d83b8ab + 1ef9ee8 commit d4e5e17
Show file tree
Hide file tree
Showing 42 changed files with 3,911 additions and 3,658 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,12 @@ insert_final_newline = true

[*.md]
trim_trailing_whitespace = false

[*.txt]
insert_final_newline = false

[*.json]
insert_final_newline = false

[*.xml]
insert_final_newline = false
16 changes: 16 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"parserOptions": {
"ecmaVersion": 8,
"sourceType": "module",
"ecmaFeatures": {
"jsx": false
}
},
"rules": {
"semi": "error",
"quotes": ["error", "single"]
},
"env": {
"es6": true
}
}
12 changes: 12 additions & 0 deletions .unibeautify.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"JavaScript": {
"indent_size": 4,
"indent_char": " ",
"quotes": "single"
},
"TypeScript": {
"indent_size": 4,
"indent_char": " ",
"quotes": "single"
}
}
8 changes: 8 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"recommendations": [
"EditorConfig.EditorConfig",
"eg2.tslint",
"dbaeumer.vscode-eslint",
"Glavin001.unibeautify-vscode"
]
}
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
{
"tslint.enable": true,
"autoimport.doubleQuotes": false,
"autoimport.spaceBetweenBraces": true
"autoimport.spaceBetweenBraces": true,
"jshint.enable" : false
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Multi-format 1D/2D barcode image processing library.
| ---------- | ------------------------ | --------------
| ~UPC-A~ | ~Code 39~ | QR Code
| ~UPC-E~ | ~Code 93~ | ~Data Matrix~
| ~EAN-8~ | Code 128 (_in-progress_) | ~Aztec (beta)~
| ~EAN-8~ | Code 128 (_no docs_) | ~Aztec (beta)~
| ~EAN-13~ | ~Codabar~ | PDF 417 (_in-progress_)
| | ~ITF~ | ~MaxiCode~
| | ~RSS-14~ |
Expand Down
5 changes: 3 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
*
* @see https://karma-runner.github.io/0.13/config/configuration-file.html
*/
const path = require('path');
import * as path from 'path';

const ROOT = path.resolve(__dirname, '.');

function rootPath() {
Expand All @@ -12,7 +13,7 @@ function rootPath() {
);
}

module.exports = function (config) {
export default function (config) {
config.set({

basePath: '',
Expand Down
Loading

0 comments on commit d4e5e17

Please sign in to comment.