Skip to content

Commit e6150e8

Browse files
committed
Updated redistributable files - resolves parallax#99, fix parallax#120, fix parallax#154, closes parallax#168, closed parallax#166, closed parallax#165, closed parallax#158, closed parallax#157, closed parallax#156, closes parallax#146, fixes parallax#138, fix parallax#128, closed parallax#127, closed parallax#125, resolved parallax#124, closes parallax#123, fixes parallax#122, closed parallax#118, closes parallax#114, fix parallax#113, closed parallax#109, closed parallax#102, closed parallax#98, closes parallax#95, closed parallax#78, fix parallax#63, closed parallax#58, closed parallax#56, closed parallax#33
1 parent cd86650 commit e6150e8

4 files changed

Lines changed: 119 additions & 117 deletions

File tree

dist/jspdf.min.js

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

dist/jspdf.source.js

Lines changed: 63 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
1-
/** @preserve jsPDF 1.0.0-trunk ( 2014-02-04T21:51 commit ID 64bfd23630cbbfd4554b846b208a056cfde891fe )
2-
Copyright (c) 2010-2014 James Hall, james@parall.ax, https://github.com/MrRio/jsPDF
3-
Copyright (c) 2012 Willow Systems Corporation, willow-systems.com
4-
MIT license.
5-
*/
6-
7-
/*
1+
/** @preserve
2+
* jsPDF - PDF Document generation from JavaScript
3+
* Version 1.0.0-trunk Built on 2014-02-06T18:42
4+
* Commit cd86650e8b76f3f82ce825ba4d63515c96e642aa
5+
*
6+
* Copyright (c) 2010-2014 James Hall, https://github.com/MrRio/jsPDF
7+
* 2010 Aaron Spike, https://github.com/acspike
8+
* 2012 Willow Systems Corporation, willow-systems.com
9+
* 2012 Pablo Hess, https://github.com/pablohess
10+
* 2012 Florian Jenett, https://github.com/fjenett
11+
* 2013 Warren Weckesser, https://github.com/warrenweckesser
12+
* 2013 Youssef Beddad, https://github.com/lifof
13+
* 2013 Lee Driscoll, https://github.com/lsdriscoll
14+
* 2013 Stefan Slonevskiy, https://github.com/stefslon
15+
* 2013 Jeremy Morel, https://github.com/jmorel
16+
* 2013 Christoph Hartmann, https://github.com/chris-rock
17+
* 2014 Juan Pablo Gaviria, https://github.com/juanpgaviria
18+
* 2014 Diego Casorran, https://github.com/diegocr
19+
* 2014 James Makes, https://github.com/dollaruw
20+
*
821
* Permission is hereby granted, free of charge, to any person obtaining
922
* a copy of this software and associated documentation files (the
1023
* "Software"), to deal in the Software without restriction, including
@@ -23,10 +36,12 @@ MIT license.
2336
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2437
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2538
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26-
* ====================================================================
39+
*
40+
* Contributor(s):
41+
* siefkenj, ahwolf, rickygu, Midnith, saintclair, eaparango,
42+
* kim3er, mfo, alnorth,
2743
*/
2844

29-
3045
/**
3146
Creates new jsPDF document object instance
3247
@class
@@ -1957,11 +1972,14 @@ Examples:
19571972
return jsPDF;
19581973
}(this));
19591974
/** @preserve
1960-
jsPDF addImage plugin (JPEG only at this time)
1961-
Copyright (c) 2012 https://github.com/siefkenj/
1962-
*/
1963-
1964-
/**
1975+
* jsPDF addImage plugin (JPEG only at this time)
1976+
* Copyright (c) 2012 Jason Siefken, https://github.com/siefkenj/
1977+
* 2013 Chris Dowling, https://github.com/gingerchris
1978+
* 2013 Trinh Ho, https://github.com/ineedfat
1979+
* 2013 Edwin Alejandro Perez, https://github.com/eaparango
1980+
* 2013 Norah Smith, https://github.com/burnburnrocket
1981+
* 2014 Diego Casorran, https://github.com/diegocr
1982+
*
19651983
* Permission is hereby granted, free of charge, to any person obtaining
19661984
* a copy of this software and associated documentation files (the
19671985
* "Software"), to deal in the Software without restriction, including
@@ -1980,7 +1998,6 @@ Copyright (c) 2012 https://github.com/siefkenj/
19801998
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19811999
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
19822000
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1983-
* ====================================================================
19842001
*/
19852002

