- Fix (Embedded editor): (Though embedding cross-origin iframes apparently

only working now in Chrome if same origin or if https?--at least not
  localhost of different ports), PDF export has been fixed (we download the
  PDF to workaround data URI limitations in Chrome)
- Fix (Embedded editor): Avoid using same origin shortcut if there is no
  global available to use (e.g., if using the modular editor)
- Fix (Embedded editor): Add events only after load is complete and
  svgCanvas is available; also log blocked error objects
- Enhancement: For PDF export, switch Chrome by default to "save" `outputType`
- Docs (JSdoc): Denote optional arguments

CHANGES.md

@@ -1,10 +1,20 @@
 # ?
 
+- Fix (Embedded editor): (Though embedding cross-origin iframes apparently
+  only working now in Chrome if same origin or if https?--at least not
+  localhost of different ports), PDF export has been fixed (we download the
+  PDF to workaround data URI limitations in Chrome)
+- Fix (Embedded editor): Avoid using same origin shortcut if there is no
+  global available to use (e.g., if using the modular editor)
+- Fix (Embedded editor): Add events only after load is complete and
+  svgCanvas is available; also log blocked error objects
+- Enhancement: For PDF export, switch Chrome by default to "save" `outputType`
 - Refactoring (canvg): Better type-checking on `canvasRGBA_` (but set
   correctly by default anyways)
 - Refactoring: Avoid redundant use of \*AttributeNS methods with
   `null` value; just use \*Attribute methods without namespace
 - Docs: CHANGES clarifications
+- Docs (JSdoc): Denote optional arguments
 - Docs: More info on `importLocale` for extensions
 - Build: Remove unused `Makefile`
 

dist/index-es.js

