Merge pull request #2101 from arasabbasi/master

refactor context2d, html, some stuff
parallax · Dec 4, 2018 · 4bd7d5c · 4bd7d5c
2 parents 4f9cfb8 + 27b32b3
commit 4bd7d5c
Show file tree

Hide file tree

Showing 42 changed files with 2,740 additions and 2,480 deletions.
diff --git a/build.browser.conf.js b/build.browser.conf.js
@@ -27,7 +27,6 @@ import './src/modules/total_pages';
 import './src/modules/viewerpreferences';
 import './src/modules/xmp_metadata';
 import './src/modules/utf8';
-import './src/modules/bidiEngine.js';
 import './src/modules/vfs';
 
 import './src/deprecated/addhtml.js';
@@ -38,6 +37,7 @@ import './node_modules/cf-blob.js/Blob.js';
 import './node_modules/file-saver/FileSaver.js';
 import './node_modules/omggif/omggif.js';
 import './src/libs/adler32cs.js';
+import './src/libs/bidiEngine.js';
 import './src/libs/JPEGEncoder.js';
 import './src/libs/BMPDecoder.js';
 import './src/libs/Deflater.js';

diff --git a/build.node.conf.js b/build.node.conf.js
@@ -25,10 +25,10 @@ import './src/modules/total_pages';
 import './src/modules/viewerpreferences';
 import './src/modules/xmp_metadata';
 import './src/modules/utf8';
-import './src/modules/bidiEngine.js';
 import './src/modules/vfs';
 
 import './src/libs/adler32cs.js';
+import './src/libs/bidiEngine.js';
 import './src/libs/JPEGEncoder.js';
 import './src/libs/BMPDecoder.js';
 import './src/libs/Deflater.js';
@@ -37,5 +37,4 @@ import './src/libs/ttffont.js';
 import './src/libs/png.js';
 import './src/libs/zlib.js';
 
-
 export default jsPDF;
diff --git a/examples/context2d/test_context2d_paths.html b/examples/context2d/test_context2d_paths.html
@@ -19,16 +19,15 @@
 
 <body style='background-color: silver; margin: 0;'>
 
-<script src="../../jspdf.js"></script>
-<script type="text/javascript" src="../../plugins/standard_fonts_metrics.js"></script>
-<script type="text/javascript" src="../../plugins/split_text_to_size.js"></script>
-<script type="text/javascript" src="../../plugins/context2d.js"></script>
-<script type="text/javascript" src="../../plugins/canvas.js"></script>
-<script type="text/javascript" src="../../plugins/addimage.js"></script>
-<script type="text/javascript" src="../../libs/rgbcolor.js"></script>
-<script type="text/javascript" src="../../libs/canvg_context2d/libs/StackBlur.js"></script>
-<script type="text/javascript" src="../../libs/css_colors.js"></script>
-<script type="text/javascript" src="../../libs/canvg_context2d/canvg.js"></script>
+<script src="../../src/jspdf.js"></script>
+<script type="text/javascript" src="../../src/modules/standard_fonts_metrics.js"></script>
+<script type="text/javascript" src="../../src/modules/split_text_to_size.js"></script>
+<script type="text/javascript" src="../../src/modules/context2d.js"></script>
+<script type="text/javascript" src="../../src/modules/canvas.js"></script>
+<script type="text/javascript" src="../../src/modules/addimage.js"></script>
+<script type="text/javascript" src="../../src/libs/rgbcolor.js"></script>
+<script type="text/javascript" src="../../src/libs/canvg_context2d/libs/StackBlur.js"></script>
+<script type="text/javascript" src="../../src/libs/css_colors.js"></script>
 <script src="../../examples/js/test_harness.js"></script>
 
 <script>

diff --git a/examples/html2pdf/acid2.html b/examples/html2pdf/acid2.html
@@ -97,6 +97,7 @@
     </style>
   <link rel="appendix stylesheet" href="data:text/css,.picture%20%7B%20background%3A%20none%3B%20%7D"> <!-- this stylesheet should be applied by default -->
 
+	<script src="https://html2canvas.hertzen.com/dist/html2canvas.js"></script>
 	<script src='../../dist/jspdf.debug.js'></script>
 	<script>
 	function onLoad() {

diff --git a/examples/html2pdf/total_mess.html b/examples/html2pdf/total_mess.html
@@ -243,6 +243,7 @@ <h2>Div and Span Tests</h2>
 		<p>
 	</div>
 
+	<script src="https://html2canvas.hertzen.com/dist/html2canvas.js"></script>
 		<script src='../../dist/jspdf.debug.js'></script>
     <script>
 

diff --git a/index.html b/index.html
@@ -8,8 +8,7 @@
 		<meta name="author" content="">
 
 		<!-- Bootstrap -->
-		<link href="./examples/bootstrap/css/bootstrap.css" rel="stylesheet">
-		<link href="./examples/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+		<link href="https://stackpath.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 
 		<!-- Editor CSS -->
 		<link href="./examples/css/editor.css" rel="stylesheet">