github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure all dependencies available for canvg-using extensions (server_moinsave, server_opensave)

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2852 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Brett Zamir
2014-05-22 03:45:31 +00:00
parent 5fa1f574e0
commit 18c9fd0932
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
editor/svg-editor.js
View File

@@ -226,14 +226,6 @@ var saveAs;
}; };
} }
function checkCanvg (callCanvg) {
return executeAfterLoads('canvg', ['canvg/rgbcolor.js', 'canvg/canvg.js'], callCanvg);
}
function executeJSPDF (callJSPDF) {
return executeAfterLoads('jsPDF', ['jspdf/underscore-min.js', 'jspdf/jspdf.js', 'jspdf/jspdf.plugin.svgToPdf.js'], callJSPDF)();
}
/** /**
* EXPORTS * EXPORTS
*/ */
@@ -266,6 +258,14 @@ var saveAs;
* @todo Prevent execution until init executes if dependent on it? * @todo Prevent execution until init executes if dependent on it?
*/ */
var buildCanvgCallback = editor.buildCanvgCallback = function (callCanvg) {
return executeAfterLoads('canvg', ['canvg/rgbcolor.js', 'canvg/canvg.js'], callCanvg);
};
var executeJSPDFCallback = editor.executeJSPDFCallback = function (callJSPDF) {
return executeAfterLoads('jsPDF', ['jspdf/underscore-min.js', 'jspdf/jspdf.js', 'jspdf/jspdf.plugin.svgToPdf.js'], callJSPDF)();
};
/** /**
* Where permitted, sets canvas and/or defaultPrefs based on previous * Where permitted, sets canvas and/or defaultPrefs based on previous
* storage. This will override URL settings (for security reasons) but * storage. This will override URL settings (for security reasons) but
@@ -439,7 +439,7 @@ var saveAs;
} }
if (opts.exportImage) { if (opts.exportImage) {
customExportImage = opts.exportImage; customExportImage = opts.exportImage;
svgCanvas.bind('exported', checkCanvg(customExportImage)); svgCanvas.bind('exported', buildCanvgCallback(customExportImage));
} }
}); });
}; };
@@ -1146,8 +1146,13 @@ var saveAs;
var orientation = res.w > res.h ? 'landscape' : 'portrait'; var orientation = res.w > res.h ? 'landscape' : 'portrait';
var units = 'pt'; // curConfig.baseUnit; // We could use baseUnit, but that is presumably not intended for export purposes var units = 'pt'; // curConfig.baseUnit; // We could use baseUnit, but that is presumably not intended for export purposes
executeJSPDF(function () { executeJSPDFCallback(function () {
var doc = new jsPDF(orientation, units, [res.w, res.h]); // Todo: Give options to use predefined jsPDF formats like "a4", etc. from pull-down (with option to keep customizable) var doc = jsPDF(
orientation: orientation,
unit: units,
format: [res.w, res.h]
// compressPdf: true
); // Todo: Give options to use predefined jsPDF formats like "a4", etc. from pull-down (with option to keep customizable)
var docTitle = svgCanvas.getDocumentTitle(); var docTitle = svgCanvas.getDocumentTitle();
doc.setProperties({ doc.setProperties({
title: docTitle/*, title: docTitle/*,
@@ -2922,7 +2927,7 @@ var saveAs;
svgCanvas.bind('transition', elementTransition); svgCanvas.bind('transition', elementTransition);
svgCanvas.bind('changed', elementChanged); svgCanvas.bind('changed', elementChanged);
svgCanvas.bind('saved', saveHandler); svgCanvas.bind('saved', saveHandler);
svgCanvas.bind('exported', checkCanvg(exportHandler)); svgCanvas.bind('exported', buildCanvgCallback(exportHandler));
svgCanvas.bind('zoomed', zoomChanged); svgCanvas.bind('zoomed', zoomChanged);
svgCanvas.bind('contextset', contextChanged); svgCanvas.bind('contextset', contextChanged);
svgCanvas.bind('extension_added', extAdded); svgCanvas.bind('extension_added', extAdded);