@@ -17561,15 +17561,17 @@ function SvgCanvas(container, config) {
   * Generates a PDF based on the current image, then calls "exportedPDF" with
   * an object including the string, the data URL, and any issues found
   * @function module:svgcanvas.SvgCanvas#exportPDF
-  * @param {string} exportWindowName Will also be used for the download file name here
+  * @param {string} [exportWindowName] Will also be used for the download file name here
   * @param {external:jsPDF.OutputType} [outputType="dataurlstring"]
-  * @param {module:svgcanvas.PDFExportedCallback} cb
+  * @param {module:svgcanvas.PDFExportedCallback} [cb]
   * @fires module:svgcanvas.SvgCanvas#event:exportedPDF
   * @returns {Promise} Resolves to {@link module:svgcanvas.PDFExportedResults}
   */
 
 
-  this.exportPDF = function (exportWindowName, outputType, cb) {
+  this.exportPDF = function (exportWindowName) {
+    var outputType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isChrome() ? 'save' : undefined;
+    var cb = arguments.length > 2 ? arguments[2] : undefined;
     var that = this;
     return new Promise(
     /*#__PURE__*/
@@ -32141,7 +32143,7 @@ editor.init = function () {
                   openExportWindow();
                 }
 
-                svgCanvas.exportPDF(exportWindowName, chrome ? 'save' : undefined);
+                svgCanvas.exportPDF(exportWindowName);
                 _context6.next = 13;
                 break;
 

dist/index-umd.js

@@ -17567,15 +17567,17 @@
     * Generates a PDF based on the current image, then calls "exportedPDF" with
     * an object including the string, the data URL, and any issues found
     * @function module:svgcanvas.SvgCanvas#exportPDF
-    * @param {string} exportWindowName Will also be used for the download file name here
+    * @param {string} [exportWindowName] Will also be used for the download file name here
     * @param {external:jsPDF.OutputType} [outputType="dataurlstring"]
-    * @param {module:svgcanvas.PDFExportedCallback} cb
+    * @param {module:svgcanvas.PDFExportedCallback} [cb]
     * @fires module:svgcanvas.SvgCanvas#event:exportedPDF
     * @returns {Promise} Resolves to {@link module:svgcanvas.PDFExportedResults}
     */
 
 
-    this.exportPDF = function (exportWindowName, outputType, cb) {
+    this.exportPDF = function (exportWindowName) {
+      var outputType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isChrome() ? 'save' : undefined;
+      var cb = arguments.length > 2 ? arguments[2] : undefined;
       var that = this;
       return new Promise(
       /*#__PURE__*/
@@ -32147,7 +32149,7 @@
                     openExportWindow();
                   }
 
-                  svgCanvas.exportPDF(exportWindowName, chrome ? 'save' : undefined);
+                  svgCanvas.exportPDF(exportWindowName);
                   _context6.next = 13;
                   break;
 

editor/embedapi-dom.js

@@ -4,6 +4,7 @@
 * @module EmbeddedSVGEditDOM
 */
 import EmbeddedSVGEdit from './embedapi.js';
+import {isChrome} from './browser.js';
 
 const $ = jQuery;
 
@@ -29,7 +30,6 @@ function saveSvg () {
 function exportPNG () {
   svgCanvas.getUIStrings()(function (uiStrings) {
     const str = uiStrings.notification.loadingImage;
-
     const exportWindow = window.open(
       'data:text/html;charset=utf-8,' + encodeURIComponent('<title>' + str + '</title><h1>' + str + '</h1>'),
       'svg-edit-exportWindow'
@@ -51,22 +51,20 @@ function exportPDF () {
     return;
     */
 
-    const exportWindow = window.open(
+    if (isChrome()) {
-      'data:text/html;charset=utf-8,' + encodeURIComponent('<title>' + str + '</title><h1>' + str + '</h1>'),
+      svgCanvas.exportPDF();
-      'svg-edit-exportWindow'
+    } else {
-    );
+      const exportWindow = window.open(
-    svgCanvas.exportPDF(exportWindow && exportWindow.name);
+        'data:text/html;charset=utf-8,' + encodeURIComponent('<title>' + str + '</title><h1>' + str + '</h1>'),
+        'svg-edit-exportWindow'
+      );
+      svgCanvas.exportPDF(exportWindow && exportWindow.name);
+    }
   });
 }
 
-// Add event handlers
-$('#load').click(loadSvg);
-$('#save').click(saveSvg);
-$('#exportPNG').click(exportPNG);
-$('#exportPDF').click(exportPDF);
-
 const frameBase = 'https://raw.githack.com/SVG-Edit/svgedit/master';
-// const frameBase = 'http://localhost:8001';
+// const frameBase = 'http://localhost:8000';
 const framePath = '/editor/xdomain-svg-editor-es.html?extensions=ext-xdomain-messaging.js';
 const iframe = $('<iframe width="900px" height="600px" id="svgedit"></iframe>');
 iframe[0].src = frameBase + framePath +
@@ -81,11 +79,17 @@ iframe[0].addEventListener('load', function () {
   try {
     doc = frame.contentDocument || frame.contentWindow.document;
   } catch (err) {
-    console.log('Blocked from accessing document');
+    console.log('Blocked from accessing document', err);
     return;
   }
   const mainButton = doc.getElementById('main_button');
   mainButton.style.display = 'none';
+
+  // Add event handlers now that `svgCanvas` is ready
+  $('#load').click(loadSvg);
+  $('#save').click(saveSvg);
+  $('#exportPNG').click(exportPNG);
+  $('#exportPDF').click(exportPDF);
 });
 $('body').append(iframe);
 const frame = document.getElementById('svgedit');

editor/embedapi.js

@@ -357,12 +357,13 @@ class EmbeddedSVGEdit {
         *   made compatile with all API functionality
         */
         // We accept and post strings for the sake of IE9 support
-        let sameOrigin = false;
+        let sameOriginWithGlobal = false;
         try {
-          sameOrigin = window.location.origin === t.frame.contentWindow.location.origin;
+          sameOriginWithGlobal = window.location.origin === t.frame.contentWindow.location.origin &&
+            t.frame.contentWindow.svgEditor.canvas;
         } catch (err) {}
 
-        if (sameOrigin) {
+        if (sameOriginWithGlobal) {
           // Although we do not really need this API if we are working same
           //  domain, it could allow us to write in a way that would work
           //  cross-domain as well, assuming we stick to the argument limitations

editor/svg-editor.js

@@ -4228,7 +4228,7 @@ editor.init = function () {
         if (!customExportPDF && !chrome) {
           openExportWindow();
         }
-        svgCanvas.exportPDF(exportWindowName, chrome ? 'save' : undefined);
+        svgCanvas.exportPDF(exportWindowName);
       } else {
         if (!customExportImage) {
           openExportWindow();

editor/svgcanvas.js

@@ -3957,13 +3957,17 @@ this.rasterExport = function (imgType, quality, exportWindowName, cb) {
 * Generates a PDF based on the current image, then calls "exportedPDF" with
 * an object including the string, the data URL, and any issues found
 * @function module:svgcanvas.SvgCanvas#exportPDF
-* @param {string} exportWindowName Will also be used for the download file name here
+* @param {string} [exportWindowName] Will also be used for the download file name here
 * @param {external:jsPDF.OutputType} [outputType="dataurlstring"]
-* @param {module:svgcanvas.PDFExportedCallback} cb
+* @param {module:svgcanvas.PDFExportedCallback} [cb]
 * @fires module:svgcanvas.SvgCanvas#event:exportedPDF
 * @returns {Promise} Resolves to {@link module:svgcanvas.PDFExportedResults}
 */
-this.exportPDF = function (exportWindowName, outputType, cb) {
+this.exportPDF = function (
+  exportWindowName,
+  outputType = isChrome() ? 'save' : undefined,
+  cb
+) {
   const that = this;
   return new Promise(async (resolve, reject) => {
     if (!window.jsPDF) {

editor/xdomain-svgedit-config-iife.js

@@ -17564,15 +17564,17 @@
     * Generates a PDF based on the current image, then calls "exportedPDF" with
     * an object including the string, the data URL, and any issues found
     * @function module:svgcanvas.SvgCanvas#exportPDF
-    * @param {string} exportWindowName Will also be used for the download file name here
+    * @param {string} [exportWindowName] Will also be used for the download file name here
     * @param {external:jsPDF.OutputType} [outputType="dataurlstring"]
-    * @param {module:svgcanvas.PDFExportedCallback} cb
+    * @param {module:svgcanvas.PDFExportedCallback} [cb]
     * @fires module:svgcanvas.SvgCanvas#event:exportedPDF
     * @returns {Promise} Resolves to {@link module:svgcanvas.PDFExportedResults}
     */
 
 
-    this.exportPDF = function (exportWindowName, outputType, cb) {
+    this.exportPDF = function (exportWindowName) {
+      var outputType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isChrome() ? 'save' : undefined;
+      var cb = arguments.length > 2 ? arguments[2] : undefined;
       var that = this;
       return new Promise(
       /*#__PURE__*/
@@ -32144,7 +32146,7 @@
                     openExportWindow();
                   }
 
-                  svgCanvas.exportPDF(exportWindowName, chrome ? 'save' : undefined);
+                  svgCanvas.exportPDF(exportWindowName);
                   _context6.next = 13;
                   break;
 

svgedit-config-iife.js

@@ -17564,15 +17564,17 @@
     * Generates a PDF based on the current image, then calls "exportedPDF" with
     * an object including the string, the data URL, and any issues found
     * @function module:svgcanvas.SvgCanvas#exportPDF
-    * @param {string} exportWindowName Will also be used for the download file name here
+    * @param {string} [exportWindowName] Will also be used for the download file name here
     * @param {external:jsPDF.OutputType} [outputType="dataurlstring"]
-    * @param {module:svgcanvas.PDFExportedCallback} cb
+    * @param {module:svgcanvas.PDFExportedCallback} [cb]
     * @fires module:svgcanvas.SvgCanvas#event:exportedPDF
     * @returns {Promise} Resolves to {@link module:svgcanvas.PDFExportedResults}
     */
 
 
-    this.exportPDF = function (exportWindowName, outputType, cb) {
+    this.exportPDF = function (exportWindowName) {
+      var outputType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isChrome() ? 'save' : undefined;
+      var cb = arguments.length > 2 ? arguments[2] : undefined;
       var that = this;
       return new Promise(
       /*#__PURE__*/
@@ -32144,7 +32146,7 @@
                     openExportWindow();
                   }
 
-                  svgCanvas.exportPDF(exportWindowName, chrome ? 'save' : undefined);
+                  svgCanvas.exportPDF(exportWindowName);
                   _context6.next = 13;
                   break;