Skip to content

Commit b8b88a7

Browse files
MrRioMrRio
committed
Update docs, change all examples to use new .save() API
1 parent d9adb08 commit b8b88a7

2 files changed

Lines changed: 34 additions & 46 deletions

File tree

‎examples/basic.html‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<script type="text/javascript" src="js/jquery/jquery-1.7.1.min.js"></script>
99
<script type="text/javascript" src="js/jquery/jquery-ui-1.8.17.custom.min.js"></script>
1010
<script type="text/javascript" src="../jspdf.js"></script>
11+
<script type="text/javascript" src="../libs/FileSaver.js/FileSaver.js"></script>
12+
<script type="text/javascript" src="../libs/BlobBuilder.js/BlobBuilder.js"></script>
13+
1114
<script type="text/javascript" src="../jspdf.plugin.standard_fonts_metrics.js"></script>
1215
<script type="text/javascript" src="../jspdf.plugin.split_text_to_size.js"></script>
1316
<script type="text/javascript" src="../jspdf.plugin.from_html.js"></script>
@@ -51,16 +54,14 @@ <h2><a href="#">Simple two-page text document</a></h2>
5154
doc.addPage();
5255
doc.text(20, 20, 'Do you like that?');
5356

54-
// Output as Data URI
55-
doc.output('datauri');</pre>
57+
doc.save('Test.pdf');</pre>
5658
<a href="javascript:demoTwoPageDocument()" class="button">Run Code</a></p></div>
5759

5860
<h2><a href="#">Landscape document</a></h2>
5961
<div><p><pre>var doc = new jsPDF('landscape');
6062
doc.text(20, 20, 'Hello landscape world!');
6163

62-
// Output as Data URI
63-
doc.output('datauri');</pre>
64+
doc.save('Test.pdf');</pre>
6465
<a href="javascript:demoLandscape()" class="button">Run Code</a></p></div>
6566

6667
<h2><a href="#">Adding metadata</a></h2>
@@ -77,7 +78,7 @@ <h2><a href="#">Adding metadata</a></h2>
7778
});
7879

7980
// Output as Data URI
80-
doc.output('datauri');</pre>
81+
doc.save('Test.pdf');</pre>
8182
<a href="javascript:demoMetadata()" class="button">Run Code</a></p></div>
8283

8384
<h2><a href="#">Example of user input</a></h2>
@@ -103,7 +104,7 @@ <h2><a href="#">Example of user input</a></h2>
103104
for(var i = 1; i <= 12; i ++) {
104105
doc.text(20, 30 + (i * 10), i + ' x ' + multiplier + ' = ' + (i * multiplier));
105106
}
106-
doc.output('datauri');</pre>
107+
doc.save('Test.pdf');</pre>
107108
<a href="javascript:demoUserInput()" class="button">Run Code</a></p></div>
108109
</div>
109110
</div>
@@ -119,8 +120,7 @@ <h2><a href="#">Different font sizes</a></h2>
119120
doc.setFontSize(16);
120121
doc.text(20, 30, 'This is some normal sized text underneath.');
121122

122-
// Output as Data URI
123-
doc.output('datauri');</pre>
123+
doc.save('Test.pdf');</pre>
124124
<a href="javascript:demoFontSizes()" class="button">Run Code</a>
125125
</p></div>
126126

@@ -144,8 +144,7 @@ <h2><a href="#">Different font types</a></h2>
144144
doc.setFontType("bolditalic");
145145
doc.text(20, 60, 'This is courier bolditalic.');
146146

147-
// Output as Data URI
148-
doc.output('datauri');</pre>
147+
doc.save('Test.pdf');</pre>
149148
<a href="javascript:demoFontTypes()" class="button">Run Code</a></p></div>
150149

151150
<h2><a href="#">Different text colors</a></h2>
@@ -166,8 +165,7 @@ <h2><a href="#">Different text colors</a></h2>
166165
doc.setTextColor(0,0,255);
167166
doc.text(20, 60, 'This is blue.');
168167

