Merge pull request #1593 from arasabbasi/fix_for_637

Fix for 637
parallax · Jan 30, 2018 · efdbc92 · efdbc92
2 parents 2e898a8 + 0e8c6e7
commit efdbc92
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/jspdf.js b/jspdf.js
@@ -1309,10 +1309,10 @@ var jsPDF = (function(global) {
       // through multiplication.
       'scaleFactor': k,
       'pageSize': {
-        get width() {
+        getWidth: function() {
           return pageWidth
         },
-        get height() {
+        getHeight: function() {
           return pageHeight
         }
       },

diff --git a/plugins/acroform.js b/plugins/acroform.js
@@ -669,7 +669,7 @@
                 throw new Error("Exception while creating AcroformDictionary");
             }
             scaleFactor = scope.internal.scaleFactor;
-            pageHeight = scope.internal.pageSize.height;
+            pageHeight = scope.internal.pageSize.getHeight();
 
             // The Object Number of the AcroForm Dictionary
             scope.internal.acroformPlugin.acroFormDictionaryRoot = new AcroFormDictionary();

diff --git a/plugins/addhtml.js b/plugins/addhtml.js
@@ -51,7 +51,7 @@
             callback = function () {};
         }
 
-        var I = this.internal, K = I.scaleFactor, W = I.pageSize.width, H = I.pageSize.height;
+        var I = this.internal, K = I.scaleFactor, W = I.pageSize.getWidth(), H = I.pageSize.getHeight();
 
         options = options || {};
         options.onrendered = function(obj) {

diff --git a/plugins/annotations.js b/plugins/annotations.js
@@ -105,7 +105,7 @@
 		this.internal.write("/Annots [");
 		var f2 = this.annotationPlugin.f2;
 		var k = this.internal.scaleFactor;
-		var pageHeight = this.internal.pageSize.height;
+		var pageHeight = this.internal.pageSize.getHeight();
 		var pageInfo = this.internal.getPageInfo(info.pageNumber);
 		for (var a = 0; a < pageAnnos.length; a++) {
 			var anno = pageAnnos[a];

diff --git a/plugins/cell.js b/plugins/cell.js
@@ -116,7 +116,7 @@
             } else {
                 //New line
                 var margins = this.margins || NO_MARGINS;
-                if ((curCell.y + curCell.h + h + margin) >= this.internal.pageSize.height - margins.bottom) {
+                if ((curCell.y + curCell.h + h + margin) >= this.internal.pageSize.getHeight() - margins.bottom) {
                     this.cellAddPage();
                     pgAdded = true;
                     if (this.printHeaders && this.tableHeaderRow) {
@@ -222,7 +222,7 @@
            fontSize        = 12,
            margins         = NO_MARGINS;
 
-           margins.width = this.internal.pageSize.width;
+           margins.width = this.internal.pageSize.getWidth();
 
         if (config) {
         //override config defaults if the user has specified non-default behavior:

diff --git a/plugins/context2d.js b/plugins/context2d.js
@@ -1366,7 +1366,7 @@
         var includeMove = true;
 
         var k = this.pdf.internal.scaleFactor;
-        var pageHeight = this.pdf.internal.pageSize.height;
+        var pageHeight = this.pdf.internal.pageSize.getHeight();
         var f2 = this.pdf.internal.f2;
 
         var a1r = a1 * (Math.PI / 180);
@@ -1442,7 +1442,7 @@
             end = c2d._matrix_map_point_obj(matrix, end);
 
             var k = this.pdf.internal.scaleFactor;
-            var pageHeight = this.pdf.internal.pageSize.height;
+            var pageHeight = this.pdf.internal.pageSize.getHeight();
             var f2 = this.pdf.internal.f2;
             this.pdf.internal.out([
                 f2((start.x) * k), f2((pageHeight - (start.y)) * k), 'm', f2((pt1.x) * k), f2((pageHeight - (pt1.y)) * k), f2((pt2.x) * k), f2((pageHeight - (pt2.y)) * k), f2((end.x) * k), f2((pageHeight - (end.y)) * k), 'c'
@@ -1462,7 +1462,7 @@
 
     c2d.internal.move2 = function (c2d, x, y) {
         var k = this.pdf.internal.scaleFactor;
-        var pageHeight = this.pdf.internal.pageSize.height;
+        var pageHeight = this.pdf.internal.pageSize.getHeight();
         var f2 = this.pdf.internal.f2;
 
         this.pdf.internal.out([
@@ -1473,7 +1473,7 @@
 
     c2d.internal.line2 = function (c2d, dx, dy) {
         var k = this.pdf.internal.scaleFactor;
-        var pageHeight = this.pdf.internal.pageSize.height;
+        var pageHeight = this.pdf.internal.pageSize.getHeight();
         var f2 = this.pdf.internal.f2;
 
         //var pt = {x: c2d._lastPoint.x + dx, y: c2d._lastPoint.y + dy};

diff --git a/plugins/from_html.js b/plugins/from_html.js
@@ -305,7 +305,7 @@
 			headers[i] = {
 				name : cell.textContent.toLowerCase().replace(/\s+/g, ''),
 				prompt : cell.textContent.replace(/\r?\n/g, ''),
-				width : (cell.clientWidth / table_with) * renderer.pdf.internal.pageSize.width
+				width : (cell.clientWidth / table_with) * renderer.pdf.internal.pageSize.getWidth()
 			};
 			i++;
 		}
@@ -395,7 +395,7 @@
 						cached_image = images[renderer.pdf.sHashCode(url) || url];
 					}
 					if (cached_image) {
-						if ((renderer.pdf.internal.pageSize.height - renderer.pdf.margins_doc.bottom < renderer.y + cn.height) && (renderer.y > renderer.pdf.margins_doc.top)) {
+						if ((renderer.pdf.internal.pageSize.getHeight() - renderer.pdf.margins_doc.bottom < renderer.y + cn.height) && (renderer.y > renderer.pdf.margins_doc.top)) {
 							renderer.pdf.addPage();
 							renderer.y = renderer.pdf.margins_doc.top;
 							//check if we have to set back some values due to e.g. header rendering for new page
@@ -596,7 +596,7 @@
 				//set current y position to old margin
 				var oldPosition = renderer.y;
 				//render all child nodes of the header element
-				renderer.y = renderer.pdf.internal.pageSize.height - renderer.pdf.margins_doc.bottom;
+				renderer.y = renderer.pdf.internal.pageSize.getHeight() - renderer.pdf.margins_doc.bottom;
 				renderer.pdf.margins_doc.bottom -= footerHeight;
 
 				//check if we have to add page numbers
@@ -815,7 +815,7 @@
 		maxLineHeight = 0;
 		defaultFontSize = 12;
 
-		if (this.pdf.internal.pageSize.height - this.pdf.margins_doc.bottom < this.y + this.pdf.internal.getFontSize()) {
+		if (this.pdf.internal.pageSize.getHeight() - this.pdf.margins_doc.bottom < this.y + this.pdf.internal.getFontSize()) {
 			this.pdf.internal.write("ET", "Q");
 			this.pdf.addPage();
 			this.y = this.pdf.margins_doc.top;

diff --git a/plugins/outline.js b/plugins/outline.js
@@ -187,9 +187,9 @@
 								// Explicit Destination
 								//WARNING this assumes page ids are 3,5,7, etc.
 								var info = pdf.internal.getPageInfo(item.options.pageNumber)
-								this.line('/Dest ' + '[' + info.objId + ' 0 R /XYZ 0 ' + this.ctx.pdf.internal.pageSize.height*this.ctx.pdf.internal.scaleFactor + ' 0]');
+								this.line('/Dest ' + '[' + info.objId + ' 0 R /XYZ 0 ' + this.ctx.pdf.internal.pageSize.getHeight()*this.ctx.pdf.internal.scaleFactor + ' 0]');
 								// this line does not work on all clients (pageNumber instead of page ref)
-								//this.line('/Dest ' + '[' + (item.options.pageNumber - 1) + ' /XYZ 0 ' + this.ctx.pdf.internal.pageSize.height + ' 0]');
+								//this.line('/Dest ' + '[' + (item.options.pageNumber - 1) + ' /XYZ 0 ' + this.ctx.pdf.internal.pageSize.getHeight() + ' 0]');
 
 								// Named Destination
 								// this.line('/Dest (page_' + (item.options.pageNumber) + ')');