📦 Release v3.5.4

lindell · Oct 18, 2016 · d0913d7 · d0913d7
1 parent e9531ff
commit d0913d7
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 19 deletions.
diff --git a/bin/barcodes/CODE128/CODE128.js b/bin/barcodes/CODE128/CODE128.js
@@ -57,7 +57,7 @@ var CODE128 = function (_Barcode) {
 		}
 
 		return {
-			text: this.text.replace(/[^\x20-\x7E]/g, ""),
+			text: this.text == this.data ? this.text.replace(/[^\x20-\x7E]/g, "") : this.text,
 			data:
 			// Add the start bits
 			this.getEncoding(startIndex) +

diff --git a/bin/barcodes/EAN_UPC/EAN13.js b/bin/barcodes/EAN_UPC/EAN13.js
@@ -35,8 +35,10 @@ var EAN13 = function (_Barcode) {
 		// Make sure the font is not bigger than the space between the guard bars
 		var _this = _possibleConstructorReturn(this, _Barcode.call(this, data, options));
 
-		if (options.fontSize > options.width * 10) {
+		if (!options.flat && options.fontSize > options.width * 10) {
 			_this.fontSize = options.width * 10;
+		} else {
+			_this.fontSize = options.fontSize;
 		}
 
 		// Make the guard bars go down half the way of the text

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "JsBarcode",
   "main": "dist/JsBarcode.all.min.js",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "homepage": "https://github.com/lindell/JsBarcode",
   "authors": [
     "Johan Lindell <[email protected]>"

diff --git a/dist/JsBarcode.all.js b/dist/JsBarcode.all.js
@@ -320,7 +320,7 @@ var CODE128 = function (_Barcode) {
 		}
 
 		return {
-			text: this.text.replace(/[^\x20-\x7E]/g, ""),
+			text: this.text == this.data ? this.text.replace(/[^\x20-\x7E]/g, "") : this.text,
 			data:
 			// Add the start bits
 			this.getEncoding(startIndex) +
@@ -1407,8 +1407,10 @@ var EAN13 = function (_Barcode) {
 		// Make sure the font is not bigger than the space between the guard bars
 		var _this = _possibleConstructorReturn(this, _Barcode.call(this, data, options));
 
-		if (options.fontSize > options.width * 10) {
+		if (!options.flat && options.fontSize > options.width * 10) {
 			_this.fontSize = options.width * 10;
+		} else {
+			_this.fontSize = options.fontSize;
 		}
 
 		// Make the guard bars go down half the way of the text

diff --git a/dist/JsBarcode.all.min.js b/dist/JsBarcode.all.min.js
diff --git a/dist/barcodes/JsBarcode.codabar.min.js b/dist/barcodes/JsBarcode.codabar.min.js
diff --git a/dist/barcodes/JsBarcode.code128.min.js b/dist/barcodes/JsBarcode.code128.min.js
diff --git a/dist/barcodes/JsBarcode.code39.min.js b/dist/barcodes/JsBarcode.code39.min.js
diff --git a/dist/barcodes/JsBarcode.ean-upc.min.js b/dist/barcodes/JsBarcode.ean-upc.min.js
diff --git a/dist/barcodes/JsBarcode.itf-14.min.js b/dist/barcodes/JsBarcode.itf-14.min.js
diff --git a/dist/barcodes/JsBarcode.itf.min.js b/dist/barcodes/JsBarcode.itf.min.js
diff --git a/dist/barcodes/JsBarcode.msi.min.js b/dist/barcodes/JsBarcode.msi.min.js
diff --git a/dist/barcodes/JsBarcode.pharmacode.min.js b/dist/barcodes/JsBarcode.pharmacode.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsbarcode",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "description": "JsBarcode is a customizable barcode generator with support for multiple barcode formats.",
   "main": "./bin/JsBarcode.js",
   "directories": {