19862003
;(function(jsPDFAPI) {
@@ -2252,8 +2269,10 @@ jsPDFAPI.autoPrint = function() {
22522269
* jsPDF Cell plugin
22532270
* Copyright (c) 2013 Youssef Beddad, youssef.beddad@gmail.com
22542271
* 2013 Eduardo Menezes de Morais, eduardo.morais@usp.br
2272+
* 2013 Lee Driscoll, https://github.com/lsdriscoll
2273+
* 2014 Juan Pablo Gaviria, https://github.com/juanpgaviria
22552274
* 2014 James Hall, james@parall.ax
2256-
*
2275+
*
22572276
* Permission is hereby granted, free of charge, to any person obtaining
22582277
* a copy of this software and associated documentation files (the
22592278
* "Software"), to deal in the Software without restriction, including
@@ -2641,12 +2660,31 @@ jsPDFAPI.autoPrint = function() {
26412660
};
26422661

26432662
})(jsPDF.API);
2644-
// Generated by CoffeeScript 1.3.3
2645-
/*
2646-
@preserve
2647-
jsPDF fromHTML plugin. BETA stage. API subject to change. Needs browser, jQuery
2648-
Copyright (c) 2012 2012 Willow Systems Corporation, willow-systems.com
2649-
*/
2663+
/** @preserve
2664+
* jsPDF fromHTML plugin. BETA stage. API subject to change. Needs browser, jQuery
2665+
* Copyright (c) 2012 2012 Willow Systems Corporation, willow-systems.com
2666+
* 2014 Juan Pablo Gaviria, https://github.com/juanpgaviria
2667+
*
2668+
* Permission is hereby granted, free of charge, to any person obtaining
2669+
* a copy of this software and associated documentation files (the
2670+
* "Software"), to deal in the Software without restriction, including
2671+
* without limitation the rights to use, copy, modify, merge, publish,
2672+
* distribute, sublicense, and/or sell copies of the Software, and to
2673+
* permit persons to whom the Software is furnished to do so, subject to
2674+
* the following conditions:
2675+
*
2676+
* The above copyright notice and this permission notice shall be
2677+
* included in all copies or substantial portions of the Software.
2678+
*
2679+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
2680+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
2681+
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
2682+
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
2683+
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2684+
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2685+
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2686+
* ====================================================================
2687+
*/
26502688

26512689
(function(jsPDFAPI) {
26522690
var DrillForContent, FontNameDB, FontStyleMap, FontWeightMap, GetCSS, PurgeWhiteSpace, Renderer, ResolveFont, ResolveUnitedNumber, UnitedNumberMap, elementHandledElsewhere, getImageFromUrl, images, loadImgs, process, tableToJson;
@@ -4068,8 +4106,10 @@ API.events.push([
40684106
* jsPDF Cell plugin
40694107
* Copyright (c) 2013 Youssef Beddad, youssef.beddad@gmail.com
40704108
* 2013 Eduardo Menezes de Morais, eduardo.morais@usp.br
4109+
* 2013 Lee Driscoll, https://github.com/lsdriscoll
4110+
* 2014 Juan Pablo Gaviria, https://github.com/juanpgaviria
40714111
* 2014 James Hall, james@parall.ax
4072-
*
4112+
*
40734113
* Permission is hereby granted, free of charge, to any person obtaining
40744114
* a copy of this software and associated documentation files (the
40754115
* "Software"), to deal in the Software without restriction, including

jspdf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @preserve
22
* jsPDF - PDF Document generation from JavaScript
3-
* 1.0.0-trunk Built on ${buildDate}
3+
* Version 1.0.0-trunk Built on ${buildDate}
44
* Commit ${commitID}
55
*
66
* Copyright (c) 2010-2014 James Hall, https://github.com/MrRio/jsPDF
@@ -12,7 +12,7 @@
1212
* 2013 Youssef Beddad, https://github.com/lifof
1313
* 2013 Lee Driscoll, https://github.com/lsdriscoll
1414
* 2013 Stefan Slonevskiy, https://github.com/stefslon
15-
* 2013 Jérémy Morel, https://github.com/jmorel
15+
* 2013 Jeremy Morel, https://github.com/jmorel
1616
* 2013 Christoph Hartmann, https://github.com/chris-rock
1717
* 2014 Juan Pablo Gaviria, https://github.com/juanpgaviria
1818
* 2014 Diego Casorran, https://github.com/diegocr

wscript.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def getCommitIDstring():
8686
# let's not bother emulating it. Not important
8787
return ""
8888
else:
89-
return "commit ID " + subprocess.check_output(
89+
return subprocess.check_output(
9090
[
9191
'git'
9292
, 'rev-parse'

0 commit comments

Comments
 (0)