Skip to content

Commit 5cfaef9

Browse files
committed
Merge pull request #569 from daniel-z/master
Fixing errors in dist files.
2 parents 67cd0d6 + 98b6a24 commit 5cfaef9

File tree

4 files changed

+44
-33
lines changed

4 files changed

+44
-33
lines changed

build.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ commit=`git rev-parse --short=10 HEAD`
1515
whoami=`whoami`
1616

1717
# Update submodules
18+
git submodule init libs/FileSaver.js/
19+
git submodule init libs/adler32cs.js/
20+
git submodule init libs/Blob.js/
21+
1822
git submodule foreach git pull origin master
1923

2024
echo "Building version ${version}"

dist/jspdf.debug.js

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** @preserve
22
* jsPDF - PDF Document creation from JavaScript
3-
* Version 1.1.135-git Built on 2015-05-16T00:15
4-
* CommitID e0da47f3da
3+
* Version 1.1.239-git Built on 2015-08-26T20:20
4+
* CommitID 6b73dc2e73
55
*
66
* Copyright (c) 2010-2014 James Hall <[email protected]>, https://github.com/MrRio/jsPDF
77
* 2010 Aaron Spike, https://github.com/acspike
@@ -2035,7 +2035,7 @@ var jsPDF = (function(global) {
20352035
* pdfdoc.mymethod() // <- !!!!!!
20362036
*/
20372037
jsPDF.API = {events:[]};
2038-
jsPDF.version = "1.1.135-debug 2015-05-16T00:15:jameshall";
2038+
jsPDF.version = "1.1.239-debug 2015-08-26T20:20:danielzamorano";
20392039

20402040
if (typeof define === 'function' && define.amd) {
20412041
define('jsPDF', function() {
@@ -7480,7 +7480,7 @@ jsPDFAPI.putTotalPages = function(pageExpression) {
74807480
}(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this.content || this));
74817481
/* FileSaver.js
74827482
* A saveAs() FileSaver implementation.
7483-
* 2015-05-07.2
7483+
* 1.1.20150716
74847484
*
74857485
* By Eli Grey, http://eligrey.com
74867486
* License: X11/MIT
@@ -7507,11 +7507,7 @@ var saveAs = saveAs || (function(view) {
75077507
, save_link = doc.createElementNS("http://www.w3.org/1999/xhtml", "a")
75087508
, can_use_save_link = "download" in save_link
75097509
, click = function(node) {
7510-
var event = doc.createEvent("MouseEvents");
7511-
event.initMouseEvent(
7512-
"click", true, false, view, 0, 0, 0, 0, 0
7513-
, false, false, false, false, 0, null
7514-
);
7510+
var event = new MouseEvent("click");
75157511
node.dispatchEvent(event);
75167512
}
75177513
, webkit_req_fs = view.webkitRequestFileSystem
@@ -7562,8 +7558,10 @@ var saveAs = saveAs || (function(view) {
75627558
}
75637559
return blob;
75647560
}
7565-
, FileSaver = function(blob, name) {
7566-
blob = auto_bom(blob);
7561+
, FileSaver = function(blob, name, no_auto_bom) {
7562+
if (!no_auto_bom) {
7563+
blob = auto_bom(blob);
7564+
}
75677565
// First try a.download, then web filesystem, then object URLs
75687566
var
75697567
filesaver = this
@@ -7611,10 +7609,12 @@ var saveAs = saveAs || (function(view) {
76117609
object_url = get_URL().createObjectURL(blob);
76127610
save_link.href = object_url;
76137611
save_link.download = name;
7614-
click(save_link);
7615-
filesaver.readyState = filesaver.DONE;
7616-
dispatch_all();
7617-
revoke(object_url);
7612+
setTimeout(function() {
7613+
click(save_link);
7614+
dispatch_all();
7615+
revoke(object_url);
7616+
filesaver.readyState = filesaver.DONE;
7617+
});
76187618
return;
76197619
}
76207620
// Object and web filesystem URLs have a problem saving in Google Chrome when
@@ -7685,14 +7685,17 @@ var saveAs = saveAs || (function(view) {
76857685
}), fs_error);
76867686
}
76877687
, FS_proto = FileSaver.prototype
7688-
, saveAs = function(blob, name) {
7689-
return new FileSaver(blob, name);
7688+
, saveAs = function(blob, name, no_auto_bom) {
7689+
return new FileSaver(blob, name, no_auto_bom);
76907690
}
76917691
;
76927692
// IE 10+ (native saveAs)
76937693
if (typeof navigator !== "undefined" && navigator.msSaveOrOpenBlob) {
7694-
return function(blob, name) {
7695-
return navigator.msSaveOrOpenBlob(auto_bom(blob), name);
7694+
return function(blob, name, no_auto_bom) {
7695+
if (!no_auto_bom) {
7696+
blob = auto_bom(blob);
7697+
}
7698+
return navigator.msSaveOrOpenBlob(blob, name || "download");
76967699
};
76977700
}
76987701

@@ -15633,7 +15636,7 @@ function XHR(url) {
1563315636
* http://opensource.org/licenses/mit-license
1563415637
*/
1563515638

15636-
html2pdf = function(html,pdf,callback) {
15639+
function html2pdf (html,pdf,callback) {
1563715640
var canvas = pdf.canvas;
1563815641
if (!canvas) {
1563915642
alert('jsPDF canvas plugin not installed');
@@ -16880,6 +16883,9 @@ var FlateStream = (function() {
1688016883
* This allows a host page to simply include require.js and bootstrap the page with a single require statement.
1688116884
*/
1688216885

16886+
// Skip if Require.JS not installed
16887+
if (typeof require === 'object') {
16888+
1688316889
if (typeof require_baseUrl_override === 'undefined'){
1688416890
require_baseUrl_override = '../';
1688516891
}
@@ -16980,6 +16986,7 @@ require.config({
1698016986
'html2pdf': 'libs/html2pdf'
1698116987
}
1698216988
});
16989+
} // Require.JS
1698316990
/** vim: et:ts=4:sw=4:sts=4
1698416991
* @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
1698516992
* Available via the MIT or new BSD license.

dist/jspdf.min.js

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

libs/FileSaver.js

0 commit comments

Comments
 (0)