update master to V7

2021-05-09 19:29:45 +02:00
parent 41fc05672d
commit 593c415664
1000 changed files with 47537 additions and 54304 deletions
--- a/src/editor/extensions/ext-server_opensave/ext-server_opensave.js
+++ b/src/editor/extensions/ext-server_opensave/ext-server_opensave.js
@@ -11,6 +11,7 @@ import {Canvg as canvg} from 'canvg';
 const loadExtensionTranslation = async function (lang) {
  let translationModule;
  try {
+    // eslint-disable-next-line no-unsanitized/method
    translationModule = await import(`./locale/${encodeURIComponent(lang)}.js`);
  } catch (_error) {
    // eslint-disable-next-line no-console
@@ -24,7 +25,7 @@ export default {
  name: 'server_opensave',
  async init ({$, decode64, encode64}) {
    const svgEditor = this;
-    const strings = await loadExtensionTranslation(svgEditor.curPrefs.lang);
+    const strings = await loadExtensionTranslation(svgEditor.configObj.pref('lang'));
    const {
      curConfig: {
        avoidClientSide, // Deprecated
@@ -32,6 +33,7 @@ export default {
      },
      canvas: svgCanvas
    } = svgEditor;
+    const {$id} = svgCanvas;

    /**
     *
@@ -62,14 +64,16 @@ export default {
      if (avoidClientSide || avoidClientSideDownload) {
        return false;
      }
-      const support = $('<a>')[0].download === '';
+      const support = document.querySelector('a').download === '';
      let a;
      if (support) {
-        a = $('<a>hidden</a>').attr({
-          download: (filename || 'image') + suffix,
-          href: uri
-        }).css('display', 'none').appendTo('body');
-        a[0].click();
+        a = document.createElement("a");
+        a.text = 'hidden';
+        a.download = (filename || 'image') + suffix;
+        a.href = uri;
+        a.style.dispaly = 'none';
+        document.body.appendChild(a);
+        a.click();
        return true;
      }
      return false;
@@ -83,10 +87,13 @@ export default {

    //  Hiding by size instead of display to avoid FF console errors
    //    with `getBBox` in browser.js `supportsPathBBox_`)
-    $(
-      `<iframe name="output_frame" title="${strings.hiddenframe}"
-          style="width: 0; height: 0;" src="data:text/html;base64,PGh0bWw+"/>`
-    ).appendTo('body');
+    const iframe = document.createElement('IFRAME');
+    iframe.src="data:text/html;base64,PGh0bWw+";
+    document.body.append(iframe);
+    iframe.name = "output_frame";
+    iframe.contentWindow.document.title = strings.hiddenframe;
+    iframe.style.cssText = "width:0;height:0;";
+
    svgEditor.setCustomHandlers({
      save (win, data) {
        const svg = '<?xml version="1.0" encoding="UTF-8"?>\n' + data, // Firefox doesn't seem to know it is UTF-8 (no matter whether we use or skip the clientDownload code) despite the Content-Disposition header containing UTF-8, but adding the encoding works
@@ -96,15 +103,16 @@ export default {
          return;
        }

-        $('<form>').attr({
-          method: 'post',
-          action: saveSvgAction,
-          target: 'output_frame'
-        }).append(`
-          <input type="hidden" name="output_svg" value="${xhtmlEscape(svg)}">
-          <input type="hidden" name="filename" value="${xhtmlEscape(filename)}">
-        `).appendTo('body')
-          .submit().remove();
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', saveSvgAction);
+        form.setAttribute('target', 'output_frame');
+        // eslint-disable-next-line no-unsanitized/property
+        form.innerHTML = `<input type="hidden" name="output_svg" value="${xhtmlEscape(svg)}">
+        <input type="hidden" name="filename" value="${xhtmlEscape(filename)}">`;
+        document.body.append(form);
+        form.submit();
+        form.remove();
      },
      exportPDF (win, data) {
        const filename = getFileNameFromTitle(),
@@ -112,28 +120,32 @@ export default {
        if (clientDownloadSupport(filename, '.pdf', datauri)) {
          return;
        }
-        $('<form>').attr({
-          method: 'post',
-          action: saveImgAction,
-          target: 'output_frame'
-        }).append(`
-          <input type="hidden" name="output_img" value="${datauri}">
-          <input type="hidden" name="mime" value="application/pdf">
-          <input type="hidden" name="filename" value="${xhtmlEscape(filename)}">
-        `).appendTo('body')
-          .submit().remove();
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', saveImgAction);
+        form.setAttribute('target', 'output_frame');
+        // eslint-disable-next-line no-unsanitized/property
+        form.innerHTML = `<input type="hidden" name="output_img" value="${datauri}">
+        <input type="hidden" name="mime" value="application/pdf">
+        <input type="hidden" name="filename" value="${xhtmlEscape(filename)}">`;
+        document.body.append(form);
+        form.submit();
+        form.remove();  
      },
      // Todo: Integrate this extension with a new built-in exportWindowType, "download"
      async exportImage (win, data) {
        const {issues, mimeType, quality} = data;

-        if (!$('#export_canvas').length) {
-          $('<canvas>', {id: 'export_canvas'}).hide().appendTo('body');
+        if (!$id('export_canvas')) {
+          const canvasx = document.createElement("CANVAS");
+          canvasx.id = 'export_canvas';
+          canvasx.style.display = 'none';
+          document.body.appendChild(canvasx);
        }
-        const c = $('#export_canvas')[0];
+        const c = $id('export_canvas');

-        c.width = svgCanvas.contentW;
-        c.height = svgCanvas.contentH;
+        c.style.width = svgCanvas.contentW;
+        c.style.height = svgCanvas.contentH;
        await canvg(c, data.svg);
        const datauri = quality ? c.toDataURL(mimeType, quality) : c.toDataURL(mimeType);
        // {uiStrings} = svgEditor;
@@ -146,7 +158,8 @@ export default {
        }

        if (note.length) {
-          await $.alert(note);
+          // eslint-disable-next-line no-alert
+          alert(note);
        }

        const filename = getFileNameFromTitle();
@@ -156,16 +169,17 @@ export default {
          return;
        }

-        $('<form>').attr({
-          method: 'post',
-          action: saveImgAction,
-          target: 'output_frame'
-        }).append(`
-          <input type="hidden" name="output_img" value="${datauri}">
-          <input type="hidden" name="mime" value="${mimeType}">
-          <input type="hidden" name="filename" value="${xhtmlEscape(filename)}">
-        `).appendTo('body')
-          .submit().remove();
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', saveImgAction);
+        form.setAttribute('target', 'output_frame');
+        // eslint-disable-next-line no-unsanitized/property
+        form.innerHTML = `<input type="hidden" name="output_img" value="${datauri}">
+        <input type="hidden" name="mime" value="${mimeType}">
+        <input type="hidden" name="filename" value="${xhtmlEscape(filename)}">`;
+        document.body.append(form);
+        form.submit();
+        form.remove();
      }
    });

@@ -184,8 +198,7 @@ export default {
        cancelled = false;
        return;
      }
-
-      $('#dialog_box').hide();
+      if($id("dialog_box") != null) $id("dialog_box").style.display = 'none';

      if (type !== 'import_img') {
        xmlstr = decode64(str64);
@@ -208,19 +221,21 @@ export default {
    };

    // Create upload form
-    const openSvgForm = $('<form>');
-    openSvgForm.attr({
-      enctype: 'multipart/form-data',
-      method: 'post',
-      action: openSvgAction,
-      target: 'output_frame'
-    });
+
+    const openSvgForm = document.createElement("FORM");
+    openSvgForm.action = openSvgAction;
+    openSvgForm.enctype = 'multipart/form-data';
+    openSvgForm.method = 'post';
+    openSvgForm.target = 'output_frame';
+    

    // Create import form
-    const importSvgForm = openSvgForm.clone().attr('action', importSvgAction);
+    const importSvgForm = openSvgForm.cloneNode(true);
+    importSvgForm.action =  importSvgAction;

    // Create image form
-    const importImgForm = openSvgForm.clone().attr('action', importImgAction);
+    const importImgForm = openSvgForm.cloneNode(true);
+    importImgForm.action = importImgAction;

    // It appears necessary to rebuild this input every time a file is
    // selected so the same file can be picked and the change event can fire.
@@ -232,7 +247,10 @@ export default {
     */
    function rebuildInput (form) {
      form.empty();
-      const inp = $('<input type="file" name="svg_file">').appendTo(form);
+      const inp = document.createElement('input');
+      inp.type = 'file';
+      inp.name = 'svg_file';
+      form.appendChild(inp);

      /**
       * Submit the form, empty its contents for reuse and show
@@ -246,7 +264,7 @@ export default {
        rebuildInput(form);
        await $.process_cancel(strings.uploading);
        cancelled = true;
-        $('#dialog_box').hide();
+        if($id("dialog_box") != null) $id("dialog_box").style.display = 'none';
      }

      if (form[0] === openSvgForm[0]) {
@@ -273,8 +291,10 @@ export default {
    rebuildInput(importImgForm);

    // Add forms to buttons
-    $('#tool_open').show().prepend(openSvgForm);
-    $('#tool_import').show().prepend(importSvgForm);
-    $('#tool_image').prepend(importImgForm);
+    $id("tool_open").style.display = 'block';
+    $id("tool_import").style.display = 'block';
+    $id('tool_open').insertBefore(openSvgForm, $id('tool_open').firstChild);
+    $id('tool_import').insertBefore(importSvgForm, $id('tool_import').firstChild);
+    $id('tool_image').insertBefore(importImgForm, $id('tool_image').firstChild);
  }
 };
--- a/src/editor/extensions/ext-server_opensave/locale/de.js
+++ b/src/editor/extensions/ext-server_opensave/locale/de.js
@@ -1,4 +0,0 @@
-export default {
-  uploading: 'Hochladen...',
-  hiddenframe: 'Opensave frame um versteckte Werte zu speichern'
-};