Skip to content

Commit

Permalink
📦 Release v3.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@lindell
lindell committed Sep 2, 2018
1 parent e84054e commit f5d4c85
Show file tree
Hide file tree
Showing 19 changed files with 307 additions and 405 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Download or get the CDN link to the script:
| CODE128 | CODE128 (auto and force mode) | 6.1 kB | [JsBarcode.code128.min.js][2] |
| CODE39 | CODE39 | 5 kB | [JsBarcode.code39.min.js][3] |
| EAN / UPC | EAN-13, EAN-8, EAN-5, EAN-2, UPC (A) | 6.5 kB | [JsBarcode.ean-upc.min.js][4] |
| ITF | ITF, ITF-14 | 4.7 kB | [JsBarcode.itf.min.js][5] |
| ITF | ITF, ITF-14 | 4.9 kB | [JsBarcode.itf.min.js][5] |
| MSI | MSI, MSI10, MSI11, MSI1010, MSI1110 | 4.9 kB | [JsBarcode.msi.min.js][6] |
| Pharmacode | Pharmacode | 4.6 kB | [JsBarcode.pharmacode.min.js][7] |
| Codabar | Codabar | 4.8 kB | [JsBarcode.codabar.min.js][8] |
Expand Down
93 changes: 26 additions & 67 deletions bin/barcodes/ITF14/index.js → bin/barcodes/ITF/ITF.js
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
"use strict";
'use strict';

Object.defineProperty(exports, "__esModule", {
value: true
});
exports.ITF14 = undefined;

var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();

var _Barcode2 = require("../Barcode.js");
var _constants = require('./constants');

var _Barcode2 = require('../Barcode');

var _Barcode3 = _interopRequireDefault(_Barcode2);

Expand All @@ -19,92 +20,50 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen

function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