169-
// Output as Data URI
170-
doc.output('datauri');</pre>
168+
doc.save('Test.pdf');</pre>
171169
<a href="javascript:demoTextColors()" class="button">Run Code</a></p></div>
172170

173171
<h2><a href="#">Font-metrics-based line sizing and split</a></h2>
@@ -203,7 +201,7 @@ <h2><a href="#">Font-metrics-based line sizing and split</a></h2>
203201
}
204202
}
205203

206-
pdf.output('dataurl')</pre>
204+
pdf.save('Test.pdf');</pre>
207205
<a href="javascript:demoStringSplitting()" class="button">Run Code</a></p></div>
208206

209207
<h2><a href="#">fromHTML plugin</a></h2>
@@ -252,7 +250,7 @@ <h2 style="font-size:120%">Header Two</h2>
252250
}
253251
)
254252

255-
pdf.output()</pre>
253+
pdf.save('Test.pdf');</pre>
256254
<a href="javascript:demoFromHTML()" class="button">Run Code</a></p></div></div>
257255

258256
</div>
@@ -282,8 +280,7 @@ <h2><a href="#">Draw example: rectangles / squares</a></h2>
282280
doc.setFillColor(255,0,0);
283281
doc.rect(120, 20, 10, 10, 'FD'); // filled red square with black borders
284282

285-
// Output as Data URI
286-
doc.output('datauri');</pre>
283+
doc.save('Test.pdf');</pre>
287284
<a href="javascript:demoRectangles()" class="button">Run Code</a></p></div>
288285

289286
<h2><a href="#">Draw example: lines</a></h2>
@@ -314,8 +311,7 @@ <h2><a href="#">Draw example: lines</a></h2>
314311
doc.setLineWidth(1.5);
315312
doc.line(115, 20, 115, 60);
316313

317-
// Output as Data URI
318-
doc.output('datauri');</pre>
314+
doc.save('Test.pdf');</pre>
319315
<a href="javascript:demoLines()" class="button">Run Code</a></p></div>
320316

321317
<h2><a href="#">Draw example: circles and ellipses</a></h2>
@@ -331,8 +327,7 @@ <h2><a href="#">Draw example: circles and ellipses</a></h2>
331327
doc.setFillColor(255,0,0);
332328
doc.circle(120, 20, 5, 'FD');
333329

334-
// Output as Data URI
335-
doc.output('datauri');</pre>
330+
doc.save('Test.pdf');</pre>
336331
<a href="javascript:demoCircles()" class="button">Run Code</a></p></div>
337332

338333
<h2><a href="#">Draw example: triangles</a></h2>
@@ -345,8 +340,7 @@ <h2><a href="#">Draw example: triangles</a></h2>
345340
doc.setFillColor(0,0,255);
346341
doc.triangle(100, 100, 110, 100, 120, 130, 'FD');
347342

348-
// Output as Data URI
349-
doc.output('datauri');</pre>
343+
doc.save('My file.pdf');</pre>
350344
<a href="javascript:demoTriangles()" class="button">Run Code</a></p></div>
351345

352346
<h2><a href="#">Draw example: Images</a></h2>

‎examples/js/basic.js‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ function demoTwoPageDocument() {
55
doc.addPage();
66
doc.text(20, 20, 'Do you like that?');
77

8-
// Output as Data URI
9-
doc.output('datauri');
8+
// Save the PDF
9+
doc.save('Test.pdf');
1010
}
1111

1212
function demoLandscape() {
1313
var doc = new jsPDF('landscape');
1414
doc.text(20, 20, 'Hello landscape world!');
1515

16-
// Output as Data URI
17-
doc.output('datauri');
16+
// Save the PDF
17+
doc.save('Test.pdf');
1818
}
1919

