pdfmake 0.1.56 → 0.1.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.1.56",
+  "version": "0.1.57",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "src/printer.js",
   "browser": "build/pdfmake.js",
@@ -10,19 +10,19 @@
   "dependencies": {
     "iconv-lite": "^0.4.24",
     "linebreak": "^0.3.0",
-    "pdfkit": "^0.9.1"
+    "pdfkit": "^0.10.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.4.4",
+    "@babel/core": "^7.4.5",
     "@babel/plugin-transform-modules-commonjs": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
-    "babel-loader": "^8.0.5",
+    "@babel/preset-env": "^7.4.5",
+    "babel-loader": "^8.0.6",
     "brfs": "^2.0.2",
-    "eslint-plugin-jsdoc": "^4.8.3",
+    "eslint-plugin-jsdoc": "^7.2.3",
     "expose-loader": "^0.7.5",
     "fancy-log": "^1.3.3",
-    "file-saver": "^2.0.1",
-    "gulp": "^4.0.1",
+    "file-saver": "^2.0.2",
+    "gulp": "^4.0.2",
     "gulp-each": "^0.5.0",
     "gulp-eslint": "^5.0.0",
     "gulp-file-contents-to-json": "^0.2.2",
@@ -32,8 +32,8 @@
     "sinon": "^7.3.2",
     "string-replace-webpack-plugin": "^0.1.3",
     "transform-loader": "^0.2.4",
-    "uglifyjs-webpack-plugin": "^2.1.2",
-    "webpack": "^4.30.0"
+    "uglifyjs-webpack-plugin": "^2.1.3",
+    "webpack": "^4.33.0"
   },
   "scripts": {
     "build": "gulp build",

package/src/browser-extensions/pdfMake.js

@@ -2,6 +2,7 @@
 
 var isFunction = require('../helpers').isFunction;
 var isUndefined = require('../helpers').isUndefined;
+var isNull = require('../helpers').isNull;
 var FileSaver = require('file-saver');
 var saveAs = FileSaver.saveAs;
 
@@ -111,6 +112,16 @@ Document.prototype._openPdf = function (options, win) {
 			var urlCreator = window.URL || window.webkitURL;
 			var pdfUrl = urlCreator.createObjectURL(result);
 			win.location.href = pdfUrl;
+
+			/* temporarily disabled
+			if (win !== window) {
+				setTimeout(function () {
+					if (isNull(win.window)) { // is closed by AdBlock
+						window.location.href = pdfUrl; // open in actual window
+					}
+				}, 500);
+			}
+			*/
 		}, options);
 	} catch (e) {
 		win.close();

package/src/documentContext.js

@@ -159,6 +159,15 @@ DocumentContext.prototype.moveTo = function (x, y) {
 	}
 };
 
+DocumentContext.prototype.moveToRelative = function (x, y) {
+	if (x !== undefined && x !== null) {
+		this.x = this.x + x;
+	}
+	if (y !== undefined && y !== null) {
+		this.y = this.y + y;
+	}
+};
+
 DocumentContext.prototype.beginDetachedBlock = function () {
 	this.snapshots.push({
 		x: this.x,

package/src/layoutBuilder.js

@@ -358,7 +358,7 @@ LayoutBuilder.prototype.processNode = function (node) {
 		var relPosition = node.relativePosition;
 		if (relPosition) {
 			self.writer.context().beginDetachedBlock();
-			self.writer.context().moveTo((relPosition.x || 0) + self.writer.context().x, (relPosition.y || 0) + self.writer.context().y);
+			self.writer.context().moveToRelative(relPosition.x || 0, relPosition.y || 0);
 		}
 
 		if (node.stack) {

package/src/printer.js

@@ -391,10 +391,6 @@ function renderLine(line, x, y, pdfKitDoc) {
 		var pageNumber = _pageNodeRef.positions[0].pageNumber.toString();
 
 		inline.text = pageNumber;
-		// TODO: Remove after release new pdfkit version with PR https://github.com/foliojs/pdfkit/pull/947
-		if (typeof pdfKitDoc.addNamedDestination != 'function') {
-			inline.linkToPage = pageNumber;
-		}
 		newWidth = textTools.widthOfString(inline.text, inline.font, inline.fontSize, inline.characterSpacing, inline.fontFeatures);
 		diffWidth = inline.width - newWidth;
 		inline.width = newWidth;