Merge pull request #727 from renuo/master

Fix #725: Acroform elements always on last page

Author: MrRio

jspdf.js

@@ -260,7 +260,7 @@ var jsPDF = (function (global) {
                 out('endstream');
             },
             putPages = function () {
-                var n, p, arr, i, deflater, adler32, adler32cs, wPt, hPt;
+                var n, p, arr, i, deflater, adler32, adler32cs, wPt, hPt, pageObjectNumbers = [];
 
                 adler32cs = global.adler32cs || jsPDF.adler32cs;
                 if (compress && typeof adler32cs === 'undefined') {
@@ -270,7 +270,7 @@ var jsPDF = (function (global) {
                 // outToPages = false as set in endDocument(). out() writes to content.
 
                 for (n = 1; n <= page; n++) {
-                    newObject();
+                    pageObjectNumbers.push(newObject());
                     wPt = (pageWidth = pagedim[n].width) * k;
                     hPt = (pageHeight = pagedim[n].height) * k;
                     out('<</Type /Page');
@@ -313,7 +313,7 @@ var jsPDF = (function (global) {
                 out('<</Type /Pages');
                 var kids = '/Kids [';
                 for (i = 0; i < page; i++) {
-                    kids += (3 + 2 * i) + ' 0 R ';
+                    kids += pageObjectNumbers[i] + ' 0 R ';
                 }
                 out(kids + ']');
                 out('/Count ' + page);

plugins/acroform.js

@@ -80,7 +80,7 @@
             type: 'reference',
             object: object
         };
-        jsPDF.API.annotationPlugin.annotations[this.internal.getCurrentPageInfo().pageNumber].push(options);
+        jsPDF.API.annotationPlugin.annotations[this.internal.getPageInfo(object.page).pageNumber].push(options);
     };
 
     var putForm = function (formObject) {
@@ -245,6 +245,7 @@
             // try to put..
             putForm.call(this, fieldObject);
         }
+        fieldObject.page = this.acroformPlugin.internal.getCurrentPageInfo().pageNumber;
         return this;
     };
 
@@ -1050,6 +1051,12 @@ AcroForm.Field = function () {
         configurable: true,
         writable: true
     });
+
+    Object.defineProperty(this, 'page', {
+        enumerable: false,
+        configurable: true,
+        writable: true
+    });
 };
 AcroForm.Field.FieldNum = 0;