Skip to content

Commit 3c73b6b

Browse files
MrRioMrRio
committed
Merge
2 parents 925dfe8 + 35a9bbd commit 3c73b6b

28 files changed

+22672
-16161
lines changed

‎bower.json.bak‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎dist/jspdf.debug.js‎

Lines changed: 15996 additions & 15149 deletions
Large diffs are not rendered by default.

‎dist/jspdf.min.js‎

Lines changed: 162 additions & 157 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/basic.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ <h2><a href="#">Draw example: rectangles / squares</a></h2>
392392

393393
doc.setDrawColor(0);
394394
doc.setFillColor(255, 255, 255);
395-
doc.roundedRect(140, 20, 10, 10, 3, 3, 'FD'); // Black sqaure with rounded corners
395+
doc.roundedRect(140, 20, 10, 10, 3, 3, 'FD'); // Black square with rounded corners
396396

397397
doc.save('Test.pdf');</pre>
398398
<a href="javascript:demoRectangles()" class="button">Run Code</a></p></div>

‎examples/canvg_context2d/bar_graph_with_text_and_lines.html‎

Lines changed: 685 additions & 0 deletions
Large diffs are not rendered by default.

‎examples/downloadify.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<body onload="load()">
1313
<h1>jsPDF Downloadify Example</h1>
1414

15-
<p>This is an example of jsPDF using <a href="http://www.downloadify.info/">Downloadify</a>. This works in all major browsers.</p>
15+
<p>This is an example of jsPDF using <a href="https://github.com/dcneiner/Downloadify">Downloadify</a>. This works in all major browsers.</p>
1616

1717
<p id="downloadify">
1818
You must have Flash 10 installed to download this file.
@@ -42,4 +42,4 @@ <h1>jsPDF Downloadify Example</h1>
4242
}
4343
</script>
4444
</body>
45-
</html>
45+
</html>

‎examples/images.html‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@
99
<meta name="description" content="">
1010

1111
<script src='js/jquery/jquery-1.7.1.min.js' type='text/javascript'></script>
12-
<script src='../libs/Blob.js/Blob.js' type='text/javascript'></script>
13-
<script src='../libs/FileSaver.js/FileSaver.js' type='text/javascript'></script>
12+
<!--<script src='../libs/Blob.js/Blob.js' type='text/javascript'></script>-->
13+
<!--<script src='../libs/FileSaver.js/FileSaver.js' type='text/javascript'></script>-->
1414

1515
<script src='../libs/png_support/zlib.js' type='text/javascript'></script>
1616
<script src='../libs/png_support/png.js' type='text/javascript'></script>
1717

18-
<script src='../libs/Deflate/deflate.js' type='text/javascript'></script>
18+
<script src='../libs/deflate.js' type='text/javascript'></script>
1919

20-
<script src='../jspdf.js' type='text/javascript'></script>
21-
<script src='../jspdf.plugin.addimage.js' type='text/javascript'></script>
22-
<script src='../jspdf.plugin.png_support.js' type='text/javascript'></script>
20+
<script src='../dist/jspdf.debug.js' type='text/javascript'></script>
2321

2422
<style>
2523
body {
@@ -156,4 +154,4 @@
156154

157155
</body>
158156

159-
</html>
157+
</html>

‎examples/js/autoprint.js‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/js/basic.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ function demoRectangles() {
140140

141141
doc.setDrawColor(0);
142142
doc.setFillColor(255, 255, 255);
143-
doc.roundedRect(140, 20, 10, 10, 3, 3, 'FD'); // Black sqaure with rounded corners
143+
doc.roundedRect(140, 20, 10, 10, 3, 3, 'FD'); // Black square with rounded corners
144144

145145
doc.save('Test.pdf');
146146
}

‎examples/js/editor.js‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)