Skip to content

Commit

Permalink
📦 Release v3.5.8
Browse files Browse the repository at this point in the history
  • Loading branch information
lindell committed Jan 16, 2017
1 parent 37e4092 commit c2b4a63
Show file tree
Hide file tree
Showing 17 changed files with 90 additions and 62 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ Download or get the CDN link to the script:

| Name | Supported barcodes | Size (gzip) | CDN / Download |
|------|--------------------|:-----------:|---------------:|
| *All* | *All the barcodes!* | *8.3 kB* | *[JsBarcode.all.min.js][1]* |
| *All* | *All the barcodes!* | *8.4 kB* | *[JsBarcode.all.min.js][1]* |
| CODE128 | CODE128 (auto and force mode) | 5.5 kB | [JsBarcode.code128.min.js][2] |
| CODE39 | CODE39 | 4.6 kB | [JsBarcode.code39.min.js][3] |
| EAN / UPC | EAN-13, EAN-8, EAN-5, EAN-2, UPC (A) | 5.4 kB | [JsBarcode.ean-upc.min.js][4] |
| ITF-14 | ITF-14 | 4.5 kB | [JsBarcode.itf-14.min.js][5] |
| ITF-14 | ITF-14 | 4.4 kB | [JsBarcode.itf-14.min.js][5] |
| ITF | ITF | 4.4 kB | [JsBarcode.itf.min.js][6] |
| MSI | MSI, MSI10, MSI11, MSI1010, MSI1110 | 4.6 kB | [JsBarcode.msi.min.js][7] |
| Pharmacode | Pharmacode | 4.3 kB | [JsBarcode.pharmacode.min.js][8] |
| Codabar | Codabar | 4.5 kB | [JsBarcode.codabar.min.js][9] |
| Codabar | Codabar | 4.4 kB | [JsBarcode.codabar.min.js][9] |

### Step 2:
Include the script in your code:
Expand Down
18 changes: 18 additions & 0 deletions bin/barcodes/CODE128/CODE128.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ var CODE128 = function (_Barcode) {
encodingResult = this.nextB(bytes, 1);
} else if (startIndex === 105) {
encodingResult = this.nextC(bytes, 1);
} else {
throw new InvalidStartCharacterException();
}

