From 1f5134bff3aa5e1b29b08f6f70574ba2987cb881 Mon Sep 17 00:00:00 2001 From: JFH <20402845+jfhenon@users.noreply.github.com> Date: Thu, 20 May 2021 23:43:31 +0200 Subject: [PATCH] temporary fix (see comment) rollup behavior makes svgEditor global variable inaccessible -> dist does not work. This fix is temporary by removing use of the variable until we solve this rollup config issue or find a different approach --- .../components/jgraduate/jQuery.jGraduate.js | 64 +++++++++---------- .../components/jgraduate/jQuery.jPicker.js | 40 ++++++------ src/editor/components/seColorPicker.js | 6 +- src/editor/components/sePalette.js | 5 +- src/editor/dialogs/cmenuDialog.js | 24 +++---- src/editor/dialogs/cmenuLayersDialog.js | 10 +-- src/editor/dialogs/editorPreferencesDialog.js | 40 ++++++------ src/editor/dialogs/exportDialog.js | 10 +-- src/editor/dialogs/imagePropertiesDialog.js | 26 ++++---- src/editor/dialogs/svgSourceDialog.js | 10 +-- .../extensions/ext-storage/storageDialog.js | 1 - 11 files changed, 118 insertions(+), 118 deletions(-) diff --git a/src/editor/components/jgraduate/jQuery.jGraduate.js b/src/editor/components/jgraduate/jQuery.jGraduate.js index 738313c9..6e14a3bd 100644 --- a/src/editor/components/jgraduate/jQuery.jGraduate.js +++ b/src/editor/components/jgraduate/jQuery.jGraduate.js @@ -1,7 +1,7 @@ /* eslint-disable no-loop-func */ /* eslint-disable prefer-destructuring */ /* eslint-disable no-unsanitized/property */ -/* globals svgEditor */ +/* gl#bals svgEditor */ /** * @file jGraduate 0.4 * @@ -237,9 +237,9 @@ export function jGraduateMethod (elem, options, okCallback, cancelCallback) { $this.classList.add('jGraduate_Picker'); // eslint-disable-next-line no-unsanitized/property $this.innerHTML = `
@@ -256,88 +256,88 @@ export function jGraduateMethod (elem, options, okCallback, cancelCallback) {
- +
- + - +
- +
- + - +
- +
- + - +
- +
-
+
- + - +
- +
- -
+ +
- -
+ +
- -
+ +
- +
- -
+ +
- - + +
`; const div = document.createElement('div'); div.innerHTML = html; diff --git a/src/editor/components/jgraduate/jQuery.jPicker.js b/src/editor/components/jgraduate/jQuery.jPicker.js index 3d25e958..61b0190f 100755 --- a/src/editor/components/jgraduate/jQuery.jPicker.js +++ b/src/editor/components/jgraduate/jQuery.jPicker.js @@ -17,7 +17,7 @@ */ /* eslint-disable no-bitwise */ /* eslint-disable max-len */ -/* globals svgEditor */ +/* gl#bals svgEditor */ import ColorValuePicker from './ColorValuePicker.js'; import Slider from './Slider.js'; import { findPos, mergeDeep } from './Util.js'; @@ -632,7 +632,7 @@ export function jPickerMethod (elem, options, commitCallback, liveCallback, canc content.innerHTML = `     -   +     `; that.insertAdjacentElement('afterend', content); @@ -1329,41 +1329,41 @@ export function jPickerMethod (elem, options, commitCallback, liveCallback, canc ${win.expandable ? ' ' : ''} -

${win.title || svgEditor.i18next.t('config.jpicker_title')}

   
+

${win.title || 'config.jpicker_title'}

   
      
- ${svgEditor.i18next.t('config.jpicker_new_color')}
  
${svgEditor.i18next.t('config.jpicker_current_color')} -
+ #svgEditor.i18next.t('config.jpicker_new_color')}
  
#svgEditor.i18next.t('config.jpicker_current_color')} +
- -  ° + +  ° - -  % + +  % -

-  %

+

+  %

- - + + - - + + - - + + - ${win.alphaSupport ? `` : ' '} - ${win.alphaSupport ? ` %` : ' '} + ${win.alphaSupport ? `` : ' '} + ${win.alphaSupport ? ` %` : ' '} - ${win.alphaSupport ? `` : ' '} + ${win.alphaSupport ? `` : ' '} `; if (win.expandable) { diff --git a/src/editor/components/seColorPicker.js b/src/editor/components/seColorPicker.js index 3fcecc57..9fe6f888 100644 --- a/src/editor/components/seColorPicker.js +++ b/src/editor/components/seColorPicker.js @@ -1,5 +1,5 @@ /* eslint-disable max-len */ -/* globals svgEditor */ +/* gl#bals svgEditor */ import { jGraduate, jGraduateMethod } from './jgraduate/jQuery.jGraduate.js'; import PaintBox from './PaintBox.js'; @@ -643,7 +643,7 @@ div.jGraduate_Slider img {
- +
@@ -693,7 +693,7 @@ export class SeColorPicker extends HTMLElement { this.setAttribute('title', newValue); break; case 'type': - this.$label.setAttribute('title', svgEditor.i18next.t('config.pick_paint_opavity', { newValue: newValue })); + this.$label.setAttribute('title', 'config.pick_paint_opavity'); break; default: // eslint-disable-next-line no-console diff --git a/src/editor/components/sePalette.js b/src/editor/components/sePalette.js index c679ed7d..1272a7c2 100644 --- a/src/editor/components/sePalette.js +++ b/src/editor/components/sePalette.js @@ -1,5 +1,5 @@ /* eslint-disable max-len */ -/* globals svgEditor */ +/* gl#bals svgEditor */ const palette = [ // Todo: Make into configuration item? 'none', '#000000', '#3f3f3f', '#7f7f7f', '#bfbfbf', '#ffffff', @@ -78,7 +78,8 @@ template.innerHTML = ` } } -
+
diff --git a/src/editor/dialogs/cmenuDialog.js b/src/editor/dialogs/cmenuDialog.js index 5f1a68c2..70ade142 100644 --- a/src/editor/dialogs/cmenuDialog.js +++ b/src/editor/dialogs/cmenuDialog.js @@ -1,4 +1,4 @@ -/* globals svgEditor */ +/* gl#bals svgEditor */ const template = document.createElement('template'); // eslint-disable-next-line no-unsanitized/property template.innerHTML = ` @@ -68,53 +68,53 @@ template.innerHTML = ` diff --git a/src/editor/dialogs/cmenuLayersDialog.js b/src/editor/dialogs/cmenuLayersDialog.js index 748eaf36..7c6e3096 100644 --- a/src/editor/dialogs/cmenuLayersDialog.js +++ b/src/editor/dialogs/cmenuLayersDialog.js @@ -1,4 +1,4 @@ -/* globals svgEditor */ +/* gl#bals svgEditor */ const template = document.createElement('template'); // eslint-disable-next-line no-unsanitized/property template.innerHTML = ` @@ -66,10 +66,10 @@ template.innerHTML = ` } `; /** diff --git a/src/editor/dialogs/editorPreferencesDialog.js b/src/editor/dialogs/editorPreferencesDialog.js index 48372353..a286282a 100644 --- a/src/editor/dialogs/editorPreferencesDialog.js +++ b/src/editor/dialogs/editorPreferencesDialog.js @@ -1,4 +1,4 @@ -/* globals svgEditor */ +/* gl#bals svgEditor */ const template = document.createElement('template'); // eslint-disable-next-line no-unsanitized/property template.innerHTML = ` @@ -150,16 +150,16 @@ template.innerHTML = `
- ${svgEditor.i18next.t('config.editor_prefs')} + #{svgEditor.i18next.t('config.editor_prefs')}
- ${svgEditor.i18next.t('config.background')} + #{svgEditor.i18next.t('config.background')}
-

