Merge pull request #529 from Flamenco/fx_canvas_undefined_v2

Fix 'canvas not defined' issue #503 #517

Author: MrRio

libs/html2pdf.js

@@ -6,7 +6,7 @@
  * http://opensource.org/licenses/mit-license
  */
 
-html2pdf = function(html,pdf,callback) {
+function html2pdf (html,pdf,callback) {
 	var canvas = pdf.canvas;
 	if (!canvas) {
 		alert('jsPDF canvas plugin not installed');

libs/require/config.js

@@ -13,6 +13,9 @@
  * This allows a host page to simply include require.js and bootstrap the page with a single require statement.
  */
 
+// Skip if Require.JS not installed
+if (typeof require === 'object') {
+
 if (typeof require_baseUrl_override === 'undefined'){
 	require_baseUrl_override = '../';
 }
@@ -113,3 +116,4 @@ require.config({
     	 'html2pdf': 'libs/html2pdf'
      }
 });
+} // Require.JS