Skip to content

Commit 33aab14

Browse files
MrRioMrRio
committed
Merge and resolve conflicts
2 parents f1447de + e1d0b90 commit 33aab14

20 files changed

+22578
-16114
lines changed

‎bower.json.bak‎

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

‎dist/jspdf.debug.js‎

Lines changed: 15970 additions & 15144 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/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/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/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.

‎examples/js/font-faces.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,15 @@ doc.text(20, 50, 'This is helvetica bold.');
1616

1717
doc.setFont("courier");
1818
doc.setFontType("bolditalic");
19-
doc.text(20, 60, 'This is courier bolditalic.');
19+
doc.text(20, 60, 'This is courier bolditalic.');
20+
21+
doc.setFont("times");
22+
doc.setFontType("normal");
23+
doc.text(105, 80, 'This is centred text.', null, null, 'center');
24+
doc.text(105, 90, 'And a little bit more underneath it.', null, null, 'center');
25+
doc.text(200, 100, 'This is right aligned text', null, null, 'right');
26+
doc.text(200, 110, 'And some more', null, null, 'right');
27+
doc.text(20, 120, 'Back to left');
28+
29+
doc.text(20, 140, '10 degrees rotated', null, 10);
30+
doc.text(20, 160, '-10 degrees rotated', null, -10);

‎examples/js/font-size.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ doc.setFontSize(22);
33
doc.text(20, 20, 'This is a title');
44

55
doc.setFontSize(16);
6-
doc.text(20, 30, 'This is some normal sized text underneath.');
6+
doc.text(20, 30, 'This is some normal sized text underneath.');

‎index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@ <h2>License</h2>
142142
<footer>&copy; 2016 James Hall - <a href="https://parall.ax/pages/privacy-policy">Privacy Policy</a></footer>
143143

144144
<!-- Scripts down here -->
145-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
145+
<script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
146146
<script src="http://html2canvas.hertzen.com/build/html2canvas.js"></script>
147147

148148
<!-- Code editor -->
149149

150-
<script src="https://cdn.jsdelivr.net/ace/1.1.01/noconflict/ace.js" type="text/javascript" charset="utf-8"></script>
150+
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.5/ace.js" type="text/javascript" charset="utf-8"></script>
151151

152152
<!-- Scripts in development mode -->
153153
<script type="text/javascript" src="dist/jspdf.debug.js"></script>

0 commit comments

Comments
 (0)