Merge pull request #507 from SVG-Edit/V7-dev

V7 dev

.eslintrc.js

@@ -21,10 +21,26 @@ module.exports = {
     es6: true
   },
   rules: {
+    /** @todo len should probably more 120-150 */
+    "max-len": [ "warn", { "code": 250 } ],
+    /** @todo jsdoc should be made warn or error */
+    "valid-jsdoc": "off",
+      /** @todo cognitive complexity should be much lower (25-50?) */
+    "sonarjs/cognitive-complexity": [ "warn", 200 ],
     "node/no-unsupported-features/es-syntax": 0,
     "no-unused-vars": [ "error", { "argsIgnorePattern": "^_" } ],
-    "sonarjs/cognitive-complexity": ["warn", 40],
     "sonarjs/no-duplicate-string": 0,
+    "semi" : "error",
+    "no-trailing-spaces": "error",
+    "array-bracket-spacing": [ "error", "always" ],
+    "comma-spacing": "error",
+    "object-curly-spacing": [ "error", "always" ],
+    "no-console": [
+      "warn",
+      { "allow": [ "warn", "error", "info", "table" ] }
+    ],
+    "no-param-reassign": [ "warn", { "props": false } ],
+    "arrow-parens": [ "error", "always" ],
   },
   overrides: [
     {
@@ -36,9 +52,7 @@ module.exports = {
         mocha: true,
         node: true
       },
-      globals: {
-        "assert": true
-      },
+      globals: { "assert": true },
       rules: {
         // with ci, instrumented is not created before linter
         "import/no-unresolved": [ 2, { ignore: [ 'instrumented' ] } ],

cypress/integration/ui/__snapshots__/scenario.js.snap

@@ -623,12 +623,12 @@ exports[`use various parts of svg-edit > check tool_star #0`] = `
       point="5"
       r="66.66666666666667"
       radialshift="0"
-      r2="13.333333333333334"
+      r2="22.222222222222225"
       orient="point"
       fill="#ffff00"
       strokecolor="#000000"
       strokewidth="0"
-      points="370,135.33333333333331 377.83713669723295,191.21310674166736 433.40376775301024,181.39886704167017 382.68075355060205,206.12022659166595 409.18568348616486,255.93446629166317 370,215.33333333333334 330.81431651383514,255.93446629166317 357.31924644939795,206.12022659166595 306.59623224698976,181.39886704167017 362.16286330276705,191.21310674166736 370,135.33333333333331 377.83713669723295,191.21310674166736 "
+      points="370,135.33333333333331 383.0618944953883,184.02184456944562 433.40376775301024,181.39886704167017 391.13458925100343,208.86704431944327 409.18568348616486,255.93446629166317 370,224.22222222222223 330.81431651383514,255.93446629166317 348.86541074899657,208.86704431944327 306.59623224698976,181.39886704167017 356.9381055046117,184.02184456944562 370,135.33333333333331 383.0618944953883,184.02184456944562 "
       stroke="#000000"
       stroke-width="0"
     >
@@ -713,12 +713,12 @@ exports[`use various parts of svg-edit > check tool_polygon #0`] = `
       point="5"
       r="66.66666666666667"
       radialshift="0"
-      r2="13.333333333333334"
+      r2="22.222222222222225"
       orient="point"
       fill="#ffff00"
       strokecolor="#000000"
       strokewidth="0"
-      points="370,135.33333333333331 377.83713669723295,191.21310674166736 433.40376775301024,181.39886704167017 382.68075355060205,206.12022659166595 409.18568348616486,255.93446629166317 370,215.33333333333334 330.81431651383514,255.93446629166317 357.31924644939795,206.12022659166595 306.59623224698976,181.39886704167017 362.16286330276705,191.21310674166736 370,135.33333333333331 377.83713669723295,191.21310674166736 "
+      points="370,135.33333333333331 383.0618944953883,184.02184456944562 433.40376775301024,181.39886704167017 391.13458925100343,208.86704431944327 409.18568348616486,255.93446629166317 370,224.22222222222223 330.81431651383514,255.93446629166317 348.86541074899657,208.86704431944327 306.59623224698976,181.39886704167017 356.9381055046117,184.02184456944562 370,135.33333333333331 383.0618944953883,184.02184456944562 "
       stroke="#000000"
       stroke-width="0"
       fill-opacity="1"

cypress/integration/unit/draw.js

@@ -727,7 +727,6 @@ describe('draw.Drawing', function () {
     drawing.setLayerOpacity(LAYER3, -1.4);
 
     assert.strictEqual(drawing.getLayerOpacity(LAYER1), 0.4);
-    // console.log('layer2 opacity ' + drawing.getLayerOpacity(LAYER2));
     assert.strictEqual(drawing.getLayerOpacity(LAYER2), 1.0);
     assert.strictEqual(drawing.getLayerOpacity(LAYER3), 1.0);
 

cypress/integration/unit/test1.js

@@ -159,8 +159,6 @@ describe('Basic Module', function () {
       assert.strictEqual(attrVal, 'bar', true, 'Preserved namespaced attribute on import');
 
       const output = svgCanvas.getSvgString();
-      // } catch(e) {console.log(e)}
-      // console.log('output',output);
       const hasXlink = output.includes('xmlns:xlink="http://www.w3.org/1999/xlink"');
       const hasSe = output.includes('xmlns:se=');
       const hasFoo = output.includes('xmlns:foo=');

docs/jsdoc-config.js

@@ -3,58 +3,7 @@
 
 module.exports = {
   plugins: [ 'plugins/markdown' ],
-  markdown: {
-    // tags: ['examples']
-    /*
-    // "The highlighter function should escape the code block's contents and wrap them in <pre><code> tags"
-    highlight (code, language) {
-      function ret () {
-        // Default:
-        return '<pre><code>' + code + ' in this language: ' + language + '</code></pre>';
-      }
-      if (language !== 'js') { // E.g., we have one URL in some tutorial Markdown
-        // Seems to be only for full triple-backticked fences
-        // console.log('lll', code);
-        return ret();
-      }
-
-      // Programmatic ESLint API: https://eslint.org/docs/developer-guide/nodejs-api
-      const {CLIEngine} = require('eslint');
-      const cli = new CLIEngine({
-        useEslintrc: true,
-        rules: {
-          'no-undef': 0, // Many variables in examples will be undefined
-          'padded-blocks': 0 // Can look nicer
-        }
-      });
-
-      // Undo escaping done by node_modules/jsdoc/lib/jsdoc/util/markdown.js
-      code = code
-        .replace(/\s+$/, '')
-        .replace(/&#39;/g, "'")
-        .replace(/(https?):\\\/\\\//g, '$1://')
-        .replace(/\{@[^}\r\n]+\}/g, function (wholeMatch) {
-          return wholeMatch.replace(/&quot;/g, '"');
-        });
-
-      // lint the supplied text and optionally set
-      // a filename that is displayed in the report
-      const report = cli.executeOnText(code + '\n');
-      if (!report.errorCount && !report.warningCount) {
-        return ret();
-      }
-
-      // Although we don't get the file, at least we can report the source code
-      const {messages} = report.results[0];
-      messages.forEach(({message, line, column, severity, ruleId}) => {
-        console.log(`${ruleId}: ${message} (Severity: ${severity}; ${line}:${column})`);
-      });
-      console.log('\n' + code);
-
-      return ret();
-    }
-    */
-  },
+  markdown: {},
   recurseDepth: 10,
   source: {
     exclude: [

package.json

@@ -117,8 +117,8 @@
     "svg2pdf.js": "2.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.14.0",
-    "@babel/preset-env": "7.14.1",
+    "@babel/core": "7.14.2",
+    "@babel/preset-env": "7.14.2",
     "@babel/register": "7.13.16",
     "@babel/runtime-corejs3": "7.14.0",
     "@cypress/code-coverage": "3.9.5",
@@ -140,7 +140,7 @@
     "coveradge": "0.6.0",
     "cp-cli": "2.0.0",
     "cross-var": "1.1.0",
-    "cypress": "7.2.0",
+    "cypress": "7.3.0",
     "cypress-axe": "0.12.2",
     "cypress-multi-reporters": "1.5.0",
     "cypress-plugin-snapshots": "1.4.4",
@@ -149,13 +149,13 @@
     "eslint-plugin-array-func": "3.1.7",
     "eslint-plugin-chai-expect": "2.2.0",
     "eslint-plugin-chai-expect-keywords": "2.1.0",
-    "eslint-plugin-chai-friendly": "0.6.0",
+    "eslint-plugin-chai-friendly": "0.7.1",
     "eslint-plugin-compat": "^3.9.0",
     "eslint-plugin-cypress": "2.11.3",
     "eslint-plugin-eslint-comments": "3.2.0",
     "eslint-plugin-html": "^6.1.2",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsdoc": "^33.1.1",
+    "eslint-plugin-import": "2.23.0",
+    "eslint-plugin-jsdoc": "34.2.2",
     "eslint-plugin-markdown": "^2.1.0",
     "eslint-plugin-mocha": "8.1.0",
     "eslint-plugin-mocha-cleanup": "1.9.1",
@@ -165,7 +165,7 @@
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-sonarjs": "^0.7.0",
     "eslint-plugin-standard": "4.1.0",
-    "eslint-plugin-unicorn": "32.0.0",
+    "eslint-plugin-unicorn": "32.0.1",
     "imageoptim-cli": "3.0.2",
     "jamilih": "0.54.0",
     "jsdoc": "3.6.6",
@@ -193,8 +193,8 @@
     "rollup-plugin-re": "1.0.7",
     "rollup-plugin-terser": "7.0.2",
     "stackblur-canvas": "2.5.0",
-    "start-server-and-test": "^1.12.1",
-    "systemjs": "6.8.3",
+    "start-server-and-test": "^1.12.2",
+    "systemjs": "6.9.0",
     "typescript": "4.2.4",
     "underscore": "1.13.1"
   }

rollup.config.js

@@ -28,7 +28,8 @@ const getDirectories = (source) => {
 // capture the list of files to build for extensions and ext-locales
 const extensionDirs = getDirectories('src/editor/extensions');
 
-const dest = ['dist/editor', 'dist/editor/system'];
+/** @todo should we support systemjs? */
+const dest = [ 'dist/editor' ];
 
 // remove existing distribution
 // eslint-disable-next-line no-console
@@ -50,15 +51,16 @@ const config = [{
       sourcemap: true,
       file: 'dist/editor/xdomain-index.js',
       intro: 'const XDOMAIN = true;'
-    },
+    }
+    /*
     {
       format: 'system',
       dir: 'dist/editor/system',
       inlineDynamicImports: true
     }
+    */
   ],
   plugins: [
-    // progress(),
     copy({
       targets: [
         {
@@ -72,6 +74,7 @@ const config = [{
           transform: (contents) => contents.toString()
             .replace('<script type="module" src="index.js">', '<script type="module" src="xdomain-index.js">')
         },
+        /*
         {
           src: 'src/editor/index.html',
           dest: ['dist/editor/system'],
@@ -91,14 +94,13 @@ const config = [{
           src: ['node_modules/systemjs/dist/s.min.js', 'node_modules/systemjs/dist/s.min.js.map'],
           dest: 'dist/editor/system'
         },
+        */
         { src: 'src/editor/images', dest },
         { src: 'src/editor/extensions/ext-shapes/shapelib', dest: dest.map((d) => `${d}/extensions/ext-shapes`) },
-        {src: 'src/editor/jgraduate', dest},
-        {src: 'src/editor/spinbtn', dest},
         { src: 'src/editor/embedapi.html', dest },
         { src: 'src/editor/embedapi.js', dest },
         { src: 'src/editor/browser-not-supported.html', dest },
-        {src: 'src/editor/redirect-on-lacking-support.js', dest},
+        { src: 'src/editor/browser-not-supported.js', dest },
         { src: 'src/editor/svgedit.css', dest }
       ]
     }),
@@ -127,15 +129,17 @@ extensionDirs.forEach((extensionDir) => {
           dir: `dist/editor/extensions/${extensionName}`,
           inlineDynamicImports: true,
           sourcemap: true
-        },
+        }
+        /*
+        ,
         {
           format: 'system',
           dir: `dist/editor/system/extensions/${extensionName}`,
           inlineDynamicImports: true
         }
+        */
       ],
       plugins: [
-        // progress(),
         url({
           include: [ '**/*.svg', '**/*.png', '**/*.jpg', '**/*.gif', '**/*.xml' ],
           limit: 0,

src/editor/ConfigObj.js

@@ -170,11 +170,11 @@ export default class ConfigObj {
       // 'ext-markers',
       'ext-overview_window',
       'ext-panning',
-      'ext-polygon',
       'ext-shapes',
-      'ext-star',
+      'ext-polystar',
       'ext-storage',
-      'ext-opensave'
+      'ext-opensave',
+      // 'ext-helloworld',
     ];
     this.curConfig = {
       // We do not put on defaultConfig to simplify object copying

src/editor/Editor.js

@@ -295,7 +295,7 @@ class Editor extends EditorStartup {
       '5/Shift+5': 'tools_ellipse'
     };
     Object.entries(keyAssocs).forEach(([ keyval, sel ]) => {
-      const parentsElements = this.getParents($id(sel), $id('main_menu'))
+      const parentsElements = this.getParents($id(sel), $id('main_menu'));
       const menu = (parentsElements.length);
 
       $qa(sel).forEach((element) => {
@@ -350,9 +350,9 @@ class Editor extends EditorStartup {
       const elements = document.getElementsByClassName("tool_button_current");
       Array.from(elements).forEach(function (element) {
         element.classList.add('tool_button_current');
-        element.classList.remove('tool_button')
+        element.classList.remove('tool_button');
       });
-      $id('tool_select').classList.add('tool_button_current')
+      $id('tool_select').classList.add('tool_button_current');
       $id('tool_select').classList.remove('tool_button');
       this.multiselected = false;
       if (elems.length) {
@@ -775,7 +775,7 @@ class Editor extends EditorStartup {
     const icon = (typeof iconId === 'string') ? img : iconId.cloneNode(true);
     if (!icon) {
       // Todo: Investigate why this still occurs in some cases
-      console.log('NOTE: Icon image missing: ' + iconId);
+      console.warn('NOTE: Icon image missing: ' + iconId);
       return;
     }
     // empty()

src/editor/EditorStartup.js

@@ -53,7 +53,7 @@ class EditorStartup {
   constructor () {
     this.extensionsAdded = false;
     this.messageQueue = [];
-    this.$svgEditor = $id('svg_editor')
+    this.$svgEditor = $id('svg_editor');
   }
   /**
   * Auto-run after a Promise microtask.
@@ -61,6 +61,10 @@ class EditorStartup {
   * @returns {void}
   */
   async init () {
+    if ('localStorage' in window) { // && onWeb removed so Webkit works locally
+      this.storage = window.localStorage;
+    }
+    this.configObj.load();
     const self = this;
     const { i18next } = await putLocale(this.configObj.pref('lang'), this.goodLangs);
     this.i18next = i18next;
@@ -97,12 +101,6 @@ class EditorStartup {
       console.error(err);
     }
 
-    if ('localStorage' in window) { // && onWeb removed so Webkit works locally
-      this.storage = window.localStorage;
-    }
-
-    this.configObj.load();
-
     /**
     * @name module:SVGthis.canvas
     * @type {module:svgcanvas.SvgCanvas}
@@ -136,7 +134,7 @@ class EditorStartup {
     this.selectedElement = null;
     this.multiselected = false;
 
-    const aLinks = $id('cur_context_panel').querySelectorAll('a')
+    const aLinks = $id('cur_context_panel').querySelectorAll('a');
 
     for (const aLink of aLinks) {
       aLink.addEventListener('click', (evt) => {
@@ -426,16 +424,16 @@ class EditorStartup {
     Array.from(elements).forEach(function(element) {
       element.addEventListener('mousedown', function(event) {
         if (!event.currentTarget.classList.contains('disabled')) {
-          event.currentTarget.classList.add('push_button_pressed')
+          event.currentTarget.classList.add('push_button_pressed');
           event.currentTarget.classList.remove('push_button');
         }
       });
       element.addEventListener('mouseout', function(event) {
-        event.currentTarget.classList.add('push_button')
+        event.currentTarget.classList.add('push_button');
         event.currentTarget.classList.remove('push_button_pressed');
       });
       element.addEventListener('mouseup', function(event) {
-        event.currentTarget.classList.add('push_button')
+        event.currentTarget.classList.add('push_button');
         event.currentTarget.classList.remove('push_button_pressed');
       });
     });
@@ -791,7 +789,6 @@ class EditorStartup {
  * @returns {void}
  */
   messageListener ({ data, origin }) {
-  // console.log('data, origin, extensionsAdded', data, origin, extensionsAdded);
     const messageObj = { data, origin };
     if (!this.extensionsAdded) {
       this.messageQueue.push(messageObj);

src/editor/MainMenu.js

@@ -111,11 +111,8 @@ class MainMenu {
 
     // set language
     if (lang && lang !== this.editor.configObj.pref("lang")) {
-      const { langParam, langData } = await this.editor.putLocale(
-        lang,
-        this.editor.goodLangs
-      );
-      await this.editor.svgCanvassetLang(langParam, langData);
+      this.editor.configObj.pref("lang", lang);
+      seAlert('Changing the language needs reload');
     }
 
     // set grid setting
@@ -130,7 +127,7 @@ class MainMenu {
     this.editor.configObj.curConfig.baseUnit = baseunit;
     this.editor.svgCanvas.setConfig(this.editor.configObj.curConfig);
     this.editor.updateCanvas();
-    this.editor.hidePreferences();
+    this.hidePreferences();
   }
 
   /**
@@ -305,7 +302,7 @@ class MainMenu {
   init() {
     // add Top panel
     const template = document.createElement("template");
-    const {i18next} = this.editor
+    const { i18next } = this.editor;
     // eslint-disable-next-line no-unsanitized/property
     template.innerHTML = `
     <se-menu id="main_button" label="SVG-Edit" src="./images/logo.svg" alt="logo">
@@ -334,7 +331,7 @@ class MainMenu {
      */
 
     $id("tool_clear").addEventListener("click", this.clickClear.bind(this));
-    $id("tool_open").addEventListener("click", e => {
+    $id("tool_open").addEventListener("click", (e) => {
       e.preventDefault();
       this.clickOpen();
       window.dispatchEvent(new CustomEvent("openImage"));

src/editor/components/jgraduate/Util.js

@@ -23,7 +23,7 @@ export function isObject(item) {
 export function mergeDeep(target, source) {
   let output = Object.assign({}, target);
   if (isObject(target) && isObject(source)) {
-    Object.keys(source).forEach(key => {
+    Object.keys(source).forEach((key) => {
       if (isObject(source[key])) {
         if (!(key in target))
           Object.assign(output, { [key]: source[key] });

src/editor/components/jgraduate/jQuery.jPicker.js

@@ -1368,7 +1368,7 @@ export function jPickerMethod (elem, options, commitCallback, liveCallback, canc
       if (!that.querySelectorAll('div.jPicker.Container').length) {
         document.body.insertBefore(container, document.body.firstChild);
       } else {
-        that.querySelector('div.jPicker.Container:last').insertAdjacentElement('afterend', container)
+        that.querySelector('div.jPicker.Container:last').insertAdjacentElement('afterend', container);
       }
       container.addEventListener('mousedown', function () {
         container.style.zIndex = 20;
@@ -1520,7 +1520,7 @@ export function jPickerMethod (elem, options, commitCallback, liveCallback, canc
       iconAlpha = that.icon.querySelector('.Alpha');
       setImg.call(that, iconAlpha, images.clientPath + 'bar-opacity.png');
       setAlpha.call(that, iconAlpha, toFixedNumeric(((255 - (!isNullish(all) ? all.a : 0)) * 100) / 255, 4));
-      iconImage = that.icon.querySelector('.Image')
+      iconImage = that.icon.querySelector('.Image');
       iconImage.style.backgroundImage = 'url(\'' + images.clientPath + images.picker.file + '\')';
       iconImage.addEventListener('click', iconImageClicked);
       if (win.bindToInput && win.updateInputColor) {

src/editor/components/seColorPicker.js

@@ -344,7 +344,7 @@ div.jGraduate_Swatch {
 }
 div.jGraduate_GradContainer {
   border: 2px inset #EEE;
-  background-image: url(../images/map-opacity.png);
+  background-image: url(./components/jgraduate/images/map-opacity.png);
   background-position: 0px 0px;
   height: 256px;
   width: 256px;

src/editor/components/seDropdown.js

@@ -40,7 +40,7 @@ class Dropdown extends ListComboBox {
         ::slotted(*) {
           padding: 4px;
           background: #E8E8E8;
-          border: 1px solid #B0B0B0;
+          border: 1px solid #5a6162;
           width: 100%;
         }
         [part~="popup"] {

src/editor/components/seExplorerButton.js

@@ -67,7 +67,7 @@ template.innerHTML = `
   .menu-item {
     line-height: 1em;
     padding: 0.5em;
-    border: 1px solid #B0B0B0;
+    border: 1px solid #5a6162;
     background: #E8E8E8;
     margin-bottom: -1px;
     white-space: nowrap;

src/editor/components/seSpinInput.js

@@ -19,7 +19,7 @@ template.innerHTML = `
   elix-number-spin-box {
     background-color: var(--input-color);
     border-radius: 3px;
-    height: 20px !important;
+    height: 20px;
     margin-top: 1px;
     vertical-align: top;
   }

src/editor/contextmenu.js

@@ -48,7 +48,6 @@ export const add = function (menuItem) {
     throw new Error('Cannot add extension "' + menuItem.id + '", an extension by that name already exists"');
   }
   // Register menuItem action, see below for deferred menu dom injection
-  console.log('Registered contextmenu item: {id:' + menuItem.id + ', label:' + menuItem.label + '}');
   contextMenuExtensions[menuItem.id] = menuItem;
   // TODO: Need to consider how to handle custom enable/disable behavior
 };

src/editor/dialogs/SePlainAlertDialog.js

@@ -52,7 +52,7 @@ export default class SePlainAlertDialog extends PlainAlertDialog {
             background: #DDD;
             overflow: auto;
             text-align: left;
-            border: 1px solid #B0B0B0;
+            border: 1px solid #5a6162;
             padding: 1em;
             border-radius: 5px;
             -moz-border-radius: 5px;

src/editor/dialogs/editorPreferencesDialog.js

@@ -71,7 +71,8 @@ template.innerHTML = `
   }
   #svg_prefs #svg_prefs_container {
     padding: 10px;
-    background-color: #B0B0B0;
+    background-color: #5a6162;
+    color: #c5c5c5;
     border: 1px outset #777;
     opacity: 1.0;
     font-family: Verdana, Helvetica, sans-serif;
@@ -84,6 +85,17 @@ template.innerHTML = `
     overflow: auto;
   }
 
+  #tool_prefs_save {
+    width: 30%;
+    background-color: #c79605;
+    margin-left: 20%;
+  }
+
+  #tool_prefs_cancel {
+    width: 30%;
+    background-color: #c8c8c8;
+  }
+  
   #svg_prefs #svg_docprops_prefs {
     float: left;
     width: 221px;
@@ -138,11 +150,9 @@ template.innerHTML = `
     <div id="svg_prefs_container">
       <div id="tool_prefs_back" class="toolbar_button">
         <button id="tool_prefs_save">
-          <img class="svg_icon" src="./images/ok.svg" alt="icon" width="16" height="16" />
           OK
         </button>
         <button id="tool_prefs_cancel">
-          <img class="svg_icon" src="./images/cancel.svg" alt="icon" width="16" height="16" />
           Cancel
         </button>
       </div>

src/editor/dialogs/exportDialog.js

@@ -6,10 +6,10 @@ template.innerHTML = `
  
   #dialog_content {
     margin: 10px 10px 5px 10px;
-    background: #DDD;
+    background: #5a6162;
     overflow: auto;
     text-align: left;
-    border: 1px solid #B0B0B0;
+    border: 1px solid #c8c8c8;
   }
 
   #dialog_content p, #dialog_content select, #dialog_content label {
@@ -24,7 +24,7 @@ template.innerHTML = `
     top: 50%;
     max-width: 400px;
     z-index: 50001;
-    background: #CCC;
+    background: #5a6162;
     border: 1px outset #777;
     font-family:Verdana,Helvetica,sans-serif;
     font-size:0.8em;
@@ -72,11 +72,9 @@ template.innerHTML = `
       </div>
       <div id="dialog_buttons">
         <button id="export_ok">
-          <img class="svg_icon" src="./images/ok.svg" alt="icon" width="16" height="16" />
           Ok
         </button>
         <button id="export_cancel">
-          <img class="svg_icon" src="./images/cancel.svg" alt="icon" width="16" height="16" />
           Cancel
         </button>
       </div>

src/editor/dialogs/imagePropertiesDialog.js

@@ -16,7 +16,8 @@ template.innerHTML = `
   }
   #svg_docprops #svg_docprops_container {
     padding: 10px;
-    background-color: #B0B0B0;
+    background-color: #5a6162;
+    color: #c5c5c5;
     border: 1px outset #777;
     opacity: 1.0;
     font-family: Verdana, Helvetica, sans-serif;

src/editor/dialogs/svgSourceDialog.js

@@ -14,7 +14,8 @@ template.innerHTML = `
   }
  
   #svg_source_editor #svg_source_container {
-    background-color: #B0B0B0;
+    background-color: #5a6162;
+    color: #c5c5c5;
     opacity: 1.0;
     text-align: center;
     border: 1px outset #777;
@@ -42,18 +43,27 @@ template.innerHTML = `
   
   #svg_source_editor #tool_source_back {
     text-align: left;
-    margin: 5px 10px;
+    height: 30px;
+  }  
+  #tool_source_save {
+    width: 20%;
+    background-color: #c79605;
+    margin-left: 30%;
+    margin-top: 5px;
+  }
+
+  #tool_source_cancel {
+    width: 20%;
+    background-color: #c8c8c8;
   }
   </style>
   <elix-dialog id="svg_source_editor" aria-label="SVG Source Editor" closed>
     <div id="svg_source_container">
       <div id="tool_source_back" class="toolbar_button">
         <button id="tool_source_save">
-          <img class="svg_icon" src="./images/ok.svg" alt="icon" width="16" height="16" />
           Apply Changes
         </button>
         <button id="tool_source_cancel">
-          <img class="svg_icon" src="./images/cancel.svg" alt="icon" width="16" height="16" />
           Cancel
         </button>
       </div>

src/editor/extensions/ext-arrows/ext-arrows.js

@@ -9,7 +9,7 @@
 
 const loadExtensionTranslation = async function (svgEditor) {
   let translationModule;
-  const lang = svgEditor.configObj.pref('lang')
+  const lang = svgEditor.configObj.pref('lang');
   try {
     // eslint-disable-next-line no-unsanitized/method
     translationModule = await import(`./locale/${encodeURIComponent(lang)}.js`);

src/editor/extensions/ext-connector/ext-connector.js

@@ -79,7 +79,7 @@ export default {
         x: midX + lenX * ratio,
         y: midY + lenY * ratio
       };
-    }
+    };
 
     /**
     * @param {"start"|"end"} side
@@ -92,7 +92,7 @@ export default {
       // TODO: Make this number (5) be based on marker width/height
       const size = line.getAttribute('stroke-width') * 5;
       return giveOffset ? size : 0;
-    }
+    };
 
     /**
     * @param {boolean} on
@@ -108,7 +108,7 @@ export default {
       connRules.textContent = (!on ? '' : '#tool_clone, #tool_topath, #tool_angle, #xy_panel { display: none !important; }');
       if ($id('connector_panel'))
         $id('connector_panel').style.display = (on) ? 'block' : 'none';
-    }
+    };
 
     /**
      * @param {Element} elem
@@ -144,7 +144,7 @@ export default {
         const ptEnd = pts.getItem(pts.numberOfItems - 1);
         setPoint(elem, 1, (ptEnd.x + ptStart.x) / 2, (ptEnd.y + ptStart.y) / 2);
       }
-    }
+    };
 
     /**
     * @param {Float} diffX
@@ -184,7 +184,7 @@ export default {
         const pt2 = getBBintersect(pt.x, pt.y, dataStorage.get(line, altPre + '_bb'), getOffset(altPre, line));
         setPoint(line, conn.is_start ? 'end' : 0, pt2.x, pt2.y, true);
       }
-    }
+    };
 
     /**
     *
@@ -244,7 +244,7 @@ export default {
           }
         }
       });
-    }
+    };
 
     /**
     * @param {Element[]} [elems=selElems]
@@ -302,7 +302,7 @@ export default {
           }
         }
       }
-    }
+    };
 
     // Do once
     (function () {
@@ -347,7 +347,7 @@ export default {
           svgCanvas.getEditorNS(true);
         }
       });
-    }
+    };
 
     const strings = await loadExtensionTranslation(svgEditor.configObj.pref('lang'));
     return {
@@ -359,7 +359,7 @@ export default {
         const buttonTemplate = document.createElement("template");
         buttonTemplate.innerHTML = `
         <se-button id="mode_connect" title="Connect two objects" src="./images/conn.svg"></se-button>
-        `
+        `;
         $id('tools_left').append(buttonTemplate.content.cloneNode(true));
         $id('mode_connect').addEventListener("click", () => {
           svgCanvas.setMode('connector');

src/editor/extensions/ext-eyedropper/ext-eyedropper.js

@@ -4,27 +4,19 @@
  * @license MIT
  *
  * @copyright 2010 Jeff Schiller
+ * @copyright 2021 OptimistikSAS
  *
  */
 
-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
-    console.error(`Missing translation (${lang}) - using 'en'`);
-    translationModule = await import(`./locale/en.js`);
-  }
-  return translationModule.default;
-};
+import { loadExtensionTranslation } from '../../locale.js';
+
+const name = "eyedropper";
 
 export default {
-  name: 'eyedropper',
+  name,
   async init(S) {
     const svgEditor = this;
-    const strings = await loadExtensionTranslation(svgEditor.configObj.pref('lang'));
+    await loadExtensionTranslation(svgEditor, name);
     const { ChangeElementCommand } = S, // , svgcontent,
       // svgdoc = S.svgroot.parentNode.ownerDocument,
       { svgCanvas } = svgEditor,
@@ -71,16 +63,19 @@ export default {
       } else {
         tool.classList.add('disabled');
       }
-    }
+    };
 
     return {
-      name: strings.name,
+      name: svgEditor.i18next.t(`${name}:name`),
       callback() {
         // Add the button and its handler(s)
         const buttonTemplate = document.createElement("template");
+        const title = svgEditor.i18next.t(`${name}:buttons.0.title`);
+        const key = svgEditor.i18next.t(`${name}:buttons.0.key`);
+        // eslint-disable-next-line no-unsanitized/property
         buttonTemplate.innerHTML = `
-        <se-button id="tool_eyedropper" title="Eye Dropper Tool" src="./images/eye_dropper.svg" shortcut="I"></se-button>
-        `
+        <se-button id="tool_eyedropper" title="${title}" src="./images/eye_dropper.svg" shortcut=${key}></se-button>
+        `;
         $id('tools_left').append(buttonTemplate.content.cloneNode(true));
         $id('tool_eyedropper').addEventListener("click", () => {
           svgCanvas.setMode('eyedropper');

src/editor/extensions/ext-eyedropper/locale/fr.js

@@ -0,0 +1,9 @@
+export default {
+  name: 'pipette',
+  buttons: [
+    {
+      title: 'Outil pipette',
+      key: 'I'
+    }
+  ]
+};

src/editor/extensions/ext-foreignobject/ext-foreignobject.js

@@ -277,7 +277,7 @@ export default {
         const attrs = {
           width: newFO.getAttribute('width'),
           height: newFO.getAttribute('height'),
-        }
+        };
         const keep = (attrs.width !== '0' || attrs.height !== '0');
         svgCanvas.addToSelection([ newFO ], true);
 

src/editor/extensions/ext-grid/ext-grid.js

@@ -7,24 +7,15 @@
  *
  */
 
-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
-    console.error(`Missing translation (${lang}) - using 'en'`);
-    translationModule = await import(`./locale/en.js`);
-  }
-  return translationModule.default;
-};
+ import { loadExtensionTranslation } from '../../locale.js';
+
+ const name = "grid";
 
 export default {
-  name: 'grid',
+  name,
   async init ({ NS, getTypeMap }) {
     const svgEditor = this;
-    const strings = await loadExtensionTranslation(svgEditor.configObj.pref('lang'));
+    await loadExtensionTranslation(svgEditor, name);
     const { svgCanvas } = svgEditor;
     const { $id } = svgCanvas;
     const svgdoc = document.getElementById('svgcanvas').ownerDocument;
@@ -138,7 +129,7 @@ export default {
       gridimg.parentNode.setAttribute('width', bigInt);
       gridimg.parentNode.setAttribute('height', bigInt);
       svgCanvas.setHref(gridimg, datauri);
-    }
+    };
 
     /**
      *
@@ -150,18 +141,21 @@ export default {
       }
       $id('canvasGrid').style.display = (showGrid) ? 'block' : 'none';
       document.getElementById('view_grid').pressed = showGrid;
-    }
+    };
     return {
-      name: strings.name,
+      name: svgEditor.i18next.t(`${name}:name`),
       zoomChanged (zoom) {
         if (showGrid) { updateGrid(zoom); }
       },
       callback () {
         // Add the button and its handler(s)
         const buttonTemplate = document.createElement("template");
+        const title = svgEditor.i18next.t(`${name}:buttons.0.title`);
+
+        // eslint-disable-next-line no-unsanitized/property
         buttonTemplate.innerHTML = `
-          <se-button id="view_grid" title="Show grid" src="./images/grid.svg"></se-button>
-        `
+          <se-button id="view_grid" title="${title}" src="./images/grid.svg"></se-button>
+        `;
         $id('editor_panel').append(buttonTemplate.content.cloneNode(true));
         $id('view_grid').addEventListener("click", () => {
           svgEditor.configObj.curConfig.showGrid = showGrid = !showGrid;

src/editor/extensions/ext-grid/locale/fr.js

@@ -0,0 +1,8 @@
+export default {
+  name: 'Grille',
+  buttons: [
+    {
+      title: 'Afficher/Cacher Grille'
+    }
+  ]
+};

src/editor/extensions/ext-helloworld/ext-helloworld.js

@@ -13,39 +13,32 @@
 *  will show the user the point on the canvas that was clicked on.
 */
 
-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
-    console.error(`Missing translation (${lang}) - using 'en'`);
-    translationModule = await import(`./locale/en.js`);
-  }
-  return translationModule.default;
-};
+import { loadExtensionTranslation } from '../../locale.js';
+
+const name = "helloworld";
 
 export default {
-  name: 'helloworld',
+  name,
   async init ({ _importLocale }) {
     const svgEditor = this;
-    const strings = await loadExtensionTranslation(svgEditor.configObj.pref('lang'));
+    await loadExtensionTranslation(svgEditor, name);
     const { svgCanvas } = svgEditor;
+    const { $id } = svgCanvas;
     return {
-      name: strings.name,
-      events: [{
-        // Must match the icon ID in helloworld-icon.xml
-        id: 'hello_world',
-        // Tooltip text
-        title: strings.buttons[0].title,
-        click () {
-          // The action taken when the button is clicked on.
-          // For "mode" buttons, any other button will
-          // automatically be de-pressed.
+      name: svgEditor.i18next.t(`${name}:name`),
+      callback() {
+        // Add the button and its handler(s)
+        const buttonTemplate = document.createElement("template");
+        const title = svgEditor.i18next.t(`${name}:buttons.0.title`);
+        // eslint-disable-next-line no-unsanitized/property
+        buttonTemplate.innerHTML = `
+        <se-button id="hello_world" title="${title}" src="./images/hello_world.svg"></se-button>
+        `;
+        $id('tools_left').append(buttonTemplate.content.cloneNode(true));
+        $id('hello_world').addEventListener("click", () => {
           svgCanvas.setMode('hello_world');
-        }
-      }],
+        });
+      },
       // This is triggered when the main mouse button is pressed down
       // on the editor canvas (not the tool panels)
       mouseDown () {
@@ -70,14 +63,7 @@ export default {
           const y = opts.mouse_y / zoom;
 
           // We do our own formatting
-          let {text} = strings;
-          [
-            ['x', x],
-            ['y', y]
-          ].forEach(([prop, val]) => {
-            text = text.replace('{' + prop + '}', val);
-          });
-
+          let text = svgEditor.i18next.t(`${name}:text`, { x, y });
           // Show the text using the custom alert function
           alert(text);
         }

src/editor/extensions/ext-helloworld/locale/en.js

@@ -1,6 +1,6 @@
 export default {
   name: 'Hello World',
-  text: 'Hello World!\n\nYou clicked here: {x}, {y}',
+  text: 'Hello World!\n\nYou clicked here: {{x}}, {{y}}',
   buttons: [
     {
       title: "Say 'Hello World'"

src/editor/extensions/ext-helloworld/locale/fr.js

@@ -0,0 +1,9 @@
+export default {
+  name: 'Bonjour le Monde',
+  text: 'Bonjour le Monde!\n\nVous avez cliqué ici: {{x}}, {{y}}',
+  buttons: [
+    {
+      title: "Dire 'Bonjour le Monde'"
+    }
+  ]
+};

src/editor/extensions/ext-helloworld/locale/zh-CN.js

@@ -1,6 +1,6 @@
 export default {
   name: 'Hello World',
-  text: 'Hello World!\n\n 请点击: {x}, {y}',
+  text: 'Hello World!\n\n 请点击: {{x}}, {{y}}',
   buttons: [
     {
       title: "输出 'Hello World'"

src/editor/extensions/ext-imagelib/ext-imagelib.js

@@ -46,7 +46,7 @@ export default {
     const closeBrowser = () => {
       $id("imgbrowse_holder").style.display = 'none';
       document.activeElement.blur(); // make sure focus is the body to correct issue #417
-    }
+    };
 
     /**
     * @param {string} url
@@ -67,7 +67,7 @@ export default {
       svgCanvas.clearSelection();
       svgCanvas.addToSelection([ newImage ]);
       svgCanvas.setImageURL(url);
-    }
+    };
 
     const pending = {};
 
@@ -290,7 +290,7 @@ export default {
               const img = document.createElement("img");
               img.src = curMeta.preview_url;
               entry.appendChild(img);
-              entry.appendChild(document.createTextNode(title))
+              entry.appendChild(document.createTextNode(title));
             } else {
               entry = document.createElement("img");
               entry.src = response;
@@ -330,7 +330,7 @@ export default {
 
     const insertAfter = (referenceNode, newNode) => {
       referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
-    }
+    };
 
     const toggleMultiLoop = () => {
       multiArr.forEach(function(item, i){
@@ -347,7 +347,7 @@ export default {
         preview.removeChild(preview.firstChild);
       multiArr = [];
       $id("imgbrowse_holder").style.display = 'none';
-    }
+    };
 
     /**
     * @param {boolean} show
@@ -375,7 +375,7 @@ export default {
       submit.style.display = (show) ? 'block' : 'none';
       preview.style.display = (show) ? 'block' : 'none';
 
-    }
+    };
 
     /**
     *
@@ -496,7 +496,7 @@ export default {
       } else {
         $id("imgbrowse_holder").style.display = 'block';
       }
-    }
+    };
 
     return {
       svgicons: 'ext-imagelib.xml',
@@ -529,7 +529,7 @@ export default {
           'bottom: 25px;' +
           'min-width: 300px;' +
           'min-height: 200px;' +
-          'background: #B0B0B0;' +
+          'background: #5a6162;' +
           'border: 1px outset #777;' +
           '}' +
           '#imgbrowse h1 {' +
@@ -567,7 +567,7 @@ export default {
           'list-style: none;' +
           'padding: .5em;' +
           'background: #E8E8E8;' +
-          'border-bottom: 1px solid #B0B0B0;' +
+          'border-bottom: 1px solid #5a6162;' +
           'line-height: 1.2em;' +
           'font-style: sans-serif;' +
           '}' +

src/editor/extensions/ext-imagelib/index.js

@@ -48,5 +48,5 @@ Array.prototype.forEach.call(atags, function (aEle) {
       }, 'html'); // 'html' is necessary to keep returned data as a string
     }
     return false;
-  })
+  });
 });

src/editor/extensions/ext-imagelib/openclipart.js

@@ -34,7 +34,6 @@ async function processResults (url) {
 
   const r = await fetch(url);
   const json = await r.json();
-  // console.log('json', json);
 
   if (!json || json.msg !== 'success') {
     // Todo: This could use a generic alert library instead
@@ -87,7 +86,6 @@ async function processResults (url) {
           async click (e) {
             e.preventDefault();
             const { value: svgurl } = this.dataset;
-            // console.log('this', id, svgurl);
             const post = (message) => {
               // Todo: Make origin customizable as set by opening window
               // Todo: If dropping IE9, avoid stringifying
@@ -103,7 +101,6 @@ async function processResults (url) {
             });
             const result = await fetch(svgurl);
             const svg = await result.text();
-            // console.log('url and svg', svgurl, svg);
             post({
               href: svgurl,
               data: svg

src/editor/extensions/ext-markers/ext-markers.js

@@ -123,8 +123,6 @@ export default {
     function setIcon (pos, id) {
       if (id.substr(0, 1) !== '\\') { id = '\\textmarker'; }
       const ci = idPrefix + pos + '_' + id.substr(1);
-      console.log(ci)
-      console.log('cur_' + pos + '_marker_list')
       svgEditor.setIcon('cur_' + pos + '_marker_list', $id(ci).children);
       $id(ci).classList.add('current');
       const siblings = Array.prototype.filter.call($id(ci).parentNode.children, function(child){
@@ -585,7 +583,6 @@ export default {
       },
       selectedChanged (opts) {
         // Use this to update the current selected elements
-        // console.log('selectChanged',opts);
         selElems = opts.elems;
 
         const markerElems = [ 'line', 'path', 'polyline', 'polygon' ];

src/editor/extensions/ext-mathjax/ext-mathjax.js

@@ -191,12 +191,11 @@ export default {
               // When MathJax is loaded get the div where the math will be rendered.
               MathJax.Hub.queue.Push(function () {
                 math = MathJax.Hub.getAllJax('#mathjax_creator')[0];
-                console.log(math); 
                 mathjaxLoaded = true;
-                console.log('MathJax Loaded'); 
+                console.info('MathJax Loaded');
               });
             } catch (e) {
-              console.log('Failed loading MathJax.'); 
+              console.warn('Failed loading MathJax.');
               // eslint-disable-next-line no-alert
               alert('Failed loading MathJax. You will not be able to change the mathematics.');
             }
@@ -260,7 +259,7 @@ export default {
           'position: absolute;' +
           'top: 50px;' +
           'padding: 10px;' +
-          'background-color: #B0B0B0;' +
+          'background-color: #5a6162;' +
           'border: 1px outset #777;' +
           'opacity: 1.0;' +
           'font-family: Verdana, Helvetica, sans-serif;' +

src/editor/extensions/ext-overview_window/dragmove/dragmove.js

@@ -92,6 +92,6 @@ export const dragmove = function(target, handler, parent, onStart, onEnd, onDrag
     target.style.left = lastX + "px";
     target.style.top = lastY + "px";
   });
-}
+};
 
 export { dragmove as default };

src/editor/extensions/ext-overview_window/ext-overview_window.js

@@ -7,7 +7,7 @@
  * @copyright 2013 James Sacksteder
  *
  */
-import { dragmove } from '../../../editor/dragmove/dragmove.js';
+import { dragmove } from './dragmove/dragmove.js';
 
 export default {
   name: 'overview_window',
@@ -119,12 +119,12 @@ export default {
       if((el.offsetLeft + el.offsetWidth) > parseFloat(getComputedStyle(parent, null).width.replace("px", ""))){
         el.style.left = (parseFloat(getComputedStyle(parent, null).width.replace("px", "")) - el.offsetWidth) + 'px';
       } else if(el.offsetLeft  < 0){
-        el.style.left = "0px"
+        el.style.left = "0px";
       }
       if((el.offsetTop + el.offsetHeight) > parseFloat(getComputedStyle(parent, null).height.replace("px", ""))){
         el.style.top = (parseFloat(getComputedStyle(parent, null).height.replace("px", "")) - el.offsetHeight) + 'px';
       } else if(el.offsetTop  < 0){
-        el.style.top = "0px"
+        el.style.top = "0px";
       }
       overviewWindowGlobals.viewBoxDragging = false;
       updateViewPortFromViewBox();
@@ -136,7 +136,7 @@ export default {
     const parentElem = document.querySelector("#overviewMiniView");
     dragmove(dragElem, dragElem, parentElem, onStart, onEnd, onDrag);
 
-    $id("overviewMiniView").addEventListener("click", evt => {
+    $id("overviewMiniView").addEventListener("click", (evt) => {
       // Firefox doesn't support evt.offsetX and evt.offsetY.
       const mouseX = (evt.offsetX || evt.originalEvent.layerX);
       const mouseY = (evt.offsetY || evt.originalEvent.layerY);

src/editor/extensions/ext-panning/ext-panning.js

@@ -36,7 +36,7 @@ export default {
     } = svgCanvas;
     const insertAfter = (referenceNode, newNode) => {
       referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
-    }
+    };
     return {
       newUI: true,
       name: strings.name,

src/editor/extensions/ext-placemark/ext-placemark.js

@@ -223,7 +223,6 @@ export default {
     function colorChanged (el) {
       const color = el.getAttribute('stroke');
       const marker = getLinked(el, 'marker-start');
-      // console.log(marker);
       if (!marker) { return; }
       if (!marker.attributes.class) { return; } // not created by this extension
       const ch = marker.lastElementChild;

src/editor/extensions/ext-polygon/ext-polygon.js

@@ -1,209 +0,0 @@
-/**
- * @file ext-polygon.js
- *
- *
- * @copyright 2010 CloudCanvas, Inc. All rights reserved
- *
- */
-
-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
-    console.error(`Missing translation (${lang}) - using 'en'`);
-    translationModule = await import(`./locale/en.js`);
-  }
-  return translationModule.default;
-};
-
-export default {
-  name: 'polygon',
-  async init (_S) {
-    const svgEditor = this;
-    const {svgCanvas} = svgEditor;
-    const {$id} = svgCanvas;
-    // const  editingitex = false;
-    const strings = await loadExtensionTranslation(svgEditor.configObj.pref('lang'));
-    let selElems;
-    let started;
-    let newFO;
-    /**
-    * @param {boolean} on
-    * @returns {void}
-    */
-    const showPanel = (on) => {
-      $id('polygon_panel').style.display = (on) ? 'block' : 'none';
-    }   
-
-    /**
-    * @param {string} attr
-    * @param {string|Float} val
-    * @returns {void}
-    */
-    const setAttr = (attr, val) => {
-      svgCanvas.changeSelectedAttribute(attr, val);
-      svgCanvas.call('changed', selElems);
-    }
-
-    /**
-    * @param {Float} n
-    * @returns {Float}
-    */
-    const cot = (n) => (1 / Math.tan(n));
-
-    /**
-    * @param {Float} n
-    * @returns {Float}
-    */
-    const sec = (n) => (1 / Math.cos(n));
-
-    return {
-      name: strings.name,
-      // The callback should be used to load the DOM with the appropriate UI items
-      callback () {
-        // Add the button and its handler(s)
-        // Note: the star extension may also add the same flying button so we check first
-        if ($id('tools_polygon') === null) {
-          const buttonTemplate = document.createElement("template");
-          buttonTemplate.innerHTML = `
-            <se-flyingbutton id="tools_polygon" title="Polygone/Star Tool">
-              <se-button id="tool_polygon" title="Polygon Tool" src="./images/polygon.svg"></se-button>
-              <se-button id="tool_star" title="Star Tool" src="./images/star.svg"></se-button>
-            </se-flyingbutton>
-          `
-          $id('tools_left').append(buttonTemplate.content.cloneNode(true));
-        }
-        $id('tool_polygon').addEventListener("click", () => {
-          if (this.leftPanel.updateLeftPanel('tool_polygon')) {
-            svgCanvas.setMode('polygon');
-            showPanel(true);
-          }   
-        }); 
-
-        // Add the context panel and its handler(s)
-        const panelTemplate = document.createElement("template");
-        panelTemplate.innerHTML = `
-          <div id="polygon_panel">
-            <se-spin-input size="3" id="polySides" min=1 step=1 value=5 label="sides">
-            </se-spin-input>
-          </div>
-        `
-        $id('tools_top').appendChild(panelTemplate.content.cloneNode(true));
-        $id("polygon_panel").style.display = 'none';
-        $id("polySides").addEventListener("change", (event) => {
-          setAttr('sides', event.target.value);
-        });
-      },
-      mouseDown (opts) {
-        if (svgCanvas.getMode() !== 'polygon') {
-          return undefined;
-        }
-        // const e = opts.event;
-        const rgb = svgCanvas.getColor('fill');
-        // const ccRgbEl = rgb.substring(1, rgb.length);
-        const sRgb = svgCanvas.getColor('stroke');
-        // ccSRgbEl = sRgb.substring(1, rgb.length);
-        const sWidth = svgCanvas.getStrokeWidth();
-
-        started = true;
-
-        newFO = svgCanvas.addSVGElementFromJson({
-          element: 'polygon',
-          attr: {
-            cx: opts.start_x,
-            cy: opts.start_y,
-            id: svgCanvas.getNextId(),
-            shape: 'regularPoly',
-            sides: document.getElementById('polySides').value,
-            orient: 'x',
-            edge: 0,
-            fill: rgb,
-            strokecolor: sRgb,
-            strokeWidth: sWidth
-          }
-        });
-
-        return {
-          started: true
-        };
-      },
-      mouseMove (opts) {
-        if (!started || svgCanvas.getMode() !== 'polygon') {
-          return undefined;
-        }
-        const cx = Number(newFO.getAttribute('cx'));
-        const cy = Number(newFO.getAttribute('cy'));
-        const sides = Number(newFO.getAttribute('sides'));
-        // const orient = newFO.getAttribute('orient');
-        const fill = newFO.getAttribute('fill');
-        const strokecolor = newFO.getAttribute('strokecolor');
-        const strokeWidth = Number(newFO.getAttribute('strokeWidth'));
-  
-        let x = opts.mouse_x;
-        let y = opts.mouse_y;
-
-        const edg = (Math.sqrt((x - cx) * (x - cx) + (y - cy) * (y - cy))) / 1.5;
-        newFO.setAttribute('edge', edg);
-
-        const inradius = (edg / 2) * cot(Math.PI / sides);
-        const circumradius = inradius * sec(Math.PI / sides);
-        let points = '';
-        for (let s = 0; sides >= s; s++) {
-          const angle = 2.0 * Math.PI * s / sides;
-          x = (circumradius * Math.cos(angle)) + cx;
-          y = (circumradius * Math.sin(angle)) + cy;
-
-          points += x + ',' + y + ' ';
-        }
-
-        // const poly = newFO.createElementNS(NS.SVG, 'polygon');
-        newFO.setAttribute('points', points);
-        newFO.setAttribute('fill', fill);
-        newFO.setAttribute('stroke', strokecolor);
-        newFO.setAttribute('stroke-width', strokeWidth);
-        return {
-          started: true
-        };
-      },
-
-      mouseUp () {
-        if (svgCanvas.getMode() !== 'polygon') {
-          return undefined;
-        }
-        const edge = newFO.getAttribute('edge');
-        const keep = (edge !== '0');
-        // svgCanvas.addToSelection([newFO], true);
-        return {
-          keep,
-          element: newFO
-        };
-      },
-      selectedChanged (opts) {
-        // Use this to update the current selected elements
-        selElems = opts.elems;
-
-        let i = selElems.length;
-        while (i--) {
-          const elem = selElems[i];
-          if (elem && elem.getAttribute('shape') === 'regularPoly') {
-            if (opts.selectedElement && !opts.multiselected) {
-              $id('polySides').value = elem.getAttribute('sides');
-
-              showPanel(true);
-            } else {
-              showPanel(false);
-            }
-          } else {
-            showPanel(false);
-          }
-        }
-      },
-      elementChanged () {
-        // const elem = opts.elems[0];
-      }
-    };
-  }
-};

src/editor/extensions/ext-polygon/locale/en.js

@@ -1,14 +0,0 @@
-export default {
-  name: 'polygon',
-  buttons: [
-    {
-      title: 'Polygon Tool'
-    }
-  ],
-  contextTools: [
-    {
-      title: 'Number of Sides',
-      label: 'sides'
-    }
-  ]
-};

src/editor/extensions/ext-polygon/locale/zh-CN.js

@@ -1,14 +0,0 @@
-export default {
-  name: '多边形',
-  buttons: [
-    {
-      title: '多边形工具'
-    }
-  ],
-  contextTools: [
-    {
-      title: '边数',
-      label: '边数'
-    }
-  ]
-};

src/editor/extensions/ext-polystar/ext-polystar.js

@@ -0,0 +1,347 @@
+/**
+ * @file ext-polystar.js
+ *
+ *
+ * @copyright 2010 CloudCanvas, Inc. All rights reserved
+ * @copyright 2021 Optimistik SAS, Inc. All rights reserved
+ * @license MIT
+ *
+ */
+
+import { loadExtensionTranslation } from "../../locale.js";
+
+const name = "polystar";
+
+export default {
+  name,
+  async init(_S) {
+    const svgEditor = this;
+    const { svgCanvas } = svgEditor;
+    const { $id } = svgCanvas;
+    let selElems;
+    let started;
+    let newFO;
+    await loadExtensionTranslation(svgEditor, name);
+
+    /**
+     * @param {boolean} on true=display
+     * @param {string} tool "star" or "polygone"
+     * @returns {void}
+     */
+    const showPanel = (on, tool) => {
+      $id(`${tool}_panel`).style.display = on ? "block" : "none";
+    };
+
+    /**
+     *
+     * @param {string} attr attribute to change
+     * @param {string|Float} val new value
+     * @returns {void}
+     */
+    const setAttr = (attr, val) => {
+      svgCanvas.changeSelectedAttribute(attr, val);
+      svgCanvas.call("changed", selElems);
+    };
+
+    /**
+     * @param {Float} n angle
+     * @return {Float} cotangeante
+     */
+    const cot = (n) => 1 / Math.tan(n);
+
+    /**
+     * @param {Float} n angle
+     * @returns {Float} sec
+     */
+    const sec = (n) => 1 / Math.cos(n);
+
+    return {
+      name: svgEditor.i18next.t(`${name}:name`),
+      // The callback should be used to load the DOM with the appropriate UI items
+      callback() {
+        // Add the button and its handler(s)
+        // Note: the star extension needs to be loaded before the polygon extension
+        const fbtitle = svgEditor.i18next.t(`${name}:title`);
+        const title_star = svgEditor.i18next.t(`${name}:buttons.0.title`);
+        const title_polygon = svgEditor.i18next.t(`${name}:buttons.1.title`);
+        const buttonTemplate = document.createElement("template");
+        // eslint-disable-next-line no-unsanitized/property
+        buttonTemplate.innerHTML = `
+            <se-flyingbutton id="tools_polygon" title="${fbtitle}">
+              <se-button id="tool_star" title="${title_star}" src="./images/star.svg">
+              </se-button>
+              <se-button id="tool_polygon" title="${title_polygon}" src="./images/polygon.svg">
+              </se-button>
+            </se-flyingbutton>
+          `;
+        $id("tools_left").append(buttonTemplate.content.cloneNode(true));
+        // handler
+        $id("tool_star").addEventListener("click", () => {
+          if (this.leftPanel.updateLeftPanel("tool_star")) {
+            svgCanvas.setMode("star");
+            showPanel(true, "star");
+            showPanel(false, "polygon");
+          }
+        });
+        $id("tool_polygon").addEventListener("click", () => {
+          if (this.leftPanel.updateLeftPanel("tool_polygon")) {
+            svgCanvas.setMode("polygon");
+            showPanel(true, "polygon");
+            showPanel(false, "star");
+          }
+        });
+
+        const label0 = svgEditor.i18next.t(`${name}:contextTools.0.label`);
+        const title0 = svgEditor.i18next.t(`${name}:contextTools.0.title`);
+        const label1 = svgEditor.i18next.t(`${name}:contextTools.1.label`);
+        const title1 = svgEditor.i18next.t(`${name}:contextTools.1.title`);
+        const label2 = svgEditor.i18next.t(`${name}:contextTools.2.label`);
+        const title2 = svgEditor.i18next.t(`${name}:contextTools.2.title`);
+        const label3 = svgEditor.i18next.t(`${name}:contextTools.3.label`);
+        const title3 = svgEditor.i18next.t(`${name}:contextTools.3.title`);
+        // Add the context panel and its handler(s)
+        const panelTemplate = document.createElement("template");
+        // eslint-disable-next-line no-unsanitized/property
+        panelTemplate.innerHTML = `
+          <div id="star_panel">
+            <se-spin-input id="starNumPoints" label="${label0}" min=1 step=1 value=5 title="${title0}">
+            </se-spin-input>
+            <se-spin-input id="RadiusMultiplier" label="${label1}" min=1 step=2.5 value=3 title="${title1}">
+            </se-spin-input>
+            <se-spin-input id="radialShift" min=0 step=1 value=0 label="${label2}" title="${title2}">
+            </se-spin-input>
+          </div>
+          <div id="polygon_panel">
+            <se-spin-input size="3" id="polySides" min=1 step=1 value=5 label="${label3}" title="${title3}">
+            </se-spin-input>
+          </div>
+        `;
+        //add handlers for the panel
+        $id("tools_top").appendChild(panelTemplate.content.cloneNode(true));
+        // don't display the panels on start
+        showPanel(false, "star");
+        showPanel(false, "polygon");
+        $id("starNumPoints").addEventListener("change", (event) => {
+          setAttr("point", event.target.value);
+        });
+        $id("RadiusMultiplier").addEventListener("change", (event) => {
+          setAttr("starRadiusMultiplier", event.target.value);
+        });
+        $id("radialShift").addEventListener("change", (event) => {
+          setAttr("radialshift", event.target.value);
+        });
+        $id("polySides").addEventListener("change", (event) => {
+          setAttr("sides", event.target.value);
+        });
+      },
+      mouseDown(opts) {
+        if (svgCanvas.getMode() === "star") {
+          const rgb = svgCanvas.getColor("fill");
+          const sRgb = svgCanvas.getColor("stroke");
+          const sWidth = svgCanvas.getStrokeWidth();
+          started = true;
+          newFO = svgCanvas.addSVGElementFromJson({
+            element: "polygon",
+            attr: {
+              cx: opts.start_x,
+              cy: opts.start_y,
+              id: svgCanvas.getNextId(),
+              shape: "star",
+              point: document.getElementById("starNumPoints").value,
+              r: 0,
+              radialshift: document.getElementById("radialShift").value,
+              r2: 0,
+              orient: "point",
+              fill: rgb,
+              strokecolor: sRgb,
+              strokeWidth: sWidth
+            }
+          });
+          return {
+            started: true
+          };
+        }
+        if (svgCanvas.getMode() === "polygon") {
+          // const e = opts.event;
+          const rgb = svgCanvas.getColor("fill");
+          // const ccRgbEl = rgb.substring(1, rgb.length);
+          const sRgb = svgCanvas.getColor("stroke");
+          // ccSRgbEl = sRgb.substring(1, rgb.length);
+          const sWidth = svgCanvas.getStrokeWidth();
+          started = true;
+          newFO = svgCanvas.addSVGElementFromJson({
+            element: "polygon",
+            attr: {
+              cx: opts.start_x,
+              cy: opts.start_y,
+              id: svgCanvas.getNextId(),
+              shape: "regularPoly",
+              sides: document.getElementById("polySides").value,
+              orient: "x",
+              edge: 0,
+              fill: rgb,
+              strokecolor: sRgb,
+              strokeWidth: sWidth
+            }
+          });
+
+          return {
+            started: true
+          };
+        }
+        return undefined;
+      },
+      mouseMove(opts) {
+        if (!started) {
+          return undefined;
+        }
+        if (svgCanvas.getMode() === "star") {
+          const cx = Number(newFO.getAttribute("cx"));
+          const cy = Number(newFO.getAttribute("cy"));
+          const point = Number(newFO.getAttribute("point"));
+          const orient = newFO.getAttribute("orient");
+          const fill = newFO.getAttribute("fill");
+          const strokecolor = newFO.getAttribute("strokecolor");
+          const strokeWidth = Number(newFO.getAttribute("strokeWidth"));
+          const radialshift = Number(newFO.getAttribute("radialshift"));
+
+          let x = opts.mouse_x;
+          let y = opts.mouse_y;
+
+          const circumradius =
+            Math.sqrt((x - cx) * (x - cx) + (y - cy) * (y - cy)) / 1.5;
+          const inradius =
+            circumradius / document.getElementById("RadiusMultiplier").value;
+          newFO.setAttribute("r", circumradius);
+          newFO.setAttribute("r2", inradius);
+
+          let polyPoints = "";
+          for (let s = 0; point >= s; s++) {
+            let angle = 2.0 * Math.PI * (s / point);
+            if (orient === "point") {
+              angle -= Math.PI / 2;
+            } else if (orient === "edge") {
+              angle = angle + Math.PI / point - Math.PI / 2;
+            }
+
+            x = circumradius * Math.cos(angle) + cx;
+            y = circumradius * Math.sin(angle) + cy;
+
+            polyPoints += x + "," + y + " ";
+
+            if (!isNaN(inradius)) {
+              angle = 2.0 * Math.PI * (s / point) + Math.PI / point;
+              if (orient === "point") {
+                angle -= Math.PI / 2;
+              } else if (orient === "edge") {
+                angle = angle + Math.PI / point - Math.PI / 2;
+              }
+              angle += radialshift;
+
+              x = inradius * Math.cos(angle) + cx;
+              y = inradius * Math.sin(angle) + cy;
+
+              polyPoints += x + "," + y + " ";
+            }
+          }
+          newFO.setAttribute("points", polyPoints);
+          newFO.setAttribute("fill", fill);
+          newFO.setAttribute("stroke", strokecolor);
+          newFO.setAttribute("stroke-width", strokeWidth);
+          /* const shape = */ newFO.getAttribute("shape");
+
+          return {
+            started: true
+          };
+        }
+        if (svgCanvas.getMode() === "polygon") {
+          const cx = Number(newFO.getAttribute("cx"));
+          const cy = Number(newFO.getAttribute("cy"));
+          const sides = Number(newFO.getAttribute("sides"));
+          // const orient = newFO.getAttribute('orient');
+          const fill = newFO.getAttribute("fill");
+          const strokecolor = newFO.getAttribute("strokecolor");
+          const strokeWidth = Number(newFO.getAttribute("strokeWidth"));
+
+          let x = opts.mouse_x;
+          let y = opts.mouse_y;
+
+          const edg =
+            Math.sqrt((x - cx) * (x - cx) + (y - cy) * (y - cy)) / 1.5;
+          newFO.setAttribute("edge", edg);
+
+          const inradius = (edg / 2) * cot(Math.PI / sides);
+          const circumradius = inradius * sec(Math.PI / sides);
+          let points = "";
+          for (let s = 0; sides >= s; s++) {
+            const angle = (2.0 * Math.PI * s) / sides;
+            x = circumradius * Math.cos(angle) + cx;
+            y = circumradius * Math.sin(angle) + cy;
+
+            points += x + "," + y + " ";
+          }
+
+          // const poly = newFO.createElementNS(NS.SVG, 'polygon');
+          newFO.setAttribute("points", points);
+          newFO.setAttribute("fill", fill);
+          newFO.setAttribute("stroke", strokecolor);
+          newFO.setAttribute("stroke-width", strokeWidth);
+          return {
+            started: true
+          };
+        }
+        return undefined;
+      },
+      mouseUp() {
+        if (svgCanvas.getMode() === "star") {
+          const r = newFO.getAttribute("r");
+          return {
+            keep: r !== "0",
+            element: newFO
+          };
+        }
+        if (svgCanvas.getMode() === "polygon") {
+          const edge = newFO.getAttribute("edge");
+          const keep = edge !== "0";
+          // svgCanvas.addToSelection([newFO], true);
+          return {
+            keep,
+            element: newFO
+          };
+        }
+        return undefined;
+      },
+      selectedChanged(opts) {
+        // Use this to update the current selected elements
+        selElems = opts.elems;
+
+        let i = selElems.length;
+        while (i--) {
+          const elem = selElems[i];
+          if (elem && elem.getAttribute("shape") === "star") {
+            if (opts.selectedElement && !opts.multiselected) {
+              $id("starNumPoints").value = elem.getAttribute("point");
+              $id("radialShift").value = elem.getAttribute("radialshift");
+              showPanel(true, "star");
+            } else {
+              showPanel(false, "star");
+            }
+          } else if (elem && elem.getAttribute("shape") === "regularPoly") {
+            if (opts.selectedElement && !opts.multiselected) {
+              $id("polySides").value = elem.getAttribute("sides");
+              showPanel(true, "polygon");
+            } else {
+              showPanel(false, "polygon");
+            }
+          } else {
+            showPanel(false, "star");
+            showPanel(false, "polygon");
+          }
+        }
+      },
+      elementChanged(_opts) {
+        // const elem = opts.elems[0];
+      }
+    };
+  }
+};

src/editor/extensions/ext-polystar/locale/en.js

@@ -1,8 +1,12 @@
 export default {
   name: 'star',
+  title: 'Polygone/Star Tool',
   buttons: [
     {
       title: 'Star Tool'
+    },
+    {
+      title: 'Polygon Tool'
     }
   ],
   contextTools: [
@@ -17,6 +21,10 @@ export default {
     {
       title: 'Twists the star',
       label: 'Radial Shift'
+    },
+    {
+      title: 'Number of Sides',
+      label: 'sides'
     }
   ]
 };

src/editor/extensions/ext-polystar/locale/fr.js

@@ -0,0 +1,30 @@
+export default {
+  name: 'etoile',
+  title: 'Outil Polygone/Etoile',
+  buttons: [
+    {
+      title: 'Outil Etoile'
+    },
+    {
+      title: 'Outil Polygone'
+    }
+  ],
+  contextTools: [
+    {
+      title: 'Nombre de côtés',
+      label: 'points'
+    },
+    {
+      title: 'Précision',
+      label: 'Précision'
+    },
+    {
+      title: 'Torsion Etoile',
+      label: 'Décalage Radial'
+    },
+    {
+      title: 'Nombre de côtés',
+      label: 'côtés'
+    }
+  ]
+};

src/editor/extensions/ext-polystar/locale/zh-CN.js

@@ -1,8 +1,12 @@
 export default {
   name: '星形',
+  title: 'Polygone/Star Tool',
   buttons: [
     {
       title: '星形工具'
+    },
+    {
+      title: '多边形工具'
     }
   ],
   contextTools: [
@@ -17,6 +21,10 @@ export default {
     {
       title: '径向',
       label: '径向'
+    },
+    {
+      title: '边数',
+      label: '边数'
     }
   ]
 };

src/editor/extensions/ext-shapes/ext-shapes.js

@@ -30,7 +30,7 @@ export default {
           buttonTemplate.innerHTML = `
           <se-explorerbutton id="tool_shapelib" title="Shape library" lib="./extensions/ext-shapes/shapelib/"
           src="./images/shapelib.svg"></se-explorerbutton>
-          `
+          `;
           $id('tools_left').append(buttonTemplate.content.cloneNode(true));
           $id('tool_shapelib').addEventListener("click", () => {
             canv.setMode(modeId);

src/editor/extensions/ext-star/ext-star.js

@@ -1,231 +0,0 @@
-/**
- * @file ext-star.js
- *
- *
- * @copyright 2010 CloudCanvas, Inc. All rights reserved
- *
- */
-
-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
-    console.error(`Missing translation (${lang}) - using 'en'`);
-    translationModule = await import(`./locale/en.js`);
-  }
-  return translationModule.default;
-};
-
-export default {
-  name: 'star',
-  async init (_S) {
-    const svgEditor = this;
-    const {svgCanvas} = svgEditor;
-    const {$id} = svgCanvas;
-    let selElems;
-    let started;
-    let newFO;
-    const strings = await loadExtensionTranslation(svgEditor.configObj.pref('lang'));
-
-    /**
-     *
-     * @param {boolean} on
-     * @returns {void}
-     */
-    const showPanel = (on) => {
-      $id('star_panel').style.display = (on) ? 'block' : 'none';
-    }
-
-    /**
-     *
-     * @param {string} attr
-     * @param {string|Float} val
-     * @returns {void}
-     */
-    const setAttr = (attr, val) => {
-      svgCanvas.changeSelectedAttribute(attr, val);
-      svgCanvas.call('changed', selElems);
-    }
-
-    return {
-      name: strings.name,
-      // The callback should be used to load the DOM with the appropriate UI items
-      callback () {
-        // Add the button and its handler(s)
-        // Note: the star extension may also add the same flying button so we check first
-        if ($id('tools_polygon') === null) {
-          const buttonTemplate = document.createElement("template");
-          buttonTemplate.innerHTML = `
-            <se-flyingbutton id="tools_polygon" title="Polygone/Star Tool">
-              <se-button id="tool_polygon" title="Polygon Tool" src="./images/polygon.svg"></se-button>
-              <se-button id="tool_star" title="Star Tool" src="./images/star.svg"></se-button>
-            </se-flyingbutton>
-          `
-          $id('tools_left').append(buttonTemplate.content.cloneNode(true));
-        }
-        $id('tool_star').addEventListener("click", () => { showPanel(true);
-          if (this.leftPanel.updateLeftPanel('tool_polygon')) {
-            svgCanvas.setMode('star');
-            showPanel(true);
-          }   
-        });
-
-        // Add the context panel and its handler(s)
-        const panelTemplate = document.createElement("template");
-        panelTemplate.innerHTML = `
-          <div id="star_panel">
-            <se-spin-input id="starNumPoints" label="points" min=1 step=1 value=5 title="Change rotation angle">
-            </se-spin-input>
-            <se-spin-input id="RadiusMultiplier" label="Radis multiplier" min=1 step=2.5 value=5 title="Change rotation angle">
-            </se-spin-input>
-            <se-spin-input id="radialShift" min=0 step=1 value=0 label="radial shift" title="Change rotation angle">
-            </se-spin-input>
-          </div>
-        `
-        //add handlers for the panel
-        $id('tools_top').appendChild(panelTemplate.content.cloneNode(true));
-        $id("starNumPoints").addEventListener("change", (event) => {
-          setAttr('point', event.target.value);
-        });
-        $id("RadiusMultiplier").addEventListener("change", (event) => {
-          setAttr('starRadiusMultiplier', event.target.value);
-        });
-        $id("radialShift").addEventListener("change", (event) => {
-          setAttr('radialshift', event.target.value);
-        });
-        // don't display the star panel on start
-        $id("star_panel").style.display = 'none';
-      },
-      mouseDown (opts) {
-        const rgb = svgCanvas.getColor('fill');
-        const sRgb = svgCanvas.getColor('stroke');
-        const sWidth = svgCanvas.getStrokeWidth();
-
-        if (svgCanvas.getMode() === 'star') {
-          started = true;
-
-          newFO = svgCanvas.addSVGElementFromJson({
-            element: 'polygon',
-            attr: {
-              cx: opts.start_x,
-              cy: opts.start_y,
-              id: svgCanvas.getNextId(),
-              shape: 'star',
-              point: document.getElementById('starNumPoints').value,
-              r: 0,
-              radialshift: document.getElementById('radialShift').value,
-              r2: 0,
-              orient: 'point',
-              fill: rgb,
-              strokecolor: sRgb,
-              strokeWidth: sWidth
-            }
-          });
-          return {
-            started: true
-          };
-        }
-        return undefined;
-      },
-      mouseMove (opts) {
-        if (!started) {
-          return undefined;
-        }
-        if (svgCanvas.getMode() === 'star') {
-          const cx = Number(newFO.getAttribute('cx'));
-          const cy = Number(newFO.getAttribute('cy'));
-          const point = Number(newFO.getAttribute('point'));
-          const orient = newFO.getAttribute('orient');
-          const fill = newFO.getAttribute('fill');
-          const strokecolor = newFO.getAttribute('strokecolor');
-          const strokeWidth = Number(newFO.getAttribute('strokeWidth'));
-          const radialshift = Number(newFO.getAttribute('radialshift'));
-
-          let x = opts.mouse_x;
-          let y = opts.mouse_y;
-
-          const circumradius = (Math.sqrt((x - cx) * (x - cx) + (y - cy) * (y - cy))) / 1.5;
-          const inradius = circumradius / document.getElementById('RadiusMultiplier').value;
-          newFO.setAttribute('r', circumradius);
-          newFO.setAttribute('r2', inradius);
-
-          let polyPoints = '';
-          for (let s = 0; point >= s; s++) {
-            let angle = 2.0 * Math.PI * (s / point);
-            if (orient === 'point') {
-              angle -= (Math.PI / 2);
-            } else if (orient === 'edge') {
-              angle = (angle + (Math.PI / point)) - (Math.PI / 2);
-            }
-
-            x = (circumradius * Math.cos(angle)) + cx;
-            y = (circumradius * Math.sin(angle)) + cy;
-
-            polyPoints += x + ',' + y + ' ';
-
-            if (!isNaN(inradius)) {
-              angle = (2.0 * Math.PI * (s / point)) + (Math.PI / point);
-              if (orient === 'point') {
-                angle -= (Math.PI / 2);
-              } else if (orient === 'edge') {
-                angle = (angle + (Math.PI / point)) - (Math.PI / 2);
-              }
-              angle += radialshift;
-
-              x = (inradius * Math.cos(angle)) + cx;
-              y = (inradius * Math.sin(angle)) + cy;
-
-              polyPoints += x + ',' + y + ' ';
-            }
-          }
-          newFO.setAttribute('points', polyPoints);
-          newFO.setAttribute('fill', fill);
-          newFO.setAttribute('stroke', strokecolor);
-          newFO.setAttribute('stroke-width', strokeWidth);
-          /* const shape = */ newFO.getAttribute('shape');
-
-          return {
-            started: true
-          };
-        }
-        return undefined;
-      },
-      mouseUp () {
-        if (svgCanvas.getMode() === 'star') {
-          const r = newFO.getAttribute('r');
-          return {
-            keep: (r !== '0'),
-            element: newFO
-          };
-        }
-        return undefined;
-      },
-      selectedChanged (opts) {
-        // Use this to update the current selected elements
-        selElems = opts.elems;
-
-        let i = selElems.length;
-        while (i--) {
-          const elem = selElems[i];
-          if (elem && elem.getAttribute('shape') === 'star') {
-            if (opts.selectedElement && !opts.multiselected) {
-              $id('starNumPoints').value = elem.getAttribute('point');
-              $id('radialShift').value = elem.getAttribute('radialshift');
-              showPanel(true);
-            } else {
-              showPanel(false);
-            }
-          } else {
-            showPanel(false);
-          }
-        }
-      },
-      elementChanged (_opts) {
-        // const elem = opts.elems[0];
-      }
-    };
-  }
-};

src/editor/extensions/ext-storage/storageDialog.js

@@ -9,7 +9,7 @@ template.innerHTML = `
     background: #DDD;
     overflow: auto;
     text-align: left;
-    border: 1px solid #B0B0B0;
+    border: 1px solid #5a6162;
   }
 
   #dialog_content p, #dialog_content select, #dialog_content label {
@@ -24,7 +24,7 @@ template.innerHTML = `
     top: 50%;
     max-width: 400px;
     z-index: 50001;
-    background: #CCC;
+    background: #5a6162;
     border: 1px outset #777;
     font-family:Verdana,Helvetica,sans-serif;
     font-size:0.8em;

src/editor/extensions/ext-webappfind/ext-webappfind.js

@@ -32,21 +32,18 @@ export default {
     this.canvas.bind(
       'message',
       /**
-      * @param {external:Window} win
-      * @param {PlainObject} info
-      * @param {module:svgcanvas.SvgCanvas#event:message} info.data
-      * @param {string} info.origin
-      * @listens module:svgcanvas.SvgCanvas#event:message
-      * @throws {Error} Unexpected event type
+       *
+       * @param {external:Window} win external Window handler
+       * @param {*} param1 info
        * @returns {void}
        */
       (win, { data, origin }) => {
-        // console.log('data, origin', data, origin);
         let type, content;
         try {
           ({ type, pathID, content } = data.webappfind); // May throw if data is not an object
           if (origin !== location.origin || // We are only interested in a message sent as though within this URL by our browser add-on
-              excludedMessages.includes(type) // Avoid our post below (other messages might be possible in the future which may also need to be excluded if your subsequent code makes assumptions on the type of message this is)
+              // Avoid our post below (other msgs might be possible which may need to be excluded if code makes assumptions on the type of message)
+              excludedMessages.includes(type)
           ) {
             return;
           }

src/editor/images/hello_world.svg

@@ -0,0 +1,11 @@
+
+<svg width="102" height="102" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit -->
+  <g>
+    <title>Layer 1</title>
+    <rect ry="30" rx="30" x="2.5" y="2.5" width="97" height="97" id="svg_3" fill="#008000" stroke="#000000" stroke-width="5"/>
+    <text x="52.668" y="42.5" id="svg_1" fill="#ffffff" stroke="#000000" stroke-width="0" font-size="24" font-family="Monospace" text-anchor="middle" xml:space="preserve">Hello</text>
+    <text x="52.668" y="71.5" fill="#ffffff" stroke="#000000" stroke-width="0" font-size="24" font-family="Monospace" text-anchor="middle" xml:space="preserve" id="svg_2">World!</text>
+  </g>
+</svg>
+

src/editor/images/helloworld-icon.xml

@@ -1,21 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg">
-<!--
-  Sample icons file. This file looks like an SVG file with groups as its
-  children. Each group element has an ID that must match the ID of the button given
-  in the extension. The SVG inside the group makes up the actual icon, and
-  needs use a viewBox instead of width/height for it to scale  properly.
-
-  Multiple icons can be included, each within their own group.
--->
-  <g id="hello_world">
-    <svg width="102" height="102" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-     <!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit -->
-     <g>
-      <title>Layer 1</title>
-      <rect ry="30" rx="30" x="2.5" y="2.5" width="97" height="97" id="svg_3" fill="#008000" stroke="#000000" stroke-width="5"/>
-      <text x="52.668" y="42.5" id="svg_1" fill="#ffffff" stroke="#000000" stroke-width="0" font-size="24" font-family="Monospace" text-anchor="middle" xml:space="preserve">Hello</text>
-      <text x="52.668" y="71.5" fill="#ffffff" stroke="#000000" stroke-width="0" font-size="24" font-family="Monospace" text-anchor="middle" xml:space="preserve" id="svg_2">World!</text>
-     </g>
-    </svg>
-  </g>
-</svg>

src/editor/images/markers-icons.xml

@@ -1,110 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg">
-    <!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit -->
-    <g id="nomarker">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-50,0l100,0"/>
-        </svg>
-    </g>
-    <g id="leftarrow">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-50,0l100,40l-30,-40l30,-40z"/>
-        </svg>
-    </g>
-    <g id="rightarrow">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m50,0l-100,40l30,-40l-30,-40z"/>
-        </svg>
-    </g>
-    <g id="leftarrow_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-50,0l100,40l-30,-40l30,-40z"/>
-        </svg>
-    </g>
-    <g id="rightarrow_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m50,0l-100,40l30,-40l-30,-40z"/>
-        </svg>
-    </g>
-    <g id="forwardslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-20,50l40,-100"/>
-        </svg>
-    </g>
-    <g id="reverseslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-20,-50l40,100"/>
-        </svg>
-    </g>
-    <g id="verticalslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m0,-50l0,100"/>
-        </svg>
-    </g>
-    <g id="mcircle">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <circle stroke-width="10" stroke="#f9bc01" fill="#f9bc01" cy="0" cx="0" r="30"/>
-        </svg>
-    </g>
-    <g id="mcircle_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <circle stroke-width="10" stroke="#f9bc01" fill="none" cy="0" cx="0" r="30"/>
-        </svg>
-    </g>
-    <g id="xmark">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-30,30l60,-60m0,60l-60,-60"/>
-        </svg>
-    </g>
-    <g id="box">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-30,-30l0,60l60,0l0,-60z"/>
-        </svg>
-    </g>
-    <g id="box_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-30,-30l0,60l60,0l0,-60z"/>
-        </svg>
-    </g>
-    <g id="star_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-40,-20l80,0l-70,60l30,-80l30,80z"/>
-        </svg>
-    </g>
-     <g id="triangle_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="M-30,30 L0,-30 L30,30 Z"/>
-        </svg>
-    </g>
-     <g id="triangle">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="M-30,30 L0,-30 L30,30 Z"/>
-        </svg>
-    </g>
-   <g id="textmarker">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-      <text xml:space="preserve" text-anchor="middle" font-family="serif" font-size="120"  y="40" x="0" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-        </svg>
-    </g>
-  <g id="mkr_markers_off">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-       <line y2="0" x2="50" y1="0" x1="-50" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       </svg>
-    </g>
-  <g id="mkr_markers_dimension">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-        <line y2="0" x2="40" y1="0" x1="20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <line y2="0" x2="-40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="0" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M-50,0 L-30,-15 L-30,15 Z"/>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
-     </svg>
-    </g>
-     <g id="mkr_markers_label">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-         <line y2="0" x2="40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="-40" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
-        </svg>
-    </g>
-  <g id="svg_eof"/>
-</svg>

src/editor/images/mkr_markers_dimension.svg

@@ -0,0 +1,7 @@
+ <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
+        <line y2="0" x2="40" y1="0" x1="20" stroke-width="5" stroke="#f9bc01" fill="none"/>
+       <line y2="0" x2="-40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
+       <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="0" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
+           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M-50,0 L-30,-15 L-30,15 Z"/>
+           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
+     </svg>

src/editor/images/mkr_markers_label.svg

@@ -0,0 +1,5 @@
+<svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
+    <line y2="0" x2="40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
+    <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="-40" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
+    <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
+</svg>

src/editor/images/mkr_markers_off.svg

@@ -0,0 +1,3 @@
+<svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
+    <line y2="0" x2="50" y1="0" x1="-50" stroke-width="5" stroke="#f9bc01" fill="none"/>
+</svg>

src/editor/images/placemark-icons.xml

@@ -1,138 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg">
-    <!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit -->
-    <g id="nomarker">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-50,0l100,0"/>
-        </svg>
-    </g>
-    <g id="leftarrow">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-50,0l100,40l-30,-40l30,-40z"/>
-        </svg>
-    </g>
-    <g id="rightarrow">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m50,0l-100,40l30,-40l-30,-40z"/>
-        </svg>
-    </g>
-    <g id="leftarrow_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-50,0l100,40l-30,-40l30,-40z"/>
-        </svg>
-    </g>
-    <g id="rightarrow_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m50,0l-100,40l30,-40l-30,-40z"/>
-        </svg>
-    </g>
-    <g id="forwardslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-20,50l40,-100"/>
-        </svg>
-    </g>
-    <g id="reverseslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-20,-50l40,100"/>
-        </svg>
-    </g>
-    <g id="verticalslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m0,-50l0,100"/>
-        </svg>
-    </g>
-    <g id="mcircle">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <circle stroke-width="10" stroke="#f9bc01" fill="#f9bc01" cy="0" cx="0" r="30"/>
-        </svg>
-    </g>
-    <g id="mcircle_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <circle stroke-width="10" stroke="#f9bc01" fill="none" cy="0" cx="0" r="30"/>
-        </svg>
-    </g>
-    <g id="xmark">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-30,30l60,-60m0,60l-60,-60"/>
-        </svg>
-    </g>
-    <g id="box">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-30,-30l0,60l60,0l0,-60z"/>
-        </svg>
-    </g>
-    <g id="star">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-40,-20l80,0l-70,60l30,-80l30,80z"/>
-        </svg>
-    </g>
-    <g id="box_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-30,-30l0,60l60,0l0,-60z"/>
-        </svg>
-    </g>
-    <g id="star_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-40,-20l80,0l-70,60l30,-80l30,80z"/>
-        </svg>
-    </g>
-     <g id="triangle_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="M-30,30 L0,-30 L30,30 Z"/>
-        </svg>
-    </g>
-     <g id="triangle">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="M-30,30 L0,-30 L30,30 Z"/>
-        </svg>
-    </g>
-   <g id="textmarker">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-      <text xml:space="preserve" text-anchor="middle" font-family="serif" font-size="120"  y="40" x="0" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-        </svg>
-    </g>
-    <g id="textmarker_top">
-        <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="4" stroke="#f9bc01" fill="none" d="M 0 60 h 100 z M 30 30 h 40 v 20 h -40 z"/>
-        </svg>
-    </g>
-    <g id="textmarker_bottom">
-        <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="4" stroke="#f9bc01" fill="none" d="M 0 30 h 100 z M 30 40 h 40 v 20 h -40 z"/>
-        </svg>
-    </g>
-  <g id="tool_placemark">
-    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 -1 110 110">
-     <line fill="none" id="svg_4" marker-start="url(#se_marker_start_svg_4)" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="5" x1="0" x2="42.58373" y1="0" y2="56.42415"/>
-     <line fill="none" id="svg_5" stroke="#000000" stroke-linecap="round" stroke-width="5" x1="99.99999" x2="42.58373" y1="56.42415" y2="56.42415"/>
-     <rect fill="none" height="26.47059" id="svg_2" stroke="#000000" stroke-dasharray="10,10" stroke-linecap="round" stroke-linejoin="round" stroke-width="5" width="55.02392" x="44.01914" y="16.71827"/>
-     <rect fill="none" height="32.73994" id="svg_3" stroke="#000000" stroke-dasharray="10,10" stroke-linecap="round" stroke-linejoin="null" stroke-width="5" width="55.98086" x="44.01914" y="67.56966"/>
-     <defs>
-      <marker class="leftarrow" id="se_marker_start_svg_4" markerHeight="5" markerUnits="strokeWidth" markerWidth="5" orient="auto" refX="0" refY="50" viewBox="0 0 100 100">
-        <path d="m0,50l100,40l-30,-40l30,-40l-100,40z" fill="#000000" id="svg_1" stroke="#000000" stroke-width="10"/>
-      </marker>
-    </defs>
-    </svg>
-  </g>
-  <g id="mkr_markers_off">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-       <line y2="0" x2="50" y1="0" x1="-50" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       </svg>
-    </g>
-  <g id="mkr_markers_dimension">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-        <line y2="0" x2="40" y1="0" x1="20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <line y2="0" x2="-40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="0" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M-50,0 L-30,-15 L-30,15 Z"/>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
-     </svg>
-    </g>
-     <g id="mkr_markers_label">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-         <line y2="0" x2="40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="-40" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
-        </svg>
-    </g>
-  <g id="svg_eof"/>
-</svg>

src/editor/images/textmarker_bottom.svg

@@ -0,0 +1,3 @@
+<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+    <path stroke-width="4" stroke="#f9bc01" fill="none" d="M 0 30 h 100 z M 30 40 h 40 v 20 h -40 z"/>
+</svg>

src/editor/images/textmarker_top.svg

@@ -0,0 +1,3 @@
+<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+    <path stroke-width="4" stroke="#f9bc01" fill="none" d="M 0 60 h 100 z M 30 30 h 40 v 20 h -40 z"/>
+</svg>

src/editor/images/tool_placemark.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 -1 110 110">
+     <line fill="none" id="svg_4" marker-start="url(#se_marker_start_svg_4)" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="5" x1="0" x2="42.58373" y1="0" y2="56.42415"/>
+     <line fill="none" id="svg_5" stroke="#000000" stroke-linecap="round" stroke-width="5" x1="99.99999" x2="42.58373" y1="56.42415" y2="56.42415"/>
+     <rect fill="none" height="26.47059" id="svg_2" stroke="#000000" stroke-dasharray="10,10" stroke-linecap="round" stroke-linejoin="round" stroke-width="5" width="55.02392" x="44.01914" y="16.71827"/>
+     <rect fill="none" height="32.73994" id="svg_3" stroke="#000000" stroke-dasharray="10,10" stroke-linecap="round" stroke-linejoin="null" stroke-width="5" width="55.98086" x="44.01914" y="67.56966"/>
+     <defs>
+      <marker class="leftarrow" id="se_marker_start_svg_4" markerHeight="5" markerUnits="strokeWidth" markerWidth="5" orient="auto" refX="0" refY="50" viewBox="0 0 100 100">
+        <path d="m0,50l100,40l-30,-40l30,-40l-100,40z" fill="#000000" id="svg_1" stroke="#000000" stroke-width="10"/>
+      </marker>
+    </defs>
+    </svg>

src/editor/index.html

@@ -18,7 +18,7 @@
   <!-- SCRIPTS -->
 
   <!-- Lacking browser support -->
-  <script type="module" src="./redirect-on-lacking-support.js"></script>
+  <script type="module" src="./browser-not-supported.js"></script>
 
   <!-- If you do not wish to add extensions by URL, you can add calls
       within the following file to svgEditor.setConfig -->

src/editor/locale.js

@@ -83,6 +83,21 @@ export const putLocale = async function (givenParam, goodLangs) {
       }
     }
   });
-  console.log(`Lang: ${i18next.t('lang')}`);
+  console.info(`Lang: ${i18next.t('lang')}`);
   return { langParam, i18next };
 };
+
+export const loadExtensionTranslation = async function (svgEditor, name) {
+  let translationModule;
+  const lang = svgEditor.configObj.pref('lang');
+  try {
+    // eslint-disable-next-line no-unsanitized/method
+    translationModule = await import(`./extensions/ext-${name}/locale/${lang}.js`);
+  } catch (_error) {
+    // eslint-disable-next-line no-console
+    console.warn(`Missing translation (${lang}) for ${name} - using 'en'`);
+    // eslint-disable-next-line no-unsanitized/method
+    translationModule = await import(`./extensions/ext-${name}/locale/en.js`);
+  }
+  svgEditor.i18next.addResourceBundle(lang, name, translationModule.default);
+};

src/editor/panels/BottomPanel.js

@@ -217,7 +217,7 @@ class BottomPanel {
           src="./images/opacity.svg"></se-spin-input>
         <se-palette id="palette"></se-palette>
       </div> <!-- tools_bottom -->
-    `
+    `;
     this.editor.$svgEditor.append(template.content.cloneNode(true));
     $id('palette').addEventListener('change', this.handlePalette.bind(this));
     const { curConfig } = this.editor.configObj;

src/editor/panels/LayersPanel.js

@@ -79,7 +79,7 @@ class LayersPanel {
    */
   toggleSidePanel(close) {
     const dpr = window.devicePixelRatio || 1;
-    const w = parseFloat(getComputedStyle($id("sidepanels"), null).width.replace("px", ""))
+    const w = parseFloat(getComputedStyle($id("sidepanels"), null).width.replace("px", ""));
     const isOpened = (dpr < 1 ? w : w / dpr) > 2;
     const zoomAdjustedSidepanelWidth =
       (dpr < 1 ? 1 : dpr) * SIDEPANEL_OPENWIDTH;
@@ -173,7 +173,7 @@ class LayersPanel {
       "change",
       this.lmenuFunc.bind(this)
     );
-    $id("se-cmenu-layers-list").addEventListener("change", e => {
+    $id("se-cmenu-layers-list").addEventListener("change", (e) => {
       this.lmenuFunc(e);
     });
     $id("sidepanel_handle").addEventListener(
@@ -183,7 +183,7 @@ class LayersPanel {
     if (this.editor.configObj.curConfig.showlayers) {
       this.toggleSidePanel();
     }
-    $id("sidepanel_handle").addEventListener("mousedown", evt => {
+    $id("sidepanel_handle").addEventListener("mousedown", (evt) => {
       this.sidedrag = evt.pageX;
       window.addEventListener("mousemove", this.resizeSidePanel.bind(this));
       this.allowmove = false;
@@ -192,14 +192,14 @@ class LayersPanel {
         this.allowmove = true;
       }, 20);
     });
-    $id("sidepanel_handle").addEventListener("mouseup", _evt => {
+    $id("sidepanel_handle").addEventListener("mouseup", (_evt) => {
       if (!this.sidedragging) {
         this.toggleSidePanel();
       }
       this.sidedrag = -1;
       this.sidedragging = false;
     });
-    window.addEventListener("mouseup", _evt => {
+    window.addEventListener("mouseup", (_evt) => {
       this.sidedrag = -1;
       this.sidedragging = false;
       $id("svg_editor").removeEventListener(
@@ -353,7 +353,7 @@ class LayersPanel {
     }
 
     if (layerNameToHighlight) {
-      curNames.forEach(curName => {
+      curNames.forEach((curName) => {
         if (curName !== layerNameToHighlight) {
           this.editor.svgCanvas
             .getCurrentDrawing()
@@ -361,7 +361,7 @@ class LayersPanel {
         }
       });
     } else {
-      curNames.forEach(curName => {
+      curNames.forEach((curName) => {
         this.editor.svgCanvas.getCurrentDrawing().setLayerOpacity(curName, 1.0);
       });
     }

src/editor/panels/LeftPanel.js

@@ -28,7 +28,7 @@ class LeftPanel {
   updateLeftPanel(button) {
     if (button.disabled) return false;
     // remove the pressed state on other(s) button(s)
-    $qa("#tools_left *[pressed]").forEach(b => {
+    $qa("#tools_left *[pressed]").forEach((b) => {
       b.pressed = false;
     });
     // pressed state for the clicked button

src/editor/panels/TopPanel.js

@@ -152,7 +152,7 @@ class TopPanel {
    * @returns {void}
    */
   updateContextPanel() {
-    const setInputWidth = elem => {
+    const setInputWidth = (elem) => {
       const w = Math.min(Math.max(12 + elem.value.length * 6, 50), 300);
       elem.style.width = w + 'px';
     };
@@ -313,7 +313,7 @@ class TopPanel {
         const curPanel = panels[tagName];
         $id(tagName + "_panel").style.display = 'block';
 
-        curPanel.forEach(item => {
+        curPanel.forEach((item) => {
           let attrVal = elem.getAttribute(item);
           if (this.editor.configObj.curConfig.baseUnit !== "px" && elem[item]) {
             const bv = elem[item].baseVal.value;
@@ -352,7 +352,7 @@ class TopPanel {
           if (this.editor.svgCanvas.addedNew) {
             // Timeout needed for IE9
             setTimeout(() => {
-              $id("text").focus()
+              $id("text").focus();
               $id("text").select();
             }, 100);
           }
@@ -406,7 +406,7 @@ class TopPanel {
 
     if ((elem && !isNode) || this.multiselected) {
       // update the selected elements' layer
-      $id("selLayerNames").removeAttribute("disabled")
+      $id("selLayerNames").removeAttribute("disabled");
       $id("selLayerNames").value = currentLayerName;
 
       // Enable regular menu options
@@ -553,10 +553,10 @@ class TopPanel {
   attrChanger(e) {
     const attr = e.target.getAttribute("data-attr");
     let val = e.target.value;
-    const valid = isValidUnit(attr, val, this.editor.selectedElement);
+    const valid = isValidUnit(attr, val, this.selectedElement);
 
     if (!valid) {
-      e.target.value = this.editor.selectedElement().getAttribute(attr);
+      e.target.value = this.selectedElement.getAttribute(attr);
       // eslint-disable-next-line no-alert
       alert(this.i18next.t('notification.invalidAttrValGiven'));
       return false;
@@ -742,7 +742,7 @@ class TopPanel {
   init() {
     // add Top panel
     const template = document.createElement("template");
-    const {i18next} = this.editor
+    const { i18next } = this.editor;
     // eslint-disable-next-line no-unsanitized/property
     template.innerHTML = `
        <div id="tools_top">
@@ -1040,7 +1040,7 @@ class TopPanel {
       "click",
       this.clickGroup.bind(this)
     );
-    $id("tool_position").addEventListener("change", evt =>
+    $id("tool_position").addEventListener("change", (evt) =>
       this.clickAlignEle.bind(this)(evt)
     );
     $id("tool_align_left").addEventListener("click", () =>
@@ -1130,7 +1130,7 @@ class TopPanel {
       "image_height",
       "path_node_x",
       "path_node_y"
-    ].forEach(attrId =>
+    ].forEach((attrId) =>
       $id(attrId).addEventListener("change", this.attrChanger.bind(this))
     );
   }

src/editor/svgedit.css

@@ -471,7 +471,7 @@ input[type=text] {
   border-top: 1px solid var(--border-color);
   border-right: 1px solid #FFFFFF;
   border-bottom: 1px solid #FFFFFF;
-  background-color: #B0B0B0;
+  background-color: #5a6162;
 }
 
 .dropdown ul {
@@ -495,7 +495,7 @@ input[type=text] {
   width: 120px;
   padding: 4px;
   background: #E8E8E8;
-  border: 1px solid #B0B0B0;
+  border: 1px solid #5a6162;
   margin: 0 0 -1px 0;
   line-height: 16px;
 }
@@ -625,10 +625,6 @@ ul li.current {
   padding-right: .3em;
 }
 
-#svg_source_editor {
-  display: none;
-}
-
 .overlay {
   position: absolute;
   top: 0;
@@ -640,19 +636,6 @@ ul li.current {
   z-index: 5;
 }
 
-#svg_source_editor #svg_source_container {
-  position: absolute;
-  top: 30px;
-  left: 30px;
-  right: 30px;
-  bottom: 30px;
-  background-color: #B0B0B0;
-  opacity: 1.0;
-  text-align: center;
-  border: 1px outset #777;
-  z-index: 6;
-}
-
 #save_output_btns {
   display: none;
   text-align: left;
@@ -668,20 +651,6 @@ ul li.current {
   margin-left: 30px;
 }
 
-#svg_docprops #svg_docprops_container,
-#svg_prefs #svg_prefs_container {
-  position: absolute;
-  top: 50px;
-  padding: 10px;
-  background-color: #B0B0B0;
-  border: 1px outset #777;
-  opacity: 1.0;
-/*  width: 450px;*/
-  font-family: Verdana, Helvetica, sans-serif;
-  font-size: .8em;
-  z-index: 20001;
-}
-
 /* ------------ */
 
 .dropdown li.tool_button {

src/svgcanvas/copy-elem.js

@@ -41,7 +41,7 @@ export const copyElem = function (el, getNextId) {
   });
 
   if (el.dataset.gsvg) {
-    newEl.dataset.gsvg = newEl.firstChild
+    newEl.dataset.gsvg = newEl.firstChild;
   } else if (el.dataset.symbol) {
     const ref = el.dataset.symbol;
     newEl.dataset.ref =  ref;

src/svgcanvas/path-actions.js

@@ -318,8 +318,7 @@ export const pathActionsMethod = (function () {
     }
     return element;
   };
-  // console.log(pathActionsContext_);
-  // const convertPath = pathActionsContext_.getConvertPath();
+
   return (/** @lends module:path.pathActions */ {
     /**
     * @param {MouseEvent} evt
@@ -464,7 +463,6 @@ export const pathActionsMethod = (function () {
               editorContext_.getMouseTarget(evt)
             )) {
               // Clicked outside canvas, so don't make point
-              // console.log('Clicked outside canvas');
               return false;
             }
 

src/svgcanvas/path-method.js

@@ -428,7 +428,7 @@ export class Segment {
    */
   selectCtrls (y) {
     document.getElementById('ctrlpointgrip_' + this.index + 'c1').setAttribute('fill', y ? '#0FF' : '#EEE');
-    document.getElementById('ctrlpointgrip_' + this.index + 'c2').setAttribute('fill', y ? '#0FF' : '#EEE')
+    document.getElementById('ctrlpointgrip_' + this.index + 'c2').setAttribute('fill', y ? '#0FF' : '#EEE');
   }
 
   /**

src/svgcanvas/recalculate.js

@@ -707,7 +707,7 @@ export const recalculateDimensions = function (selected) {
             y1: selected.getAttribute('y1'),
             x2: selected.getAttribute('x2'),
             y2: selected.getAttribute('y2'),
-          }
+          };
         // Fallthrough
         case 'polyline':
         case 'polygon':

src/svgcanvas/selected-elem.js

@@ -733,7 +733,7 @@ export const convertToGroup = function (elem) {
     recalculateDimensions(elem);
     elementContext_.call('selected', [ elem ]);
   } else if (dataStorage.has($elem, 'symbol')) {
-    elem = dataStorage.get($elem, 'symbol')
+    elem = dataStorage.get($elem, 'symbol');
 
     ts = $elem.attr('transform');
     const pos = $elem.attr([ 'x', 'y' ]);

src/svgcanvas/utilities.js

@@ -1140,7 +1140,7 @@ export const getVisibleElements = function (parentElement) {
   }
 
   const contentElems = [];
-  const childrens = parentElement.children
+  const childrens = parentElement.children;
   Array.prototype.forEach.call(childrens, function (elem) {
     if (elem.getBBox) {
       contentElems.push(elem);

web-dev-server.config.mjs

@@ -1,4 +1,5 @@
 import { fromRollup } from '@web/dev-server-rollup';
+// eslint-disable-next-line node/no-unpublished-import
 import rollupCommonjs from '@rollup/plugin-commonjs';
 
 const commonjs = fromRollup(rollupCommonjs);