${svgEditor.i18next.t('config.editor_bg_note')}

+

#{svgEditor.i18next.t('config.editor_bg_note')}

- ${svgEditor.i18next.t('config.grid')} + #{svgEditor.i18next.t('config.grid')}
- ${svgEditor.i18next.t('config.units_and_rulers')} + #{svgEditor.i18next.t('config.units_and_rulers')}
diff --git a/src/editor/dialogs/imagePropertiesDialog.js b/src/editor/dialogs/imagePropertiesDialog.js index c8375b7c..9a9d675a 100644 --- a/src/editor/dialogs/imagePropertiesDialog.js +++ b/src/editor/dialogs/imagePropertiesDialog.js @@ -1,4 +1,4 @@ -/* globals svgEditor */ +/* gl#bals svgEditor */ import { isValidUnit } from '../../common/units.js'; const template = document.createElement('template'); @@ -71,46 +71,46 @@ template.innerHTML = `
- - + +
- ${svgEditor.i18next.t('config.image_props')} + #{svgEditor.i18next.t('config.image_props')}
- ${svgEditor.i18next.t('config.doc_dims')} + #{svgEditor.i18next.t('config.doc_dims')}
- ${svgEditor.i18next.t('config.included_images')} + #{svgEditor.i18next.t('config.included_images')}
diff --git a/src/editor/dialogs/svgSourceDialog.js b/src/editor/dialogs/svgSourceDialog.js index 9e843eaa..3e8c4bb5 100644 --- a/src/editor/dialogs/svgSourceDialog.js +++ b/src/editor/dialogs/svgSourceDialog.js @@ -1,4 +1,4 @@ -/* globals svgEditor */ +/* gl#bals svgEditor */ const template = document.createElement('template'); // eslint-disable-next-line no-unsanitized/property template.innerHTML = ` @@ -63,17 +63,17 @@ template.innerHTML = `

- ${svgEditor.i18next.t('notification.source_dialog_note')} + #{svgEditor.i18next.t('notification.source_dialog_note')}

- +
diff --git a/src/editor/extensions/ext-storage/storageDialog.js b/src/editor/extensions/ext-storage/storageDialog.js index f84364a0..92f4a2af 100644 --- a/src/editor/extensions/ext-storage/storageDialog.js +++ b/src/editor/extensions/ext-storage/storageDialog.js @@ -1,6 +1,5 @@ /* eslint-disable max-len */ /* globals svgEditor */ -import 'elix/define/Dialog.js'; const template = document.createElement('template'); const notification = svgEditor.i18next.t('notification.editorPreferencesMsg'); const prefs_and_content = svgEditor.i18next.t('properties.prefs_and_content');