var ITF14 = function (_Barcode) {
_inherits(ITF14, _Barcode);

function ITF14(data, options) {
_classCallCheck(this, ITF14);
var ITF = function (_Barcode) {
_inherits(ITF, _Barcode);

// Add checksum if it does not exist
if (data.search(/^[0-9]{13}$/) !== -1) {
data += checksum(data);
}
function ITF() {
_classCallCheck(this, ITF);

var _this = _possibleConstructorReturn(this, (ITF14.__proto__ || Object.getPrototypeOf(ITF14)).call(this, data, options));

_this.binaryRepresentation = {
"0": "00110",
"1": "10001",
"2": "01001",
"3": "11000",
"4": "00101",
"5": "10100",
"6": "01100",
"7": "00011",
"8": "10010",
"9": "01010"
};
return _this;
return _possibleConstructorReturn(this, (ITF.__proto__ || Object.getPrototypeOf(ITF)).apply(this, arguments));
}

_createClass(ITF14, [{
key: "valid",
_createClass(ITF, [{
key: 'valid',
value: function valid() {
return this.data.search(/^[0-9]{14}$/) !== -1 && this.data[13] == checksum(this.data);
return this.data.search(/^([0-9]{2})+$/) !== -1;
}
}, {
key: "encode",
key: 'encode',
value: function encode() {
var result = "1010";
var _this2 = this;

// Calculate all the digit pairs
for (var i = 0; i < 14; i += 2) {
result += this.calculatePair(this.data.substr(i, 2));
}

// Always add the same end bits
result += "11101";
var encoded = this.data.match(/.{2}/g).map(function (pair) {
return _this2.encodePair(pair);
}).join('');

return {
data: result,
data: _constants.START_BIN + encoded + _constants.END_BIN,
text: this.text
};
}

// Calculate the data of a number pair

}, {
key: "calculatePair",
value: function calculatePair(numberPair) {
var result = "";

var number1Struct = this.binaryRepresentation[numberPair[0]];
var number2Struct = this.binaryRepresentation[numberPair[1]];

// Take every second bit and add to the result
for (var i = 0; i < 5; i++) {
result += number1Struct[i] == "1" ? "111" : "1";
result += number2Struct[i] == "1" ? "000" : "0";
}
key: 'encodePair',
value: function encodePair(pair) {
var second = _constants.BINARIES[pair[1]];

return result;
return _constants.BINARIES[pair[0]].split('').map(function (first, idx) {
return (first === '1' ? '111' : '1') + (second[idx] === '1' ? '000' : '0');
}).join('');
}
}]);

return ITF14;
return ITF;
}(_Barcode3.default);

// Calulate the checksum digit


function checksum(data) {
var result = 0;

for (var i = 0; i < 13; i++) {
result += parseInt(data[i]) * (3 - i % 2 * 2);
}

return Math.ceil(result / 10) * 10 - result;
}

exports.ITF14 = ITF14;
exports.default = ITF;
55 changes: 55 additions & 0 deletions bin/barcodes/ITF/ITF14.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
'use strict';

Object.defineProperty(exports, "__esModule", {
value: true
});

var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();

var _ITF2 = require('./ITF');

var _ITF3 = _interopRequireDefault(_ITF2);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }

function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

// Calculate the checksum digit
var checksum = function checksum(data) {
var res = data.substr(0, 13).split('').map(function (num) {
return parseInt(num, 10);
}).reduce(function (sum, n, idx) {
return sum + n * (3 - idx % 2 * 2);
}, 0);

return Math.ceil(res / 10) * 10 - res;
};

var ITF14 = function (_ITF) {
_inherits(ITF14, _ITF);

function ITF14(data, options) {
_classCallCheck(this, ITF14);

// Add checksum if it does not exist
if (data.search(/^[0-9]{13}$/) !== -1) {
data += checksum(data);
}
return _possibleConstructorReturn(this, (ITF14.__proto__ || Object.getPrototypeOf(ITF14)).call(this, data, options));
}

_createClass(ITF14, [{
key: 'valid',
value: function valid() {
return this.data.search(/^[0-9]{14}$/) !== -1 && +this.data[13] === checksum(this.data);
}
}]);

return ITF14;
}(_ITF3.default);

exports.default = ITF14;
9 changes: 9 additions & 0 deletions bin/barcodes/ITF/constants.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use strict';

Object.defineProperty(exports, "__esModule", {
value: true
});
var START_BIN = exports.START_BIN = '1010';
var END_BIN = exports.END_BIN = '11101';

var BINARIES = exports.BINARIES = ['00110', '10001', '01001', '11000', '00101', '10100', '01100', '00011', '10010', '01010'];
94 changes: 10 additions & 84 deletions bin/barcodes/ITF/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,19 @@
"use strict";
'use strict';

Object.defineProperty(exports, "__esModule", {
value: true
value: true
});
exports.ITF = undefined;
exports.ITF14 = exports.ITF = undefined;

var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
var _ITF = require('./ITF');

var _Barcode2 = require("../Barcode.js");
var _ITF2 = _interopRequireDefault(_ITF);

var _Barcode3 = _interopRequireDefault(_Barcode2);
var _ITF3 = require('./ITF14');

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }

function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

var ITF = function (_Barcode) {
_inherits(ITF, _Barcode);

function ITF(data, options) {
_classCallCheck(this, ITF);

var _this = _possibleConstructorReturn(this, (ITF.__proto__ || Object.getPrototypeOf(ITF)).call(this, data, options));

_this.binaryRepresentation = {
"0": "00110",
"1": "10001",
"2": "01001",
"3": "11000",
"4": "00101",
"5": "10100",
"6": "01100",
"7": "00011",
"8": "10010",
"9": "01010"
};
return _this;
}

_createClass(ITF, [{
key: "valid",
value: function valid() {
return this.data.search(/^([0-9]{2})+$/) !== -1;
}
}, {
key: "encode",
value: function encode() {
// Always add the same start bits
var result = "1010";
var _ITF4 = _interopRequireDefault(_ITF3);

// Calculate all the digit pairs
for (var i = 0; i < this.data.length; i += 2) {
result += this.calculatePair(this.data.substr(i, 2));
}

// Always add the same end bits
result += "11101";

return {
data: result,
text: this.text
};
}

// Calculate the data of a number pair

}, {
key: "calculatePair",
value: function calculatePair(numberPair) {
var result = "";

var number1Struct = this.binaryRepresentation[numberPair[0]];
var number2Struct = this.binaryRepresentation[numberPair[1]];

// Take every second bit and add to the result
for (var i = 0; i < 5; i++) {
result += number1Struct[i] == "1" ? "111" : "1";
result += number2Struct[i] == "1" ? "000" : "0";
}

return result;
}
}]);

return ITF;
}(_Barcode3.default);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

exports.ITF = ITF;
exports.ITF = _ITF2.default;
exports.ITF14 = _ITF4.default;
6 changes: 2 additions & 4 deletions bin/barcodes/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ var _CODE2 = require('./CODE128/');

var _EAN_UPC = require('./EAN_UPC/');

var _ITF = require('./ITF14/');

var _ITF2 = require('./ITF/');
var _ITF = require('./ITF/');

var _MSI = require('./MSI/');

Expand All @@ -27,7 +25,7 @@ exports.default = {
CODE128: _CODE2.CODE128, CODE128A: _CODE2.CODE128A, CODE128B: _CODE2.CODE128B, CODE128C: _CODE2.CODE128C,
EAN13: _EAN_UPC.EAN13, EAN8: _EAN_UPC.EAN8, EAN5: _EAN_UPC.EAN5, EAN2: _EAN_UPC.EAN2, UPC: _EAN_UPC.UPC, UPCE: _EAN_UPC.UPCE,
ITF14: _ITF.ITF14,
ITF: _ITF2.ITF,
ITF: _ITF.ITF,
MSI: _MSI.MSI, MSI10: _MSI.MSI10, MSI11: _MSI.MSI11, MSI1010: _MSI.MSI1010, MSI1110: _MSI.MSI1110,
pharmacode: _pharmacode.pharmacode,
codabar: _codabar.codabar,
Expand Down
6 changes: 2 additions & 4 deletions bin/barcodes/index.tmp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ var _CODE2 = require('./CODE128/');

var _EAN_UPC = require('./EAN_UPC/');

var _ITF = require('./ITF14/');

var _ITF2 = require('./ITF/');
var _ITF = require('./ITF/');

var _MSI = require('./MSI/');

Expand All @@ -27,7 +25,7 @@ exports.default = {
CODE128: _CODE2.CODE128, CODE128A: _CODE2.CODE128A, CODE128B: _CODE2.CODE128B, CODE128C: _CODE2.CODE128C,
EAN13: _EAN_UPC.EAN13, EAN8: _EAN_UPC.EAN8, EAN5: _EAN_UPC.EAN5, EAN2: _EAN_UPC.EAN2, UPC: _EAN_UPC.UPC, UPCE: _EAN_UPC.UPCE,
ITF14: _ITF.ITF14,
ITF: _ITF2.ITF,
ITF: _ITF.ITF,
MSI: _MSI.MSI, MSI10: _MSI.MSI10, MSI11: _MSI.MSI11, MSI1010: _MSI.MSI1010, MSI1110: _MSI.MSI1110,
pharmacode: _pharmacode.pharmacode,
codabar: _codabar.codabar,
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "JsBarcode",
"main": "dist/JsBarcode.all.min.js",
"version": "3.9.0",
"version": "3.11.0",
"homepage": "https://github.com/lindell/JsBarcode",
"authors": [
"Johan Lindell <[email protected]>"
Expand Down
Loading

0 comments on commit f5d4c85

Please sign in to comment.