return {
Expand Down Expand Up @@ -228,4 +230,20 @@ var CODE128 = function (_Barcode) {
return CODE128;
}(_Barcode3.default);

var InvalidStartCharacterException = function (_Error) {
_inherits(InvalidStartCharacterException, _Error);

function InvalidStartCharacterException() {
_classCallCheck(this, InvalidStartCharacterException);

var _this2 = _possibleConstructorReturn(this, _Error.call(this));

_this2.name = "InvalidStartCharacterException";
_this2.message = "The encoding does not start with a start character.";
return _this2;
}

return InvalidStartCharacterException;
}(Error);

exports.default = CODE128;
10 changes: 6 additions & 4 deletions bin/help/getRenderProperties.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ var _getOptionsFromElement2 = _interopRequireDefault(_getOptionsFromElement);

var _renderers = require("../renderers");

var _renderers2 = _interopRequireDefault(_renderers);

var _exceptions = require("../exceptions/exceptions.js");

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
Expand Down Expand Up @@ -47,22 +49,22 @@ function getRenderProperties(element) {
return {
element: element,
options: (0, _getOptionsFromElement2.default)(element),
renderer: (0, _renderers.getRendererClass)("svg")
renderer: _renderers2.default.SVGRenderer
};
}
// If canvas (in browser)
else if (typeof HTMLCanvasElement !== 'undefined' && element instanceof HTMLCanvasElement) {
return {
element: element,
options: (0, _getOptionsFromElement2.default)(element),
renderer: (0, _renderers.getRendererClass)("canvas")
renderer: _renderers2.default.CanvasRenderer
};
}
// If canvas (in node)
else if (element.getContext) {
return {
element: element,
renderer: (0, _renderers.getRendererClass)("canvas")
renderer: _renderers2.default.CanvasRenderer
};
} else {
throw new _exceptions.InvalidElementException();
Expand All @@ -89,7 +91,7 @@ function newCanvasRenderProperties(imgElement) {
return {
element: canvas,
options: (0, _getOptionsFromElement2.default)(imgElement),
renderer: (0, _renderers.getRendererClass)("canvas"),
renderer: _renderers2.default.CanvasRenderer,
afterRender: function afterRender() {
imgElement.setAttribute("src", canvas.toDataURL());
}
Expand Down
16 changes: 2 additions & 14 deletions bin/renderers/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
'use strict';

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

var _canvas = require('./canvas.js');

Expand All @@ -15,15 +14,4 @@ var _svg2 = _interopRequireDefault(_svg);

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

function getRendererClass(name) {
switch (name) {
case "canvas":
return _canvas2.default;
case "svg":
return _svg2.default;
default:
throw new Error("Invalid rederer");
}
}

exports.getRendererClass = getRendererClass;
exports.default = { CanvasRenderer: _canvas2.default, SVGRenderer: _svg2.default };
8 changes: 7 additions & 1 deletion bin/renderers/shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@ function calculateEncodingAttributes(encodings, barcodeOptions, context) {
var options = (0, _merge2.default)(barcodeOptions, encoding.options);

// Calculate the width of the encoding
var textWidth = messureText(encoding.text, options, context);
var textWidth;
if (options.displayValue) {
textWidth = messureText(encoding.text, options, context);
} else {
textWidth = 0;
}

var barcodeWidth = encoding.data.length * options.width;
encoding.width = Math.ceil(Math.max(textWidth, barcodeWidth));

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "JsBarcode",
"main": "dist/JsBarcode.all.min.js",
"version": "3.5.7",
"version": "3.5.8",
"homepage": "https://github.com/lindell/JsBarcode",
"authors": [
"Johan Lindell <johan@lindell.me>"
Expand Down
52 changes: 33 additions & 19 deletions dist/JsBarcode.all.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ var CODE128 = function (_Barcode) {
encodingResult = this.nextB(bytes, 1);
} else if (startIndex === 105) {
encodingResult = this.nextC(bytes, 1);
} else {
throw new InvalidStartCharacterException();
}

return {
Expand Down Expand Up @@ -491,6 +493,22 @@ var CODE128 = function (_Barcode) {
return CODE128;
}(_Barcode3.default);

var InvalidStartCharacterException = function (_Error) {
_inherits(InvalidStartCharacterException, _Error);

function InvalidStartCharacterException() {
_classCallCheck(this, InvalidStartCharacterException);

var _this2 = _possibleConstructorReturn(this, _Error.call(this));

_this2.name = "InvalidStartCharacterException";
_this2.message = "The encoding does not start with a start character.";
return _this2;
}

return InvalidStartCharacterException;
}(Error);

exports.default = CODE128;

/***/ },
Expand Down Expand Up @@ -709,7 +727,13 @@ function calculateEncodingAttributes(encodings, barcodeOptions, context) {
var options = (0, _merge2.default)(barcodeOptions, encoding.options);

// Calculate the width of the encoding
var textWidth = messureText(encoding.text, options, context);
var textWidth;
if (options.displayValue) {
textWidth = messureText(encoding.text, options, context);
} else {
textWidth = 0;
}

var barcodeWidth = encoding.data.length * options.width;
encoding.width = Math.ceil(Math.max(textWidth, barcodeWidth));

Expand Down Expand Up @@ -894,6 +918,8 @@ var _getOptionsFromElement2 = _interopRequireDefault(_getOptionsFromElement);

var _renderers = __webpack_require__(39);

var _renderers2 = _interopRequireDefault(_renderers);

var _exceptions = __webpack_require__(6);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
Expand Down Expand Up @@ -931,22 +957,22 @@ function getRenderProperties(element) {
return {
element: element,
options: (0, _getOptionsFromElement2.default)(element),
renderer: (0, _renderers.getRendererClass)("svg")
renderer: _renderers2.default.SVGRenderer
};
}
// If canvas (in browser)
else if (typeof HTMLCanvasElement !== 'undefined' && element instanceof HTMLCanvasElement) {
return {
element: element,
options: (0, _getOptionsFromElement2.default)(element),
renderer: (0, _renderers.getRendererClass)("canvas")
renderer: _renderers2.default.CanvasRenderer
};
}
// If canvas (in node)
else if (element.getContext) {
return {
element: element,
renderer: (0, _renderers.getRendererClass)("canvas")
renderer: _renderers2.default.CanvasRenderer
};
} else {
throw new _exceptions.InvalidElementException();
Expand All @@ -973,7 +999,7 @@ function newCanvasRenderProperties(imgElement) {
return {
element: canvas,
options: (0, _getOptionsFromElement2.default)(imgElement),
renderer: (0, _renderers.getRendererClass)("canvas"),
renderer: _renderers2.default.CanvasRenderer,
afterRender: function afterRender() {
imgElement.setAttribute("src", canvas.toDataURL());
}
Expand Down Expand Up @@ -2861,9 +2887,8 @@ exports.default = CanvasRenderer;
'use strict';

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

var _canvas = __webpack_require__(38);

Expand All @@ -2875,18 +2900,7 @@ var _svg2 = _interopRequireDefault(_svg);

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

function getRendererClass(name) {
switch (name) {
case "canvas":
return _canvas2.default;
case "svg":
return _svg2.default;
default:
throw new Error("Invalid rederer");
}
}

exports.getRendererClass = getRendererClass;
exports.default = { CanvasRenderer: _canvas2.default, SVGRenderer: _svg2.default };

/***/ },
/* 40 */
Expand Down
6 changes: 3 additions & 3 deletions dist/JsBarcode.all.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/barcodes/JsBarcode.codabar.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/barcodes/JsBarcode.code128.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/barcodes/JsBarcode.code39.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/barcodes/JsBarcode.ean-upc.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/barcodes/JsBarcode.itf-14.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/barcodes/JsBarcode.itf.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/barcodes/JsBarcode.msi.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/barcodes/JsBarcode.pharmacode.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": "jsbarcode",
"version": "3.5.7",
"version": "3.5.8",
"description": "JsBarcode is a customizable barcode generator with support for multiple barcode formats.",
"main": "./bin/JsBarcode.js",
"directories": {
Expand Down

0 comments on commit c2b4a63

Please sign in to comment.