2020
function demoFontSizes() {
@@ -23,10 +23,9 @@ function demoFontSizes() {
2323
doc.text(20, 20, 'This is a title');
2424

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

28-
// Output as Data URI
29-
doc.output('datauri');
28+
doc.save('Test.pdf');
3029
}
3130

3231
function demoFontTypes() {
@@ -50,8 +49,7 @@ function demoFontTypes() {
5049
doc.setFontType("bolditalic");
5150
doc.text(20, 60, 'This is courier bolditalic.');
5251

53-
// Output as Data URI
54-
doc.output('datauri');
52+
doc.save('Test.pdf');
5553
}
5654

5755
function demoTextColors() {
@@ -61,7 +59,7 @@ function demoTextColors() {
6159
doc.text(20, 20, 'This is gray.');
6260

6361
doc.setTextColor(150);
64-
doc.text(20, 30, 'This is light gray.');
62+
doc.text(20, 30, 'This is light gray.');
6563

6664
doc.setTextColor(255,0,0);
6765
doc.text(20, 40, 'This is red.');
@@ -83,14 +81,13 @@ function demoMetadata() {
8381
// Optional - set properties on the document
8482
doc.setProperties({
8583
title: 'Title',
86-
subject: 'This is the subject',
84+
subject: 'This is the subject',
8785
author: 'James Hall',
8886
keywords: 'generated, javascript, web 2.0, ajax',
8987
creator: 'MEEE'
9088
});
9189

92-
// Output as Data URI
93-
doc.output('datauri');
90+
doc.save('Test.pdf');
9491
}
9592

9693
function demoUserInput() {
@@ -116,7 +113,7 @@ function demoUserInput() {
116113
for(var i = 1; i <= 12; i ++) {
117114
doc.text(20, 30 + (i * 10), i + ' x ' + multiplier + ' = ' + (i * multiplier));
118115
}
119-
doc.output('datauri');
116+
doc.save('Test.pdf');
120117

121118
}
122119

@@ -141,8 +138,7 @@ function demoRectangles() {
141138
doc.setFillColor(255,0,0);
142139
doc.rect(120, 20, 10, 10, 'FD'); // filled red square with black borders
143140

144-
// Output as Data URI
145-
doc.output('datauri');
141+
doc.save('Test.pdf');
146142
}
147143

148144
function demoLines() {
@@ -190,8 +186,7 @@ function demoCircles() {
190186
doc.setFillColor(255,0,0);
191187
doc.circle(120, 20, 5, 'FD');
192188

193-
// Output as Data URI
194-
doc.output('datauri');
189+
doc.save('Test.pdf');
195190
}
196191

197192
function demoTriangles() {
@@ -204,8 +199,7 @@ function demoTriangles() {
204199
doc.setFillColor(0,0,255);
205200
doc.triangle(100, 100, 110, 100, 120, 130, 'FD');
206201

207-
// Output as Data URI
208-
doc.output('datauri');
202+
doc.save('Test.pdf');
209203
}
210204

211205
function demoImages() {
@@ -255,8 +249,8 @@ function demoImages() {
255249
doc.addImage(imgData, 'JPEG', 10, 10, 50, 50);
256250
doc.addImage(imgData, 'JPEG', 70, 10, 100, 120);
257251

258-
// Output as Data URI
259-
doc.output('datauri');
252+
doc.save('Test.pdf');
253+
260254
}
261255

262256
getImageFromUrl('thinking-monkey.jpg', createPDF);
@@ -304,7 +298,7 @@ function demoStringSplitting() {
304298
}
305299
}
306300

307-
pdf.output('dataurl')
301+
pdf.save('Test.pdf');
308302
}
309303

310304
function demoFromHTML() {
@@ -338,5 +332,5 @@ function demoFromHTML() {
338332
}
339333
)
340334

341-
pdf.output('dataurl')
335+
pdf.save('Test.pdf');
342336
}

0 commit comments

Comments
 (0)