Skip to content

Commit

Permalink
📦 Release v3.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lindell committed Apr 12, 2017
1 parent 546c59c commit c71f5a5
Show file tree
Hide file tree
Showing 16 changed files with 121 additions and 43 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,15 @@ Download or get the CDN link to the script:

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

### Step 2:
Include the script in your code:
Expand Down
15 changes: 11 additions & 4 deletions bin/help/getRenderProperties.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
value: true
});

var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; /* global HTMLImageElement */
/* global HTMLCanvasElement */
/* global SVGElement */

var _getOptionsFromElement = require("./getOptionsFromElement.js");

var _getOptionsFromElement2 = _interopRequireDefault(_getOptionsFromElement);
Expand Down Expand Up @@ -61,17 +65,20 @@ function getRenderProperties(element) {
};
}
// If canvas (in node)
else if (element.getContext) {
else if (element && element.getContext) {
return {
element: element,
renderer: _renderers2.default.CanvasRenderer
};
} else if (element && (typeof element === "undefined" ? "undefined" : _typeof(element)) === 'object' && !element.nodeName) {
return {
element: element,
renderer: _renderers2.default.ObjectRenderer
};
} else {
throw new _exceptions.InvalidElementException();
}
} /* global HTMLImageElement */
/* global HTMLCanvasElement */
/* global SVGElement */
}

function querySelectedRenderProperties(string) {
var selector = document.querySelectorAll(string);
Expand Down
6 changes: 5 additions & 1 deletion bin/renderers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ var _svg = require('./svg.js');

var _svg2 = _interopRequireDefault(_svg);

var _object = require('./object.js');

var _object2 = _interopRequireDefault(_object);

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

exports.default = { CanvasRenderer: _canvas2.default, SVGRenderer: _svg2.default };
exports.default = { CanvasRenderer: _canvas2.default, SVGRenderer: _svg2.default, ObjectRenderer: _object2.default };
25 changes: 25 additions & 0 deletions bin/renderers/object.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
"use strict";

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

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

var ObjectRenderer = function () {
function ObjectRenderer(object, encodings, options) {
_classCallCheck(this, ObjectRenderer);

this.object = object;
this.encodings = encodings;
this.options = options;
}

ObjectRenderer.prototype.render = function render() {
this.object.encodings = this.encodings;
};

return ObjectRenderer;
}();

exports.default = ObjectRenderer;
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.9",
"version": "3.6.0",
"homepage": "https://github.com/lindell/JsBarcode",
"authors": [
"Johan Lindell <johan@lindell.me>"
Expand Down
58 changes: 50 additions & 8 deletions dist/JsBarcode.all.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
/******/ __webpack_require__.p = "";

/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 41);
/******/ return __webpack_require__(__webpack_require__.s = 42);
/******/ })
/************************************************************************/
/******/ ([
Expand Down Expand Up @@ -912,6 +912,10 @@ Object.defineProperty(exports, "__esModule", {
value: true
});

var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; /* global HTMLImageElement */
/* global HTMLCanvasElement */
/* global SVGElement */

var _getOptionsFromElement = __webpack_require__(37);

var _getOptionsFromElement2 = _interopRequireDefault(_getOptionsFromElement);
Expand Down Expand Up @@ -969,17 +973,20 @@ function getRenderProperties(element) {
};
}
// If canvas (in node)
else if (element.getContext) {
else if (element && element.getContext) {
return {
element: element,
renderer: _renderers2.default.CanvasRenderer
};
} else if (element && (typeof element === "undefined" ? "undefined" : _typeof(element)) === 'object' && !element.nodeName) {
return {
element: element,
renderer: _renderers2.default.ObjectRenderer
};
} else {
throw new _exceptions.InvalidElementException();
}
} /* global HTMLImageElement */
/* global HTMLCanvasElement */
/* global SVGElement */
}

function querySelectedRenderProperties(string) {
var selector = document.querySelectorAll(string);
Expand Down Expand Up @@ -2894,16 +2901,51 @@ var _canvas = __webpack_require__(38);

var _canvas2 = _interopRequireDefault(_canvas);

var _svg = __webpack_require__(40);
var _svg = __webpack_require__(41);

var _svg2 = _interopRequireDefault(_svg);

var _object = __webpack_require__(40);

var _object2 = _interopRequireDefault(_object);

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

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

/***/ },
/* 40 */
/***/ function(module, exports) {

"use strict";
"use strict";

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

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

var ObjectRenderer = function () {
function ObjectRenderer(object, encodings, options) {
_classCallCheck(this, ObjectRenderer);

this.object = object;
this.encodings = encodings;
this.options = options;
}

ObjectRenderer.prototype.render = function render() {
this.object.encodings = this.encodings;
};

return ObjectRenderer;
}();

exports.default = ObjectRenderer;

/***/ },
/* 41 */
/***/ function(module, exports, __webpack_require__) {

"use strict";
Expand Down Expand Up @@ -3086,7 +3128,7 @@ function drawRect(x, y, width, height, parent) {
exports.default = SVGRenderer;

/***/ },
/* 41 */
/* 42 */
/***/ function(module, exports, __webpack_require__) {

"use strict";
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.9",
"version": "3.6.0",
"description": "JsBarcode is a customizable barcode generator with support for multiple barcode formats.",
"main": "./bin/JsBarcode.js",
"directories": {
Expand Down

0 comments on commit c71f5a5

Please sign in to comment.