minor format and lint fix

This commit is contained in:
jfh
2020-09-20 23:50:22 +02:00
parent 20e76ba679
commit a6d7a872f0
2 changed files with 668 additions and 698 deletions

View File

@@ -2,7 +2,7 @@
// This rollup script is run by the command:
// 'npm run build'
import {join, basename} from 'path';
import path from 'path';
import {lstatSync, readdirSync} from 'fs';
import rimraf from 'rimraf';
import babel from '@rollup/plugin-babel';
@@ -21,7 +21,7 @@ const getDirectories = (source) => {
const isDirectory = (dir) => {
return lstatSync(dir).isDirectory();
};
return readdirSync(source).map((nme) => join(source, nme)).filter((i) => isDirectory(i));
return readdirSync(source).map((nme) => path.join(source, nme)).filter((i) => isDirectory(i));
};
// capture the list of files to build for extensions and ext-locales
@@ -116,7 +116,7 @@ const config = [{
// config for dynamic extensions
extensionDirs.forEach((extensionDir) => {
const extensionName = basename(extensionDir);
const extensionName = path.basename(extensionDir);
extensionName && config.push(
{
input: `./src/editor/extensions/${extensionName}/${extensionName}.js`,

View File

@@ -1,10 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />
<meta name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<!-- No-op until loaded dynamically (could make configurable) -->
@@ -12,7 +12,8 @@
<!-- STYLESHEETS (others loaded dynamically) -->
<style id="styleoverrides" media="screen"></style>
<link href="svgedit.css" rel="stylesheet" media="all"></link>
<link href="svgedit.css" rel="stylesheet" media="all">
</link>
<!-- SCRIPTS -->
@@ -25,10 +26,11 @@
<title>SVG-edit</title>
</head>
<body>
<div id="svg_container" style="visibility: hidden;">
<div id="svg_editor" role="main">
<div id="svg_container" style="visibility: hidden;">
<div id="svg_editor" role="main">
<div id="rulers">
<div id="ruler_corner"></div>
<div id="ruler_x">
@@ -64,13 +66,11 @@
</tr>
</table>
<span id="selLayerLabel">Move elements to:</span>
<select id="selLayerNames" title="Move selected elements to a different layer"
disabled="disabled">
<select id="selLayerNames" title="Move selected elements to a different layer" disabled="disabled">
<option selected="selected" value="layer1">Layer 1</option>
</select>
</div>
<div id="sidepanel_handle"
title="Drag left/right to resize side panel [X]">L a y e r s
<div id="sidepanel_handle" title="Drag left/right to resize side panel [X]">L a y e r s
</div>
</div>
<div id="main_button">
@@ -126,55 +126,46 @@
<!-- History buttons -->
<div id="history_panel">
<div class="tool_sep"></div>
<div class="push_button tool_button_disabled" id="tool_undo"
title="Undo [Z]"></div>
<div class="push_button tool_button_disabled" id="tool_redo"
title="Redo [Y]"></div>
<div class="push_button tool_button_disabled" id="tool_undo" title="Undo [Z]"></div>
<div class="push_button tool_button_disabled" id="tool_redo" title="Redo [Y]"></div>
</div>
<!-- Buttons when a single element is selected -->
<div id="selected_panel">
<div class="toolset">
<div class="tool_sep"></div>
<div class="push_button" id="tool_clone"
title="Duplicate Element [D]"></div>
<div class="push_button" id="tool_delete"
title="Delete Element [Delete/Backspace]"></div>
<div class="push_button" id="tool_clone" title="Duplicate Element [D]"></div>
<div class="push_button" id="tool_delete" title="Delete Element [Delete/Backspace]"></div>
<div class="tool_sep"></div>
<div class="push_button" id="tool_move_top"
title="Bring to Front [ Ctrl+Shift+] ]"></div>
<div class="push_button" id="tool_move_bottom"
title="Send to Back [ Ctrl+Shift+[ ]"></div>
<div class="push_button" id="tool_topath"
title="Convert to Path"></div>
<div class="push_button" id="tool_reorient"
title="Reorient path"></div>
<div class="push_button" id="tool_make_link"
title="Make (hyper)link"></div>
<div class="push_button" id="tool_move_top" title="Bring to Front [ Ctrl+Shift+] ]"></div>
<div class="push_button" id="tool_move_bottom" title="Send to Back [ Ctrl+Shift+[ ]"></div>
<div class="push_button" id="tool_topath" title="Convert to Path"></div>
<div class="push_button" id="tool_reorient" title="Reorient path"></div>
<div class="push_button" id="tool_make_link" title="Make (hyper)link"></div>
<div class="tool_sep"></div>
<label id="idLabel" title="Identify the element">
<span>id:</span>
<input id="elem_id" class="attr_changer"
data-attr="id" size="10" type="text"/>
<input id="elem_id" class="attr_changer" data-attr="id" size="10" type="text" />
</label>
<label id="classLabel" title="Element class">
<span>class:</span>
<input id="elem_class" class="attr_changer"
data-attr="class" size="10" type="text"/>
<input id="elem_class" class="attr_changer" data-attr="class" size="10" type="text" />
</label>
</div>
<label id="tool_angle" title="Change rotation angle" class="toolset">
<span id="angleLabel" class="icon_label"></span>
<input id="angle" size="2" value="0" type="text"/>
<input id="angle" size="2" value="0" type="text" />
</label>
<div class="toolset" id="tool_blur" title="Change gaussian blur value">
<label>
<span id="blurLabel" class="icon_label"></span>
<input id="blur" size="2" value="0" type="text"/>
<input id="blur" size="2" value="0" type="text" />
</label>
<div id="blur_dropdown" class="dropdown">
<button></button>
<ul>
<li class="special"><div id="blur_slider"></div></li>
<li class="special">
<div id="blur_slider"></div>
</li>
</ul>
</div>
</div>
@@ -184,22 +175,18 @@
</div>
<div id="xy_panel" class="toolset">
<label>
x: <input id="selected_x" class="attr_changer"
title="Change X coordinate" size="3" data-attr="x"/>
x: <input id="selected_x" class="attr_changer" title="Change X coordinate" size="3" data-attr="x" />
</label>
<label>
y: <input id="selected_y" class="attr_changer"
title="Change Y coordinate" size="3" data-attr="y"/>
y: <input id="selected_y" class="attr_changer" title="Change Y coordinate" size="3" data-attr="y" />
</label>
</div>
</div>
<!-- Buttons when multiple elements are selected -->
<div id="multiselected_panel">
<div class="tool_sep"></div>
<div class="push_button" id="tool_clone_multi"
title="Clone Elements [C]"></div>
<div class="push_button" id="tool_delete_multi"
title="Delete Selected Elements [Delete/Backspace]"></div>
<div class="push_button" id="tool_clone_multi" title="Clone Elements [C]"></div>
<div class="push_button" id="tool_delete_multi" title="Delete Selected Elements [Delete/Backspace]"></div>
<div class="tool_sep"></div>
<div class="push_button" id="tool_group_elements" title="Group Elements [G]"></div>
<div class="push_button" id="tool_make_link_multi" title="Make (hyper)link"></div>
@@ -224,33 +211,30 @@
<div class="toolset">
<label id="rect_width_tool" title="Change rectangle width">
<span id="rwidthLabel" class="icon_label"></span>
<input id="rect_width" class="attr_changer" size="3" data-attr="width"/>
<input id="rect_width" class="attr_changer" size="3" data-attr="width" />
</label>
<label id="rect_height_tool" title="Change rectangle height">
<span id="rheightLabel" class="icon_label"></span>
<input id="rect_height" class="attr_changer" size="3" data-attr="height"/>
<input id="rect_height" class="attr_changer" size="3" data-attr="height" />
</label>
</div>
<label id="cornerRadiusLabel" class="toolset"
title="Change Rectangle Corner Radius">
<label id="cornerRadiusLabel" class="toolset" title="Change Rectangle Corner Radius">
<span class="icon_label"></span>
<input id="rect_rx" size="3" value="0" type="text" data-attr="Corner Radius"/>
<input id="rect_rx" size="3" value="0" type="text" data-attr="Corner Radius" />
</label>
</div>
<div id="image_panel">
<div class="toolset">
<label><span id="iwidthLabel" class="icon_label"></span>
<input id="image_width" class="attr_changer"
title="Change image width" size="3" data-attr="width"/>
<input id="image_width" class="attr_changer" title="Change image width" size="3" data-attr="width" />
</label>
<label><span id="iheightLabel" class="icon_label"></span>
<input id="image_height" class="attr_changer"
title="Change image height" size="3" data-attr="height"/>
<input id="image_height" class="attr_changer" title="Change image height" size="3" data-attr="height" />
</label>
</div>
<div class="toolset">
<label id="tool_image_url">url:
<input id="image_url" type="text" title="Change URL" size="35"/>
<input id="image_url" type="text" title="Change URL" size="35" />
</label>
<label id="tool_change_image">
<button id="change_image_url" style="display: none;">Change Image</button>
@@ -262,76 +246,71 @@
<div id="circle_panel">
<div class="toolset">
<label id="tool_circle_cx">cx:
<input id="circle_cx" class="attr_changer"
title="Change circle's cx coordinate" size="3" data-attr="cx"/>
<input id="circle_cx" class="attr_changer" title="Change circle's cx coordinate" size="3"
data-attr="cx" />
</label>
<label id="tool_circle_cy">cy:
<input id="circle_cy" class="attr_changer"
title="Change circle's cy coordinate" size="3" data-attr="cy"/>
<input id="circle_cy" class="attr_changer" title="Change circle's cy coordinate" size="3"
data-attr="cy" />
</label>
</div>
<div class="toolset">
<label id="tool_circle_r">r:
<input id="circle_r" class="attr_changer"
title="Change circle's radius" size="3" data-attr="r"/>
<input id="circle_r" class="attr_changer" title="Change circle's radius" size="3" data-attr="r" />
</label>
</div>
</div>
<div id="ellipse_panel">
<div class="toolset">
<label id="tool_ellipse_cx">cx:
<input id="ellipse_cx" class="attr_changer"
title="Change ellipse's cx coordinate" size="3" data-attr="cx"/>
<input id="ellipse_cx" class="attr_changer" title="Change ellipse's cx coordinate" size="3"
data-attr="cx" />
</label>
<label id="tool_ellipse_cy">cy:
<input id="ellipse_cy" class="attr_changer"
title="Change ellipse's cy coordinate" size="3" data-attr="cy"/>
<input id="ellipse_cy" class="attr_changer" title="Change ellipse's cy coordinate" size="3"
data-attr="cy" />
</label>
</div>
<div class="toolset">
<label id="tool_ellipse_rx">rx:
<input id="ellipse_rx" class="attr_changer"
title="Change ellipse's x radius" size="3" data-attr="rx"/>
<input id="ellipse_rx" class="attr_changer" title="Change ellipse's x radius" size="3" data-attr="rx" />
</label>
<label id="tool_ellipse_ry">ry:
<input id="ellipse_ry" class="attr_changer"
title="Change ellipse's y radius" size="3" data-attr="ry"/>
<input id="ellipse_ry" class="attr_changer" title="Change ellipse's y radius" size="3" data-attr="ry" />
</label>
</div>
</div>
<div id="line_panel">
<div class="toolset">
<label id="tool_line_x1">x1:
<input id="line_x1" class="attr_changer"
title="Change line's starting x coordinate" size="3" data-attr="x1"/>
<input id="line_x1" class="attr_changer" title="Change line's starting x coordinate" size="3"
data-attr="x1" />
</label>
<label id="tool_line_y1">y1:
<input id="line_y1" class="attr_changer"
title="Change line's starting y coordinate" size="3" data-attr="y1"/>
<input id="line_y1" class="attr_changer" title="Change line's starting y coordinate" size="3"
data-attr="y1" />
</label>
</div>
<div class="toolset">
<label id="tool_line_x2">x2:
<input id="line_x2" class="attr_changer"
title="Change line's ending x coordinate" size="3" data-attr="x2"/>
<input id="line_x2" class="attr_changer" title="Change line's ending x coordinate" size="3"
data-attr="x2" />
</label>
<label id="tool_line_y2">y2:
<input id="line_y2" class="attr_changer"
title="Change line's ending y coordinate" size="3" data-attr="y2"/>
<input id="line_y2" class="attr_changer" title="Change line's ending y coordinate" size="3"
data-attr="y2" />
</label>
</div>
</div>
<div id="text_panel">
<div class="toolset">
<div class="tool_button" id="tool_bold"
title="Bold Text [B]"><span></span>B</div>
<div class="tool_button" id="tool_italic"
title="Italic Text [I]"><span></span>i</div>
<div class="tool_button" id="tool_bold" title="Bold Text [B]"><span></span>B</div>
<div class="tool_button" id="tool_italic" title="Italic Text [I]"><span></span>i</div>
</div>
<div class="toolset" id="tool_font_family">
<label>
<!-- Font family -->
<input id="font_family" type="text" title="Change Font Family" size="12"/>
<input id="font_family" type="text" title="Change Font Family" size="12" />
</label>
<div id="font_family_dropdown" class="dropdown">
<button></button>
@@ -349,10 +328,10 @@
</div>
<label id="tool_font_size" title="Change Font Size">
<span id="font_sizeLabel" class="icon_label"></span>
<input id="font_size" size="3" value="0" type="text"/>
<input id="font_size" size="3" value="0" type="text" />
</label>
<!-- Not visible, but still used -->
<input id="text" type="text" size="35"/>
<input id="text" type="text" size="35" />
</div>
<!-- formerly gsvg_panel -->
<div id="container_panel">
@@ -360,12 +339,11 @@
<!-- Add viewBox field here? -->
<label id="group_title" title="Group identification label">
<span>label:</span>
<input id="g_title" data-attr="title" size="10" type="text"/>
<input id="g_title" data-attr="title" size="10" type="text" />
</label>
</div>
<div id="use_panel">
<div class="push_button" id="tool_unlink_use"
title="Break link to reference element (make unique)"></div>
<div class="push_button" id="tool_unlink_use" title="Break link to reference element (make unique)"></div>
</div>
<div id="g_panel">
<div class="push_button" id="tool_ungroup" title="Ungroup Elements [G]"></div>
@@ -374,25 +352,21 @@
<div id="a_panel">
<label id="tool_link_url" title="Set link URL (leave empty to remove)">
<span id="linkLabel" class="icon_label"></span>
<input id="link_url" type="text" size="35"/>
<input id="link_url" type="text" size="35" />
</label>
</div>
<div id="path_node_panel">
<div class="tool_sep"></div>
<div id="tool_node_link" class="tool_button push_button_pressed"
title="Link Control Points"></div>
<div id="tool_node_link" class="tool_button push_button_pressed" title="Link Control Points"></div>
<div class="tool_sep"></div>
<label id="tool_node_x">x:
<input id="path_node_x" class="attr_changer"
title="Change node's x coordinate" size="3" data-attr="x"/>
<input id="path_node_x" class="attr_changer" title="Change node's x coordinate" size="3" data-attr="x" />
</label>
<label id="tool_node_y">y:
<input id="path_node_y" class="attr_changer"
title="Change node's y coordinate" size="3" data-attr="y"/>
<input id="path_node_y" class="attr_changer" title="Change node's y coordinate" size="3" data-attr="y" />
</label>
<select id="seg_type" title="Change Segment type">
<option id="straight_segments"
selected="selected" value="4">Straight</option>
<option id="straight_segments" selected="selected" value="4">Straight</option>
<option id="curve_segments" value="6">Curve</option>
</select>
<div class="tool_button" id="tool_node_clone" title="Clone Node"></div>
@@ -407,12 +381,10 @@
<div class="tool_button" id="tool_select" title="Select Tool"></div>
<div class="tool_button" id="tool_fhpath" title="Pencil Tool"></div>
<div class="tool_button" id="tool_line" title="Line Tool"></div>
<div id="tools_rect_show" class="tool_button flyout_current"
title="Square/Rect Tool">
<div id="tools_rect_show" class="tool_button flyout_current" title="Square/Rect Tool">
<div class="flyout_arrow_horiz"></div>
</div>
<div id="tools_ellipse_show" class="tool_button flyout_current"
title="Ellipse/Circle Tool">
<div id="tools_ellipse_show" class="tool_button flyout_current" title="Ellipse/Circle Tool">
<div class="flyout_arrow_horiz"></div>
</div>
<div class="tool_button" id="tool_path" title="Path Tool"></div>
@@ -433,7 +405,7 @@
<div id="zoom_panel" class="toolset" title="Change zoom level">
<label>
<span id="zoomLabel" class="zoom_tool icon_label"></span>
<input id="zoom" size="3" value="100" type="text"/>
<input id="zoom" size="3" value="100" type="text" />
</label>
<div id="zoom_dropdown" class="dropdown">
<button></button>
@@ -469,9 +441,8 @@
<div id="stroke_color" class="color_block" title="Change stroke color"></div>
</div>
<label class="stroke_label">
<input id="stroke_width"
title="Change stroke width by 1, shift-click to change by 0.1"
size="2" value="5" type="text" data-attr="Stroke Width"/>
<input id="stroke_width" title="Change stroke width by 1, shift-click to change by 0.1" size="2"
value="5" type="text" data-attr="Stroke Width" />
</label>
<div id="toggle_stroke_tools" title="Show/hide more stroke tools"></div>
<label class="stroke_tool">
@@ -495,7 +466,7 @@
<div class="color_tool" id="tool_opacity" title="Change selected item opacity">
<label>
<span id="group_opacityLabel" class="icon_label"></span>
<input id="group_opacity" size="3" value="100" type="text"/>
<input id="group_opacity" size="3" value="100" type="text" />
</label>
<div id="opacity_dropdown" class="dropdown">
<button></button>
@@ -505,7 +476,9 @@
<li>50%</li>
<li>75%</li>
<li>100%</li>
<li class="special"><div id="opac_slider"></div></li>
<li class="special">
<div id="opac_slider"></div>
</li>
</ul>
</div>
</div>
@@ -513,8 +486,7 @@
</div>
<div id="tools_bottom_3">
<div id="palette_holder">
<div id="palette"
title="Click to change fill color, shift-click to change stroke color">
<div id="palette" title="Click to change fill color, shift-click to change stroke color">
</div>
</div>
</div>
@@ -542,8 +514,8 @@
</div>
<!-- hidden divs -->
<div id="color_picker"></div>
</div> <!-- svg_editor -->
<div id="svg_source_editor">
</div> <!-- svg_editor -->
<div id="svg_source_editor">
<div class="overlay"></div>
<div id="svg_source_container">
<div id="tool_source_back" class="toolbar_button">
@@ -560,8 +532,8 @@
<textarea id="svg_source_textarea" spellcheck="false"></textarea>
</form>
</div>
</div>
<div id="svg_docprops">
</div>
<div id="svg_docprops">
<div class="overlay"></div>
<div id="svg_docprops_container">
<div id="tool_docprops_back" class="toolbar_button">
@@ -572,47 +544,45 @@
<legend id="svginfo_image_props">Image Properties</legend>
<label>
<span id="svginfo_title">Title:</span>
<input type="text" id="canvas_title"/>
<input type="text" id="canvas_title" />
</label>
<fieldset id="change_resolution">
<legend id="svginfo_dim">Canvas Dimensions</legend>
<label>
<span id="svginfo_width">width:</span>
<input type="text" id="canvas_width" size="6"/>
<input type="text" id="canvas_width" size="6" />
</label>
<label>
<span id="svginfo_height">height:</span>
<input type="text" id="canvas_height" size="6"/>
<input type="text" id="canvas_height" size="6" />
</label>
<label>
<select id="resolution">
<option id="selectedPredefined"
selected="selected">Select predefined:</option>
<option id="selectedPredefined" selected="selected">Select predefined:</option>
<option>640x480</option>
<option>800x600</option>
<option>1024x768</option>
<option>1280x960</option>
<option>1600x1200</option>
<option id="fitToContent"
value="content">Fit to Content</option>
<option id="fitToContent" value="content">Fit to Content</option>
</select>
</label>
</fieldset>
<fieldset id="image_save_opts">
<legend id="includedImages">Included Images</legend>
<label>
<input type="radio" name="image_opt" value="embed" checked="checked"/>
<input type="radio" name="image_opt" value="embed" checked="checked" />
<span id="image_opt_embed">Embed data (local files)</span>
</label>
<label>
<input type="radio" name="image_opt" value="ref"/>
<input type="radio" name="image_opt" value="ref" />
<span id="image_opt_ref">Use file reference</span>
</label>
</fieldset>
</fieldset>
</div>
</div>
<div id="svg_prefs">
</div>
<div id="svg_prefs">
<div class="overlay"></div>
<div id="svg_prefs_container">
<div id="tool_prefs_back" class="toolbar_button">
@@ -661,7 +631,7 @@
<div id="bg_blocks"></div>
<label>
<span id="svginfo_bg_url">URL:</span>
<input type="text" id="canvas_bg_url"/>
<input type="text" id="canvas_bg_url" />
</label>
<p id="svginfo_bg_note">Note: Background will not be saved with image.</p>
</fieldset>
@@ -669,23 +639,22 @@
<legend id="svginfo_grid_settings">Grid</legend>
<label>
<span id="svginfo_snap_onoff">Snapping on/off</span>
<input type="checkbox" value="snapping_on" id="grid_snapping_on"/>
<input type="checkbox" value="snapping_on" id="grid_snapping_on" />
</label>
<label>
<span id="svginfo_snap_step">Snapping Step-Size:</span>
<input type="text" id="grid_snapping_step" size="3" value="10"/>
<input type="text" id="grid_snapping_step" size="3" value="10" />
</label>
<label>
<span id="svginfo_grid_color">Grid color:</span>
<input type="text" id="grid_color" size="3" value="#000"/>
<input type="text" id="grid_color" size="3" value="#000" />
</label>
</fieldset>
<fieldset id="units_rulers">
<legend id="svginfo_units_rulers">Units &amp; Rulers</legend>
<label>
<span id="svginfo_rulers_onoff">Show rulers</span>
<input id="show_rulers" type="checkbox"
value="show_rulers" checked="checked"/>
<input id="show_rulers" type="checkbox" value="show_rulers" checked="checked" />
</label>
<label>
<span id="svginfo_unit">Base Unit:</span>
@@ -724,15 +693,15 @@
</fieldset>
</fieldset>
</div>
</div>
<div id="dialog_box">
</div>
<div id="dialog_box">
<div class="overlay"></div>
<div id="dialog_container">
<div id="dialog_content"></div>
<div id="dialog_buttons"></div>
</div>
</div>
<ul id="cmenu_canvas" class="contextMenu">
</div>
<ul id="cmenu_canvas" class="contextMenu">
<li><a href="#cut">Cut<span class="shortcut">META+X</span></a></li>
<li><a href="#copy">Copy<span class="shortcut">META+C</span></a></li>
<li><a href="#paste">Paste</a></li>
@@ -744,14 +713,15 @@
<li><a href="#move_up">Bring Forward<span class="shortcut">CTRL+]</span></a></li>
<li><a href="#move_down">Send Backward<span class="shortcut">CTRL+[</span></a></li>
<li><a href="#move_back">Send to Back<span class="shortcut">CTRL+SHFT+[</span></a></li>
</ul>
<ul id="cmenu_layers" class="contextMenu">
</ul>
<ul id="cmenu_layers" class="contextMenu">
<li><a href="#dupe">Duplicate Layer...</a></li>
<li><a href="#delete">Delete Layer</a></li>
<li><a href="#merge_down">Merge Down</a></li>
<li><a href="#merge_all">Merge All</a></li>
</ul>
</ul>
</div>
</div>
</body>
</html>