From ce6b71ce0d662ba9675b09c06eb6b47e0b27b3c2 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Sat, 19 Mar 2016 11:00:22 +0100 Subject: [PATCH 1/4] Make sure html2canvas is only included once in dist files --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3998abab8..9ad1b2ca7 100755 --- a/build.sh +++ b/build.sh @@ -9,7 +9,7 @@ output=dist/jspdf.min.js options="-m -c --wrap --stats" version="$(node -p -e "require('./package.json').version")" npm_libs="node_modules/cf-blob.js/Blob.js node_modules/filesaver.js/FileSaver.js node_modules/adler32cs/adler32cs.js" -libs="${npm_libs} `find libs/* -maxdepth 2 -type f | grep .js$ | grep -v -E '(\.min|BlobBuilder\.js$|Downloadify|demo|deps|test)'`" +libs="${npm_libs} `find libs/* -maxdepth 2 -type f | grep .js$ | grep -v -E '(\.min|BlobBuilder\.js$|Downloadify|demo|deps|test|html2canvas/src)'`" files="jspdf.js plugins/*js" build=`date +%Y-%m-%dT%H:%M` commit=`git rev-parse --short=10 HEAD` From 1fc7fd1fd505c375a963a2d52712993de46303ab Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Sun, 20 Mar 2016 23:50:13 +0100 Subject: [PATCH 2/4] Remove requirejs from dist files --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 9ad1b2ca7..6320429a0 100755 --- a/build.sh +++ b/build.sh @@ -9,7 +9,7 @@ output=dist/jspdf.min.js options="-m -c --wrap --stats" version="$(node -p -e "require('./package.json').version")" npm_libs="node_modules/cf-blob.js/Blob.js node_modules/filesaver.js/FileSaver.js node_modules/adler32cs/adler32cs.js" -libs="${npm_libs} `find libs/* -maxdepth 2 -type f | grep .js$ | grep -v -E '(\.min|BlobBuilder\.js$|Downloadify|demo|deps|test|html2canvas/src)'`" +libs="${npm_libs} `find libs/* -maxdepth 2 -type f | grep .js$ | grep -v -E '(\.min|BlobBuilder\.js$|Downloadify|demo|deps|test|html2canvas/src|require)'`" files="jspdf.js plugins/*js" build=`date +%Y-%m-%dT%H:%M` commit=`git rev-parse --short=10 HEAD` From 5ba8ca8a1f51e5d9c319685b7e0d9dc264803b56 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Tue, 22 Mar 2016 23:56:30 +0100 Subject: [PATCH 3/4] Remove unused html2pdf.js --- libs/html2pdf.js | 110 ----------------------------------------------- 1 file changed, 110 deletions(-) delete mode 100644 libs/html2pdf.js diff --git a/libs/html2pdf.js b/libs/html2pdf.js deleted file mode 100644 index 7c22e10d5..000000000 --- a/libs/html2pdf.js +++ /dev/null @@ -1,110 +0,0 @@ -/** - * html2pdf.js - * Copyright (c) 2014 Steven Spungin (TwelveTone LLC) steven@twelvetone.tv - * - * Licensed under the MIT License. - * http://opensource.org/licenses/mit-license - */ - -function html2pdf (html,pdf,callback) { - var canvas = pdf.canvas; - if (!canvas) { - alert('jsPDF canvas plugin not installed'); - return; - } - canvas.pdf = pdf; - pdf.annotations = { - - _nameMap : [], - - createAnnotation : function(href,bounds) { - var x = pdf.context2d._wrapX(bounds.left); - var y = pdf.context2d._wrapY(bounds.top); - var page = pdf.context2d._page(bounds.top); - var options; - var index = href.indexOf('#'); - if (index >= 0) { - options = { - name : href.substring(index + 1) - }; - } else { - options = { - url : href - }; - } - pdf.link(x, y, bounds.right - bounds.left, bounds.bottom - bounds.top, options); - }, - - setName : function(name,bounds) { - var x = pdf.context2d._wrapX(bounds.left); - var y = pdf.context2d._wrapY(bounds.top); - var page = pdf.context2d._page(bounds.top); - this._nameMap[name] = { - page : page, - x : x, - y : y - }; - } - - }; - canvas.annotations = pdf.annotations; - - pdf.context2d._pageBreakAt = function(y) { - this.pageBreaks.push(y); - }; - - pdf.context2d._gotoPage = function(pageOneBased) { - while (pdf.internal.getNumberOfPages() < pageOneBased) { - pdf.addPage(); - } - pdf.setPage(pageOneBased); - } - - if (typeof html === 'string') { - // remove all scripts - html = html.replace(/)<[^<]*)*<\/script>/gi, ''); - - var iframe = document.createElement('iframe'); - //iframe.style.width = canvas.width; - //iframe.src = ""; - //iframe.document.domain = - document.body.appendChild(iframe); - var doc; - doc = iframe.contentDocument; - if (doc == undefined || doc == null) { - doc = iframe.contentWindow.document; - } - //iframe.setAttribute('style', 'position:absolute;right:0; top:0; bottom:0; height:100%; width:500px'); - - doc.open(); - doc.write(html); - doc.close(); - - var promise = html2canvas(doc.body, { - canvas : canvas, - onrendered : function(canvas) { - if (callback) { - if (iframe) { - iframe.parentElement.removeChild(iframe); - } - callback(pdf); - } - } - }); - - } else { - var body = html; - var promise = html2canvas(body, { - canvas : canvas, - onrendered : function(canvas) { - if (callback) { - if (iframe) { - iframe.parentElement.removeChild(iframe); - } - callback(pdf); - } - } - }); - } - -} \ No newline at end of file From e3f98f17c8687e39807c1130b41978b3d3233089 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Thu, 24 Mar 2016 14:29:28 +0100 Subject: [PATCH 4/4] Remove deprecated build script --- build.sh | 101 ------------------------------------------------------- 1 file changed, 101 deletions(-) delete mode 100755 build.sh diff --git a/build.sh b/build.sh deleted file mode 100755 index 6320429a0..000000000 --- a/build.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# -# Build script for jsPDF -# (c) 2014 Diego Casorran -# (c) 2015 James Hall -# - -output=dist/jspdf.min.js -options="-m -c --wrap --stats" -version="$(node -p -e "require('./package.json').version")" -npm_libs="node_modules/cf-blob.js/Blob.js node_modules/filesaver.js/FileSaver.js node_modules/adler32cs/adler32cs.js" -libs="${npm_libs} `find libs/* -maxdepth 2 -type f | grep .js$ | grep -v -E '(\.min|BlobBuilder\.js$|Downloadify|demo|deps|test|html2canvas/src|require)'`" -files="jspdf.js plugins/*js" -build=`date +%Y-%m-%dT%H:%M` -commit=`git rev-parse --short=10 HEAD` -whoami=`whoami` - -echo "Building version ${version}" - -# Update Bower -sed -i.bak "s/\"version\": \"(.*)\"/\"${version}\"/" bower.json - -# Fix conflict with adler32 & FileSaver -adler1="node_modules/adler32cs/adler32cs.js" -adler2="adler32-tmp.js" -cat ${adler1} \ - | sed -e 's/this, function/jsPDF, function/' \ - | sed -e 's/typeof define/0/' > $adler2 -libs="$(echo $libs | sed "s#$adler1#$adler2#")" -saveas1="node_modules/filesaver.js/FileSaver.js" -saveas2="FileSaver-tmp.js" -cat ${saveas1} \ - | sed -e 's/define !== null) && (define.amd != null/0/' > $saveas2 -libs="$(echo $libs | sed "s#$saveas1#$saveas2#")" - -# Build dist files -cat ${files} ${libs} \ - | sed s/\${versionID}/${version}-git\ Built\ on\ ${build}/ \ - | sed s/\${commitID}/${commit}/ \ - | sed "s/\"1\.0\.0-trunk\"/\"${version}-debug ${build}:${whoami}\"/" > "$(echo $output | sed s/min/debug/)" -./node_modules/.bin/uglifyjs ${options} -o ${output} ${files} ${libs} - -# Pretend license information to minimized file -for fn in ${files} ${libs}; do - awk '/^\/\*/,/\*\//' $fn \ - | sed -n -e '1,/\*\//p' \ - | sed -e 'H;${x;s/\s*@preserve/ /g;p;};d' \ - | sed -e 's/\s*===\+//' \ - | grep -v *global > ${output}.x - - if test "x$fn" = "xjspdf.js"; then - cat ${output}.x \ - | sed s/\${versionID}/${version}-git\ Built\ on\ ${build}/ \ - | sed s/\${commitID}/${commit}/ >> ${output}.tmp - else - cat ${output}.x \ - | sed -e '/Permission/,/SOFTWARE\./c \ ' \ - | sed -E '/^\s\*\s*$/d' >> ${output}.tmp - fi -done -cat ${output} >> ${output}.tmp -cat ${output}.tmp | sed '/^\s*$/d' | sed "s/\"1\.0\.0-trunk\"/\"${version}-git ${build}:${whoami}\"/" > ${output} -rm -f ${output}.tmp ${output}.x $adler2 $saveas2 - - -# Check options -while [ $# -gt 0 ] - do - case "$1" in - -c|-commit) - shift - git_commit="$1" - ;; - -p|-push) - git_push=1 - ;; - -t|-tag) - git_tag=1 - ;; - *) - break - ;; - esac - shift -done - -if [ "$git_push" = "1" -a -z "$git_commit" ]; then - git_commit="New dist files." -fi -if [ -n "$git_commit" ]; then - git commit -a -m "$git_commit" -fi -if [ "$git_push" = "1" ]; then - git push -fi -if [ "$git_tag" = "1" ]; then - commit=`git rev-parse --short=10 HEAD` - git history - git tag -m "${build} ${commit}" -s v${version} - git push upstream v${version} -fi