Build and fix conflicts

Author: MrRio

bower.json.bak

@@ -12,8 +12,8 @@
 
   /** @preserve
    * jsPDF - PDF Document creation from JavaScript
-   * Version 1.2.61 Built on 2016-09-21T03:47:23.229Z
-   *                           CommitID 811fbb2f6a
+   * Version 1.2.61 Built on 2016-09-25T19:47:26.050Z
+   *                           CommitID 68baeff299
    *
    * Copyright (c) 2010-2014 James Hall <[email protected]>, https://github.com/MrRio/jsPDF
    *               2010 Aaron Spike, https://github.com/acspike
@@ -2029,7 +2029,7 @@
        * pdfdoc.mymethod() // <- !!!!!!
        */
       jsPDF.API = { events: [] };
-      jsPDF.version = "1.2.61 2016-09-21T03:47:23.229Z:albert";
+      jsPDF.version = "1.2.61 2016-09-25T19:47:26.050Z:jameshall";
 
       if (typeof define === 'function' && define.amd) {
           define('jsPDF', function () {
@@ -2713,9 +2713,9 @@ Q\n";
        */
       createDefaultAppearanceStream: function createDefaultAppearanceStream(formObject) {
           var stream = "";
-          // Set Helvetica to Standard Font (12px)
+          // Set Helvetica to Standard Font (size: auto)
           // Color: Black
-          stream += "/Helv 12 Tf 0 g";
+          stream += "/Helv 0 Tf 0 g";
           return stream;
       }
   };

dist/jspdf.debug.js

@@ -3,4 +3,4 @@ doc.setFontSize(22);
 doc.text(20, 20, 'This is a title');
 
 doc.setFontSize(16);
-doc.text(20, 30, 'This is some normal sized text underneath.');
+doc.text(20, 30, 'This is some normal sized text underneath.');

dist/jspdf.min.js

@@ -142,12 +142,12 @@ <h2>License</h2>
 		<footer>&copy; 2016 James Hall - <a href="https://parall.ax/pages/privacy-policy">Privacy Policy</a></footer>
 
 		<!-- Scripts down here -->
-		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+		<script   src="https://code.jquery.com/jquery-3.1.1.min.js"   integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="   crossorigin="anonymous"></script>
 		<script src="http://html2canvas.hertzen.com/build/html2canvas.js"></script>
 
 		<!-- Code editor -->
 
-		<script src="https://cdn.jsdelivr.net/ace/1.1.01/noconflict/ace.js" type="text/javascript" charset="utf-8"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.5/ace.js" type="text/javascript" charset="utf-8"></script>
 
 		<!-- Scripts in development mode -->
 		<script type="text/javascript" src="dist/jspdf.debug.js"></script>

examples/js/autoprint.js

@@ -0,0 +1,45 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'start' ]
+2 info using [email protected]
+3 info using [email protected]
+4 verbose run-script [ 'prestart', 'start', 'poststart' ]
+5 info lifecycle [email protected]~prestart: [email protected]
+6 silly lifecycle [email protected]~prestart: no script for prestart, continuing
+7 info lifecycle [email protected]~start: [email protected]
+8 verbose lifecycle [email protected]~start: unsafe-perm in lifecycle true
+9 verbose lifecycle [email protected]~start: PATH: /usr/local/lib/node_modules/npm/bin/node-gyp-bin:/Users/jameshall/Code/jsPDF/node_modules/.bin:/Library/Frameworks/Python.framework/Versions/3.5/bin:~/.composer/vendor/bin:/Library/Frameworks/Python.framework/Versions/2.7/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
+10 verbose lifecycle [email protected]~start: CWD: /Users/jameshall/Code/jsPDF
+11 silly lifecycle [email protected]~start: Args: [ '-c', 'ws' ]
+12 silly lifecycle [email protected]~start: Returned: code: 1  signal: null
+13 info lifecycle [email protected]~start: Failed to exec start script
+14 verbose stack Error: [email protected] start: `ws`
+14 verbose stack Exit status 1
+14 verbose stack     at EventEmitter.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:255:16)
+14 verbose stack     at emitTwo (events.js:87:13)
+14 verbose stack     at EventEmitter.emit (events.js:172:7)
+14 verbose stack     at ChildProcess.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:40:14)
+14 verbose stack     at emitTwo (events.js:87:13)
+14 verbose stack     at ChildProcess.emit (events.js:172:7)
+14 verbose stack     at maybeClose (internal/child_process.js:827:16)
+14 verbose stack     at Process.ChildProcess._handle.onexit (internal/child_process.js:211:5)
+15 verbose pkgid [email protected]
+16 verbose cwd /Users/jameshall/Code/jsPDF
+17 error Darwin 15.6.0
+18 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "start"
+19 error node v4.4.7
+20 error npm  v3.10.6
+21 error code ELIFECYCLE
+22 error [email protected] start: `ws`
+22 error Exit status 1
+23 error Failed at the [email protected] start script 'ws'.
+23 error Make sure you have the latest version of node.js and npm installed.
+23 error If you do, this is most likely a problem with the jspdf package,
+23 error not with npm itself.
+23 error Tell the author that this fails on your system:
+23 error     ws
+23 error You can get information on how to open an issue for this project with:
+23 error     npm bugs jspdf
+23 error Or if that isn't available, you can get their info via:
+23 error     npm owner ls jspdf
+23 error There is likely additional logging output above.
+24 verbose exit [ 1, true ]

examples/js/editor.js

@@ -3,9 +3,9 @@
   "version": "1.2.61",
   "homepage": "https://github.com/mrrio/jspdf",
   "description": "PDF Document creation from JavaScript",
-  "main": "dist/jspdf.min.js",
+  "main": "dist/jspdf.debug.js",
   "files": [
-    "dist/jspdf.min.js",
+    "dist/jspdf.debug.js",
     "README.md"
   ],
   "keywords": [

examples/js/font-size.js

@@ -677,9 +677,9 @@ Q\n";
      */
     createDefaultAppearanceStream: function (formObject) {
         var stream = "";
-        // Set Helvetica to Standard Font (12px)
+        // Set Helvetica to Standard Font (size: auto)
         // Color: Black
-        stream += "/Helv 12 Tf 0 g";
+        stream += "/Helv 0 Tf 0 g";
         return stream;
     }
 };