eslint/browser list/accessibility test

master
JFH 2020-07-26 20:11:18 +02:00
parent 630a76c1b6
commit 89e20d49e6
114 changed files with 105155 additions and 93732 deletions

View File

@ -1,343 +1,15 @@
'use strict';
module.exports = {
extends: ['ash-nazg/sauron-node'],
extends: ['eslint:recommended', 'ash-nazg/sauron-node'],
parserOptions: {
"ecmaVersion": 10,
sourceType: 'module'
},
env: {
browser: true
browser: true,
es6: true
},
settings: {
polyfills: [
],
jsdoc: {
additionalTagNames: {
// In case we need to extend
customTags: []
},
augmentsExtendsReplacesDocs: true
// Todo: Figure out why this is not working and why seem to have to
// disable for all Markdown:
/*
baseConfig: {
rules: {
'no-multi-spaces': 'off'
}
}
*/
}
},
overrides: [
// Locales have no need for importing outside of SVG-Edit
{
files: [
'src/editor/locale/lang.*.js', 'src/editor/extensions/ext-locale/**',
'docs/tutorials/ExtensionDocs.md'
],
rules: {
'import/no-anonymous-default-export': ['off']
}
},
// These browser files don't do importing or requiring
{
files: [
'src/editor/svgpathseg.js',
'src/editor/touch.js',
'src/editor/typedefs.js',
'src/editor/redirect-on-no-module-support.js',
'src/editor/extensions/imagelib/index.js',
'src/external/dom-polyfill/dom-polyfill.js',
'docs/screencasts/svgopen2010/script.js'
],
rules: {
'import/unambiguous': ['off']
}
},
{
files: ['**/*.html', 'docs/screencasts/**'],
globals: {
root: 'off'
},
settings: {
polyfills: [
'document.querySelector',
'history',
'history.pushState',
'history.replaceState',
'location.hash',
'navigator',
'Number.parseFloat',
'Number.parseInt',
'Number.isNaN'
]
},
rules: {
'import/unambiguous': 'off'
}
},
{
files: ['.eslintrc.js', '.ncurc.js', 'tools/mochawesome-cli.js'],
extends: [
'ash-nazg/sauron-node-script'
]
},
// Our Markdown rules (and used for JSDoc examples as well, by way of
// our use of `jsdoc/check-examples` within `ash-nazg`)
{
files: ['**/*.md'],
settings: {
polyfills: [
// Tutorials
'console',
'location.href'
]
},
rules: {
// Todo: Figure out why this is not enough to disable warning
// for examples in my environment (but it is in others')
// Used in examples of assert-close.js plugin
'mocha-cleanup/no-assertions-outside-it': 'off',
'eslint-comments/no-unused-disable': 'warn',
'eol-last': ['off'],
'no-console': ['off'],
'no-undef': ['off'],
'no-unused-vars': ['warn'],
'padded-blocks': ['off'],
'import/unambiguous': ['off'],
'import/no-unresolved': ['off'],
'node/no-missing-import': ['off'],
'no-multi-spaces': 'off',
'sonarjs/no-all-duplicated-branches': 'off',
'node/no-unpublished-import': ['error', {
allowModules: ['@cypress/fiddle']
}],
'no-alert': 'off',
// Disable until may fix https://github.com/gajus/eslint-plugin-jsdoc/issues/211
indent: 'off'
}
},
// Dis-apply Node rules mistakenly giving errors with browser files,
// and treating Node global `root` as being present for shadowing
{
files: ['src/editor/**', 'src/external/**'],
globals: {
root: 'off'
},
settings: {
polyfills: [
// These are the primary polyfills needed by regular users if
// not present, e.g., with core-js-bundle; also those under
// extensions
'Array.isArray',
'Blob',
'console',
'CustomEvent',
'document.body',
'document.createElementNS',
'document.evaluate',
'document.head',
'document.importNode',
'document.querySelector',
'document.querySelectorAll',
'DOMParser',
'Error',
'FileReader',
'JSON',
'KeyboardEvent',
'location.href',
'location.origin',
'MouseEvent',
'MutationObserver',
'navigator',
'Number.isNaN',
'Number.parseFloat',
'Number.parseInt',
'Object.assign',
'Object.defineProperty',
'Object.defineProperties',
'Object.entries',
'Object.getOwnPropertyDescriptor',
'Object.keys',
'Object.values',
'Promise',
'Promise.all',
'Set',
'Uint8Array',
'URL',
'URL.createObjectURL',
'XMLSerializer',
'XMLHttpRequest',
'window.getComputedStyle',
'window.parent',
'window.scrollX',
'window.scrollY'
]
},
rules: {
// Should probably add this rule to ash-nazg as facilitates tree-shaking
'import/no-namespace': ['error'],
'node/no-unsupported-features/node-builtins': 'off'
}
},
// For extensions, `this` is generally assigned to be the more
// descriptive `svgEditor`; they also have no need for importing outside
// of SVG-Edit
{
files: ['src/editor/extensions/**'],
settings: {
polyfills: [
'console',
'fetch',
'location.origin',
'Number.isNaN',
'Number.parseFloat',
'Number.parseInt',
'window.postMessage'
]
},
rules: {
'consistent-this': ['error', 'svgEditor'],
'import/no-anonymous-default-export': ['off']
}
},
{
// Node files
files: [
'docs/jsdoc-config.js',
'build/build-html.js',
'rollup.config.js', 'rollup-config.config.js'
],
env: {
node: true
},
settings: {
polyfills: [
'console',
'Promise.resolve'
]
},
globals: {
require: true
},
rules: {
// We can't put Rollup in npmignore or user can't get access,
// and we have too many modules to add to `peerDependencies`
// so this rule can know them to be available, so we instead
// disable
'node/no-unpublished-import': 'off'
}
},
{
// As consumed by jsdoc, cannot be expressed as ESM
files: ['docs/jsdoc-config.js'],
parserOptions: {
sourceType: 'script'
},
globals: {
module: false
},
rules: {
'import/no-commonjs': 'off',
strict: 'off'
}
},
{
// Should probably have as external, but should still check
files: ['src/editor/canvg/rgbcolor.js'],
settings: {
polyfills: [
'Number.isNaN',
'Number.parseInt',
'Object.assign',
'Object.keys'
]
}
},
{
files: ['cypress/plugins/index.js'],
extends: [
'ash-nazg/sauron-node-script'
]
},
{
files: ['cypress/**'],
extends: [
'plugin:cypress/recommended',
'plugin:mocha/recommended',
'plugin:mocha-cleanup/recommended-no-limits',
'plugin:@fintechstudios/chai-as-promised/recommended',
'plugin:chai-expect-keywords/recommended',
'plugin:chai-expect/recommended',
'plugin:chai-friendly/recommended'
],
env: {
node: true
},
settings: {
polyfills: [
'console',
'Date.now',
'document.body',
'document.createElementNS',
'document.head',
'DOMParser',
'Number.isNaN',
'Object.keys',
'Object.entries',
'Promise'
]
},
rules: {
// These errors are caused in Cypress files if user has not
// yet instrumented code; need to reinvestigate why we had to
// instrument separately from nyc mocha
'import/no-unresolved': ['error', {ignore: ['/instrumented/']}],
'node/no-missing-import': 'off',
'chai-expect-keywords/no-unsupported-keywords': [
'error', {
allowChaiDOM: true
}
],
// Would be good but seems necessary due to some bugs in Cypress
// in detecting visibility
// 'cypress/no-force': 0,
// Good but would be difficult to enforce (and data-* may not be less
// brittle than IDs/classes anyways)
// 'cypress/require-data-selectors': 0,
'cypress/assertion-before-screenshot': 2,
// Conflicts with Cypress `should`
'mocha-cleanup/invalid-assertions': 0,
// Might see about working around to avoid the option limitation,
// but convenient
'mocha-cleanup/no-expressions-in-assertions': ['error', {
replacementsOnly: true
}],
// Too oppressive when planning to extend a section
'mocha/no-hooks-for-single-case': 0,
// Would be good to enable but needs some refactoring
'mocha/no-setup-in-describe': 0,
'mocha-cleanup/no-outside-declaration': 0,
// Useful to ensure allowing `this.timeout()`, etc., but a
// little oppressive
'mocha/no-mocha-arrows': 0,
// Useful if enabling the regular `prefer-arrow-callback`
// 'mocha/prefer-arrow-callback': 2
'jsdoc/require-jsdoc': 0,
'no-console': 0,
'import/unambiguous': 0
}
}
],
rules: {
// check-examples is not picking up eslint config properly in some
// environments; see also discussion above
@ -350,20 +22,6 @@ module.exports = {
'unicorn/regex-shorthand': 0,
// The Babel transform seems to have a problem converting these
'prefer-named-capture-group': 'off',
// Override these `ash-nazg/sauron` rules which are difficult for us
// to apply at this time
'unicorn/prefer-string-slice': 'off',
'default-case': 'off',
'require-unicode-regexp': 'off',
'max-len': 'off', /* , {
ignoreUrls: true,
ignoreRegExpLiterals: true
} */
'unicorn/prefer-query-selector': 'off',
'unicorn/no-fn-reference-in-iterator': 'off',
'unicorn/prefer-node-append': 'off',
'unicorn/no-zero-fractions': 'off',
'unicorn/prefer-number-properties': 'off',
'jsdoc/require-file-overview': ['error', {
tags: {
file: {
@ -392,8 +50,37 @@ module.exports = {
}
}
}],
// Disable for now
'eslint-comments/require-description': 0
// Warning or Off for now but should be reviewed
// Override these rules which are difficult for us
// to apply at this time
'unicorn/prefer-string-slice': 'off',
'default-case': 'off',
'require-unicode-regexp': 'off',
'max-len': ['warn', { 'ignoreComments': true, 'code': 130 }], // 130 is too much but too many occurences
'unicorn/prefer-query-selector': 'off',
'unicorn/no-fn-reference-in-iterator': 'off',
'unicorn/prefer-node-append': 'off',
'unicorn/no-zero-fractions': 'off',
'unicorn/prefer-number-properties': 'off',
'eslint-comments/require-description': 'off',
'compat/compat': 'warn',
'consistent-this': 'off',
'import/no-anonymous-default-export': 'off',
'node/no-unsupported-features/node-builtins': 'warn',
'prefer-exponentiation-operator': 'warn'
},
overrides: [
// Locales have no need for importing outside of SVG-Edit
// and translations may need a longer line length
{
files: [
'src/editor/locale/lang.*.js', 'src/editor/extensions/ext-locale/**',
'docs/tutorials/ExtensionDocs.md'
],
rules: {
'import/no-anonymous-default-export': 'off',
'max-len': 'off'
}
}
]
};

View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="421" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="orange" stroke="#000" d="M0 0h120v20H0zM120 0h102v20H120zM222 0h87v20h-87zM309 0h112v20H309z"/><path fill="url(#smooth)" d="M0 0h421v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Statements 37.51%</text><text class="high" x="5" y="14">Statements 37.51%</text><text class="shadow" x="125.5" y="15">Branches 28.8%</text><text class="high" x="125" y="14">Branches 28.8%</text><text class="shadow" x="227.5" y="15">Lines 38.46%</text><text class="high" x="227" y="14">Lines 38.46%</text><text class="shadow" x="314.5" y="15">Functions 47.27%</text><text class="high" x="314" y="14">Functions 47.27%</text></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="428" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="orange" stroke="#000" d="M0 0h120v20H0zM120 0h109v20H120zM229 0h87v20h-87z"/><path fill="green" stroke="#000" d="M316 0h112v20H316z"/><path fill="url(#smooth)" d="M0 0h428v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Statements 37.49%</text><text class="high" x="5" y="14">Statements 37.49%</text><text class="shadow" x="125.5" y="15">Branches 28.78%</text><text class="high" x="125" y="14">Branches 28.78%</text><text class="shadow" x="234.5" y="15">Lines 38.44%</text><text class="high" x="234" y="14">Lines 38.44%</text><text class="shadow" x="321.5" y="15">Functions 47.27%</text><text class="high" x="321" y="14">Functions 47.27%</text></g></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -1,4 +1,3 @@
// eslint-disable-next-line mocha/no-skipped-tests
describe.skip('UI - Accessibility', function () {
beforeEach(() => {
cy.visit('/instrumented/editor/svg-editor-es.html');
@ -26,6 +25,15 @@ describe.skip('UI - Accessibility', function () {
locale: Object
*/
});
cy.checkA11y();
cy.checkA11y(
{},
{
rules: {
'label-title-only': { enabled: false },
'page-has-heading-one': { enabled: false },
'region': { enabled: false },
'scrollable-region-focusable': { enabled: false },
}
});
});
});

3181
dist/canvg.js vendored

File diff suppressed because it is too large Load Diff

84
dist/dom-polyfill.js vendored
View File

@ -1,6 +1,22 @@
(function () {
'use strict';
function _typeof(obj) {
"@babel/helpers - typeof";
if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
_typeof = function (obj) {
return typeof obj;
};
} else {
_typeof = function (obj) {
return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
};
}
return _typeof(obj);
}
// From https://github.com/inexorabletash/polyfill/blob/master/dom.js
/**
@ -15,7 +31,7 @@
*/
function mixin(o, ps) {
if (!o) return;
Object.keys(ps).forEach(p => {
Object.keys(ps).forEach(function (p) {
if (p in o || p in o.prototype) {
return;
}
@ -36,8 +52,8 @@
function convertNodesIntoANode(nodes) {
nodes = nodes.map(node => {
const isNode = node && typeof node === 'object' && 'nodeType' in node;
nodes = nodes.map(function (node) {
var isNode = node && _typeof(node) === 'object' && 'nodeType' in node;
return isNode ? node : document.createTextNode(node);
});
@ -45,24 +61,30 @@
return nodes[0];
}
const node = document.createDocumentFragment();
nodes.forEach(n => {
var node = document.createDocumentFragment();
nodes.forEach(function (n) {
node.appendChild(n);
});
return node;
}
const ParentNode = {
prepend(...nodes) {
var ParentNode = {
prepend: function prepend() {
for (var _len = arguments.length, nodes = new Array(_len), _key = 0; _key < _len; _key++) {
nodes[_key] = arguments[_key];
}
nodes = convertNodesIntoANode(nodes);
this.insertBefore(nodes, this.firstChild);
},
append: function append() {
for (var _len2 = arguments.length, nodes = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
nodes[_key2] = arguments[_key2];
}
append(...nodes) {
nodes = convertNodesIntoANode(nodes);
this.appendChild(nodes);
}
};
mixin(Document || HTMLDocument, ParentNode); // HTMLDocument for IE8
@ -70,44 +92,54 @@
mixin(Element, ParentNode); // Mixin ChildNode
// https://dom.spec.whatwg.org/#interface-childnode
const ChildNode = {
before(...nodes) {
const parent = this.parentNode;
var ChildNode = {
before: function before() {
var parent = this.parentNode;
if (!parent) return;
let viablePreviousSibling = this.previousSibling;
var viablePreviousSibling = this.previousSibling;
for (var _len3 = arguments.length, nodes = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
nodes[_key3] = arguments[_key3];
}
while (nodes.includes(viablePreviousSibling)) {
viablePreviousSibling = viablePreviousSibling.previousSibling;
}
const node = convertNodesIntoANode(nodes);
var node = convertNodesIntoANode(nodes);
parent.insertBefore(node, viablePreviousSibling ? viablePreviousSibling.nextSibling : parent.firstChild);
},
after(...nodes) {
const parent = this.parentNode;
after: function after() {
var parent = this.parentNode;
if (!parent) return;
let viableNextSibling = this.nextSibling;
var viableNextSibling = this.nextSibling;
for (var _len4 = arguments.length, nodes = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
nodes[_key4] = arguments[_key4];
}
while (nodes.includes(viableNextSibling)) {
viableNextSibling = viableNextSibling.nextSibling;
}
const node = convertNodesIntoANode(nodes); // eslint-disable-next-line unicorn/prefer-modern-dom-apis
var node = convertNodesIntoANode(nodes); // eslint-disable-next-line unicorn/prefer-modern-dom-apis
parent.insertBefore(node, viableNextSibling);
},
replaceWith(...nodes) {
const parent = this.parentNode;
replaceWith: function replaceWith() {
var parent = this.parentNode;
if (!parent) return;
let viableNextSibling = this.nextSibling;
var viableNextSibling = this.nextSibling;
for (var _len5 = arguments.length, nodes = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
nodes[_key5] = arguments[_key5];
}
while (nodes.includes(viableNextSibling)) {
viableNextSibling = viableNextSibling.nextSibling;
}
const node = convertNodesIntoANode(nodes);
var node = convertNodesIntoANode(nodes);
if (this.parentNode === parent) {
parent.replaceChild(node, this);
@ -116,15 +148,13 @@
parent.insertBefore(node, viableNextSibling);
}
},
remove() {
remove: function remove() {
if (!this.parentNode) {
return;
}
this.parentNode.removeChild(this); // eslint-disable-line unicorn/prefer-node-remove
}
};
mixin(DocumentType, ChildNode);
mixin(Element, ChildNode);

View File

@ -1,6 +1,42 @@
var svgEditorExtension_arrows = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* @file ext-arrows.js
*
@ -11,105 +47,165 @@ var svgEditorExtension_arrows = (function () {
*/
var extArrows = {
name: 'arrows',
init: function init(S) {
var _this = this;
async init(S) {
const strings = await S.importLocale();
const svgEditor = this;
const svgCanvas = svgEditor.canvas;
const // {svgcontent} = S,
addElem = svgCanvas.addSVGElementFromJson,
{
nonce,
$
} = S,
prefix = 'se_arrow_';
let selElems,
arrowprefix,
randomizeIds = S.randomize_ids;
/**
* @param {Window} win
* @param {!(string|Integer)} n
* @returns {void}
*/
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
var strings, svgEditor, svgCanvas, addElem, nonce, $, prefix, selElems, arrowprefix, randomizeIds, setArrowNonce, unsetArrowNonce, pathdata, getLinked, showPanel, resetMarker, addMarker, setArrow, colorChanged, contextTools;
return regeneratorRuntime.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
colorChanged = function _colorChanged(elem) {
var color = elem.getAttribute('stroke');
var mtypes = ['start', 'mid', 'end'];
var defs = svgCanvas.findDefs();
$.each(mtypes, function (i, type) {
var marker = getLinked(elem, 'marker-' + type);
function setArrowNonce(win, n) {
randomizeIds = true;
arrowprefix = prefix + n + '_';
pathdata.fw.id = arrowprefix + 'fw';
pathdata.bk.id = arrowprefix + 'bk';
}
/**
* @param {Window} win
* @returns {void}
*/
function unsetArrowNonce(win) {
randomizeIds = false;
arrowprefix = prefix;
pathdata.fw.id = arrowprefix + 'fw';
pathdata.bk.id = arrowprefix + 'bk';
if (!marker) {
return;
}
svgCanvas.bind('setnonce', setArrowNonce);
svgCanvas.bind('unsetnonce', unsetArrowNonce);
var curColor = $(marker).children().attr('fill');
var curD = $(marker).children().attr('d');
if (randomizeIds) {
arrowprefix = prefix + nonce + '_';
} else {
arrowprefix = prefix;
if (curColor === color) {
return;
}
const pathdata = {
fw: {
d: 'm0,0l10,5l-10,5l5,-5l-5,-5z',
refx: 8,
id: arrowprefix + 'fw'
},
bk: {
d: 'm10,0l-10,5l10,5l-5,-5l5,-5z',
refx: 2,
id: arrowprefix + 'bk'
var allMarkers = $(defs).find('marker');
var newMarker = null; // Different color, check if already made
allMarkers.each(function () {
var attrs = $(this).children().attr(['fill', 'd']);
if (attrs.fill === color && attrs.d === curD) {
// Found another marker with this color and this path
newMarker = this;
}
});
if (!newMarker) {
// Create a new marker with this color
var lastId = marker.id;
var dir = lastId.includes('_fw') ? 'fw' : 'bk';
newMarker = addMarker(dir, type, arrowprefix + dir + allMarkers.length);
$(newMarker).children().attr('fill', color);
}
$(elem).attr('marker-' + type, 'url(#' + newMarker.id + ')'); // Check if last marker can be removed
var remove = true;
$(S.svgcontent).find('line, polyline, path, polygon').each(function () {
var element = this;
$.each(mtypes, function (j, mtype) {
if ($(element).attr('marker-' + mtype) === 'url(#' + marker.id + ')') {
remove = false;
return remove;
}
return undefined;
});
if (!remove) {
return false;
}
return undefined;
}); // Not found, so can safely remove
if (remove) {
$(marker).remove();
}
});
};
/**
* Gets linked element.
* @param {Element} elem
* @param {string} attr
* @returns {Element}
*/
function getLinked(elem, attr) {
const str = elem.getAttribute(attr);
setArrow = function _setArrow() {
resetMarker();
var type = this.value;
if (!str) {
return null;
if (type === 'none') {
return;
} // Set marker on element
var dir = 'fw';
if (type === 'mid_bk') {
type = 'mid';
dir = 'bk';
} else if (type === 'both') {
addMarker('bk', type);
svgCanvas.changeSelectedAttribute('marker-start', 'url(#' + pathdata.bk.id + ')');
type = 'end';
dir = 'fw';
} else if (type === 'start') {
dir = 'bk';
}
const m = str.match(/\(#(.*)\)/); // const m = str.match(/\(#(?<id>.+)\)/);
// if (!m || !m.groups.id) {
addMarker(dir, type);
svgCanvas.changeSelectedAttribute('marker-' + type, 'url(#' + pathdata[dir].id + ')');
svgCanvas.call('changed', selElems);
};
if (!m || m.length !== 2) {
return null;
addMarker = function _addMarker(dir, type, id) {
// TODO: Make marker (or use?) per arrow type, since refX can be different
id = id || arrowprefix + dir;
var data = pathdata[dir];
if (type === 'mid') {
data.refx = 5;
}
return svgCanvas.getElem(m[1]); // return svgCanvas.getElem(m.groups.id);
var marker = svgCanvas.getElem(id);
if (!marker) {
marker = addElem({
element: 'marker',
attr: {
viewBox: '0 0 10 10',
id: id,
refY: 5,
markerUnits: 'strokeWidth',
markerWidth: 5,
markerHeight: 5,
orient: 'auto',
style: 'pointer-events:none' // Currently needed for Opera
}
});
var arrow = addElem({
element: 'path',
attr: {
d: data.d,
fill: '#000000'
}
});
marker.append(arrow);
svgCanvas.findDefs().append(marker);
}
/**
* @param {boolean} on
* @returns {void}
*/
marker.setAttribute('refX', data.refx);
return marker;
};
function showPanel(on) {
resetMarker = function _resetMarker() {
var el = selElems[0];
el.removeAttribute('marker-start');
el.removeAttribute('marker-mid');
el.removeAttribute('marker-end');
};
showPanel = function _showPanel(on) {
$('#arrow_panel').toggle(on);
if (on) {
const el = selElems[0];
const end = el.getAttribute('marker-end');
const start = el.getAttribute('marker-start');
const mid = el.getAttribute('marker-mid');
let val;
var el = selElems[0];
var end = el.getAttribute('marker-end');
var start = el.getAttribute('marker-start');
var mid = el.getAttribute('marker-mid');
var val;
if (end && start) {
val = 'both';
@ -131,173 +227,84 @@ var svgEditorExtension_arrows = (function () {
$('#arrow_list').val(val);
}
};
getLinked = function _getLinked(elem, attr) {
var str = elem.getAttribute(attr);
if (!str) {
return null;
}
var m = str.match(/\(#(.*)\)/); // const m = str.match(/\(#(?<id>.+)\)/);
// if (!m || !m.groups.id) {
if (!m || m.length !== 2) {
return null;
}
return svgCanvas.getElem(m[1]); // return svgCanvas.getElem(m.groups.id);
};
unsetArrowNonce = function _unsetArrowNonce(win) {
randomizeIds = false;
arrowprefix = prefix;
pathdata.fw.id = arrowprefix + 'fw';
pathdata.bk.id = arrowprefix + 'bk';
};
setArrowNonce = function _setArrowNonce(win, n) {
randomizeIds = true;
arrowprefix = prefix + n + '_';
pathdata.fw.id = arrowprefix + 'fw';
pathdata.bk.id = arrowprefix + 'bk';
};
_context2.next = 10;
return S.importLocale();
case 10:
strings = _context2.sent;
svgEditor = _this;
svgCanvas = svgEditor.canvas;
// {svgcontent} = S,
addElem = svgCanvas.addSVGElementFromJson, nonce = S.nonce, $ = S.$, prefix = 'se_arrow_';
randomizeIds = S.randomize_ids;
/**
*
* @param {Window} win
* @param {!(string|Integer)} n
* @returns {void}
*/
svgCanvas.bind('setnonce', setArrowNonce);
svgCanvas.bind('unsetnonce', unsetArrowNonce);
function resetMarker() {
const el = selElems[0];
el.removeAttribute('marker-start');
el.removeAttribute('marker-mid');
el.removeAttribute('marker-end');
if (randomizeIds) {
arrowprefix = prefix + nonce + '_';
} else {
arrowprefix = prefix;
}
pathdata = {
fw: {
d: 'm0,0l10,5l-10,5l5,-5l-5,-5z',
refx: 8,
id: arrowprefix + 'fw'
},
bk: {
d: 'm10,0l-10,5l10,5l-5,-5l5,-5z',
refx: 2,
id: arrowprefix + 'bk'
}
};
/**
* @param {"bk"|"fw"} dir
* @param {"both"|"mid"|"end"|"start"} type
* @param {string} id
* Gets linked element.
* @param {Element} elem
* @param {string} attr
* @returns {Element}
*/
function addMarker(dir, type, id) {
// TODO: Make marker (or use?) per arrow type, since refX can be different
id = id || arrowprefix + dir;
const data = pathdata[dir];
if (type === 'mid') {
data.refx = 5;
}
let marker = svgCanvas.getElem(id);
if (!marker) {
marker = addElem({
element: 'marker',
attr: {
viewBox: '0 0 10 10',
id,
refY: 5,
markerUnits: 'strokeWidth',
markerWidth: 5,
markerHeight: 5,
orient: 'auto',
style: 'pointer-events:none' // Currently needed for Opera
}
});
const arrow = addElem({
element: 'path',
attr: {
d: data.d,
fill: '#000000'
}
});
marker.append(arrow);
svgCanvas.findDefs().append(marker);
}
marker.setAttribute('refX', data.refx);
return marker;
}
/**
*
* @returns {void}
*/
function setArrow() {
resetMarker();
let type = this.value;
if (type === 'none') {
return;
} // Set marker on element
let dir = 'fw';
if (type === 'mid_bk') {
type = 'mid';
dir = 'bk';
} else if (type === 'both') {
addMarker('bk', type);
svgCanvas.changeSelectedAttribute('marker-start', 'url(#' + pathdata.bk.id + ')');
type = 'end';
dir = 'fw';
} else if (type === 'start') {
dir = 'bk';
}
addMarker(dir, type);
svgCanvas.changeSelectedAttribute('marker-' + type, 'url(#' + pathdata[dir].id + ')');
svgCanvas.call('changed', selElems);
}
/**
* @param {Element} elem
* @returns {void}
*/
function colorChanged(elem) {
const color = elem.getAttribute('stroke');
const mtypes = ['start', 'mid', 'end'];
const defs = svgCanvas.findDefs();
$.each(mtypes, function (i, type) {
const marker = getLinked(elem, 'marker-' + type);
if (!marker) {
return;
}
const curColor = $(marker).children().attr('fill');
const curD = $(marker).children().attr('d');
if (curColor === color) {
return;
}
const allMarkers = $(defs).find('marker');
let newMarker = null; // Different color, check if already made
allMarkers.each(function () {
const attrs = $(this).children().attr(['fill', 'd']);
if (attrs.fill === color && attrs.d === curD) {
// Found another marker with this color and this path
newMarker = this; // eslint-disable-line consistent-this
}
});
if (!newMarker) {
// Create a new marker with this color
const lastId = marker.id;
const dir = lastId.includes('_fw') ? 'fw' : 'bk';
newMarker = addMarker(dir, type, arrowprefix + dir + allMarkers.length);
$(newMarker).children().attr('fill', color);
}
$(elem).attr('marker-' + type, 'url(#' + newMarker.id + ')'); // Check if last marker can be removed
let remove = true;
$(S.svgcontent).find('line, polyline, path, polygon').each(function () {
const element = this; // eslint-disable-line consistent-this
$.each(mtypes, function (j, mtype) {
if ($(element).attr('marker-' + mtype) === 'url(#' + marker.id + ')') {
remove = false;
return remove;
}
return undefined;
});
if (!remove) {
return false;
}
return undefined;
}); // Not found, so can safely remove
if (remove) {
$(marker).remove();
}
});
}
const contextTools = [{
contextTools = [{
type: 'select',
panel: 'arrow_panel',
id: 'arrow_list',
@ -306,38 +313,51 @@ var svgEditorExtension_arrows = (function () {
change: setArrow
}
}];
return {
return _context2.abrupt("return", {
name: strings.name,
context_tools: strings.contextTools.map((contextTool, i) => {
context_tools: strings.contextTools.map(function (contextTool, i) {
return Object.assign(contextTools[i], contextTool);
}),
callback() {
callback: function callback() {
$('#arrow_panel').hide(); // Set ID so it can be translated in locale file
$('#arrow_list option')[0].id = 'connector_no_arrow';
},
addLangData: function addLangData(_ref) {
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var lang, importLocale, _yield$importLocale, langList;
async addLangData({
lang,
importLocale
}) {
const {
langList
} = await importLocale();
return {
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
lang = _ref.lang, importLocale = _ref.importLocale;
_context.next = 3;
return importLocale();
case 3:
_yield$importLocale = _context.sent;
langList = _yield$importLocale.langList;
return _context.abrupt("return", {
data: langList
};
},
});
selectedChanged(opts) {
case 6:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
},
selectedChanged: function selectedChanged(opts) {
// Use this to update the current selected elements
selElems = opts.elems;
const markerElems = ['line', 'path', 'polyline', 'polygon'];
let i = selElems.length;
var markerElems = ['line', 'path', 'polyline', 'polygon'];
var i = selElems.length;
while (i--) {
const elem = selElems[i];
var elem = selElems[i];
if (elem && markerElems.includes(elem.tagName)) {
if (opts.selectedElement && !opts.multiselected) {
@ -350,9 +370,8 @@ var svgEditorExtension_arrows = (function () {
}
}
},
elementChanged(opts) {
const elem = opts.elems[0];
elementChanged: function elementChanged(opts) {
var elem = opts.elems[0];
if (elem && (elem.getAttribute('marker-start') || elem.getAttribute('marker-mid') || elem.getAttribute('marker-end'))) {
// const start = elem.getAttribute('marker-start');
@ -362,10 +381,16 @@ var svgEditorExtension_arrows = (function () {
colorChanged(elem);
}
}
});
};
case 21:
case "end":
return _context2.stop();
}
}
}, _callee2);
}))();
}
};
return extArrows;

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,42 @@
var svgEditorExtension_connector = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* @file ext-connector.js
*
@ -11,195 +47,90 @@ var svgEditorExtension_connector = (function () {
*/
var extConnector = {
name: 'connector',
init: function init(S) {
var _this = this;
async init(S) {
const svgEditor = this;
const svgCanvas = svgEditor.canvas;
const {
getElem
} = svgCanvas;
const {
$,
svgroot,
importLocale
} = S,
addElem = svgCanvas.addSVGElementFromJson,
selManager = S.selectorManager,
connSel = '.se_connector',
// connect_str = '-SE_CONNECT-',
elData = $.data;
const strings = await importLocale();
let startX,
startY,
curLine,
startElem,
endElem,
seNs,
{
svgcontent
} = S,
started = false,
connections = [],
selElems = [];
/**
*
* @param {Float} x
* @param {Float} y
* @param {module:utilities.BBoxObject} bb
* @param {Float} offset
* @returns {module:math.XYObject}
*/
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var svgEditor, svgCanvas, getElem, $, svgroot, importLocale, addElem, selManager, connSel, elData, strings, startX, startY, curLine, startElem, endElem, seNs, svgcontent, started, connections, selElems, getBBintersect, getOffset, showPanel, setPoint, updateLine, findConnectors, updateConnectors, init, buttons;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
init = function _init() {
// Make sure all connectors have data set
$(svgcontent).find('*').each(function () {
var conn = this.getAttributeNS(seNs, 'connector');
function getBBintersect(x, y, bb, offset) {
if (offset) {
offset -= 0;
bb = $.extend({}, bb);
bb.width += offset;
bb.height += offset;
bb.x -= offset / 2;
bb.y -= offset / 2;
if (conn) {
this.setAttribute('class', connSel.substr(1));
var connData = conn.split(' ');
var sbb = svgCanvas.getStrokedBBox([getElem(connData[0])]);
var ebb = svgCanvas.getStrokedBBox([getElem(connData[1])]);
$(this).data('c_start', connData[0]).data('c_end', connData[1]).data('start_bb', sbb).data('end_bb', ebb);
svgCanvas.getEditorNS(true);
}
const midX = bb.x + bb.width / 2;
const midY = bb.y + bb.height / 2;
const lenX = x - midX;
const lenY = y - midY;
const slope = Math.abs(lenY / lenX);
let ratio;
if (slope < bb.height / bb.width) {
ratio = bb.width / 2 / Math.abs(lenX);
} else {
ratio = lenY ? bb.height / 2 / Math.abs(lenY) : 0;
}
return {
x: midX + lenX * ratio,
y: midY + lenY * ratio
}); // updateConnectors();
};
}
/**
* @param {"start"|"end"} side
* @param {Element} line
* @returns {Float}
*/
updateConnectors = function _updateConnectors(elems) {
// Updates connector lines based on selected elements
// Is not used on mousemove, as it runs getStrokedBBox every time,
// which isn't necessary there.
findConnectors(elems);
function getOffset(side, line) {
const giveOffset = line.getAttribute('marker-' + side); // const giveOffset = $(line).data(side+'_off');
// 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
* @returns {void}
*/
function showPanel(on) {
let connRules = $('#connector_rules');
if (!connRules.length) {
connRules = $('<style id="connector_rules"></style>').appendTo('head');
}
connRules.text(!on ? '' : '#tool_clone, #tool_topath, #tool_angle, #xy_panel { display: none !important; }');
$('#connector_panel').toggle(on);
}
/**
* @param {Element} elem
* @param {Integer|"end"} pos
* @param {Float} x
* @param {Float} y
* @param {boolean} [setMid]
* @returns {void}
*/
function setPoint(elem, pos, x, y, setMid) {
const pts = elem.points;
const pt = svgroot.createSVGPoint();
pt.x = x;
pt.y = y;
if (pos === 'end') {
pos = pts.numberOfItems - 1;
} // TODO: Test for this on init, then use alt only if needed
try {
pts.replaceItem(pt, pos);
} catch (err) {
// Should only occur in FF which formats points attr as "n,n n,n", so just split
const ptArr = elem.getAttribute('points').split(' ');
for (let i = 0; i < ptArr.length; i++) {
if (i === pos) {
ptArr[i] = x + ',' + y;
}
}
elem.setAttribute('points', ptArr.join(' '));
}
if (setMid) {
// Add center point
const ptStart = pts.getItem(0);
const ptEnd = pts.getItem(pts.numberOfItems - 1);
setPoint(elem, 1, (ptEnd.x + ptStart.x) / 2, (ptEnd.y + ptStart.y) / 2);
}
}
/**
* @param {Float} diffX
* @param {Float} diffY
* @returns {void}
*/
function updateLine(diffX, diffY) {
if (connections.length) {
// Update line with element
let i = connections.length;
var i = connections.length;
while (i--) {
const conn = connections[i];
const line = conn.connector; // const {elem} = conn;
var conn = connections[i];
var line = conn.connector;
var elem = conn.elem; // const sw = line.getAttribute('stroke-width') * 5;
const pre = conn.is_start ? 'start' : 'end'; // const sw = line.getAttribute('stroke-width') * 5;
// Update bbox for this element
var pre = conn.is_start ? 'start' : 'end'; // Update bbox for this element
const bb = elData(line, pre + '_bb');
bb.x = conn.start_x + diffX;
bb.y = conn.start_y + diffY;
var bb = svgCanvas.getStrokedBBox([elem]);
bb.x = conn.start_x;
bb.y = conn.start_y;
elData(line, pre + '_bb', bb);
const altPre = conn.is_start ? 'end' : 'start'; // Get center pt of connected element
/* const addOffset = */
const bb2 = elData(line, altPre + '_bb');
const srcX = bb2.x + bb2.width / 2;
const srcY = bb2.y + bb2.height / 2; // Set point of element being moved
elData(line, pre + '_off');
var altPre = conn.is_start ? 'end' : 'start'; // Get center pt of connected element
const pt = getBBintersect(srcX, srcY, bb, getOffset(pre, line)); // $(line).data(pre+'_off')?sw:0
var bb2 = elData(line, altPre + '_bb');
var srcX = bb2.x + bb2.width / 2;
var srcY = bb2.y + bb2.height / 2; // Set point of element being moved
var pt = getBBintersect(srcX, srcY, bb, getOffset(pre, line));
setPoint(line, conn.is_start ? 0 : 'end', pt.x, pt.y, true); // Set point of connected element
const pt2 = getBBintersect(pt.x, pt.y, elData(line, altPre + '_bb'), getOffset(altPre, line));
setPoint(line, conn.is_start ? 'end' : 0, pt2.x, pt2.y, true);
var pt2 = getBBintersect(pt.x, pt.y, elData(line, altPre + '_bb'), getOffset(altPre, line));
setPoint(line, conn.is_start ? 'end' : 0, pt2.x, pt2.y, true); // Update points attribute manually for webkit
if (navigator.userAgent.includes('AppleWebKit')) {
var pts = line.points;
var len = pts.numberOfItems;
var ptArr = [];
for (var j = 0; j < len; j++) {
pt = pts.getItem(j);
ptArr[j] = pt.x + ',' + pt.y;
}
line.setAttribute('points', ptArr.join(' '));
}
}
/**
*
* @param {Element[]} [elems=selElems] Array of elements
* @returns {void}
*/
}
};
function findConnectors(elems = selElems) {
const connectors = $(svgcontent).find(connSel);
findConnectors = function _findConnectors() {
var elems = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : selElems;
var connectors = $(svgcontent).find(connSel);
connections = []; // Loop through connectors to see if one is connected to the element
connectors.each(function () {
let addThis;
var addThis;
/**
*
* @returns {void}
@ -213,10 +144,10 @@ var svgEditorExtension_connector = (function () {
} // Grab the ends
const parts = [];
var parts = [];
['start', 'end'].forEach(function (pos, i) {
const key = 'c_' + pos;
let part = elData(this, key);
var key = 'c_' + pos;
var part = elData(this, key);
if (part === null || part === undefined) {
// Does this ever return nullish values?
@ -228,8 +159,8 @@ var svgEditorExtension_connector = (function () {
parts.push(part);
}, this);
for (let i = 0; i < 2; i++) {
const cElem = parts[i];
for (var i = 0; i < 2; i++) {
var cElem = parts[i];
addThis = false; // The connected element might be part of a selected group
$(cElem).parents().each(add);
@ -240,7 +171,7 @@ var svgEditorExtension_connector = (function () {
}
if (elems.includes(cElem) || addThis) {
const bb = svgCanvas.getStrokedBBox([cElem]);
var bb = svgCanvas.getStrokedBBox([cElem]);
connections.push({
elem: cElem,
connector: this,
@ -251,80 +182,161 @@ var svgEditorExtension_connector = (function () {
}
}
});
}
/**
* @param {Element[]} [elems=selElems]
* @returns {void}
*/
};
function updateConnectors(elems) {
// Updates connector lines based on selected elements
// Is not used on mousemove, as it runs getStrokedBBox every time,
// which isn't necessary there.
findConnectors(elems);
if (connections.length) {
updateLine = function _updateLine(diffX, diffY) {
// Update line with element
let i = connections.length;
var i = connections.length;
while (i--) {
const conn = connections[i];
const line = conn.connector;
const {
elem
} = conn; // const sw = line.getAttribute('stroke-width') * 5;
var conn = connections[i];
var line = conn.connector; // const {elem} = conn;
const pre = conn.is_start ? 'start' : 'end'; // Update bbox for this element
var pre = conn.is_start ? 'start' : 'end'; // const sw = line.getAttribute('stroke-width') * 5;
// Update bbox for this element
const bb = svgCanvas.getStrokedBBox([elem]);
bb.x = conn.start_x;
bb.y = conn.start_y;
var bb = elData(line, pre + '_bb');
bb.x = conn.start_x + diffX;
bb.y = conn.start_y + diffY;
elData(line, pre + '_bb', bb);
/* const addOffset = */
var altPre = conn.is_start ? 'end' : 'start'; // Get center pt of connected element
elData(line, pre + '_off');
const altPre = conn.is_start ? 'end' : 'start'; // Get center pt of connected element
var bb2 = elData(line, altPre + '_bb');
var srcX = bb2.x + bb2.width / 2;
var srcY = bb2.y + bb2.height / 2; // Set point of element being moved
const bb2 = elData(line, altPre + '_bb');
const srcX = bb2.x + bb2.width / 2;
const srcY = bb2.y + bb2.height / 2; // Set point of element being moved
var pt = getBBintersect(srcX, srcY, bb, getOffset(pre, line)); // $(line).data(pre+'_off')?sw:0
let pt = getBBintersect(srcX, srcY, bb, getOffset(pre, line));
setPoint(line, conn.is_start ? 0 : 'end', pt.x, pt.y, true); // Set point of connected element
const pt2 = getBBintersect(pt.x, pt.y, elData(line, altPre + '_bb'), getOffset(altPre, line));
setPoint(line, conn.is_start ? 'end' : 0, pt2.x, pt2.y, true); // Update points attribute manually for webkit
if (navigator.userAgent.includes('AppleWebKit')) {
const pts = line.points;
const len = pts.numberOfItems;
const ptArr = [];
for (let j = 0; j < len; j++) {
pt = pts.getItem(j);
ptArr[j] = pt.x + ',' + pt.y;
var pt2 = getBBintersect(pt.x, pt.y, elData(line, altPre + '_bb'), getOffset(altPre, line));
setPoint(line, conn.is_start ? 'end' : 0, pt2.x, pt2.y, true);
}
};
line.setAttribute('points', ptArr.join(' '));
setPoint = function _setPoint(elem, pos, x, y, setMid) {
var pts = elem.points;
var pt = svgroot.createSVGPoint();
pt.x = x;
pt.y = y;
if (pos === 'end') {
pos = pts.numberOfItems - 1;
} // TODO: Test for this on init, then use alt only if needed
try {
pts.replaceItem(pt, pos);
} catch (err) {
// Should only occur in FF which formats points attr as "n,n n,n", so just split
var ptArr = elem.getAttribute('points').split(' ');
for (var i = 0; i < ptArr.length; i++) {
if (i === pos) {
ptArr[i] = x + ',' + y;
}
}
elem.setAttribute('points', ptArr.join(' '));
}
} // Do once
if (setMid) {
// Add center point
var ptStart = pts.getItem(0);
var ptEnd = pts.getItem(pts.numberOfItems - 1);
setPoint(elem, 1, (ptEnd.x + ptStart.x) / 2, (ptEnd.y + ptStart.y) / 2);
}
};
showPanel = function _showPanel(on) {
var connRules = $('#connector_rules');
if (!connRules.length) {
connRules = $('<style id="connector_rules"></style>').appendTo('head');
}
connRules.text(!on ? '' : '#tool_clone, #tool_topath, #tool_angle, #xy_panel { display: none !important; }');
$('#connector_panel').toggle(on);
};
getOffset = function _getOffset(side, line) {
var giveOffset = line.getAttribute('marker-' + side); // const giveOffset = $(line).data(side+'_off');
// TODO: Make this number (5) be based on marker width/height
var size = line.getAttribute('stroke-width') * 5;
return giveOffset ? size : 0;
};
getBBintersect = function _getBBintersect(x, y, bb, offset) {
if (offset) {
offset -= 0;
bb = $.extend({}, bb);
bb.width += offset;
bb.height += offset;
bb.x -= offset / 2;
bb.y -= offset / 2;
}
var midX = bb.x + bb.width / 2;
var midY = bb.y + bb.height / 2;
var lenX = x - midX;
var lenY = y - midY;
var slope = Math.abs(lenY / lenX);
var ratio;
if (slope < bb.height / bb.width) {
ratio = bb.width / 2 / Math.abs(lenX);
} else {
ratio = lenY ? bb.height / 2 / Math.abs(lenY) : 0;
}
return {
x: midX + lenX * ratio,
y: midY + lenY * ratio
};
};
svgEditor = _this;
svgCanvas = svgEditor.canvas;
getElem = svgCanvas.getElem;
$ = S.$, svgroot = S.svgroot, importLocale = S.importLocale, addElem = svgCanvas.addSVGElementFromJson, selManager = S.selectorManager, connSel = '.se_connector', elData = $.data;
_context.next = 14;
return importLocale();
case 14:
strings = _context.sent;
svgcontent = S.svgcontent, started = false, connections = [], selElems = [];
/**
*
* @param {Float} x
* @param {Float} y
* @param {module:utilities.BBoxObject} bb
* @param {Float} offset
* @returns {module:math.XYObject}
*/
// Do once
(function () {
const gse = svgCanvas.groupSelectedElements;
var gse = svgCanvas.groupSelectedElements;
svgCanvas.groupSelectedElements = function (...args) {
svgCanvas.groupSelectedElements = function () {
svgCanvas.removeFromSelection($(connSel).toArray());
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
args[_key] = arguments[_key];
}
return gse.apply(this, args);
};
const mse = svgCanvas.moveSelectedElements;
var mse = svgCanvas.moveSelectedElements;
svgCanvas.moveSelectedElements = function (...args) {
const cmd = mse.apply(this, args);
svgCanvas.moveSelectedElements = function () {
for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
args[_key2] = arguments[_key2];
}
var cmd = mse.apply(this, args);
updateConnectors();
return cmd;
};
@ -337,21 +349,7 @@ var svgEditorExtension_connector = (function () {
*/
function init() {
// Make sure all connectors have data set
$(svgcontent).find('*').each(function () {
const conn = this.getAttributeNS(seNs, 'connector');
if (conn) {
this.setAttribute('class', connSel.substr(1));
const connData = conn.split(' ');
const sbb = svgCanvas.getStrokedBBox([getElem(connData[0])]);
const ebb = svgCanvas.getStrokedBBox([getElem(connData[1])]);
$(this).data('c_start', connData[0]).data('c_end', connData[1]).data('start_bb', sbb).data('end_bb', ebb);
svgCanvas.getEditorNS(true);
}
}); // updateConnectors();
} // $(svgroot).parent().mousemove(function (e) {
// $(svgroot).parent().mousemove(function (e) {
// // if (started
// // || svgCanvas.getMode() !== 'connector'
// // || e.target.parentNode.parentNode !== svgcontent) return;
@ -361,9 +359,7 @@ var svgEditorExtension_connector = (function () {
// //
// // }
// });
const buttons = [{
buttons = [{
id: 'mode_connect',
type: 'mode',
icon: svgEditor.curConfig.imgPath + 'cut.png',
@ -373,57 +369,50 @@ var svgEditorExtension_connector = (function () {
position: 1
},
events: {
click() {
click: function click() {
svgCanvas.setMode('connector');
}
}
}];
return {
return _context.abrupt("return", {
name: strings.name,
svgicons: svgEditor.curConfig.imgPath + 'conn.svg',
buttons: strings.buttons.map((button, i) => {
buttons: strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
}),
/* async */
addLangData({
lang
}) {
addLangData: function addLangData(_ref) {
var lang = _ref.lang;
// , importLocale: importLoc
return {
data: strings.langList
};
},
mouseDown(opts) {
const e = opts.event;
mouseDown: function mouseDown(opts) {
var e = opts.event;
startX = opts.start_x;
startY = opts.start_y;
const mode = svgCanvas.getMode();
const {
curConfig: {
initStroke
}
} = svgEditor;
var mode = svgCanvas.getMode();
var initStroke = svgEditor.curConfig.initStroke;
if (mode === 'connector') {
if (started) {
return undefined;
}
const mouseTarget = e.target;
const parents = $(mouseTarget).parents();
var mouseTarget = e.target;
var parents = $(mouseTarget).parents();
if ($.inArray(svgcontent, parents) !== -1) {
// Connectable element
// If child of foreignObject, use parent
const fo = $(mouseTarget).closest('foreignObject');
var fo = $(mouseTarget).closest('foreignObject');
startElem = fo.length ? fo[0] : mouseTarget; // Get center of source element
const bb = svgCanvas.getStrokedBBox([startElem]);
const x = bb.x + bb.width / 2;
const y = bb.y + bb.height / 2;
var bb = svgCanvas.getStrokedBBox([startElem]);
var x = bb.x + bb.width / 2;
var y = bb.y + bb.height / 2;
started = true;
curLine = addElem({
element: 'polyline',
@ -451,30 +440,29 @@ var svgEditorExtension_connector = (function () {
return undefined;
},
mouseMove: function mouseMove(opts) {
var zoom = svgCanvas.getZoom(); // const e = opts.event;
mouseMove(opts) {
const zoom = svgCanvas.getZoom(); // const e = opts.event;
const x = opts.mouse_x / zoom;
const y = opts.mouse_y / zoom;
const diffX = x - startX,
var x = opts.mouse_x / zoom;
var y = opts.mouse_y / zoom;
var diffX = x - startX,
diffY = y - startY;
const mode = svgCanvas.getMode();
var mode = svgCanvas.getMode();
if (mode === 'connector' && started) {
// const sw = curLine.getAttribute('stroke-width') * 3;
// Set start point (adjusts based on bb)
const pt = getBBintersect(x, y, elData(curLine, 'start_bb'), getOffset('start', curLine));
var pt = getBBintersect(x, y, elData(curLine, 'start_bb'), getOffset('start', curLine));
startX = pt.x;
startY = pt.y;
setPoint(curLine, 0, pt.x, pt.y, true); // Set end point
setPoint(curLine, 'end', x, y, true);
} else if (mode === 'select') {
let slen = selElems.length;
var slen = selElems.length;
while (slen--) {
const elem = selElems[slen]; // Look for selected connector elements
var elem = selElems[slen]; // Look for selected connector elements
if (elem && elData(elem, 'c_start')) {
// Remove the "translate" transform given to move
@ -488,25 +476,24 @@ var svgEditorExtension_connector = (function () {
}
}
},
mouseUp(opts) {
mouseUp: function mouseUp(opts) {
// const zoom = svgCanvas.getZoom();
const e = opts.event; // , x = opts.mouse_x / zoom,
var e = opts.event; // , x = opts.mouse_x / zoom,
// , y = opts.mouse_y / zoom,
let mouseTarget = e.target;
var mouseTarget = e.target;
if (svgCanvas.getMode() !== 'connector') {
return undefined;
}
const fo = $(mouseTarget).closest('foreignObject');
var fo = $(mouseTarget).closest('foreignObject');
if (fo.length) {
mouseTarget = fo[0];
}
const parents = $(mouseTarget).parents();
var parents = $(mouseTarget).parents();
if (mouseTarget === startElem) {
// Start line through click
@ -514,7 +501,7 @@ var svgEditorExtension_connector = (function () {
return {
keep: true,
element: null,
started
started: started
};
}
@ -525,19 +512,19 @@ var svgEditorExtension_connector = (function () {
return {
keep: false,
element: null,
started
started: started
};
} // Valid end element
endElem = mouseTarget;
const startId = startElem.id,
var startId = startElem.id,
endId = endElem.id;
const connStr = startId + ' ' + endId;
const altStr = endId + ' ' + startId; // Don't create connector if one already exists
var connStr = startId + ' ' + endId;
var altStr = endId + ' ' + startId; // Don't create connector if one already exists
const dupe = $(svgcontent).find(connSel).filter(function () {
const conn = this.getAttributeNS(seNs, 'connector');
var dupe = $(svgcontent).find(connSel).filter(function () {
var conn = this.getAttributeNS(seNs, 'connector');
if (conn === connStr || conn === altStr) {
return true;
@ -555,8 +542,8 @@ var svgEditorExtension_connector = (function () {
};
}
const bb = svgCanvas.getStrokedBBox([endElem]);
const pt = getBBintersect(startX, startY, bb, getOffset('start', curLine));
var bb = svgCanvas.getStrokedBBox([endElem]);
var pt = getBBintersect(startX, startY, bb, getOffset('start', curLine));
setPoint(curLine, 'end', pt.x, pt.y, true);
$(curLine).data('c_start', startId).data('c_end', endId).data('end_bb', bb);
seNs = svgCanvas.getEditorNS(true);
@ -570,11 +557,10 @@ var svgEditorExtension_connector = (function () {
return {
keep: true,
element: curLine,
started
started: started
};
},
selectedChanged(opts) {
selectedChanged: function selectedChanged(opts) {
// TODO: Find better way to skip operations if no connectors are in use
if (!$(svgcontent).find(connSel).length) {
return;
@ -586,10 +572,10 @@ var svgEditorExtension_connector = (function () {
selElems = opts.elems;
let i = selElems.length;
var i = selElems.length;
while (i--) {
const elem = selElems[i];
var elem = selElems[i];
if (elem && elData(elem, 'c_start')) {
selManager.requestSelector(elem).showGrips(false);
@ -607,9 +593,8 @@ var svgEditorExtension_connector = (function () {
updateConnectors();
},
elementChanged(opts) {
let elem = opts.elems[0];
elementChanged: function elementChanged(opts) {
var elem = opts.elems[0];
if (!elem) return;
if (elem.tagName === 'svg' && elem.id === 'svgcontent') {
@ -620,23 +605,22 @@ var svgEditorExtension_connector = (function () {
if (elem.getAttribute('marker-start') || elem.getAttribute('marker-mid') || elem.getAttribute('marker-end')) {
const start = elem.getAttribute('marker-start');
const mid = elem.getAttribute('marker-mid');
const end = elem.getAttribute('marker-end');
var start = elem.getAttribute('marker-start');
var mid = elem.getAttribute('marker-mid');
var end = elem.getAttribute('marker-end');
curLine = elem;
$(elem).data('start_off', Boolean(start)).data('end_off', Boolean(end));
if (elem.tagName === 'line' && mid) {
// Convert to polyline to accept mid-arrow
const x1 = Number(elem.getAttribute('x1'));
const x2 = Number(elem.getAttribute('x2'));
const y1 = Number(elem.getAttribute('y1'));
const y2 = Number(elem.getAttribute('y2'));
const {
id
} = elem;
const midPt = ' ' + (x1 + x2) / 2 + ',' + (y1 + y2) / 2 + ' ';
const pline = addElem({
var x1 = Number(elem.getAttribute('x1'));
var x2 = Number(elem.getAttribute('x2'));
var y1 = Number(elem.getAttribute('y1'));
var y2 = Number(elem.getAttribute('y2'));
var _elem = elem,
id = _elem.id;
var midPt = ' ' + (x1 + x2) / 2 + ',' + (y1 + y2) / 2 + ' ';
var pline = addElem({
element: 'polyline',
attr: {
points: x1 + ',' + y1 + midPt + x2 + ',' + y2,
@ -657,15 +641,15 @@ var svgEditorExtension_connector = (function () {
if (elem.getAttribute('class') === connSel.substr(1)) {
const start = getElem(elData(elem, 'c_start'));
updateConnectors([start]);
var _start = getElem(elData(elem, 'c_start'));
updateConnectors([_start]);
} else {
updateConnectors();
}
},
IDsUpdated(input) {
const remove = [];
IDsUpdated: function IDsUpdated(input) {
var remove = [];
input.elems.forEach(function (elem) {
if ('se:connector' in elem.attr) {
elem.attr['se:connector'] = elem.attr['se:connector'].split(' ').map(function (oldID) {
@ -679,11 +663,10 @@ var svgEditorExtension_connector = (function () {
}
});
return {
remove
remove: remove
};
},
toolButtonStateUpdate(opts) {
toolButtonStateUpdate: function toolButtonStateUpdate(opts) {
if (opts.nostroke) {
if ($('#mode_connect').hasClass('tool_button_current')) {
svgEditor.clickSelect();
@ -692,10 +675,16 @@ var svgEditorExtension_connector = (function () {
$('#mode_connect').toggleClass('disabled', opts.nostroke);
}
});
};
case 19:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
return extConnector;

View File

@ -1,6 +1,42 @@
var svgEditorExtension_eyedropper = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* @file ext-eyedropper.js
*
@ -11,50 +47,26 @@ var svgEditorExtension_eyedropper = (function () {
*/
var extEyedropper = {
name: 'eyedropper',
init: function init(S) {
var _this = this;
async init(S) {
const strings = await S.importLocale();
const svgEditor = this;
const {
$,
ChangeElementCommand
} = S,
// , svgcontent,
// svgdoc = S.svgroot.parentNode.ownerDocument,
svgCanvas = svgEditor.canvas,
addToHistory = function (cmd) {
svgCanvas.undoMgr.addCommandToHistory(cmd);
},
currentStyle = {
fillPaint: 'red',
fillOpacity: 1.0,
strokePaint: 'black',
strokeOpacity: 1.0,
strokeWidth: 5,
strokeDashArray: null,
opacity: 1.0,
strokeLinecap: 'butt',
strokeLinejoin: 'miter'
};
/**
*
* @param {module:svgcanvas.SvgCanvas#event:ext_selectedChanged|module:svgcanvas.SvgCanvas#event:ext_elementChanged} opts
* @returns {void}
*/
function getStyle(opts) {
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var strings, svgEditor, $, ChangeElementCommand, svgCanvas, addToHistory, currentStyle, getStyle, buttons;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
getStyle = function _getStyle(opts) {
// if we are in eyedropper mode, we don't want to disable the eye-dropper tool
const mode = svgCanvas.getMode();
var mode = svgCanvas.getMode();
if (mode === 'eyedropper') {
return;
}
const tool = $('#tool_eyedropper'); // enable-eye-dropper if one element is selected
var tool = $('#tool_eyedropper'); // enable-eye-dropper if one element is selected
let elem = null;
var elem = null;
if (!opts.multiselected && opts.elems[0] && !['svg', 'g', 'use'].includes(opts.elems[0].nodeName)) {
elem = opts.elems[0];
@ -72,42 +84,63 @@ var svgEditorExtension_eyedropper = (function () {
} else {
tool.addClass('disabled');
}
}
};
const buttons = [{
_context.next = 3;
return S.importLocale();
case 3:
strings = _context.sent;
svgEditor = _this;
$ = S.$, ChangeElementCommand = S.ChangeElementCommand, svgCanvas = svgEditor.canvas, addToHistory = function addToHistory(cmd) {
svgCanvas.undoMgr.addCommandToHistory(cmd);
}, currentStyle = {
fillPaint: 'red',
fillOpacity: 1.0,
strokePaint: 'black',
strokeOpacity: 1.0,
strokeWidth: 5,
strokeDashArray: null,
opacity: 1.0,
strokeLinecap: 'butt',
strokeLinejoin: 'miter'
};
/**
*
* @param {module:svgcanvas.SvgCanvas#event:ext_selectedChanged|module:svgcanvas.SvgCanvas#event:ext_elementChanged} opts
* @returns {void}
*/
buttons = [{
id: 'tool_eyedropper',
icon: svgEditor.curConfig.extIconsPath + 'eyedropper.png',
type: 'mode',
events: {
click() {
click: function click() {
svgCanvas.setMode('eyedropper');
}
}
}];
return {
return _context.abrupt("return", {
name: strings.name,
svgicons: svgEditor.curConfig.extIconsPath + 'eyedropper-icon.xml',
buttons: strings.buttons.map((button, i) => {
buttons: strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
}),
// if we have selected an element, grab its paint and enable the eye dropper button
selectedChanged: getStyle,
elementChanged: getStyle,
mouseDown(opts) {
const mode = svgCanvas.getMode();
mouseDown: function mouseDown(opts) {
var mode = svgCanvas.getMode();
if (mode === 'eyedropper') {
const e = opts.event;
const {
target
} = e;
var e = opts.event;
var target = e.target;
if (!['svg', 'g', 'use'].includes(target.nodeName)) {
const changes = {};
var changes = {};
const change = function (elem, attrname, newvalue) {
var change = function change(elem, attrname, newvalue) {
changes[attrname] = elem.getAttribute(attrname);
elem.setAttribute(attrname, newvalue);
};
@ -152,10 +185,16 @@ var svgEditorExtension_eyedropper = (function () {
}
}
}
});
};
case 8:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
return extEyedropper;

View File

@ -1,6 +1,42 @@
var svgEditorExtension_foreignobject = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* @file ext-foreignobject.js
*
@ -11,69 +47,43 @@ var svgEditorExtension_foreignobject = (function () {
*/
var extForeignobject = {
name: 'foreignobject',
init: function init(S) {
var _this = this;
async init(S) {
const svgEditor = this;
const {
$,
text2xml,
NS,
importLocale
} = S;
const svgCanvas = svgEditor.canvas;
const // {svgcontent} = S,
// addElem = svgCanvas.addSVGElementFromJson,
svgdoc = S.svgroot.parentNode.ownerDocument;
const strings = await importLocale();
const properlySourceSizeTextArea = function () {
// TODO: remove magic numbers here and get values from CSS
const height = $('#svg_source_container').height() - 80;
$('#svg_source_textarea').css('height', height);
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
var svgEditor, $, text2xml, NS, importLocale, svgCanvas, svgdoc, strings, properlySourceSizeTextArea, showPanel, toggleSourceButtons, selElems, started, newFO, editingforeign, setForeignString, showForeignEditor, setAttr, buttons, contextTools;
return regeneratorRuntime.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
setAttr = function _setAttr(attr, val) {
svgCanvas.changeSelectedAttribute(attr, val);
svgCanvas.call('changed', selElems);
};
/**
* @param {boolean} on
* @returns {void}
*/
showForeignEditor = function _showForeignEditor() {
var elt = selElems[0];
function showPanel(on) {
let fcRules = $('#fc_rules');
if (!fcRules.length) {
fcRules = $('<style id="fc_rules"></style>').appendTo('head');
if (!elt || editingforeign) {
return;
}
fcRules.text(!on ? '' : ' #tool_topath { display: none !important; }');
$('#foreignObject_panel').toggle(on);
}
/**
* @param {boolean} on
* @returns {void}
*/
editingforeign = true;
toggleSourceButtons(true);
elt.removeAttribute('fill');
var str = svgCanvas.svgToString(elt, 0);
$('#svg_source_textarea').val(str);
$('#svg_source_editor').fadeIn();
properlySourceSizeTextArea();
$('#svg_source_textarea').focus();
};
function toggleSourceButtons(on) {
$('#tool_source_save, #tool_source_cancel').toggle(!on);
$('#foreign_save, #foreign_cancel').toggle(on);
}
let selElems,
started,
newFO,
editingforeign = false;
/**
* This function sets the content of element elt to the input XML.
* @param {string} xmlString - The XML text
* @returns {boolean} This function returns false if the set was unsuccessful, true otherwise.
*/
function setForeignString(xmlString) {
const elt = selElems[0]; // The parent `Element` to append to
setForeignString = function _setForeignString(xmlString) {
var elt = selElems[0]; // The parent `Element` to append to
try {
// convert string into XML document
const newDoc = text2xml('<svg xmlns="' + NS.SVG + '" xmlns:xlink="' + NS.XLINK + '">' + xmlString + '</svg>'); // run it through our sanitizer to remove anything we do not support
var newDoc = text2xml('<svg xmlns="' + NS.SVG + '" xmlns:xlink="' + NS.XLINK + '">' + xmlString + '</svg>'); // run it through our sanitizer to remove anything we do not support
svgCanvas.sanitizeSvg(newDoc.documentElement);
elt.replaceWith(svgdoc.importNode(newDoc.documentElement.firstChild, true));
@ -87,50 +97,60 @@ var svgEditorExtension_foreignobject = (function () {
}
return true;
};
toggleSourceButtons = function _toggleSourceButtons(on) {
$('#tool_source_save, #tool_source_cancel').toggle(!on);
$('#foreign_save, #foreign_cancel').toggle(on);
};
showPanel = function _showPanel(on) {
var fcRules = $('#fc_rules');
if (!fcRules.length) {
fcRules = $('<style id="fc_rules"></style>').appendTo('head');
}
fcRules.text(!on ? '' : ' #tool_topath { display: none !important; }');
$('#foreignObject_panel').toggle(on);
};
svgEditor = _this;
$ = S.$, text2xml = S.text2xml, NS = S.NS, importLocale = S.importLocale;
svgCanvas = svgEditor.canvas;
svgdoc = S.svgroot.parentNode.ownerDocument;
_context2.next = 11;
return importLocale();
case 11:
strings = _context2.sent;
properlySourceSizeTextArea = function properlySourceSizeTextArea() {
// TODO: remove magic numbers here and get values from CSS
var height = $('#svg_source_container').height() - 80;
$('#svg_source_textarea').css('height', height);
};
/**
*
* @param {boolean} on
* @returns {void}
*/
function showForeignEditor() {
const elt = selElems[0];
if (!elt || editingforeign) {
return;
}
editingforeign = true;
toggleSourceButtons(true);
elt.removeAttribute('fill');
const str = svgCanvas.svgToString(elt, 0);
$('#svg_source_textarea').val(str);
$('#svg_source_editor').fadeIn();
properlySourceSizeTextArea();
$('#svg_source_textarea').focus();
}
editingforeign = false;
/**
* @param {string} attr
* @param {string|Float} val
* @returns {void}
* This function sets the content of element elt to the input XML.
* @param {string} xmlString - The XML text
* @returns {boolean} This function returns false if the set was unsuccessful, true otherwise.
*/
function setAttr(attr, val) {
svgCanvas.changeSelectedAttribute(attr, val);
svgCanvas.call('changed', selElems);
}
const buttons = [{
buttons = [{
id: 'tool_foreign',
icon: svgEditor.curConfig.extIconsPath + 'foreignobject-tool.png',
type: 'mode',
events: {
click() {
click: function click() {
svgCanvas.setMode('foreign');
}
}
}, {
id: 'edit_foreign',
@ -138,32 +158,29 @@ var svgEditorExtension_foreignobject = (function () {
type: 'context',
panel: 'foreignObject_panel',
events: {
click() {
click: function click() {
showForeignEditor();
}
}
}];
const contextTools = [{
contextTools = [{
type: 'input',
panel: 'foreignObject_panel',
id: 'foreign_width',
size: 3,
events: {
change() {
change: function change() {
setAttr('width', this.value);
}
}
}, {
type: 'input',
panel: 'foreignObject_panel',
id: 'foreign_height',
events: {
change() {
change: function change() {
setAttr('height', this.value);
}
}
}, {
type: 'input',
@ -172,26 +189,24 @@ var svgEditorExtension_foreignobject = (function () {
size: 2,
defval: 16,
events: {
change() {
change: function change() {
setAttr('font-size', this.value);
}
}
}];
return {
return _context2.abrupt("return", {
name: strings.name,
svgicons: svgEditor.curConfig.extIconsPath + 'foreignobject-icons.xml',
buttons: strings.buttons.map((button, i) => {
buttons: strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
}),
context_tools: strings.contextTools.map((contextTool, i) => {
context_tools: strings.contextTools.map(function (contextTool, i) {
return Object.assign(contextTools[i], contextTool);
}),
callback() {
callback: function callback() {
$('#foreignObject_panel').hide();
const endChanges = function () {
var endChanges = function endChanges() {
$('#svg_source_editor').hide();
editingforeign = false;
$('#svg_source_textarea').blur();
@ -203,24 +218,53 @@ var svgEditorExtension_foreignobject = (function () {
// Create source save/cancel buttons
/* const save = */
$('#tool_source_save').clone().hide().attr('id', 'foreign_save').unbind().appendTo('#tool_source_back').click(async function () {
if (!editingforeign) {
return;
$('#tool_source_save').clone().hide().attr('id', 'foreign_save').unbind().appendTo('#tool_source_back').click( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var ok;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
if (editingforeign) {
_context.next = 2;
break;
}
if (!setForeignString($('#svg_source_textarea').val())) {
const ok = await $.confirm('Errors found. Revert to original?');
return _context.abrupt("return");
if (!ok) {
return;
case 2:
if (setForeignString($('#svg_source_textarea').val())) {
_context.next = 11;
break;
}
endChanges();
} else {
endChanges();
} // setSelectMode();
_context.next = 5;
return $.confirm('Errors found. Revert to original?');
});
case 5:
ok = _context.sent;
if (ok) {
_context.next = 8;
break;
}
return _context.abrupt("return");
case 8:
endChanges();
_context.next = 12;
break;
case 11:
endChanges();
case 12:
case "end":
return _context.stop();
}
}
}, _callee);
})));
/* const cancel = */
$('#tool_source_cancel').clone().hide().attr('id', 'foreign_cancel').unbind().appendTo('#tool_source_back').click(function () {
@ -228,8 +272,7 @@ var svgEditorExtension_foreignobject = (function () {
});
}, 3000);
},
mouseDown(opts) {
mouseDown: function mouseDown(opts) {
// const e = opts.event;
if (svgCanvas.getMode() !== 'foreign') {
return undefined;
@ -249,45 +292,43 @@ var svgEditorExtension_foreignobject = (function () {
style: 'pointer-events:inherit'
}
});
const m = svgdoc.createElementNS(NS.MATH, 'math');
var m = svgdoc.createElementNS(NS.MATH, 'math');
m.setAttributeNS(NS.XMLNS, 'xmlns', NS.MATH);
m.setAttribute('display', 'inline');
const mi = svgdoc.createElementNS(NS.MATH, 'mi');
var mi = svgdoc.createElementNS(NS.MATH, 'mi');
mi.setAttribute('mathvariant', 'normal');
mi.textContent = '\u03A6';
const mo = svgdoc.createElementNS(NS.MATH, 'mo');
mo.textContent = '\u222A';
const mi2 = svgdoc.createElementNS(NS.MATH, 'mi');
mi2.textContent = '\u2133';
mi.textContent = "\u03A6";
var mo = svgdoc.createElementNS(NS.MATH, 'mo');
mo.textContent = "\u222A";
var mi2 = svgdoc.createElementNS(NS.MATH, 'mi');
mi2.textContent = "\u2133";
m.append(mi, mo, mi2);
newFO.append(m);
return {
started: true
};
},
mouseUp(opts) {
mouseUp: function mouseUp(opts) {
// const e = opts.event;
if (svgCanvas.getMode() !== 'foreign' || !started) {
return undefined;
}
const attrs = $(newFO).attr(['width', 'height']);
const keep = attrs.width !== '0' || attrs.height !== '0';
var attrs = $(newFO).attr(['width', 'height']);
var keep = attrs.width !== '0' || attrs.height !== '0';
svgCanvas.addToSelection([newFO], true);
return {
keep,
keep: keep,
element: newFO
};
},
selectedChanged(opts) {
selectedChanged: function selectedChanged(opts) {
// Use this to update the current selected elements
selElems = opts.elems;
let i = selElems.length;
var i = selElems.length;
while (i--) {
const elem = selElems[i];
var elem = selElems[i];
if (elem && elem.tagName === 'foreignObject') {
if (opts.selectedElement && !opts.multiselected) {
@ -303,13 +344,18 @@ var svgEditorExtension_foreignobject = (function () {
}
}
},
elementChanged(opts) {// const elem = opts.elems[0];
elementChanged: function elementChanged(opts) {// const elem = opts.elems[0];
}
});
};
case 17:
case "end":
return _context2.stop();
}
}
}, _callee2);
}))();
}
};
return extForeignobject;

View File

@ -1,6 +1,42 @@
var svgEditorExtension_grid = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* @file ext-grid.js
*
@ -11,28 +47,84 @@ var svgEditorExtension_grid = (function () {
*/
var extGrid = {
name: 'grid',
init: function init(_ref) {
var _this = this;
async init({
$,
NS,
getTypeMap,
importLocale
}) {
const strings = await importLocale();
const svgEditor = this;
const svgCanvas = svgEditor.canvas;
const svgdoc = document.getElementById('svgcanvas').ownerDocument,
{
assignAttributes
} = svgCanvas,
hcanvas = document.createElement('canvas'),
canvBG = $('#canvasBackground'),
units = getTypeMap(),
// Assumes prior `init()` call on `units.js` module
intervals = [0.01, 0.1, 1, 10, 100, 1000];
let showGrid = svgEditor.curConfig.showGrid || false;
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var $, NS, getTypeMap, importLocale, strings, svgEditor, svgCanvas, svgdoc, assignAttributes, hcanvas, canvBG, units, intervals, showGrid, canvasGrid, gridDefs, gridPattern, gridimg, gridBox, updateGrid, gridUpdate, buttons;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
gridUpdate = function _gridUpdate() {
if (showGrid) {
updateGrid(svgCanvas.getZoom());
}
$('#canvasGrid').toggle(showGrid);
$('#view_grid').toggleClass('push_button_pressed tool_button');
};
updateGrid = function _updateGrid(zoom) {
// TODO: Try this with <line> elements, then compare performance difference
var unit = units[svgEditor.curConfig.baseUnit]; // 1 = 1px
var uMulti = unit * zoom; // Calculate the main number interval
var rawM = 100 / uMulti;
var multi = 1;
intervals.some(function (num) {
multi = num;
return rawM <= num;
});
var bigInt = multi * uMulti; // Set the canvas size to the width of the container
hcanvas.width = bigInt;
hcanvas.height = bigInt;
var ctx = hcanvas.getContext('2d');
var curD = 0.5;
var part = bigInt / 10;
ctx.globalAlpha = 0.2;
ctx.strokeStyle = svgEditor.curConfig.gridColor;
for (var i = 1; i < 10; i++) {
var subD = Math.round(part * i) + 0.5; // const lineNum = (i % 2)?12:10;
var lineNum = 0;
ctx.moveTo(subD, bigInt);
ctx.lineTo(subD, lineNum);
ctx.moveTo(bigInt, subD);
ctx.lineTo(lineNum, subD);
}
ctx.stroke();
ctx.beginPath();
ctx.globalAlpha = 0.5;
ctx.moveTo(curD, bigInt);
ctx.lineTo(curD, 0);
ctx.moveTo(bigInt, curD);
ctx.lineTo(0, curD);
ctx.stroke();
var datauri = hcanvas.toDataURL('image/png');
gridimg.setAttribute('width', bigInt);
gridimg.setAttribute('height', bigInt);
gridimg.parentNode.setAttribute('width', bigInt);
gridimg.parentNode.setAttribute('height', bigInt);
svgCanvas.setHref(gridimg, datauri);
};
$ = _ref.$, NS = _ref.NS, getTypeMap = _ref.getTypeMap, importLocale = _ref.importLocale;
_context.next = 5;
return importLocale();
case 5:
strings = _context.sent;
svgEditor = _this;
svgCanvas = svgEditor.canvas;
svgdoc = document.getElementById('svgcanvas').ownerDocument, assignAttributes = svgCanvas.assignAttributes, hcanvas = document.createElement('canvas'), canvBG = $('#canvasBackground'), units = getTypeMap(), intervals = [0.01, 0.1, 1, 10, 100, 1000];
showGrid = svgEditor.curConfig.showGrid || false;
$(hcanvas).hide().appendTo('body');
const canvasGrid = svgdoc.createElementNS(NS.SVG, 'svg');
canvasGrid = svgdoc.createElementNS(NS.SVG, 'svg');
assignAttributes(canvasGrid, {
id: 'canvasGrid',
width: '100%',
@ -43,9 +135,9 @@ var svgEditorExtension_grid = (function () {
display: 'none'
});
canvBG.append(canvasGrid);
const gridDefs = svgdoc.createElementNS(NS.SVG, 'defs'); // grid-pattern
gridDefs = svgdoc.createElementNS(NS.SVG, 'defs'); // grid-pattern
const gridPattern = svgdoc.createElementNS(NS.SVG, 'pattern');
gridPattern = svgdoc.createElementNS(NS.SVG, 'pattern');
assignAttributes(gridPattern, {
id: 'gridpattern',
patternUnits: 'userSpaceOnUse',
@ -56,7 +148,7 @@ var svgEditorExtension_grid = (function () {
width: 100,
height: 100
});
const gridimg = svgdoc.createElementNS(NS.SVG, 'image');
gridimg = svgdoc.createElementNS(NS.SVG, 'image');
assignAttributes(gridimg, {
x: 0,
y: 0,
@ -67,7 +159,7 @@ var svgEditorExtension_grid = (function () {
gridDefs.append(gridPattern);
$('#canvasGrid').append(gridDefs); // grid-box
const gridBox = svgdoc.createElementNS(NS.SVG, 'rect');
gridBox = svgdoc.createElementNS(NS.SVG, 'rect');
assignAttributes(gridBox, {
width: '100%',
height: '100%',
@ -85,103 +177,44 @@ var svgEditorExtension_grid = (function () {
* @returns {void}
*/
function updateGrid(zoom) {
// TODO: Try this with <line> elements, then compare performance difference
const unit = units[svgEditor.curConfig.baseUnit]; // 1 = 1px
const uMulti = unit * zoom; // Calculate the main number interval
const rawM = 100 / uMulti;
let multi = 1;
intervals.some(num => {
multi = num;
return rawM <= num;
});
const bigInt = multi * uMulti; // Set the canvas size to the width of the container
hcanvas.width = bigInt;
hcanvas.height = bigInt;
const ctx = hcanvas.getContext('2d');
const curD = 0.5;
const part = bigInt / 10;
ctx.globalAlpha = 0.2;
ctx.strokeStyle = svgEditor.curConfig.gridColor;
for (let i = 1; i < 10; i++) {
const subD = Math.round(part * i) + 0.5; // const lineNum = (i % 2)?12:10;
const lineNum = 0;
ctx.moveTo(subD, bigInt);
ctx.lineTo(subD, lineNum);
ctx.moveTo(bigInt, subD);
ctx.lineTo(lineNum, subD);
}
ctx.stroke();
ctx.beginPath();
ctx.globalAlpha = 0.5;
ctx.moveTo(curD, bigInt);
ctx.lineTo(curD, 0);
ctx.moveTo(bigInt, curD);
ctx.lineTo(0, curD);
ctx.stroke();
const datauri = hcanvas.toDataURL('image/png');
gridimg.setAttribute('width', bigInt);
gridimg.setAttribute('height', bigInt);
gridimg.parentNode.setAttribute('width', bigInt);
gridimg.parentNode.setAttribute('height', bigInt);
svgCanvas.setHref(gridimg, datauri);
}
/**
*
* @returns {void}
*/
function gridUpdate() {
if (showGrid) {
updateGrid(svgCanvas.getZoom());
}
$('#canvasGrid').toggle(showGrid);
$('#view_grid').toggleClass('push_button_pressed tool_button');
}
const buttons = [{
buttons = [{
id: 'view_grid',
icon: svgEditor.curConfig.extIconsPath + 'grid.png',
type: 'context',
panel: 'editor_panel',
events: {
click() {
click: function click() {
svgEditor.curConfig.showGrid = showGrid = !showGrid;
gridUpdate();
}
}
}];
return {
return _context.abrupt("return", {
name: strings.name,
svgicons: svgEditor.curConfig.extIconsPath + 'grid-icon.xml',
zoomChanged(zoom) {
zoomChanged: function zoomChanged(zoom) {
if (showGrid) {
updateGrid(zoom);
}
},
callback() {
callback: function callback() {
if (showGrid) {
gridUpdate();
}
},
buttons: strings.buttons.map((button, i) => {
buttons: strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
})
};
}
});
case 27:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
return extGrid;

View File

@ -1,6 +1,98 @@
var svgEditorExtension_helloworld = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
function _slicedToArray(arr, i) {
return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
}
function _arrayWithHoles(arr) {
if (Array.isArray(arr)) return arr;
}
function _iterableToArrayLimit(arr, i) {
if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
var _arr = [];
var _n = true;
var _d = false;
var _e = undefined;
try {
for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
_arr.push(_s.value);
if (i && _arr.length === i) break;
}
} catch (err) {
_d = true;
_e = err;
} finally {
try {
if (!_n && _i["return"] != null) _i["return"]();
} finally {
if (_d) throw _e;
}
}
return _arr;
}
function _unsupportedIterableToArray(o, minLen) {
if (!o) return;
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(o);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
}
function _arrayLikeToArray(arr, len) {
if (len == null || len > arr.length) len = arr.length;
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
return arr2;
}
function _nonIterableRest() {
throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
/**
* @file ext-helloworld.js
*
@ -17,16 +109,24 @@ var svgEditorExtension_helloworld = (function () {
*/
var extHelloworld = {
name: 'helloworld',
init: function init(_ref) {
var _this = this;
async init({
$,
importLocale
}) {
// See `/editor/extensions/ext-locale/helloworld/`
const strings = await importLocale();
const svgEditor = this;
const svgCanvas = svgEditor.canvas;
return {
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var $, importLocale, strings, svgEditor, svgCanvas;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
$ = _ref.$, importLocale = _ref.importLocale;
_context.next = 3;
return importLocale();
case 3:
strings = _context.sent;
svgEditor = _this;
svgCanvas = svgEditor.canvas;
return _context.abrupt("return", {
name: strings.name,
// For more notes on how to make an icon file, see the source of
// the helloworld-icon.xml
@ -44,19 +144,17 @@ var svgEditorExtension_helloworld = (function () {
title: strings.buttons[0].title,
// Events
events: {
click() {
click: function click() {
// The action taken when the button is clicked on.
// For "mode" buttons, any other button will
// automatically be de-pressed.
svgCanvas.setMode('hello_world');
}
}
}],
// This is triggered when the main mouse button is pressed down
// on the editor canvas (not the tool panels)
mouseDown() {
mouseDown: function mouseDown() {
// Check the mode on mousedown
if (svgCanvas.getMode() === 'hello_world') {
// The returned object must include "started" with
@ -68,31 +166,38 @@ var svgEditorExtension_helloworld = (function () {
return undefined;
},
// This is triggered from anywhere, but "started" must have been set
// to true (see above). Note that "opts" is an object with event info
mouseUp(opts) {
mouseUp: function mouseUp(opts) {
// Check the mode on mouseup
if (svgCanvas.getMode() === 'hello_world') {
const zoom = svgCanvas.getZoom(); // Get the actual coordinate by dividing by the zoom value
var zoom = svgCanvas.getZoom(); // Get the actual coordinate by dividing by the zoom value
const x = opts.mouse_x / zoom;
const y = opts.mouse_y / zoom; // We do our own formatting
var x = opts.mouse_x / zoom;
var y = opts.mouse_y / zoom; // We do our own formatting
var text = strings.text;
[['x', x], ['y', y]].forEach(function (_ref2) {
var _ref3 = _slicedToArray(_ref2, 2),
prop = _ref3[0],
val = _ref3[1];
let {
text
} = strings;
[['x', x], ['y', y]].forEach(([prop, val]) => {
text = text.replace('{' + prop + '}', val);
}); // Show the text using the custom alert function
$.alert(text);
}
}
});
};
case 7:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
return extHelloworld;

View File

@ -1,6 +1,58 @@
var svgEditorExtension_imagelib = (function () {
'use strict';
function _typeof(obj) {
"@babel/helpers - typeof";
if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
_typeof = function (obj) {
return typeof obj;
};
} else {
_typeof = function (obj) {
return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
};
}
return _typeof(obj);
}
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* @file ext-imagelib.js
*
@ -11,161 +63,184 @@ var svgEditorExtension_imagelib = (function () {
*/
var extImagelib = {
name: 'imagelib',
init: function init(_ref) {
var _this = this;
async init({
$,
decode64,
importLocale,
dropXMLInternalSubset
}) {
const imagelibStrings = await importLocale();
const modularVersion = !('svgEditor' in window) || !window.svgEditor || window.svgEditor.modules !== false;
const svgEditor = this;
const {
uiStrings,
canvas: svgCanvas,
curConfig: {
extIconsPath
}
} = svgEditor;
imagelibStrings.imgLibs = imagelibStrings.imgLibs.map(({
name,
url,
description
}) => {
// Todo: Adopt some standard formatting library like `fluent.js` instead
url = url // Keep these regexes as is in prep. for switching to `u` flag
// which will require escaping
// eslint-disable-next-line unicorn/better-regex
.replace(/\{path\}/g, extIconsPath).replace( // eslint-disable-next-line unicorn/better-regex
/\{modularVersion\}/g, modularVersion ? imagelibStrings.moduleEnding || '-es' : '');
return {
name,
url,
description
};
});
const allowedImageLibOrigins = imagelibStrings.imgLibs.map(({
url
}) => {
try {
return new URL(url).origin;
} catch (err) {
return location.origin;
}
});
/**
*
* @returns {void}
*/
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
var $, decode64, importLocale, dropXMLInternalSubset, imagelibStrings, modularVersion, svgEditor, uiStrings, svgCanvas, extIconsPath, allowedImageLibOrigins, closeBrowser, importImage, pending, mode, multiArr, transferStopped, preview, submit, onMessage, _onMessage, toggleMulti, showBrowser, buttons;
function closeBrowser() {
return regeneratorRuntime.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
showBrowser = function _showBrowser() {
var browser = $('#imgbrowse');
if (!browser.length) {
$('<div id=imgbrowse_holder><div id=imgbrowse class=toolbar_button>' + '</div></div>').insertAfter('#svg_docprops');
browser = $('#imgbrowse');
var allLibs = imagelibStrings.select_lib;
var libOpts = $('<ul id=imglib_opts>').appendTo(browser);
var frame = $('<iframe src="javascript:0"/>').prependTo(browser).hide().wrap('<div id=lib_framewrap>');
var header = $('<h1>').prependTo(browser).text(allLibs).css({
position: 'absolute',
top: 0,
left: 0,
width: '100%'
});
var cancel = $('<button>' + uiStrings.common.cancel + '</button>').appendTo(browser).on('click touchend', function () {
$('#imgbrowse_holder').hide();
document.activeElement.blur(); // make sure focus is the body to correct issue #417
}
/**
* @param {string} url
* @returns {void}
*/
function importImage(url) {
const newImage = svgCanvas.addSVGElementFromJson({
element: 'image',
attr: {
x: 0,
y: 0,
width: 0,
height: 0,
id: svgCanvas.getNextId(),
style: 'pointer-events:inherit'
}
}).css({
position: 'absolute',
top: 5,
right: -10
});
svgCanvas.clearSelection();
svgCanvas.addToSelection([newImage]);
svgCanvas.setImageURL(url);
var leftBlock = $('<span>').css({
position: 'absolute',
top: 5,
left: 10
}).appendTo(browser);
var back = $('<button hidden>' + imagelibStrings.show_list + '</button>').appendTo(leftBlock).on('click touchend', function () {
frame.attr('src', 'about:blank').hide();
libOpts.show();
header.text(allLibs);
back.hide();
}).css({
'margin-right': 5
}).hide();
/* const type = */
$('<select><option value=s>' + imagelibStrings.import_single + '</option><option value=m>' + imagelibStrings.import_multi + '</option><option value=o>' + imagelibStrings.open + '</option></select>').appendTo(leftBlock).change(function () {
mode = $(this).val();
switch (mode) {
case 's':
case 'o':
toggleMulti(false);
break;
case 'm':
// Import multiple
toggleMulti(true);
break;
}
}).css({
'margin-top': 10
});
cancel.prepend($.getSvgIcon('cancel', true));
back.prepend($.getSvgIcon('tool_imagelib', true));
imagelibStrings.imgLibs.forEach(function (_ref5) {
var name = _ref5.name,
url = _ref5.url,
description = _ref5.description;
$('<li>').appendTo(libOpts).text(name).on('click touchend', function () {
frame.attr('src', url).show();
header.text(name);
libOpts.hide();
back.show();
}).append("<span>".concat(description, "</span>"));
});
} else {
$('#imgbrowse_holder').show();
}
};
toggleMulti = function _toggleMulti(show) {
$('#lib_framewrap, #imglib_opts').css({
right: show ? 200 : 10
});
if (!preview) {
preview = $('<div id=imglib_preview>').css({
position: 'absolute',
top: 45,
right: 10,
width: 180,
bottom: 45,
background: '#fff',
overflow: 'auto'
}).insertAfter('#lib_framewrap');
submit = $('<button disabled>Import selected</button>').appendTo('#imgbrowse').on('click touchend', function () {
$.each(multiArr, function (i) {
var type = this[0];
var data = this[1];
if (type === 'svg') {
svgCanvas.importSvgString(data);
} else {
importImage(data);
}
const pending = {};
let mode = 's';
let multiArr = [];
let transferStopped = false;
let preview, submit;
/**
* Contains the SVG to insert.
* @typedef {PlainObject} ImageLibMessage
* @property {"imagelib"} namespace Required to distinguish from any other messages of app.
* @property {string} href Set to same value as previous `ImageLibMetaMessage` `id`.
* @property {string} data The response (as an SVG string or URL)
*/
/**
* Used for setting meta-data before images are retrieved.
* @typedef {PlainObject} ImageLibMetaMessage
* @property {"imagelib"} namespace Required to distinguish from any other messages of app.
* @property {string} name If the subsequent response is an SVG string or if `preview_url`
* is present, will be used as the title for the preview image. When an
* SVG string is present, will default to the first `<title>`'s contents or
* "(SVG #<Length of response>)" if none is present. Otherwise, if `preview_url`
* is present, will default to the empty string. Though `name` may be falsy,
* it is always expected to be present for meta messages.
* @property {string} id Identifier (the expected `href` for a subsequent response message);
* used for ensuring the subsequent response can be tied to this `ImageLibMetaMessage` object.
* @property {string} [preview_url] When import mode is multiple, used to set an image
* source along with the name/title. If the subsequent response is an SVG string
* and there is no `preview_url`, the default will just be to show the
* name/title. If the response is not an SVG string, the default will be to
* show that response (i.e., the URL).
* @property {string} entry Set automatically with div holding retrieving
* message (until ready to delete)
* @todo Should use a separate Map instead of `entry`
*/
/**
* @param {PlainObject} cfg
* @param {string} cfg.origin
* @param {ImageLibMetaMessage|ImageLibMessage|string} cfg.data String is deprecated when parsed to JSON `ImageLibMessage`
* @returns {void}
*/
async function onMessage({
origin,
data: response
}) {
// eslint-disable-line no-shadow
if (!response || !['string', 'object'].includes(typeof response)) {
// Do nothing
return;
svgCanvas.moveSelectedElements(i * 20, i * 20, false);
});
preview.empty();
multiArr = [];
$('#imgbrowse_holder').hide();
}).css({
position: 'absolute',
bottom: 10,
right: -10
});
}
let id;
let type;
preview.toggle(show);
submit.toggle(show);
};
try {
_onMessage = function _onMessage3() {
_onMessage = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref4) {
var origin, response, id, type, hasName, hasHref, char1, secondpos, entry, curMeta, svgStr, imgStr, name, message, pre, src, title, xml, ok;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
origin = _ref4.origin, response = _ref4.data;
if (!(!response || !['string', 'object'].includes(_typeof(response)))) {
_context.next = 3;
break;
}
return _context.abrupt("return");
case 3:
_context.prev = 3;
// Todo: This block can be removed (and the above check changed to
// insist on an object) if embedAPI moves away from a string to
// an object (if IE9 support not needed)
response = typeof response === 'object' ? response : JSON.parse(response);
response = _typeof(response) === 'object' ? response : JSON.parse(response);
if (response.namespace !== 'imagelib') {
return;
if (!(response.namespace !== 'imagelib')) {
_context.next = 7;
break;
}
return _context.abrupt("return");
case 7:
if (!(!allowedImageLibOrigins.includes('*') && !allowedImageLibOrigins.includes(origin))) {
_context.next = 10;
break;
}
if (!allowedImageLibOrigins.includes('*') && !allowedImageLibOrigins.includes(origin)) {
// Todo: Surface this error to user?
console.log(`Origin ${origin} not whitelisted for posting to ${window.origin}`); // eslint-disable-line no-console
console.log("Origin ".concat(origin, " not whitelisted for posting to ").concat(window.origin)); // eslint-disable-line no-console
return;
return _context.abrupt("return");
case 10:
hasName = 'name' in response;
hasHref = 'href' in response;
if (!(!hasName && transferStopped)) {
_context.next = 15;
break;
}
const hasName = ('name' in response);
const hasHref = ('href' in response);
if (!hasName && transferStopped) {
transferStopped = false;
return;
}
return _context.abrupt("return");
case 15:
if (hasHref) {
id = response.href;
response = response.data;
@ -174,74 +249,100 @@ var svgEditorExtension_imagelib = (function () {
$('#dialog_box').hide();
type = hasName ? 'meta' : response.charAt(0);
} catch (e) {
// This block is for backward compatibility (for IAN and Openclipart);
// should otherwise return
if (typeof response === 'string') {
const char1 = response.charAt(0);
_context.next = 28;
break;
if (char1 !== '{' && transferStopped) {
transferStopped = false;
return;
case 20:
_context.prev = 20;
_context.t0 = _context["catch"](3);
if (!(typeof response === 'string')) {
_context.next = 28;
break;
}
char1 = response.charAt(0);
if (!(char1 !== '{' && transferStopped)) {
_context.next = 27;
break;
}
transferStopped = false;
return _context.abrupt("return");
case 27:
if (char1 === '|') {
const secondpos = response.indexOf('|', 1);
secondpos = response.indexOf('|', 1);
id = response.substr(1, secondpos - 1);
response = response.substr(secondpos + 1);
type = response.charAt(0);
}
}
}
let entry, curMeta, svgStr, imgStr;
case 28:
_context.t1 = type;
_context.next = _context.t1 === 'meta' ? 31 : _context.t1 === '<' ? 47 : _context.t1 === 'd' ? 49 : 60;
break;
switch (type) {
case 'meta':
{
case 31:
// Metadata
transferStopped = false;
curMeta = response; // Should be safe to add dynamic property as passed metadata
pending[curMeta.id] = curMeta; // lgtm [js/remote-property-injection]
const name = curMeta.name || 'file';
const message = uiStrings.notification.retrieving.replace('%s', name);
name = curMeta.name || 'file';
message = uiStrings.notification.retrieving.replace('%s', name);
if (mode !== 'm') {
await $.process_cancel(message);
if (!(mode !== 'm')) {
_context.next = 43;
break;
}
_context.next = 39;
return $.process_cancel(message);
case 39:
transferStopped = true; // Should a message be sent back to the frame?
$('#dialog_box').hide();
} else {
_context.next = 46;
break;
case 43:
entry = $('<div>').text(message).data('id', curMeta.id);
preview.append(entry);
curMeta.entry = entry;
}
return;
}
case 46:
return _context.abrupt("return");
case '<':
case 47:
svgStr = true;
break;
return _context.abrupt("break", 62);
case 'd':
{
if (response.startsWith('data:image/svg+xml')) {
const pre = 'data:image/svg+xml;base64,';
const src = response.substring(pre.length);
case 49:
if (!response.startsWith('data:image/svg+xml')) {
_context.next = 57;
break;
}
pre = 'data:image/svg+xml;base64,';
src = response.substring(pre.length);
response = decode64(src);
svgStr = true;
break;
} else if (response.startsWith('data:image/')) {
imgStr = true;
break;
}
}
// Else fall through
return _context.abrupt("break", 62);
default:
case 57:
if (!response.startsWith('data:image/')) {
_context.next = 60;
break;
}
imgStr = true;
return _context.abrupt("break", 62);
case 60:
// TODO: See if there's a way to base64 encode the binary data stream
// const str = 'data:;base64,' + svgedit.utilities.encode64(response, true);
// Assume it's raw image data
@ -260,11 +361,14 @@ var svgEditorExtension_imagelib = (function () {
// });
return;
}
return _context.abrupt("return");
switch (mode) {
case 's':
case 62:
_context.t2 = mode;
_context.next = _context.t2 === 's' ? 65 : _context.t2 === 'm' ? 68 : _context.t2 === 'o' ? 72 : 83;
break;
case 65:
// Import one
if (svgStr) {
svgCanvas.importSvgString(response);
@ -273,14 +377,12 @@ var svgEditorExtension_imagelib = (function () {
}
closeBrowser();
break;
return _context.abrupt("break", 83);
case 'm':
{
case 68:
// Import multiple
multiArr.push([svgStr ? 'svg' : 'img', response]);
curMeta = pending[id];
let title;
if (svgStr) {
if (curMeta && curMeta.name) {
@ -288,7 +390,7 @@ var svgEditorExtension_imagelib = (function () {
} else {
// Try to find a title
// `dropXMLInternalSubset` is to help prevent the billion laughs attack
const xml = new DOMParser().parseFromString(dropXMLInternalSubset(response), 'text/xml').documentElement; // lgtm [js/xml-bomb]
xml = new DOMParser().parseFromString(dropXMLInternalSubset(response), 'text/xml').documentElement; // lgtm [js/xml-bomb]
title = $(xml).children('title').first().text() || '(SVG #' + response.length + ')';
}
@ -330,159 +432,124 @@ var svgEditorExtension_imagelib = (function () {
}
}
return _context.abrupt("break", 83);
case 72:
if (svgStr) {
_context.next = 74;
break;
}
case 'o':
{
// Open
if (!svgStr) {
break;
}
return _context.abrupt("break", 83);
case 74:
closeBrowser();
const ok = await svgEditor.openPrep();
_context.next = 77;
return svgEditor.openPrep();
if (!ok) {
return;
case 77:
ok = _context.sent;
if (ok) {
_context.next = 80;
break;
}
return _context.abrupt("return");
case 80:
svgCanvas.clear();
svgCanvas.setSvgString(response); // updateCanvas();
break;
return _context.abrupt("break", 83);
case 83:
case "end":
return _context.stop();
}
}
} // Receive `postMessage` data
}, _callee, null, [[3, 20]]);
}));
return _onMessage.apply(this, arguments);
};
onMessage = function _onMessage2(_x) {
return _onMessage.apply(this, arguments);
};
importImage = function _importImage(url) {
var newImage = svgCanvas.addSVGElementFromJson({
element: 'image',
attr: {
x: 0,
y: 0,
width: 0,
height: 0,
id: svgCanvas.getNextId(),
style: 'pointer-events:inherit'
}
});
svgCanvas.clearSelection();
svgCanvas.addToSelection([newImage]);
svgCanvas.setImageURL(url);
};
closeBrowser = function _closeBrowser() {
$('#imgbrowse_holder').hide();
document.activeElement.blur(); // make sure focus is the body to correct issue #417
};
$ = _ref.$, decode64 = _ref.decode64, importLocale = _ref.importLocale, dropXMLInternalSubset = _ref.dropXMLInternalSubset;
_context2.next = 9;
return importLocale();
case 9:
imagelibStrings = _context2.sent;
modularVersion = !('svgEditor' in window) || !window.svgEditor || window.svgEditor.modules !== false;
svgEditor = _this;
uiStrings = svgEditor.uiStrings, svgCanvas = svgEditor.canvas, extIconsPath = svgEditor.curConfig.extIconsPath;
imagelibStrings.imgLibs = imagelibStrings.imgLibs.map(function (_ref2) {
var name = _ref2.name,
url = _ref2.url,
description = _ref2.description;
// Todo: Adopt some standard formatting library like `fluent.js` instead
url = url // Keep these regexes as is in prep. for switching to `u` flag
// which will require escaping
// eslint-disable-next-line unicorn/better-regex
.replace(/\{path\}/g, extIconsPath).replace( // eslint-disable-next-line unicorn/better-regex
/\{modularVersion\}/g, modularVersion ? imagelibStrings.moduleEnding || '-es' : '');
return {
name: name,
url: url,
description: description
};
});
allowedImageLibOrigins = imagelibStrings.imgLibs.map(function (_ref3) {
var url = _ref3.url;
try {
return new URL(url).origin;
} catch (err) {
return location.origin;
}
});
/**
*
* @returns {void}
*/
pending = {};
mode = 's';
multiArr = [];
transferStopped = false;
// Receive `postMessage` data
window.addEventListener('message', onMessage, true);
/**
* @param {boolean} show
* @returns {void}
*/
function toggleMulti(show) {
$('#lib_framewrap, #imglib_opts').css({
right: show ? 200 : 10
});
if (!preview) {
preview = $('<div id=imglib_preview>').css({
position: 'absolute',
top: 45,
right: 10,
width: 180,
bottom: 45,
background: '#fff',
overflow: 'auto'
}).insertAfter('#lib_framewrap');
submit = $('<button disabled>Import selected</button>').appendTo('#imgbrowse').on('click touchend', function () {
$.each(multiArr, function (i) {
const type = this[0];
const data = this[1];
if (type === 'svg') {
svgCanvas.importSvgString(data);
} else {
importImage(data);
}
svgCanvas.moveSelectedElements(i * 20, i * 20, false);
});
preview.empty();
multiArr = [];
$('#imgbrowse_holder').hide();
}).css({
position: 'absolute',
bottom: 10,
right: -10
});
}
preview.toggle(show);
submit.toggle(show);
}
/**
*
* @returns {void}
*/
function showBrowser() {
let browser = $('#imgbrowse');
if (!browser.length) {
$('<div id=imgbrowse_holder><div id=imgbrowse class=toolbar_button>' + '</div></div>').insertAfter('#svg_docprops');
browser = $('#imgbrowse');
const allLibs = imagelibStrings.select_lib;
const libOpts = $('<ul id=imglib_opts>').appendTo(browser);
const frame = $('<iframe src="javascript:0"/>').prependTo(browser).hide().wrap('<div id=lib_framewrap>');
const header = $('<h1>').prependTo(browser).text(allLibs).css({
position: 'absolute',
top: 0,
left: 0,
width: '100%'
});
const cancel = $('<button>' + uiStrings.common.cancel + '</button>').appendTo(browser).on('click touchend', function () {
$('#imgbrowse_holder').hide();
}).css({
position: 'absolute',
top: 5,
right: -10
});
const leftBlock = $('<span>').css({
position: 'absolute',
top: 5,
left: 10
}).appendTo(browser);
const back = $('<button hidden>' + imagelibStrings.show_list + '</button>').appendTo(leftBlock).on('click touchend', function () {
frame.attr('src', 'about:blank').hide();
libOpts.show();
header.text(allLibs);
back.hide();
}).css({
'margin-right': 5
}).hide();
/* const type = */
$('<select><option value=s>' + imagelibStrings.import_single + '</option><option value=m>' + imagelibStrings.import_multi + '</option><option value=o>' + imagelibStrings.open + '</option></select>').appendTo(leftBlock).change(function () {
mode = $(this).val();
switch (mode) {
case 's':
case 'o':
toggleMulti(false);
break;
case 'm':
// Import multiple
toggleMulti(true);
break;
}
}).css({
'margin-top': 10
});
cancel.prepend($.getSvgIcon('cancel', true));
back.prepend($.getSvgIcon('tool_imagelib', true));
imagelibStrings.imgLibs.forEach(function ({
name,
url,
description
}) {
$('<li>').appendTo(libOpts).text(name).on('click touchend', function () {
frame.attr('src', url).show();
header.text(name);
libOpts.hide();
back.show();
}).append(`<span>${description}</span>`);
});
} else {
$('#imgbrowse_holder').show();
}
}
const buttons = [{
buttons = [{
id: 'tool_imagelib',
type: 'app_menu',
// _flyout
@ -492,19 +559,24 @@ var svgEditorExtension_imagelib = (function () {
mouseup: showBrowser
}
}];
return {
return _context2.abrupt("return", {
svgicons: extIconsPath + 'ext-imagelib.xml',
buttons: imagelibStrings.buttons.map((button, i) => {
buttons: imagelibStrings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
}),
callback() {
callback: function callback() {
$('<style>').text('#imgbrowse_holder {' + 'position: absolute;' + 'top: 0;' + 'left: 0;' + 'width: 100%;' + 'height: 100%;' + 'background-color: rgba(0, 0, 0, .5);' + 'z-index: 5;' + '}' + '#imgbrowse {' + 'position: absolute;' + 'top: 25px;' + 'left: 25px;' + 'right: 25px;' + 'bottom: 25px;' + 'min-width: 300px;' + 'min-height: 200px;' + 'background: #B0B0B0;' + 'border: 1px outset #777;' + '}' + '#imgbrowse h1 {' + 'font-size: 20px;' + 'margin: .4em;' + 'text-align: center;' + '}' + '#lib_framewrap,' + '#imgbrowse > ul {' + 'position: absolute;' + 'top: 45px;' + 'left: 10px;' + 'right: 10px;' + 'bottom: 10px;' + 'background: white;' + 'margin: 0;' + 'padding: 0;' + '}' + '#imgbrowse > ul {' + 'overflow: auto;' + '}' + '#imgbrowse > div {' + 'border: 1px solid #666;' + '}' + '#imglib_preview > div {' + 'padding: 5px;' + 'font-size: 12px;' + '}' + '#imglib_preview img {' + 'display: block;' + 'margin: 0 auto;' + 'max-height: 100px;' + '}' + '#imgbrowse li {' + 'list-style: none;' + 'padding: .5em;' + 'background: #E8E8E8;' + 'border-bottom: 1px solid #B0B0B0;' + 'line-height: 1.2em;' + 'font-style: sans-serif;' + '}' + '#imgbrowse li > span {' + 'color: #666;' + 'font-size: 15px;' + 'display: block;' + '}' + '#imgbrowse li:hover {' + 'background: #FFC;' + 'cursor: pointer;' + '}' + '#imgbrowse iframe {' + 'width: 100%;' + 'height: 100%;' + 'border: 0;' + '}').appendTo('head');
}
});
};
case 22:
case "end":
return _context2.stop();
}
}
}, _callee2);
}))();
}
};
return extImagelib;

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,42 @@
var svgEditorExtension_mathjax = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* Add any of the whitelisted attributes to the script tag.
* @param {HTMLScriptElement} script
@ -10,38 +46,32 @@ var svgEditorExtension_mathjax = (function () {
function addScriptAtts(script, atts) {
['id', 'class', 'type'].forEach(prop => {
['id', 'class', 'type'].forEach(function (prop) {
if (prop in atts) {
script[prop] = atts[prop];
}
});
} // Additions by Brett
/**
*
* @author Brett Zamir (other items are from `dynamic-import-polyfill`)
* @param {string|string[]} url
* @param {PlainObject} [atts={}]
* @returns {Promise<void|Error>} Resolves to `undefined` or rejects with an `Error` upon a
* script loading error
*/
function importScript(url, atts = {}) {
function importScript(url) {
var atts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
if (Array.isArray(url)) {
return Promise.all(url.map(u => {
return Promise.all(url.map(function (u) {
return importScript(u, atts);
}));
}
return new Promise((resolve, reject) => {
return new Promise(function (resolve, reject) {
// eslint-disable-line promise/avoid-new
const script = document.createElement('script');
var script = document.createElement('script');
/**
*
* @returns {void}
*/
function scriptOnError() {
reject(new Error(`Failed to import: ${url}`));
reject(new Error("Failed to import: ".concat(url)));
destructor();
}
/**
@ -55,7 +85,7 @@ var svgEditorExtension_mathjax = (function () {
destructor();
}
const destructor = () => {
var destructor = function destructor() {
script.removeEventListener('error', scriptOnError);
script.removeEventListener('load', scriptOnLoad);
script.remove();
@ -71,20 +101,79 @@ var svgEditorExtension_mathjax = (function () {
});
}
/* globals MathJax */
var extMathjax = {
name: 'mathjax',
init: function init(_ref) {
var _this = this;
async init({
$,
importLocale
}) {
const strings = await importLocale();
const svgEditor = this;
const svgCanvas = svgEditor.canvas; // Configuration of the MathJax extention.
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
var $, importLocale, strings, svgEditor, svgCanvas, mathjaxSrcSecure, uiStrings, math, locationX, locationY, mathjaxLoaded, saveMath, buttons;
return regeneratorRuntime.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
saveMath = function _saveMath() {
var code = $('#mathjax_code_textarea').val(); // displaystyle to force MathJax NOT to use the inline style. Because it is
// less fancy!
MathJax.Hub.queue.Push(['Text', math, '\\displaystyle{' + code + '}']);
/*
* The MathJax library doesn't want to bloat your webpage so it creates
* every symbol (glymph) you need only once. These are saved in a `<svg>` on
* the top of your html document, just under the body tag. Each glymph has
* its unique id and is saved as a `<path>` in the `<defs>` tag of the `<svg>`
*
* Then when the symbols are needed in the rest of your html document they
* are refferd to by a `<use>` tag.
* Because of bug 1076 we can't just grab the defs tag on the top and add it
* to your formula's `<svg>` and copy the lot. So we have to replace each
* `<use>` tag by its `<path>`.
*/
MathJax.Hub.queue.Push(function () {
var mathjaxMath = $('.MathJax_SVG');
var svg = $(mathjaxMath.html());
svg.find('use').each(function () {
// TODO: find a less pragmatic and more elegant solution to this.
var id = $(this).attr('href') ? $(this).attr('href').slice(1) // Works in Chrome.
: $(this).attr('xlink:href').slice(1); // Works in Firefox.
var glymph = $('#' + id).clone().removeAttr('id');
var x = $(this).attr('x');
var y = $(this).attr('y');
var transform = $(this).attr('transform');
if (transform && (x || y)) {
glymph.attr('transform', transform + ' translate(' + x + ',' + y + ')');
} else if (transform) {
glymph.attr('transform', transform);
} else if (x || y) {
glymph.attr('transform', 'translate(' + x + ',' + y + ')');
}
$(this).replaceWith(glymph);
}); // Remove the style tag because it interferes with SVG-Edit.
svg.removeAttr('style');
svg.attr('xmlns', 'http://www.w3.org/2000/svg');
svgCanvas.importSvgString($('<div>').append(svg.clone()).html(), true);
svgCanvas.ungroupSelectedElement(); // TODO: To undo the adding of the Formula you now have to undo twice.
// This should only be once!
svgCanvas.moveSelectedElements(locationX, locationY, true);
});
};
$ = _ref.$, importLocale = _ref.importLocale;
_context2.next = 4;
return importLocale();
case 4:
strings = _context2.sent;
svgEditor = _this;
svgCanvas = svgEditor.canvas; // Configuration of the MathJax extention.
// This will be added to the head tag before MathJax is loaded.
const
/* mathjaxConfiguration = `<script type="text/x-mathjax-config">
MathJax.Hub.Config({
extensions: ['tex2jax.js'],
@ -110,13 +199,7 @@ var svgEditorExtension_mathjax = (function () {
// mathjaxSrc = 'http://cdn.mathjax.org/mathjax/latest/MathJax.js',
// Had been on https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_SVG.js
// Obtained Text-AMS-MML_SVG.js from https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.3/config/TeX-AMS-MML_SVG.js
mathjaxSrcSecure = 'mathjax/MathJax.min.js?config=TeX-AMS-MML_SVG.js',
{
uiStrings
} = svgEditor;
let math,
locationX,
locationY,
mathjaxSrcSecure = 'mathjax/MathJax.min.js?config=TeX-AMS-MML_SVG.js', uiStrings = svgEditor.uiStrings;
mathjaxLoaded = false; // TODO: Implement language support. Move these uiStrings to the locale files and
// the code to the langReady callback. Also i18nize alert and HTML below
@ -134,69 +217,26 @@ var svgEditorExtension_mathjax = (function () {
* @returns {void}
*/
function saveMath() {
const code = $('#mathjax_code_textarea').val(); // displaystyle to force MathJax NOT to use the inline style. Because it is
// less fancy!
MathJax.Hub.queue.Push(['Text', math, '\\displaystyle{' + code + '}']);
/*
* The MathJax library doesn't want to bloat your webpage so it creates
* every symbol (glymph) you need only once. These are saved in a `<svg>` on
* the top of your html document, just under the body tag. Each glymph has
* its unique id and is saved as a `<path>` in the `<defs>` tag of the `<svg>`
*
* Then when the symbols are needed in the rest of your html document they
* are refferd to by a `<use>` tag.
* Because of bug 1076 we can't just grab the defs tag on the top and add it
* to your formula's `<svg>` and copy the lot. So we have to replace each
* `<use>` tag by its `<path>`.
*/
MathJax.Hub.queue.Push(function () {
const mathjaxMath = $('.MathJax_SVG');
const svg = $(mathjaxMath.html());
svg.find('use').each(function () {
// TODO: find a less pragmatic and more elegant solution to this.
const id = $(this).attr('href') ? $(this).attr('href').slice(1) // Works in Chrome.
: $(this).attr('xlink:href').slice(1); // Works in Firefox.
const glymph = $('#' + id).clone().removeAttr('id');
const x = $(this).attr('x');
const y = $(this).attr('y');
const transform = $(this).attr('transform');
if (transform && (x || y)) {
glymph.attr('transform', transform + ' translate(' + x + ',' + y + ')');
} else if (transform) {
glymph.attr('transform', transform);
} else if (x || y) {
glymph.attr('transform', 'translate(' + x + ',' + y + ')');
}
$(this).replaceWith(glymph);
}); // Remove the style tag because it interferes with SVG-Edit.
svg.removeAttr('style');
svg.attr('xmlns', 'http://www.w3.org/2000/svg');
svgCanvas.importSvgString($('<div>').append(svg.clone()).html(), true);
svgCanvas.ungroupSelectedElement(); // TODO: To undo the adding of the Formula you now have to undo twice.
// This should only be once!
svgCanvas.moveSelectedElements(locationX, locationY, true);
});
}
const buttons = [{
buttons = [{
id: 'tool_mathjax',
type: 'mode',
icon: svgEditor.curConfig.extIconsPath + 'mathjax.png',
events: {
async click() {
click: function click() {
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
// Set the mode.
svgCanvas.setMode('mathjax'); // Only load Mathjax when needed, we don't want to strain Svg-Edit any more.
// From this point on it is very probable that it will be needed, so load it.
if (mathjaxLoaded === false) {
if (!(mathjaxLoaded === false)) {
_context.next = 17;
break;
}
$('<div id="mathjax">' + '<!-- Here is where MathJax creates the math -->' + '<div id="mathjax_creator" class="tex2jax_process" style="display:none">' + '$${}$$' + '</div>' + '<div id="mathjax_overlay"></div>' + '<div id="mathjax_container">' + '<div id="tool_mathjax_back" class="toolbar_button">' + '<button id="tool_mathjax_save">OK</button>' + '<button id="tool_mathjax_cancel">Cancel</button>' + '</div>' + '<fieldset>' + '<legend id="mathjax_legend">Mathematics Editor</legend>' + '<label>' + '<span id="mathjax_explication">Please type your mathematics in ' + '<a href="https://en.wikipedia.org/wiki/Help:Displaying_a_formula" target="_blank">TeX</a> code.</span></label>' + '<textarea id="mathjax_code_textarea" spellcheck="false"></textarea>' + '</fieldset>' + '</div>' + '</div>').insertAfter('#svg_prefs').hide(); // Make the MathEditor draggable.
$('#mathjax_container').draggable({
@ -236,9 +276,12 @@ var svgEditorExtension_mathjax = (function () {
// We use `extIconsPath` here for now as it does not vary with
// the modular type as does `extPath`
try {
await importScript(svgEditor.curConfig.extIconsPath + mathjaxSrcSecure); // When MathJax is loaded get the div where the math will be rendered.
_context.prev = 7;
_context.next = 10;
return importScript(svgEditor.curConfig.extIconsPath + mathjaxSrcSecure);
case 10:
// 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); // eslint-disable-line no-console
@ -246,24 +289,33 @@ var svgEditorExtension_mathjax = (function () {
mathjaxLoaded = true;
console.log('MathJax Loaded'); // eslint-disable-line no-console
});
} catch (e) {
_context.next = 17;
break;
case 13:
_context.prev = 13;
_context.t0 = _context["catch"](7);
console.log('Failed loading MathJax.'); // eslint-disable-line no-console
$.alert('Failed loading MathJax. You will not be able to change the mathematics.');
}
}
}
case 17:
case "end":
return _context.stop();
}
}
}, _callee, null, [[7, 13]]);
}))();
}
}
}];
return {
return _context2.abrupt("return", {
name: strings.name,
svgicons: svgEditor.curConfig.extIconsPath + 'mathjax-icons.xml',
buttons: strings.buttons.map((button, i) => {
buttons: strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
}),
mouseDown() {
mouseDown: function mouseDown() {
if (svgCanvas.getMode() === 'mathjax') {
return {
started: true
@ -272,11 +324,10 @@ var svgEditorExtension_mathjax = (function () {
return undefined;
},
mouseUp(opts) {
mouseUp: function mouseUp(opts) {
if (svgCanvas.getMode() === 'mathjax') {
// Get the coordinates from your mouse.
const zoom = svgCanvas.getZoom(); // Get the actual coordinate by dividing by the zoom value
var zoom = svgCanvas.getZoom(); // Get the actual coordinate by dividing by the zoom value
locationX = opts.mouse_x / zoom;
locationY = opts.mouse_y / zoom;
@ -288,15 +339,20 @@ var svgEditorExtension_mathjax = (function () {
return undefined;
},
callback() {
callback: function callback() {
$('<style>').text('#mathjax fieldset{' + 'padding: 5px;' + 'margin: 5px;' + 'border: 1px solid #DDD;' + '}' + '#mathjax label{' + 'display: block;' + 'margin: .5em;' + '}' + '#mathjax legend {' + 'max-width:195px;' + '}' + '#mathjax_overlay {' + 'position: absolute;' + 'top: 0;' + 'left: 0;' + 'right: 0;' + 'bottom: 0;' + 'background-color: black;' + 'opacity: 0.6;' + 'z-index: 20000;' + '}' + '#mathjax_container {' + 'position: absolute;' + 'top: 50px;' + 'padding: 10px;' + 'background-color: #B0B0B0;' + 'border: 1px outset #777;' + 'opacity: 1.0;' + 'font-family: Verdana, Helvetica, sans-serif;' + 'font-size: .8em;' + 'z-index: 20001;' + '}' + '#tool_mathjax_back {' + 'margin-left: 1em;' + 'overflow: auto;' + '}' + '#mathjax_legend{' + 'font-weight: bold;' + 'font-size:1.1em;' + '}' + '#mathjax_code_textarea {\\n' + 'margin: 5px .7em;' + 'overflow: hidden;' + 'width: 416px;' + 'display: block;' + 'height: 100px;' + '}').appendTo('head'); // Add the MathJax configuration.
// $(mathjaxConfiguration).appendTo('head');
}
});
};
case 12:
case "end":
return _context2.stop();
}
}
}, _callee2);
}))();
}
};
return extMathjax;

View File

@ -11,18 +11,16 @@ var svgEditorExtension_overview_window = (function () {
*/
var extOverview_window = {
name: 'overview_window',
init({
$,
isChrome,
isIE
}) {
const overviewWindowGlobals = {}; // Disabled in Chrome 48-, see https://github.com/SVG-Edit/svgedit/issues/26 and
init: function init(_ref) {
var $ = _ref.$,
isChrome = _ref.isChrome,
isIE = _ref.isIE;
var overviewWindowGlobals = {}; // Disabled in Chrome 48-, see https://github.com/SVG-Edit/svgedit/issues/26 and
// https://code.google.com/p/chromium/issues/detail?id=565120.
if (isChrome()) {
const verIndex = navigator.userAgent.indexOf('Chrome/') + 7;
const chromeVersion = Number.parseInt(navigator.userAgent.substring(verIndex));
var verIndex = navigator.userAgent.indexOf('Chrome/') + 7;
var chromeVersion = Number.parseInt(navigator.userAgent.substring(verIndex));
if (chromeVersion < 49) {
return undefined;
@ -30,22 +28,22 @@ var svgEditorExtension_overview_window = (function () {
} // Define and insert the base html element.
const propsWindowHtml = '<div id="overview_window_content_pane" style="width:100%; word-wrap:break-word; display:inline-block; margin-top:20px;">' + '<div id="overview_window_content" style="position:relative; left:12px; top:0px;">' + '<div style="background-color:#A0A0A0; display:inline-block; overflow:visible;">' + '<svg id="overviewMiniView" width="150" height="100" x="0" y="0" viewBox="0 0 4800 3600" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">' + '<use x="0" y="0" xlink:href="#svgroot"> </use>' + '</svg>' + '<div id="overview_window_view_box" style="min-width:50px; min-height:50px; position:absolute; top:30px; left:30px; z-index:5; background-color:rgba(255,0,102,0.3);">' + '</div>' + '</div>' + '</div>' + '</div>';
var propsWindowHtml = '<div id="overview_window_content_pane" style="width:100%; word-wrap:break-word; display:inline-block; margin-top:20px;">' + '<div id="overview_window_content" style="position:relative; left:12px; top:0px;">' + '<div style="background-color:#A0A0A0; display:inline-block; overflow:visible;">' + '<svg id="overviewMiniView" width="150" height="100" x="0" y="0" viewBox="0 0 4800 3600" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">' + '<use x="0" y="0" xlink:href="#svgroot"> </use>' + '</svg>' + '<div id="overview_window_view_box" style="min-width:50px; min-height:50px; position:absolute; top:30px; left:30px; z-index:5; background-color:rgba(255,0,102,0.3);">' + '</div>' + '</div>' + '</div>' + '</div>';
$('#sidepanels').append(propsWindowHtml); // Define dynamic animation of the view box.
const updateViewBox = function () {
const portHeight = Number.parseFloat($('#workarea').css('height'));
const portWidth = Number.parseFloat($('#workarea').css('width'));
const portX = $('#workarea').scrollLeft();
const portY = $('#workarea').scrollTop();
const windowWidth = Number.parseFloat($('#svgcanvas').css('width'));
const windowHeight = Number.parseFloat($('#svgcanvas').css('height'));
const overviewWidth = $('#overviewMiniView').attr('width');
const overviewHeight = $('#overviewMiniView').attr('height');
const viewBoxX = portX / windowWidth * overviewWidth;
const viewBoxY = portY / windowHeight * overviewHeight;
const viewBoxWidth = portWidth / windowWidth * overviewWidth;
const viewBoxHeight = portHeight / windowHeight * overviewHeight;
var updateViewBox = function updateViewBox() {
var portHeight = Number.parseFloat($('#workarea').css('height'));
var portWidth = Number.parseFloat($('#workarea').css('width'));
var portX = $('#workarea').scrollLeft();
var portY = $('#workarea').scrollTop();
var windowWidth = Number.parseFloat($('#svgcanvas').css('width'));
var windowHeight = Number.parseFloat($('#svgcanvas').css('height'));
var overviewWidth = $('#overviewMiniView').attr('width');
var overviewHeight = $('#overviewMiniView').attr('height');
var viewBoxX = portX / windowWidth * overviewWidth;
var viewBoxY = portY / windowHeight * overviewHeight;
var viewBoxWidth = portWidth / windowWidth * overviewWidth;
var viewBoxHeight = portHeight / windowHeight * overviewHeight;
$('#overview_window_view_box').css('min-width', viewBoxWidth + 'px');
$('#overview_window_view_box').css('min-height', viewBoxHeight + 'px');
$('#overview_window_view_box').css('top', viewBoxY + 'px');
@ -60,11 +58,11 @@ var svgEditorExtension_overview_window = (function () {
$('#workarea').resize(updateViewBox);
updateViewBox(); // Compensate for changes in zoom and canvas size.
const updateViewDimensions = function () {
const viewWidth = $('#svgroot').attr('width');
const viewHeight = $('#svgroot').attr('height');
let viewX = 640;
let viewY = 480;
var updateViewDimensions = function updateViewDimensions() {
var viewWidth = $('#svgroot').attr('width');
var viewHeight = $('#svgroot').attr('height');
var viewX = 640;
var viewY = 480;
if (isIE()) {
// This has only been tested with Firefox 10 and IE 9 (without chrome frame).
@ -77,8 +75,8 @@ var svgEditorExtension_overview_window = (function () {
viewY = 0;
}
const svgWidthOld = $('#overviewMiniView').attr('width');
const svgHeightNew = viewHeight / viewWidth * svgWidthOld;
var svgWidthOld = $('#overviewMiniView').attr('width');
var svgHeightNew = viewHeight / viewWidth * svgWidthOld;
$('#overviewMiniView').attr('viewBox', viewX + ' ' + viewY + ' ' + viewWidth + ' ' + viewHeight);
$('#overviewMiniView').attr('height', svgHeightNew);
updateViewBox();
@ -88,15 +86,15 @@ var svgEditorExtension_overview_window = (function () {
overviewWindowGlobals.viewBoxDragging = false;
const updateViewPortFromViewBox = function () {
const windowWidth = Number.parseFloat($('#svgcanvas').css('width'));
const windowHeight = Number.parseFloat($('#svgcanvas').css('height'));
const overviewWidth = $('#overviewMiniView').attr('width');
const overviewHeight = $('#overviewMiniView').attr('height');
const viewBoxX = Number.parseFloat($('#overview_window_view_box').css('left'));
const viewBoxY = Number.parseFloat($('#overview_window_view_box').css('top'));
const portX = viewBoxX / overviewWidth * windowWidth;
const portY = viewBoxY / overviewHeight * windowHeight;
var updateViewPortFromViewBox = function updateViewPortFromViewBox() {
var windowWidth = Number.parseFloat($('#svgcanvas').css('width'));
var windowHeight = Number.parseFloat($('#svgcanvas').css('height'));
var overviewWidth = $('#overviewMiniView').attr('width');
var overviewHeight = $('#overviewMiniView').attr('height');
var viewBoxX = Number.parseFloat($('#overview_window_view_box').css('left'));
var viewBoxY = Number.parseFloat($('#overview_window_view_box').css('top'));
var portX = viewBoxX / overviewWidth * windowWidth;
var portY = viewBoxY / overviewHeight * windowHeight;
$('#workarea').scrollLeft(portX);
$('#workarea').scrollTop(portY);
};
@ -104,26 +102,23 @@ var svgEditorExtension_overview_window = (function () {
$('#overview_window_view_box').draggable({
containment: 'parent',
drag: updateViewPortFromViewBox,
start() {
start: function start() {
overviewWindowGlobals.viewBoxDragging = true;
},
stop() {
stop: function stop() {
overviewWindowGlobals.viewBoxDragging = false;
}
});
$('#overviewMiniView').click(function (evt) {
// Firefox doesn't support evt.offsetX and evt.offsetY.
const mouseX = evt.offsetX || evt.originalEvent.layerX;
const mouseY = evt.offsetY || evt.originalEvent.layerY;
const overviewWidth = $('#overviewMiniView').attr('width');
const overviewHeight = $('#overviewMiniView').attr('height');
const viewBoxWidth = Number.parseFloat($('#overview_window_view_box').css('min-width'));
const viewBoxHeight = Number.parseFloat($('#overview_window_view_box').css('min-height'));
let viewBoxX = mouseX - 0.5 * viewBoxWidth;
let viewBoxY = mouseY - 0.5 * viewBoxHeight; // deal with constraints
var mouseX = evt.offsetX || evt.originalEvent.layerX;
var mouseY = evt.offsetY || evt.originalEvent.layerY;
var overviewWidth = $('#overviewMiniView').attr('width');
var overviewHeight = $('#overviewMiniView').attr('height');
var viewBoxWidth = Number.parseFloat($('#overview_window_view_box').css('min-width'));
var viewBoxHeight = Number.parseFloat($('#overview_window_view_box').css('min-height'));
var viewBoxX = mouseX - 0.5 * viewBoxWidth;
var viewBoxY = mouseY - 0.5 * viewBoxHeight; // deal with constraints
if (viewBoxX < 0) {
viewBoxX = 0;
@ -151,7 +146,6 @@ var svgEditorExtension_overview_window = (function () {
workareaResized: updateViewBox
};
}
};
return extOverview_window;

View File

@ -1,6 +1,42 @@
var svgEditorExtension_panning = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* @file ext-panning.js
*
@ -15,32 +51,40 @@ var svgEditorExtension_panning = (function () {
*/
var extPanning = {
name: 'panning',
init: function init(_ref) {
var _this = this;
async init({
importLocale
}) {
const strings = await importLocale();
const svgEditor = this;
const svgCanvas = svgEditor.canvas;
const buttons = [{
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var importLocale, strings, svgEditor, svgCanvas, buttons;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
importLocale = _ref.importLocale;
_context.next = 3;
return importLocale();
case 3:
strings = _context.sent;
svgEditor = _this;
svgCanvas = svgEditor.canvas;
buttons = [{
id: 'ext-panning',
icon: svgEditor.curConfig.extIconsPath + 'panning.png',
type: 'mode',
events: {
click() {
click: function click() {
svgCanvas.setMode('ext-panning');
}
}
}];
return {
return _context.abrupt("return", {
name: strings.name,
svgicons: svgEditor.curConfig.extIconsPath + 'ext-panning.xml',
buttons: strings.buttons.map((button, i) => {
buttons: strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
}),
mouseDown() {
mouseDown: function mouseDown() {
if (svgCanvas.getMode() === 'ext-panning') {
svgEditor.setPanning(true);
return {
@ -50,8 +94,7 @@ var svgEditorExtension_panning = (function () {
return undefined;
},
mouseUp() {
mouseUp: function mouseUp() {
if (svgCanvas.getMode() === 'ext-panning') {
svgEditor.setPanning(false);
return {
@ -62,10 +105,16 @@ var svgEditorExtension_panning = (function () {
return undefined;
}
});
};
case 8:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
return extPanning;

View File

@ -5,41 +5,33 @@ var svgEditorExtension_php_savefile = (function () {
// handler as in "ext-server_opensave.js" (and in savefile.php)
var extPhp_savefile = {
name: 'php_savefile',
init({
$
}) {
const svgEditor = this;
const {
curConfig: {
extPath
},
canvas: svgCanvas
} = svgEditor;
init: function init(_ref) {
var $ = _ref.$;
var svgEditor = this;
var extPath = svgEditor.curConfig.extPath,
svgCanvas = svgEditor.canvas;
/**
* Get file name out of SVGEdit document title.
* @returns {string}
*/
function getFileNameFromTitle() {
const title = svgCanvas.getDocumentTitle();
var title = svgCanvas.getDocumentTitle();
return title.trim();
}
const saveSvgAction = extPath + 'savefile.php';
var saveSvgAction = extPath + 'savefile.php';
svgEditor.setCustomHandlers({
save(win, data) {
const svg = '<?xml version="1.0" encoding="UTF-8"?>\n' + data,
save: function save(win, data) {
var svg = '<?xml version="1.0" encoding="UTF-8"?>\n' + data,
filename = getFileNameFromTitle();
$.post(saveSvgAction, {
output_svg: svg,
filename
filename: filename
});
}
});
}
};
return extPhp_savefile;

View File

@ -1,6 +1,98 @@
var svgEditorExtension_placemark = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
function _slicedToArray(arr, i) {
return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
}
function _arrayWithHoles(arr) {
if (Array.isArray(arr)) return arr;
}
function _iterableToArrayLimit(arr, i) {
if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
var _arr = [];
var _n = true;
var _d = false;
var _e = undefined;
try {
for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
_arr.push(_s.value);
if (i && _arr.length === i) break;
}
} catch (err) {
_d = true;
_e = err;
} finally {
try {
if (!_n && _i["return"] != null) _i["return"]();
} finally {
if (_d) throw _e;
}
}
return _arr;
}
function _unsupportedIterableToArray(o, minLen) {
if (!o) return;
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(o);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
}
function _arrayLikeToArray(arr, len) {
if (len == null || len > arr.length) len = arr.length;
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
return arr2;
}
function _nonIterableRest() {
throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
/**
* @file ext-placemark.js
*
@ -10,25 +102,269 @@ var svgEditorExtension_placemark = (function () {
*/
var extPlacemark = {
name: 'placemark',
init: function init(S) {
var _this = this;
async init(S) {
const svgEditor = this;
const svgCanvas = svgEditor.canvas;
const addElem = svgCanvas.addSVGElementFromJson;
const {
$,
importLocale
} = S; // {svgcontent},
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var svgEditor, svgCanvas, addElem, $, importLocale, selElems, started, newPM, strings, markerTypes, showPanel, getLinked, updateText, updateFont, addMarker, setMarker, colorChanged, updateReferences, setArrowFromButton, getTitle, addMarkerButtons, buttons, contextTools;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
addMarkerButtons = function _addMarkerButtons(buttons) {
Object.keys(markerTypes).forEach(function (id) {
var title = getTitle(String(id));
buttons.push({
id: 'placemark_marker_' + id,
svgicon: id,
icon: svgEditor.curConfig.extIconsPath + 'markers-' + id + '.png',
title: title,
type: 'context',
events: {
click: setArrowFromButton
},
panel: 'placemark_panel',
list: 'placemark_marker',
isDefault: id === 'leftarrow'
});
});
return buttons;
};
let selElems, // editingitex = false,
// svgdoc = S.svgroot.parentNode.ownerDocument,
started, newPM; // edg = 0,
// newFOG, newFOGParent, newDef, newImageName, newMaskID,
// undoCommand = 'Not image',
// modeChangeG, ccZoom, wEl, hEl, wOffset, hOffset, ccRgbEl, brushW, brushH;
getTitle = function _getTitle(id) {
var langList = strings.langList;
var item = langList.find(function (itm) {
return itm.id === id;
});
return item ? item.title : id;
};
const strings = await importLocale();
const markerTypes = {
setArrowFromButton = function _setArrowFromButton(ev) {
var parts = this.id.split('_');
var val = parts[2];
if (parts[3]) {
val += '_' + parts[3];
}
$('#placemark_marker').attr('value', val);
};
updateReferences = function _updateReferences(el) {
var id = 'placemark_marker_' + el.id;
var markerName = 'marker-start';
var marker = getLinked(el, markerName);
if (!marker || !marker.attributes["class"]) {
return;
} // not created by this extension
var url = el.getAttribute(markerName);
if (url) {
var len = el.id.length;
var linkid = url.substr(-len - 1, len);
if (el.id !== linkid) {
var val = $('#placemark_marker').attr('value') || 'leftarrow';
addMarker(id, val);
svgCanvas.changeSelectedAttribute(markerName, 'url(#' + id + ')');
svgCanvas.call('changed', selElems);
}
}
};
colorChanged = function _colorChanged(el) {
var color = el.getAttribute('stroke');
var marker = getLinked(el, 'marker-start'); // console.log(marker);
if (!marker) {
return;
}
if (!marker.attributes["class"]) {
return;
} // not created by this extension
var ch = marker.lastElementChild;
if (!ch) {
return;
}
var curfill = ch.getAttribute('fill');
var curstroke = ch.getAttribute('stroke');
if (curfill && curfill !== 'none') {
ch.setAttribute('fill', color);
}
if (curstroke && curstroke !== 'none') {
ch.setAttribute('stroke', color);
}
};
setMarker = function _setMarker(el, val) {
var markerName = 'marker-start';
var marker = getLinked(el, markerName);
if (marker) {
$(marker).remove();
}
el.removeAttribute(markerName);
if (val === 'nomarker') {
svgCanvas.call('changed', [el]);
return;
} // Set marker on element
var id = 'placemark_marker_' + el.id;
addMarker(id, val);
el.setAttribute(markerName, 'url(#' + id + ')');
svgCanvas.call('changed', [el]);
};
addMarker = function _addMarker(id, val) {
var marker = svgCanvas.getElem(id);
if (marker) {
return undefined;
} // console.log(id);
if (val === '' || val === 'nomarker') {
return undefined;
}
var color = svgCanvas.getColor('stroke'); // NOTE: Safari didn't like a negative value in viewBox
// so we use a standardized 0 0 100 100
// with 50 50 being mapped to the marker position
var scale = 2; // parseFloat($('#marker_size').val());
var strokeWidth = 10;
var refX = 50;
var refY = 50;
var viewBox = '0 0 100 100';
var markerWidth = 5 * scale;
var markerHeight = 5 * scale;
var seType = val;
if (!markerTypes[seType]) {
return undefined;
} // an unknown type!
// positional markers(arrows) at end of line
if (seType.includes('left')) refX = 0;
if (seType.includes('right')) refX = 100; // create a generic marker
marker = addElem({
element: 'marker',
attr: {
id: id,
markerUnits: 'strokeWidth',
orient: 'auto',
style: 'pointer-events:none',
"class": seType
}
});
var mel = addElem(markerTypes[seType]);
var fillcolor = seType.substr(-2) === '_o' ? 'none' : color;
mel.setAttribute('fill', fillcolor);
mel.setAttribute('stroke', color);
mel.setAttribute('stroke-width', strokeWidth);
marker.append(mel);
marker.setAttribute('viewBox', viewBox);
marker.setAttribute('markerWidth', markerWidth);
marker.setAttribute('markerHeight', markerHeight);
marker.setAttribute('refX', refX);
marker.setAttribute('refY', refY);
svgCanvas.findDefs().append(marker);
return marker;
};
updateFont = function _updateFont(font) {
font = font.split(' ');
var fontSize = Number.parseInt(font.pop());
font = font.join(' ');
selElems.forEach(function (elem) {
if (elem && elem.getAttribute('class').includes('placemark')) {
$(elem).children().each(function (_, i) {
var _i$id$split3 = i.id.split('_'),
_i$id$split4 = _slicedToArray(_i$id$split3, 3),
type = _i$id$split4[2];
if (type === 'txt') {
$(i).attr({
'font-family': font,
'font-size': fontSize
});
}
});
}
});
};
updateText = function _updateText(txt) {
var items = txt.split(';');
selElems.forEach(function (elem) {
if (elem && elem.getAttribute('class').includes('placemark')) {
$(elem).children().each(function (_, i) {
var _i$id$split = i.id.split('_'),
_i$id$split2 = _slicedToArray(_i$id$split, 4),
type = _i$id$split2[2],
n = _i$id$split2[3];
if (type === 'txt') {
$(i).text(items[n]);
}
});
}
});
};
getLinked = function _getLinked(elem, attr) {
if (!elem) {
return null;
}
var str = elem.getAttribute(attr);
if (!str) {
return null;
} // const m = str.match(/\(#(?<id>.+)\)/);
// if (!m || !m.groups.id) {
var m = str.match(/\(#(.*)\)/);
if (!m || m.length !== 2) {
return null;
}
return svgCanvas.getElem(m[1]); // return svgCanvas.getElem(m.groups.id);
};
showPanel = function _showPanel(on) {
$('#placemark_panel').toggle(on);
};
svgEditor = _this;
svgCanvas = svgEditor.canvas;
addElem = svgCanvas.addSVGElementFromJson;
$ = S.$, importLocale = S.importLocale; // {svgcontent},
_context.next = 17;
return importLocale();
case 17:
strings = _context.sent;
markerTypes = {
nomarker: {},
forwardslash: {
element: 'path',
@ -94,7 +430,7 @@ var svgEditorExtension_placemark = (function () {
}
}; // duplicate shapes to support unfilled (open) marker types with an _o suffix
['leftarrow', 'rightarrow', 'box', 'star', 'mcircle', 'triangle'].forEach(v => {
['leftarrow', 'rightarrow', 'box', 'star', 'mcircle', 'triangle'].forEach(function (v) {
markerTypes[v + '_o'] = markerTypes[v];
});
/**
@ -103,320 +439,19 @@ var svgEditorExtension_placemark = (function () {
* @returns {void}
*/
function showPanel(on) {
$('#placemark_panel').toggle(on);
}
/**
* @param {Element} elem - A graphic element will have an attribute like marker-start
* @param {"marker-start"|"marker-mid"|"marker-end"} attr
* @returns {Element} The marker element that is linked to the graphic element
*/
function getLinked(elem, attr) {
if (!elem) {
return null;
}
const str = elem.getAttribute(attr);
if (!str) {
return null;
} // const m = str.match(/\(#(?<id>.+)\)/);
// if (!m || !m.groups.id) {
const m = str.match(/\(#(.*)\)/);
if (!m || m.length !== 2) {
return null;
}
return svgCanvas.getElem(m[1]); // return svgCanvas.getElem(m.groups.id);
}
/**
* Called when text is changed.
* @param {string} txt
* @returns {void}
*/
function updateText(txt) {
const items = txt.split(';');
selElems.forEach(elem => {
if (elem && elem.getAttribute('class').includes('placemark')) {
$(elem).children().each((_, i) => {
const [,, type, n] = i.id.split('_');
if (type === 'txt') {
$(i).text(items[n]);
}
});
}
});
}
/**
* Called when font is changed.
* @param {string} font
* @returns {void}
*/
function updateFont(font) {
font = font.split(' ');
const fontSize = Number.parseInt(font.pop());
font = font.join(' ');
selElems.forEach(elem => {
if (elem && elem.getAttribute('class').includes('placemark')) {
$(elem).children().each((_, i) => {
const [,, type] = i.id.split('_');
if (type === 'txt') {
$(i).attr({
'font-family': font,
'font-size': fontSize
});
}
});
}
});
}
/**
* @param {string} id
* @param {""|"\\nomarker"|"nomarker"|"leftarrow"|"rightarrow"|"textmarker"|"textmarker_top"|"textmarker_bottom"|"forwardslash"|"reverseslash"|"verticalslash"|"box"|"star"|"xmark"|"triangle"|"mcircle"} val
* @returns {SVGMarkerElement}
*/
function addMarker(id, val) {
let marker = svgCanvas.getElem(id);
if (marker) {
return undefined;
} // console.log(id);
if (val === '' || val === 'nomarker') {
return undefined;
}
const color = svgCanvas.getColor('stroke'); // NOTE: Safari didn't like a negative value in viewBox
// so we use a standardized 0 0 100 100
// with 50 50 being mapped to the marker position
const scale = 2; // parseFloat($('#marker_size').val());
const strokeWidth = 10;
let refX = 50;
const refY = 50;
const viewBox = '0 0 100 100';
const markerWidth = 5 * scale;
const markerHeight = 5 * scale;
const seType = val;
if (!markerTypes[seType]) {
return undefined;
} // an unknown type!
// positional markers(arrows) at end of line
if (seType.includes('left')) refX = 0;
if (seType.includes('right')) refX = 100; // create a generic marker
marker = addElem({
element: 'marker',
attr: {
id,
markerUnits: 'strokeWidth',
orient: 'auto',
style: 'pointer-events:none',
class: seType
}
});
const mel = addElem(markerTypes[seType]);
const fillcolor = seType.substr(-2) === '_o' ? 'none' : color;
mel.setAttribute('fill', fillcolor);
mel.setAttribute('stroke', color);
mel.setAttribute('stroke-width', strokeWidth);
marker.append(mel);
marker.setAttribute('viewBox', viewBox);
marker.setAttribute('markerWidth', markerWidth);
marker.setAttribute('markerHeight', markerHeight);
marker.setAttribute('refX', refX);
marker.setAttribute('refY', refY);
svgCanvas.findDefs().append(marker);
return marker;
}
/**
* @param {Element} el
* @param {string} val
* @returns {void}
*/
function setMarker(el, val) {
const markerName = 'marker-start';
const marker = getLinked(el, markerName);
if (marker) {
$(marker).remove();
}
el.removeAttribute(markerName);
if (val === 'nomarker') {
svgCanvas.call('changed', [el]);
return;
} // Set marker on element
const id = 'placemark_marker_' + el.id;
addMarker(id, val);
el.setAttribute(markerName, 'url(#' + id + ')');
svgCanvas.call('changed', [el]);
}
/**
* Called when the main system modifies an object. This routine changes
* the associated markers to be the same color.
* @param {Element} el
* @returns {void}
*/
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;
if (!ch) {
return;
}
const curfill = ch.getAttribute('fill');
const curstroke = ch.getAttribute('stroke');
if (curfill && curfill !== 'none') {
ch.setAttribute('fill', color);
}
if (curstroke && curstroke !== 'none') {
ch.setAttribute('stroke', color);
}
}
/**
* Called when the main system creates or modifies an object.
* Its primary purpose is to create new markers for cloned objects.
* @param {Element} el
* @returns {void}
*/
function updateReferences(el) {
const id = 'placemark_marker_' + el.id;
const markerName = 'marker-start';
const marker = getLinked(el, markerName);
if (!marker || !marker.attributes.class) {
return;
} // not created by this extension
const url = el.getAttribute(markerName);
if (url) {
const len = el.id.length;
const linkid = url.substr(-len - 1, len);
if (el.id !== linkid) {
const val = $('#placemark_marker').attr('value') || 'leftarrow';
addMarker(id, val);
svgCanvas.changeSelectedAttribute(markerName, 'url(#' + id + ')');
svgCanvas.call('changed', selElems);
}
}
}
/**
* @param {Event} ev
* @returns {void}
*/
function setArrowFromButton(ev) {
const parts = this.id.split('_');
let val = parts[2];
if (parts[3]) {
val += '_' + parts[3];
}
$('#placemark_marker').attr('value', val);
}
/**
* @param {"nomarker"|"leftarrow"|"rightarrow"|"textmarker"|"forwardslash"|"reverseslash"|"verticalslash"|"box"|"star"|"xmark"|"triangle"|"mcircle"} id
* @returns {string}
*/
function getTitle(id) {
const {
langList
} = strings;
const item = langList.find(itm => {
return itm.id === id;
});
return item ? item.title : id;
}
/**
* Build the toolbar button array from the marker definitions.
* @param {module:SVGEditor.Button[]} buttons
* @returns {module:SVGEditor.Button[]}
*/
function addMarkerButtons(buttons) {
Object.keys(markerTypes).forEach(function (id) {
const title = getTitle(String(id));
buttons.push({
id: 'placemark_marker_' + id,
svgicon: id,
icon: svgEditor.curConfig.extIconsPath + 'markers-' + id + '.png',
title,
type: 'context',
events: {
click: setArrowFromButton
},
panel: 'placemark_panel',
list: 'placemark_marker',
isDefault: id === 'leftarrow'
});
});
return buttons;
}
const buttons = [{
buttons = [{
id: 'tool_placemark',
icon: svgEditor.curConfig.extIconsPath + 'placemark.png',
type: 'mode',
position: 12,
events: {
click() {
click: function click() {
showPanel(true);
svgCanvas.setMode('placemark');
}
}
}];
const contextTools = [{
contextTools = [{
type: 'button-select',
panel: 'placemark_panel',
id: 'placemark_marker',
@ -431,10 +466,9 @@ var svgEditorExtension_placemark = (function () {
size: 20,
defval: '',
events: {
change() {
change: function change() {
updateText(this.value);
}
}
}, {
type: 'input',
@ -443,42 +477,39 @@ var svgEditorExtension_placemark = (function () {
size: 7,
defval: 'Arial 10',
events: {
change() {
change: function change() {
updateFont(this.value);
}
}
}];
return {
return _context.abrupt("return", {
name: strings.name,
svgicons: svgEditor.curConfig.extIconsPath + 'placemark-icons.xml',
buttons: addMarkerButtons(strings.buttons.map((button, i) => {
buttons: addMarkerButtons(strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
})),
context_tools: strings.contextTools.map((contextTool, i) => {
context_tools: strings.contextTools.map(function (contextTool, i) {
return Object.assign(contextTools[i], contextTool);
}),
callback() {
callback: function callback() {
$('#placemark_panel').hide(); // const endChanges = function(){};
},
mouseDown(opts) {
mouseDown: function mouseDown(opts) {
// const rgb = svgCanvas.getColor('fill');
const sRgb = svgCanvas.getColor('stroke');
const sWidth = svgCanvas.getStrokeWidth();
var sRgb = svgCanvas.getColor('stroke');
var sWidth = svgCanvas.getStrokeWidth();
if (svgCanvas.getMode() === 'placemark') {
started = true;
const id = svgCanvas.getNextId();
const items = $('#placemarkText').val().split(';');
let font = $('#placemarkFont').val().split(' ');
const fontSize = Number.parseInt(font.pop());
var id = svgCanvas.getNextId();
var items = $('#placemarkText').val().split(';');
var font = $('#placemarkFont').val().split(' ');
var fontSize = Number.parseInt(font.pop());
font = font.join(' ');
const x0 = opts.start_x + 10,
var x0 = opts.start_x + 10,
y0 = opts.start_y + 10;
let maxlen = 0;
const children = [{
var maxlen = 0;
var children = [{
element: 'line',
attr: {
id: id + '_pline_0',
@ -492,7 +523,7 @@ var svgEditorExtension_placemark = (function () {
y2: y0
}
}];
items.forEach((i, n) => {
items.forEach(function (i, n) {
maxlen = Math.max(maxlen, i.length);
children.push({
element: 'line',
@ -545,17 +576,17 @@ var svgEditorExtension_placemark = (function () {
newPM = svgCanvas.addSVGElementFromJson({
element: 'g',
attr: {
id,
class: 'placemark',
fontSize,
maxlen,
id: id,
"class": 'placemark',
fontSize: fontSize,
maxlen: maxlen,
lines: items.length,
x: opts.start_x,
y: opts.start_y,
px: opts.start_x,
py: opts.start_y
},
children
children: children
});
setMarker(newPM.firstElementChild, $('#placemark_marker').attr('value') || 'leftarrow');
return {
@ -565,32 +596,36 @@ var svgEditorExtension_placemark = (function () {
return undefined;
},
mouseMove(opts) {
mouseMove: function mouseMove(opts) {
if (!started) {
return undefined;
}
if (svgCanvas.getMode() === 'placemark') {
const x = opts.mouse_x / svgCanvas.getZoom();
const y = opts.mouse_y / svgCanvas.getZoom();
const {
fontSize,
maxlen,
lines,
px,
py
} = $(newPM).attr(['fontSize', 'maxlen', 'lines', 'px', 'py']);
var x = opts.mouse_x / svgCanvas.getZoom();
var y = opts.mouse_y / svgCanvas.getZoom();
var _$$attr = $(newPM).attr(['fontSize', 'maxlen', 'lines', 'px', 'py']),
fontSize = _$$attr.fontSize,
maxlen = _$$attr.maxlen,
lines = _$$attr.lines,
px = _$$attr.px,
py = _$$attr.py;
$(newPM).attr({
x,
y
x: x,
y: y
});
$(newPM).children().each((_, i) => {
const [,, type, n] = i.id.split('_');
const y0 = y + (fontSize + 6) * n,
$(newPM).children().each(function (_, i) {
var _i$id$split5 = i.id.split('_'),
_i$id$split6 = _slicedToArray(_i$id$split5, 4),
type = _i$id$split6[2],
n = _i$id$split6[3];
var y0 = y + (fontSize + 6) * n,
x0 = x + maxlen * fontSize * 0.5 + fontSize;
const nx = x + (x0 - x) / 2 < px ? x0 : x;
const ny = y + (fontSize + 6) * (lines - 1) / 2 < py ? y + (fontSize + 6) * (lines - 1) : y;
var nx = x + (x0 - x) / 2 < px ? x0 : x;
var ny = y + (fontSize + 6) * (lines - 1) / 2 < py ? y + (fontSize + 6) * (lines - 1) : y;
if (type === 'pline') {
i.setAttribute('x2', nx);
@ -623,15 +658,14 @@ var svgEditorExtension_placemark = (function () {
return undefined;
},
mouseUp() {
mouseUp: function mouseUp() {
if (svgCanvas.getMode() === 'placemark') {
const {
x,
y,
px,
py
} = $(newPM).attr(['x', 'y', 'px', 'py']);
var _$$attr2 = $(newPM).attr(['x', 'y', 'px', 'py']),
x = _$$attr2.x,
y = _$$attr2.y,
px = _$$attr2.px,
py = _$$attr2.py;
return {
keep: x != px && y != py,
// eslint-disable-line eqeqeq
@ -641,15 +675,16 @@ var svgEditorExtension_placemark = (function () {
return undefined;
},
selectedChanged(opts) {
selectedChanged: function selectedChanged(opts) {
// Use this to update the current selected elements
selElems = opts.elems;
selElems.forEach(elem => {
selElems.forEach(function (elem) {
if (elem && elem.getAttribute('class').includes('placemark')) {
const txt = [];
$(elem).children().each((n, i) => {
const [,, type] = i.id.split('_');
var txt = [];
$(elem).children().each(function (n, i) {
var _i$id$split7 = i.id.split('_'),
_i$id$split8 = _slicedToArray(_i$id$split7, 3),
type = _i$id$split8[2];
if (type === 'txt') {
$('#placemarkFont').val(i.getAttribute('font-family') + ' ' + i.getAttribute('font-size'));
@ -663,9 +698,8 @@ var svgEditorExtension_placemark = (function () {
}
});
},
elementChanged(opts) {
opts.elems.forEach(elem => {
elementChanged: function elementChanged(opts) {
opts.elems.forEach(function (elem) {
if (elem.id.includes('pline_0')) {
// need update marker of pline_0
colorChanged(elem);
@ -673,10 +707,16 @@ var svgEditorExtension_placemark = (function () {
}
});
}
});
};
case 23:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
return extPlacemark;

View File

@ -1,6 +1,42 @@
var svgEditorExtension_polygon = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* @file ext-polygon.js
*
@ -10,40 +46,30 @@ var svgEditorExtension_polygon = (function () {
*/
var extPolygon = {
name: 'polygon',
init: function init(S) {
var _this = this;
async init(S) {
const svgEditor = this;
const svgCanvas = svgEditor.canvas;
const {
$,
importLocale
} = S;
const strings = await importLocale();
let selElems, // svgdoc = S.svgroot.parentNode.ownerDocument,
// newFOG, newFOGParent, newDef, newImageName, newMaskID, modeChangeG,
// edg = 0,
// undoCommand = 'Not image';
started, newFO; // const ccZoom;
// const wEl, hEl;
// const wOffset, hOffset;
// const ccRBG;
// const ccOpacity;
// const brushW, brushH;
// const ccDebug = document.getElementById('debugpanel');
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var svgEditor, svgCanvas, $, importLocale, editingitex, strings, selElems, started, newFO, showPanel, setAttr, cot, sec, buttons, contextTools;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
sec = function _sec(n) {
return 1 / Math.cos(n);
};
/* const properlySourceSizeTextArea = function(){
// TODO: remove magic numbers here and get values from CSS
const height = $('#svg_source_container').height() - 80;
$('#svg_source_textarea').css('height', height);
}; */
cot = function _cot(n) {
return 1 / Math.tan(n);
};
/**
* @param {boolean} on
* @returns {void}
*/
setAttr = function _setAttr(attr, val) {
svgCanvas.changeSelectedAttribute(attr, val);
svgCanvas.call('changed', selElems);
};
function showPanel(on) {
let fcRules = $('#fc_rules');
showPanel = function _showPanel(on) {
var fcRules = $('#fc_rules');
if (!fcRules.length) {
fcRules = $('<style id="fc_rules"></style>').appendTo('head');
@ -51,43 +77,17 @@ var svgEditorExtension_polygon = (function () {
fcRules.text(!on ? '' : ' #tool_topath { display: none !important; }');
$('#polygon_panel').toggle(on);
}
/*
function toggleSourceButtons(on){
$('#tool_source_save, #tool_source_cancel').toggle(!on);
$('#polygon_save, #polygon_cancel').toggle(on);
}
*/
};
/**
* @param {string} attr
* @param {string|Float} val
* @returns {void}
*/
svgEditor = _this;
svgCanvas = svgEditor.canvas;
$ = S.$, importLocale = S.importLocale, editingitex = false;
_context.next = 9;
return importLocale();
case 9:
strings = _context.sent;
function setAttr(attr, val) {
svgCanvas.changeSelectedAttribute(attr, val);
svgCanvas.call('changed', selElems);
}
/**
* @param {Float} n
* @returns {Float}
*/
function cot(n) {
return 1 / Math.tan(n);
}
/**
* @param {Float} n
* @returns {Float}
*/
function sec(n) {
return 1 / Math.cos(n);
}
/**
* Obtained from http://code.google.com/p/passenger-top/source/browse/instiki/public/svg-edit/editor/extensions/ext-itex.js?r=3
* This function sets the content of of the currently-selected foreignObject element,
@ -132,45 +132,40 @@ var svgEditorExtension_polygon = (function () {
return true;
}
*/
const buttons = [{
buttons = [{
id: 'tool_polygon',
icon: svgEditor.curConfig.extIconsPath + 'polygon.png',
type: 'mode',
position: 11,
events: {
click() {
click: function click() {
svgCanvas.setMode('polygon');
showPanel(true);
}
}
}];
const contextTools = [{
contextTools = [{
type: 'input',
panel: 'polygon_panel',
id: 'polySides',
size: 3,
defval: 5,
events: {
change() {
change: function change() {
setAttr('sides', this.value);
}
}
}];
return {
return _context.abrupt("return", {
name: strings.name,
svgicons: svgEditor.curConfig.extIconsPath + 'polygon-icons.svg',
buttons: strings.buttons.map((button, i) => {
buttons: strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
}),
context_tools: strings.contextTools.map((contextTool, i) => {
context_tools: strings.contextTools.map(function (contextTool, i) {
return Object.assign(contextTools[i], contextTool);
}),
callback() {
callback: function callback() {
$('#polygon_panel').hide();
@ -179,7 +174,7 @@ var svgEditorExtension_polygon = (function () {
/* const save = */
$('#tool_source_save').clone().hide().attr('id', 'polygon_save').unbind().appendTo('#tool_source_back').click(function () {
{
if (!editingitex) {
return;
} // Todo: Uncomment the setItexString() function above and handle ajaxEndpoint?
// setSelectMode();
@ -190,18 +185,17 @@ var svgEditorExtension_polygon = (function () {
});
}, 3000);
},
mouseDown(opts) {
mouseDown: function mouseDown(opts) {
if (svgCanvas.getMode() !== 'polygon') {
return undefined;
} // const e = opts.event;
const rgb = svgCanvas.getColor('fill'); // const ccRgbEl = rgb.substring(1, rgb.length);
var rgb = svgCanvas.getColor('fill'); // const ccRgbEl = rgb.substring(1, rgb.length);
const sRgb = svgCanvas.getColor('stroke'); // ccSRgbEl = sRgb.substring(1, rgb.length);
var sRgb = svgCanvas.getColor('stroke'); // ccSRgbEl = sRgb.substring(1, rgb.length);
const sWidth = svgCanvas.getStrokeWidth();
var sWidth = svgCanvas.getStrokeWidth();
started = true;
newFO = svgCanvas.addSVGElementFromJson({
element: 'polygon',
@ -222,33 +216,29 @@ var svgEditorExtension_polygon = (function () {
started: true
};
},
mouseMove(opts) {
mouseMove: function mouseMove(opts) {
if (!started || svgCanvas.getMode() !== 'polygon') {
return undefined;
} // const e = opts.event;
const c = $(newFO).attr(['cx', 'cy', 'sides', 'orient', 'fill', 'strokecolor', 'strokeWidth']);
let x = opts.mouse_x;
let y = opts.mouse_y;
const {
cx,
cy,
fill,
strokecolor,
strokeWidth,
sides
} = c,
// {orient} = c,
var c = $(newFO).attr(['cx', 'cy', 'sides', 'orient', 'fill', 'strokecolor', 'strokeWidth']);
var x = opts.mouse_x;
var y = opts.mouse_y;
var cx = c.cx,
cy = c.cy,
fill = c.fill,
strokecolor = c.strokecolor,
strokeWidth = c.strokeWidth,
sides = c.sides,
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 = '';
var inradius = edg / 2 * cot(Math.PI / sides);
var circumradius = inradius * sec(Math.PI / sides);
var points = '';
for (let s = 0; sides >= s; s++) {
const angle = 2.0 * Math.PI * s / sides;
for (var s = 0; sides >= s; s++) {
var angle = 2.0 * Math.PI * s / sides;
x = circumradius * Math.cos(angle) + cx;
y = circumradius * Math.sin(angle) + cy;
points += x + ',' + y + ' ';
@ -267,28 +257,26 @@ var svgEditorExtension_polygon = (function () {
started: true
};
},
mouseUp(opts) {
mouseUp: function mouseUp(opts) {
if (svgCanvas.getMode() !== 'polygon') {
return undefined;
}
const attrs = $(newFO).attr('edge');
const keep = attrs.edge !== '0'; // svgCanvas.addToSelection([newFO], true);
var attrs = $(newFO).attr('edge');
var keep = attrs.edge !== '0'; // svgCanvas.addToSelection([newFO], true);
return {
keep,
keep: keep,
element: newFO
};
},
selectedChanged(opts) {
selectedChanged: function selectedChanged(opts) {
// Use this to update the current selected elements
selElems = opts.elems;
let i = selElems.length;
var i = selElems.length;
while (i--) {
const elem = selElems[i];
var elem = selElems[i];
if (elem && elem.getAttribute('shape') === 'regularPoly') {
if (opts.selectedElement && !opts.multiselected) {
@ -302,13 +290,18 @@ var svgEditorExtension_polygon = (function () {
}
}
},
elementChanged(opts) {// const elem = opts.elems[0];
elementChanged: function elementChanged(opts) {// const elem = opts.elems[0];
}
});
};
case 13:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
return extPolygon;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,98 @@
var svgEditorExtension_shapes = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
function _slicedToArray(arr, i) {
return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
}
function _arrayWithHoles(arr) {
if (Array.isArray(arr)) return arr;
}
function _iterableToArrayLimit(arr, i) {
if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
var _arr = [];
var _n = true;
var _d = false;
var _e = undefined;
try {
for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
_arr.push(_s.value);
if (i && _arr.length === i) break;
}
} catch (err) {
_d = true;
_e = err;
} finally {
try {
if (!_n && _i["return"] != null) _i["return"]();
} finally {
if (_d) throw _e;
}
}
return _arr;
}
function _unsupportedIterableToArray(o, minLen) {
if (!o) return;
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(o);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
}
function _arrayLikeToArray(arr, len) {
if (len == null || len > arr.length) len = arr.length;
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
return arr2;
}
function _nonIterableRest() {
throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
/**
* @file ext-shapes.js
*
@ -11,21 +103,89 @@ var svgEditorExtension_shapes = (function () {
*/
var extShapes = {
name: 'shapes',
init: function init(_ref) {
var _this = this;
async init({
$,
importLocale
}) {
const strings = await importLocale();
const svgEditor = this;
const canv = svgEditor.canvas;
const svgroot = canv.getRootElem();
let lastBBox = {}; // This populates the category list
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var $, importLocale, strings, svgEditor, canv, svgroot, lastBBox, categories, library, modeId, startClientPos, currentD, curShapeId, curShape, startX, startY, curLib, loadIcons, makeButtons, loadLibrary, buttons;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
loadLibrary = function _loadLibrary(catId) {
var lib = library[catId];
const {
categories
} = strings;
const library = {
if (!lib) {
$('#shape_buttons').html(strings.loading);
$.getJSON(svgEditor.curConfig.extIconsPath + 'shapelib/' + catId + '.json', function (result) {
curLib = library[catId] = {
data: result.data,
size: result.size,
fill: result.fill
};
makeButtons(catId, result);
loadIcons();
});
return;
}
curLib = lib;
if (!lib.buttons.length) {
makeButtons(catId, lib);
}
loadIcons();
};
makeButtons = function _makeButtons(cat, shapes) {
var size = curLib.size || 300;
var fill = curLib.fill || false;
var off = size * 0.05;
var vb = [-off, -off, size + off * 2, size + off * 2].join(' ');
var stroke = fill ? 0 : size / 30;
var shapeIcon = new DOMParser().parseFromString('<svg xmlns="http://www.w3.org/2000/svg">' + '<svg viewBox="' + vb + '">' + '<path fill="' + (fill ? '#333' : 'none') + '" stroke="#000" stroke-width="' + stroke + '" /></svg></svg>', 'text/xml');
var width = 24;
var height = 24;
shapeIcon.documentElement.setAttribute('width', width);
shapeIcon.documentElement.setAttribute('height', height);
var svgElem = $(document.importNode(shapeIcon.documentElement, true));
var data = shapes.data;
curLib.buttons = Object.entries(data).map(function (_ref2) {
var _ref3 = _slicedToArray(_ref2, 2),
id = _ref3[0],
pathD = _ref3[1];
var icon = svgElem.clone();
icon.find('path').attr('d', pathD);
var iconBtn = icon.wrap('<div class="tool_button">').parent().attr({
id: modeId + '_' + id,
title: id
}); // Store for later use
return iconBtn[0];
});
};
loadIcons = function _loadIcons() {
$('#shape_buttons').empty().append(curLib.buttons);
};
$ = _ref.$, importLocale = _ref.importLocale;
_context.next = 6;
return importLocale();
case 6:
strings = _context.sent;
svgEditor = _this;
canv = svgEditor.canvas;
svgroot = canv.getRootElem();
lastBBox = {}; // This populates the category list
categories = strings.categories;
/* eslint-disable max-len */
library = {
basic: {
data: {
heart: 'm150,73c61,-175 300,0 0,225c-300,-225 -61,-400 0,-225z',
@ -60,151 +220,48 @@ var svgEditorExtension_shapes = (function () {
buttons: []
}
};
const modeId = 'shapelib';
const startClientPos = {};
let currentD, curShapeId, curShape, startX, startY;
let curLib = library.basic;
/* eslint-enable max-len */
modeId = 'shapelib';
startClientPos = {};
curLib = library.basic;
/**
*
* @returns {void}
*/
function loadIcons() {
$('#shape_buttons').empty().append(curLib.buttons);
}
/**
* @typedef {PlainObject} module:Extension.Shapes.Shapes
* @property {PlainObject<string, string>} data
* @property {Integer} [size]
* @property {boolean} [fill]
*/
/**
* @param {string|"basic"} cat Category ID
* @param {module:Extension.Shapes.Shapes} shapes
* @returns {void}
*/
function makeButtons(cat, shapes) {
const size = curLib.size || 300;
const fill = curLib.fill || false;
const off = size * 0.05;
const vb = [-off, -off, size + off * 2, size + off * 2].join(' ');
const stroke = fill ? 0 : size / 30;
const shapeIcon = new DOMParser().parseFromString('<svg xmlns="http://www.w3.org/2000/svg">' + '<svg viewBox="' + vb + '">' + '<path fill="' + (fill ? '#333' : 'none') + '" stroke="#000" stroke-width="' + stroke + '" /></svg></svg>', 'text/xml');
const width = 24;
const height = 24;
shapeIcon.documentElement.setAttribute('width', width);
shapeIcon.documentElement.setAttribute('height', height);
const svgElem = $(document.importNode(shapeIcon.documentElement, true));
const {
data
} = shapes;
curLib.buttons = Object.entries(data).map(([id, pathD]) => {
const icon = svgElem.clone();
icon.find('path').attr('d', pathD);
const iconBtn = icon.wrap('<div class="tool_button">').parent().attr({
id: modeId + '_' + id,
title: id
}); // Store for later use
return iconBtn[0];
});
}
/**
* @param {string|"basic"} catId
* @returns {void}
*/
function loadLibrary(catId) {
const lib = library[catId];
if (!lib) {
$('#shape_buttons').html(strings.loading);
$.getJSON(svgEditor.curConfig.extIconsPath + 'shapelib/' + catId + '.json', function (result) {
curLib = library[catId] = {
data: result.data,
size: result.size,
fill: result.fill
};
makeButtons(catId, result);
loadIcons();
});
return;
}
curLib = lib;
if (!lib.buttons.length) {
makeButtons(catId, lib);
}
loadIcons();
}
const buttons = [{
buttons = [{
id: 'tool_shapelib',
icon: svgEditor.curConfig.extIconsPath + 'shapes.png',
type: 'mode_flyout',
// _flyout
position: 6,
events: {
click() {
click: function click() {
canv.setMode(modeId);
}
}
}];
return {
return _context.abrupt("return", {
svgicons: svgEditor.curConfig.extIconsPath + 'ext-shapes.xml',
buttons: strings.buttons.map((button, i) => {
buttons: strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
}),
callback() {
$('<style>').text(`
#shape_buttons {
overflow: auto;
width: 180px;
max-height: 300px;
display: table-cell;
vertical-align: middle;
}
#shape_cats {
min-width: 110px;
display: table-cell;
vertical-align: middle;
height: 300px;
}
#shape_cats > div {
line-height: 1em;
padding: .5em;
border:1px solid #B0B0B0;
background: #E8E8E8;
margin-bottom: -1px;
}
#shape_cats div:hover {
background: #FFFFCC;
}
#shape_cats div.current {
font-weight: bold;
}
`).appendTo('head');
const btnDiv = $('<div id="shape_buttons">');
callback: function callback() {
$('<style>').text("\n #shape_buttons {\n overflow: auto;\n width: 180px;\n max-height: 300px;\n display: table-cell;\n vertical-align: middle;\n }\n #shape_cats {\n min-width: 110px;\n display: table-cell;\n vertical-align: middle;\n height: 300px;\n }\n #shape_cats > div {\n line-height: 1em;\n padding: .5em;\n border:1px solid #B0B0B0;\n background: #E8E8E8;\n margin-bottom: -1px;\n }\n #shape_cats div:hover {\n background: #FFFFCC;\n }\n #shape_cats div.current {\n font-weight: bold;\n }\n ").appendTo('head');
var btnDiv = $('<div id="shape_buttons">');
$('#tools_shapelib > *').wrapAll(btnDiv);
const shower = $('#tools_shapelib_show');
var shower = $('#tools_shapelib_show');
loadLibrary('basic'); // Do mouseup on parent element rather than each button
$('#shape_buttons').mouseup(function (evt) {
const btn = $(evt.target).closest('div.tool_button');
var btn = $(evt.target).closest('div.tool_button');
if (!btn.length) {
return;
}
const copy = btn.children().clone();
var copy = btn.children().clone();
shower.children(':not(.flyout_arrow_horiz)').remove();
shower.append(copy).attr('data-curopt', '#' + btn[0].id) // This sets the current mode
.mouseup();
@ -213,13 +270,13 @@ var svgEditorExtension_shapes = (function () {
currentD = curLib.data[curShapeId];
$('.tools_flyout').fadeOut();
});
const shapeCats = $('<div id="shape_cats">');
let catStr = '';
var shapeCats = $('<div id="shape_cats">');
var catStr = '';
$.each(categories, function (id, label) {
catStr += '<div data-cat=' + id + '>' + label + '</div>';
});
shapeCats.html(catStr).children().bind('mouseup', function () {
const catlink = $(this);
var catlink = $(this);
catlink.siblings().removeClass('current');
catlink.addClass('current');
loadLibrary(catlink.attr('data-cat')); // Get stuff
@ -232,31 +289,34 @@ var svgEditorExtension_shapes = (function () {
canv.setMode(currentD ? modeId : 'select');
});
$('#tool_shapelib').remove();
const h = $('#tools_shapelib').height();
var h = $('#tools_shapelib').height();
$('#tools_shapelib').css({
'margin-top': -(h / 2 - 15),
'margin-left': 3
}); // Now add shape categories from locale
const cats = {};
Object.entries(categories).forEach(([o, categoryName]) => {
var cats = {};
Object.entries(categories).forEach(function (_ref4) {
var _ref5 = _slicedToArray(_ref4, 2),
o = _ref5[0],
categoryName = _ref5[1];
cats['#shape_cats [data-cat="' + o + '"]'] = categoryName;
});
this.setStrings('content', cats);
},
mouseDown(opts) {
const mode = canv.getMode();
mouseDown: function mouseDown(opts) {
var mode = canv.getMode();
if (mode !== modeId) {
return undefined;
}
startX = opts.start_x;
const x = startX;
var x = startX;
startY = opts.start_y;
const y = startY;
const curStyle = canv.getStyle();
var y = startY;
var curStyle = canv.getStyle();
startClientPos.x = opts.event.clientX;
startClientPos.y = opts.event.clientY;
curShape = canv.addSVGElementFromJson({
@ -286,25 +346,24 @@ var svgEditorExtension_shapes = (function () {
started: true
};
},
mouseMove(opts) {
const mode = canv.getMode();
mouseMove: function mouseMove(opts) {
var mode = canv.getMode();
if (mode !== modeId) {
return;
}
const zoom = canv.getZoom();
const evt = opts.event;
const x = opts.mouse_x / zoom;
const y = opts.mouse_y / zoom;
const tlist = canv.getTransformList(curShape),
var zoom = canv.getZoom();
var evt = opts.event;
var x = opts.mouse_x / zoom;
var y = opts.mouse_y / zoom;
var tlist = canv.getTransformList(curShape),
box = curShape.getBBox(),
left = box.x,
top = box.y; // {width, height} = box,
// const dx = (x - startX), dy = (y - startY);
const newbox = {
var newbox = {
x: Math.min(startX, x),
y: Math.min(startY, y),
width: Math.abs(x - startX),
@ -316,29 +375,29 @@ var svgEditorExtension_shapes = (function () {
sx = width ? (width + dx) / width : 1;
*/
let sx = newbox.width / lastBBox.width || 1;
let sy = newbox.height / lastBBox.height || 1; // Not perfect, but mostly works...
var sx = newbox.width / lastBBox.width || 1;
var sy = newbox.height / lastBBox.height || 1; // Not perfect, but mostly works...
let tx = 0;
var tx = 0;
if (x < startX) {
tx = lastBBox.width;
}
let ty = 0;
var ty = 0;
if (y < startY) {
ty = lastBBox.height;
} // update the transform list with translate,scale,translate
const translateOrigin = svgroot.createSVGTransform(),
var translateOrigin = svgroot.createSVGTransform(),
scale = svgroot.createSVGTransform(),
translateBack = svgroot.createSVGTransform();
translateOrigin.setTranslate(-(left + tx), -(top + ty));
if (!evt.shiftKey) {
const max = Math.min(Math.abs(sx), Math.abs(sy));
var max = Math.min(Math.abs(sx), Math.abs(sy));
sx = max * (sx < 0 ? -1 : 1);
sy = max * (sy < 0 ? -1 : 1);
}
@ -351,25 +410,30 @@ var svgEditorExtension_shapes = (function () {
canv.recalculateDimensions(curShape);
lastBBox = curShape.getBBox();
},
mouseUp(opts) {
const mode = canv.getMode();
mouseUp: function mouseUp(opts) {
var mode = canv.getMode();
if (mode !== modeId) {
return undefined;
}
const keepObject = opts.event.clientX !== startClientPos.x && opts.event.clientY !== startClientPos.y;
var keepObject = opts.event.clientX !== startClientPos.x && opts.event.clientY !== startClientPos.y;
return {
keep: keepObject,
element: curShape,
started: false
};
}
});
};
case 18:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
return extShapes;

View File

@ -1,6 +1,42 @@
var svgEditorExtension_star = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* @file ext-star.js
*
@ -10,31 +46,22 @@ var svgEditorExtension_star = (function () {
*/
var extStar = {
name: 'star',
init: function init(S) {
var _this = this;
async init(S) {
const svgEditor = this;
const svgCanvas = svgEditor.canvas;
const {
$,
importLocale
} = S; // {svgcontent},
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var svgEditor, svgCanvas, $, importLocale, selElems, started, newFO, strings, showPanel, setAttr, buttons, contextTools;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
setAttr = function _setAttr(attr, val) {
svgCanvas.changeSelectedAttribute(attr, val);
svgCanvas.call('changed', selElems);
};
let selElems, // editingitex = false,
// svgdoc = S.svgroot.parentNode.ownerDocument,
started, newFO; // edg = 0,
// newFOG, newFOGParent, newDef, newImageName, newMaskID,
// undoCommand = 'Not image',
// modeChangeG, ccZoom, wEl, hEl, wOffset, hOffset, ccRgbEl, brushW, brushH;
const strings = await importLocale();
/**
*
* @param {boolean} on
* @returns {void}
*/
function showPanel(on) {
let fcRules = $('#fc_rules');
showPanel = function _showPanel(on) {
var fcRules = $('#fc_rules');
if (!fcRules.length) {
fcRules = $('<style id="fc_rules"></style>').appendTo('head');
@ -42,25 +69,18 @@ var svgEditorExtension_star = (function () {
fcRules.text(!on ? '' : ' #tool_topath { display: none !important; }');
$('#star_panel').toggle(on);
}
/*
function toggleSourceButtons(on){
$('#star_save, #star_cancel').toggle(on);
}
*/
};
/**
*
* @param {string} attr
* @param {string|Float} val
* @returns {void}
*/
svgEditor = _this;
svgCanvas = svgEditor.canvas;
$ = S.$, importLocale = S.importLocale; // {svgcontent},
_context.next = 7;
return importLocale();
case 7:
strings = _context.sent;
function setAttr(attr, val) {
svgCanvas.changeSelectedAttribute(attr, val);
svgCanvas.call('changed', selElems);
}
/*
function cot(n){
return 1 / Math.tan(n);
@ -69,32 +89,28 @@ var svgEditorExtension_star = (function () {
return 1 / Math.cos(n);
}
*/
const buttons = [{
buttons = [{
id: 'tool_star',
icon: svgEditor.curConfig.extIconsPath + 'star.png',
type: 'mode',
position: 12,
events: {
click() {
click: function click() {
showPanel(true);
svgCanvas.setMode('star');
}
}
}];
const contextTools = [{
contextTools = [{
type: 'input',
panel: 'star_panel',
id: 'starNumPoints',
size: 3,
defval: 5,
events: {
change() {
change: function change() {
setAttr('point', this.value);
}
}
}, {
type: 'input',
@ -109,32 +125,29 @@ var svgEditorExtension_star = (function () {
size: 3,
defval: 0,
events: {
change() {
change: function change() {
setAttr('radialshift', this.value);
}
}
}];
return {
return _context.abrupt("return", {
name: strings.name,
svgicons: svgEditor.curConfig.extIconsPath + 'star-icons.svg',
buttons: strings.buttons.map((button, i) => {
buttons: strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
}),
context_tools: strings.contextTools.map((contextTool, i) => {
context_tools: strings.contextTools.map(function (contextTool, i) {
return Object.assign(contextTools[i], contextTool);
}),
callback() {
callback: function callback() {
$('#star_panel').hide(); // const endChanges = function(){};
},
mouseDown: function mouseDown(opts) {
var rgb = svgCanvas.getColor('fill'); // const ccRgbEl = rgb.substring(1, rgb.length);
mouseDown(opts) {
const rgb = svgCanvas.getColor('fill'); // const ccRgbEl = rgb.substring(1, rgb.length);
var sRgb = svgCanvas.getColor('stroke'); // const ccSRgbEl = sRgb.substring(1, rgb.length);
const sRgb = svgCanvas.getColor('stroke'); // const ccSRgbEl = sRgb.substring(1, rgb.length);
const sWidth = svgCanvas.getStrokeWidth();
var sWidth = svgCanvas.getStrokeWidth();
if (svgCanvas.getMode() === 'star') {
started = true;
@ -162,34 +175,31 @@ var svgEditorExtension_star = (function () {
return undefined;
},
mouseMove(opts) {
mouseMove: function mouseMove(opts) {
if (!started) {
return undefined;
}
if (svgCanvas.getMode() === 'star') {
const c = $(newFO).attr(['cx', 'cy', 'point', 'orient', 'fill', 'strokecolor', 'strokeWidth', 'radialshift']);
let x = opts.mouse_x;
let y = opts.mouse_y;
const {
cx,
cy,
fill,
strokecolor,
strokeWidth,
radialshift,
point,
orient
} = c,
var c = $(newFO).attr(['cx', 'cy', 'point', 'orient', 'fill', 'strokecolor', 'strokeWidth', 'radialshift']);
var x = opts.mouse_x;
var y = opts.mouse_y;
var cx = c.cx,
cy = c.cy,
fill = c.fill,
strokecolor = c.strokecolor,
strokeWidth = c.strokeWidth,
radialshift = c.radialshift,
point = c.point,
orient = c.orient,
circumradius = Math.sqrt((x - cx) * (x - cx) + (y - cy) * (y - cy)) / 1.5,
inradius = circumradius / document.getElementById('starRadiusMulitplier').value;
newFO.setAttribute('r', circumradius);
newFO.setAttribute('r2', inradius);
let polyPoints = '';
var polyPoints = '';
for (let s = 0; point >= s; s++) {
let angle = 2.0 * Math.PI * (s / point);
for (var s = 0; point >= s; s++) {
var angle = 2.0 * Math.PI * (s / point);
if (orient === 'point') {
angle -= Math.PI / 2;
@ -231,10 +241,9 @@ var svgEditorExtension_star = (function () {
return undefined;
},
mouseUp() {
mouseUp: function mouseUp() {
if (svgCanvas.getMode() === 'star') {
const attrs = $(newFO).attr(['r']); // svgCanvas.addToSelection([newFO], true);
var attrs = $(newFO).attr(['r']); // svgCanvas.addToSelection([newFO], true);
return {
keep: attrs.r !== '0',
@ -244,14 +253,13 @@ var svgEditorExtension_star = (function () {
return undefined;
},
selectedChanged(opts) {
selectedChanged: function selectedChanged(opts) {
// Use this to update the current selected elements
selElems = opts.elems;
let i = selElems.length;
var i = selElems.length;
while (i--) {
const elem = selElems[i];
var elem = selElems[i];
if (elem && elem.getAttribute('shape') === 'star') {
if (opts.selectedElement && !opts.multiselected) {
@ -267,13 +275,18 @@ var svgEditorExtension_star = (function () {
}
}
},
elementChanged(opts) {// const elem = opts.elems[0];
elementChanged: function elementChanged(opts) {// const elem = opts.elems[0];
}
});
};
case 11:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
return extStar;

View File

@ -1,6 +1,98 @@
var svgEditorExtension_storage = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
function _slicedToArray(arr, i) {
return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
}
function _arrayWithHoles(arr) {
if (Array.isArray(arr)) return arr;
}
function _iterableToArrayLimit(arr, i) {
if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
var _arr = [];
var _n = true;
var _d = false;
var _e = undefined;
try {
for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
_arr.push(_s.value);
if (i && _arr.length === i) break;
}
} catch (err) {
_d = true;
_e = err;
} finally {
try {
if (!_n && _i["return"] != null) _i["return"]();
} finally {
if (_d) throw _e;
}
}
return _arr;
}
function _unsupportedIterableToArray(o, minLen) {
if (!o) return;
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(o);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
}
function _arrayLikeToArray(arr, len) {
if (len == null || len > arr.length) len = arr.length;
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
return arr2;
}
function _nonIterableRest() {
throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
/**
* @file ext-storage.js
*
@ -23,35 +115,21 @@ var svgEditorExtension_storage = (function () {
*/
var extStorage = {
name: 'storage',
init({
$
}) {
const svgEditor = this;
const svgCanvas = svgEditor.canvas; // We could empty any already-set data for users when they decline storage,
init: function init(_ref) {
var $ = _ref.$;
var svgEditor = this;
var svgCanvas = svgEditor.canvas; // We could empty any already-set data for users when they decline storage,
// but it would be a risk for users who wanted to store but accidentally
// said "no"; instead, we'll let those who already set it, delete it themselves;
// to change, set the "emptyStorageOnDecline" config setting to true
// in svgedit-config-iife.js/svgedit-config-es.js.
const {
emptyStorageOnDecline,
// When the code in svg-editor.js prevents local storage on load per
// user request, we also prevent storing on unload here so as to
// avoid third-party sites making XSRF requests or providing links
// which would cause the user's local storage not to load and then
// upon page unload (such as the user closing the window), the storage
// would thereby be set with an empty value, erasing any of the
// user's prior work. To change this behavior so that no use of storage
// or adding of new storage takes place regardless of settings, set
// the "noStorageOnLoad" config setting to true in svgedit-config-*.js.
noStorageOnLoad,
forceStorage
} = svgEditor.curConfig;
const {
storage,
updateCanvas
} = svgEditor;
var _svgEditor$curConfig = svgEditor.curConfig,
emptyStorageOnDecline = _svgEditor$curConfig.emptyStorageOnDecline,
noStorageOnLoad = _svgEditor$curConfig.noStorageOnLoad,
forceStorage = _svgEditor$curConfig.forceStorage;
var storage = svgEditor.storage,
updateCanvas = svgEditor.updateCanvas;
/**
* Replace `storagePrompt` parameter within URL.
* @param {string} val
@ -61,7 +139,7 @@ var svgEditorExtension_storage = (function () {
function replaceStoragePrompt(val) {
val = val ? 'storagePrompt=' + val : '';
const loc = top.location; // Allow this to work with the embedded editor as well
var loc = top.location; // Allow this to work with the embedded editor as well
if (loc.href.includes('storagePrompt=')) {
/*
@ -86,7 +164,7 @@ var svgEditorExtension_storage = (function () {
function setSVGContentStorage(val) {
if (storage) {
const name = 'svgedit-' + svgEditor.curConfig.canvasName;
var name = 'svgedit-' + svgEditor.curConfig.canvasName;
if (!val) {
storage.removeItem(name);
@ -122,7 +200,7 @@ var svgEditorExtension_storage = (function () {
function emptyStorage() {
setSVGContentStorage('');
Object.keys(svgEditor.curPrefs).forEach(name => {
Object.keys(svgEditor.curPrefs).forEach(function (name) {
name = 'svg-edit-' + name;
if (storage) {
@ -160,11 +238,13 @@ var svgEditorExtension_storage = (function () {
}); // No need for explicit saving at all once storage is on
// svgEditor.showSaveWarning = false;
const {
curPrefs
} = svgEditor;
Object.entries(curPrefs).forEach(([key, val]) => {
const store = val !== undefined;
var curPrefs = svgEditor.curPrefs;
Object.entries(curPrefs).forEach(function (_ref2) {
var _ref3 = _slicedToArray(_ref2, 2),
key = _ref3[0],
val = _ref3[1];
var store = val !== undefined;
key = 'svg-edit-' + key;
if (!store) {
@ -183,37 +263,41 @@ var svgEditorExtension_storage = (function () {
});
}
let loaded = false;
var loaded = false;
return {
name: 'storage',
langReady: function langReady(_ref4) {
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var importLocale, storagePrompt, confirmSetStorage, message, storagePrefsAndContent, storagePrefsOnly, storagePrefs, storageNoPrefsOrContent, storageNoPrefs, rememberLabel, rememberTooltip, options, oldContainerWidth, oldContainerMarginLeft, oldContentHeight, oldContainerHeight, _yield$$$select, pref, checked;
async langReady({
importLocale
}) {
const storagePrompt = new URL(top.location).searchParams.get('storagePrompt');
const confirmSetStorage = await importLocale();
const {
message,
storagePrefsAndContent,
storagePrefsOnly,
storagePrefs,
storageNoPrefsOrContent,
storageNoPrefs,
rememberLabel,
rememberTooltip
} = confirmSetStorage; // No need to run this one-time dialog again just because the user
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
importLocale = _ref4.importLocale;
storagePrompt = new URL(top.location).searchParams.get('storagePrompt');
_context.next = 4;
return importLocale();
case 4:
confirmSetStorage = _context.sent;
message = confirmSetStorage.message, storagePrefsAndContent = confirmSetStorage.storagePrefsAndContent, storagePrefsOnly = confirmSetStorage.storagePrefsOnly, storagePrefs = confirmSetStorage.storagePrefs, storageNoPrefsOrContent = confirmSetStorage.storageNoPrefsOrContent, storageNoPrefs = confirmSetStorage.storageNoPrefs, rememberLabel = confirmSetStorage.rememberLabel, rememberTooltip = confirmSetStorage.rememberTooltip; // No need to run this one-time dialog again just because the user
// changes the language
if (loaded) {
return;
if (!loaded) {
_context.next = 8;
break;
}
return _context.abrupt("return");
case 8:
loaded = true; // Note that the following can load even if "noStorageOnLoad" is
// set to false; to avoid any chance of storage, avoid this
// extension! (and to avoid using any prior storage, set the
// config option "noStorageOnLoad" to true).
if (!forceStorage && ( // If the URL has been explicitly set to always prompt the
if (!(!forceStorage && ( // If the URL has been explicitly set to always prompt the
// user (e.g., so one can be pointed to a URL where one
// can alter one's settings, say to prevent future storage)...
storagePrompt === 'true' || // ...or...if the URL at least doesn't explicitly prevent a
@ -222,8 +306,12 @@ var svgEditorExtension_storage = (function () {
// continual prompts about it)...
storagePrompt !== 'false' && // ...and this user hasn't previously indicated a desire for storage
!document.cookie.match(/(?:^|;\s*)svgeditstore=(?:prefsAndContent|prefsOnly)/) // ...then show the storage prompt.
)) {
const options = [];
))) {
_context.next = 44;
break;
}
options = [];
if (storage) {
options.unshift({
@ -247,10 +335,7 @@ var svgEditorExtension_storage = (function () {
} // Hack to temporarily provide a wide and high enough dialog
const oldContainerWidth = $('#dialog_container')[0].style.width,
oldContainerMarginLeft = $('#dialog_container')[0].style.marginLeft,
oldContentHeight = $('#dialog_content')[0].style.height,
oldContainerHeight = $('#dialog_container')[0].style.height;
oldContainerWidth = $('#dialog_container')[0].style.width, oldContainerMarginLeft = $('#dialog_container')[0].style.marginLeft, oldContentHeight = $('#dialog_content')[0].style.height, oldContainerHeight = $('#dialog_container')[0].style.height;
$('#dialog_content')[0].style.height = '120px';
$('#dialog_container')[0].style.height = '170px';
$('#dialog_container')[0].style.width = '800px';
@ -258,16 +343,23 @@ var svgEditorExtension_storage = (function () {
// From svg-editor.js
svgEditor.storagePromptState = 'waiting';
const {
response: pref,
checked
} = await $.select(message, options, null, null, {
_context.next = 20;
return $.select(message, options, null, null, {
label: rememberLabel,
checked: true,
tooltip: rememberTooltip
});
if (pref && pref !== 'noPrefsOrContent') {
case 20:
_yield$$$select = _context.sent;
pref = _yield$$$select.response;
checked = _yield$$$select.checked;
if (!(pref && pref !== 'noPrefsOrContent')) {
_context.next = 30;
break;
}
// Regardless of whether the user opted
// to remember the choice (and move to a URL which won't
// ask them again), we have to assume the user
@ -280,11 +372,19 @@ var svgEditorExtension_storage = (function () {
// don't want ask them again upon page refresh so move
// them instead to a URL which does not always prompt
if (storagePrompt === 'true' && checked) {
replaceStoragePrompt();
return;
if (!(storagePrompt === 'true' && checked)) {
_context.next = 28;
break;
}
} else {
replaceStoragePrompt();
return _context.abrupt("return");
case 28:
_context.next = 35;
break;
case 30:
// The user does not wish storage (or cancelled, which we treat equivalently)
removeStoragePrefCookie();
@ -293,14 +393,17 @@ var svgEditorExtension_storage = (function () {
emptyStorage();
}
if (pref && checked) {
if (!(pref && checked)) {
_context.next = 35;
break;
}
// Open a URL which won't set storage and won't prompt user about storage
replaceStoragePrompt('false');
return;
}
} // Reset width/height of dialog (e.g., for use by Export)
return _context.abrupt("return");
case 35:
// Reset width/height of dialog (e.g., for use by Export)
$('#dialog_container')[0].style.width = oldContainerWidth;
$('#dialog_container')[0].style.marginLeft = oldContainerMarginLeft;
$('#dialog_content')[0].style.height = oldContentHeight;
@ -316,14 +419,24 @@ var svgEditorExtension_storage = (function () {
setupBeforeUnloadListener();
svgEditor.storagePromptState = 'closed';
updateCanvas(true);
} else if (!noStorageOnLoad || forceStorage) {
_context.next = 45;
break;
case 44:
if (!noStorageOnLoad || forceStorage) {
setupBeforeUnloadListener();
}
}
case 45:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
}
};
return extStorage;

View File

@ -1,6 +1,42 @@
var svgEditorExtension_webappfind = (function () {
'use strict';
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
try {
var info = gen[key](arg);
var value = info.value;
} catch (error) {
reject(error);
return;
}
if (info.done) {
resolve(value);
} else {
Promise.resolve(value).then(_next, _throw);
}
}
function _asyncToGenerator(fn) {
return function () {
var self = this,
args = arguments;
return new Promise(function (resolve, reject) {
var gen = fn.apply(self, args);
function _next(value) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
}
function _throw(err) {
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
}
_next(undefined);
});
};
}
/**
* Depends on Firefox add-on and executables from
* {@link https://github.com/brettz9/webappfind}.
@ -10,18 +46,25 @@ var svgEditorExtension_webappfind = (function () {
*/
var extWebappfind = {
name: 'webappfind',
init: function init(_ref) {
var _this = this;
async init({
importLocale,
$
}) {
const strings = await importLocale();
const svgEditor = this;
const saveMessage = 'save',
readMessage = 'read',
excludedMessages = [readMessage, saveMessage];
let pathID;
this.canvas.bind('message',
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
var importLocale, $, strings, svgEditor, saveMessage, readMessage, excludedMessages, pathID, buttons;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
importLocale = _ref.importLocale, $ = _ref.$;
_context.next = 3;
return importLocale();
case 3:
strings = _context.sent;
svgEditor = _this;
saveMessage = 'save', readMessage = 'read', excludedMessages = [readMessage, saveMessage];
_this.canvas.bind('message',
/**
* @param {external:Window} win
* @param {PlainObject} info
@ -31,21 +74,20 @@ var svgEditorExtension_webappfind = (function () {
* @throws {Error} Unexpected event type
* @returns {void}
*/
(win, {
data,
origin
}) => {
function (win, _ref2) {
var data = _ref2.data,
origin = _ref2.origin;
// eslint-disable-line no-shadow
// console.log('data, origin', data, origin);
let type, content;
var type, content;
try {
({
type,
pathID,
content
} = data.webappfind); // May throw if data is not an object
var _data$webappfind = data.webappfind;
type = _data$webappfind.type;
pathID = _data$webappfind.pathID;
content = _data$webappfind.content;
// 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)
) {
@ -66,7 +108,7 @@ var svgEditorExtension_webappfind = (function () {
break;
case 'save-end':
$.alert(`save complete for pathID ${pathID}!`);
$.alert("save complete for pathID ".concat(pathID, "!"));
break;
default:
@ -86,7 +128,8 @@ var svgEditorExtension_webappfind = (function () {
);
*/
const buttons = [{
buttons = [{
id: 'webappfind_save',
//
icon: svgEditor.curConfig.extIconsPath + 'webappfind.png',
@ -94,7 +137,7 @@ var svgEditorExtension_webappfind = (function () {
position: 4,
// Before 0-based index position 4 (after the regular "Save Image (S)")
events: {
click() {
click: function click() {
if (!pathID) {
// Not ready yet as haven't received first payload
return;
@ -103,25 +146,31 @@ var svgEditorExtension_webappfind = (function () {
window.postMessage({
webappfind: {
type: saveMessage,
pathID,
pathID: pathID,
content: svgEditor.canvas.getSvgString()
}
}, window.location.origin === 'null' // Avoid "null" string error for `file:` protocol (even
// though file protocol not currently supported by add-on)
? '*' : window.location.origin);
}
}
}];
return {
return _context.abrupt("return", {
name: strings.name,
svgicons: svgEditor.curConfig.extIconsPath + 'webappfind-icon.svg',
buttons: strings.buttons.map((button, i) => {
buttons: strings.buttons.map(function (button, i) {
return Object.assign(buttons[i], button);
})
};
}
});
case 9:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
}
};
return extWebappfind;

View File

@ -1,6 +1,55 @@
var svgEditorExtension_xdomain_messaging = (function () {
'use strict';
function _typeof(obj) {
"@babel/helpers - typeof";
if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
_typeof = function (obj) {
return typeof obj;
};
} else {
_typeof = function (obj) {
return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
};
}
return _typeof(obj);
}
function _toConsumableArray(arr) {
return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
}
function _arrayWithoutHoles(arr) {
if (Array.isArray(arr)) return _arrayLikeToArray(arr);
}
function _iterableToArray(iter) {
if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
}
function _unsupportedIterableToArray(o, minLen) {
if (!o) return;
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(o);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
}
function _arrayLikeToArray(arr, len) {
if (len == null || len > arr.length) len = arr.length;
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
return arr2;
}
function _nonIterableSpread() {
throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
/**
* Should not be needed for same domain control (just call via child frame),
* but an API common for cross-domain and same domain use can be found
@ -8,43 +57,38 @@ var svgEditorExtension_xdomain_messaging = (function () {
*/
var extXdomainMessaging = {
name: 'xdomain-messaging',
init() {
const svgEditor = this;
const svgCanvas = svgEditor.canvas;
init: function init() {
var svgEditor = this;
var svgCanvas = svgEditor.canvas;
try {
window.addEventListener('message', function (e) {
// We accept and post strings for the sake of IE9 support
if (!e.data || !['string', 'object'].includes(typeof e.data) || e.data.charAt() === '|') {
if (!e.data || !['string', 'object'].includes(_typeof(e.data)) || e.data.charAt() === '|') {
return;
}
const data = typeof e.data === 'object' ? e.data : JSON.parse(e.data);
var data = _typeof(e.data) === 'object' ? e.data : JSON.parse(e.data);
if (!data || typeof data !== 'object' || data.namespace !== 'svgCanvas') {
if (!data || _typeof(data) !== 'object' || data.namespace !== 'svgCanvas') {
return;
} // The default is not to allow any origins, including even the same domain or
// if run on a `file:///` URL. See `svgedit-config-es.js` for an example of how
// to configure
const {
allowedOrigins
} = svgEditor.curConfig;
var allowedOrigins = svgEditor.curConfig.allowedOrigins;
if (!allowedOrigins.includes('*') && !allowedOrigins.includes(e.origin)) {
console.log(`Origin ${e.origin} not whitelisted for posting to ${window.origin}`); // eslint-disable-line no-console
console.log("Origin ".concat(e.origin, " not whitelisted for posting to ").concat(window.origin)); // eslint-disable-line no-console
return;
}
const cbid = data.id;
const {
name,
args
} = data;
const message = {
var cbid = data.id;
var name = data.name,
args = data.args;
var message = {
namespace: 'svg-edit',
id: cbid
};
@ -52,7 +96,7 @@ var svgEditorExtension_xdomain_messaging = (function () {
try {
// Now that we know the origin is trusted, we perform otherwise
// unsafe arbitrary canvas method execution
message.result = svgCanvas[name](...args); // lgtm [js/remote-property-injection]
message.result = svgCanvas[name].apply(svgCanvas, _toConsumableArray(args)); // lgtm [js/remote-property-injection]
} catch (err) {
message.error = err.message;
}
@ -63,7 +107,6 @@ var svgEditorExtension_xdomain_messaging = (function () {
console.log('Error with xdomain message listener: ' + err); // eslint-disable-line no-console
}
}
};
return extXdomainMessaging;

View File

@ -20,14 +20,12 @@
}
/* globals jQuery */
const $ = jQuery;
var $ = jQuery;
$('a').click(function () {
const {
href
} = this;
const target = window.parent;
var href = this.href;
var target = window.parent;
const post = message => {
var post = function post(message) {
// Todo: Make origin customizable as set by opening window
// Todo: If dropping IE9, avoid stringifying
target.postMessage(JSON.stringify(_extends({
@ -44,15 +42,15 @@
});
if (!href.includes('.svg')) {
const img = new Image();
var img = new Image();
img.addEventListener('load', function () {
const canvas = document.createElement('canvas');
var canvas = document.createElement('canvas');
canvas.width = this.width;
canvas.height = this.height; // load the raster image into the canvas
canvas.getContext('2d').drawImage(this, 0, 0); // retrieve the data: URL
let data;
var data;
try {
data = canvas.toDataURL();
@ -65,8 +63,8 @@
}
post({
href,
data
href: href,
data: data
});
});
img.src = href;
@ -74,8 +72,8 @@
// Do ajax request for image's href value
$.get(href, function (data) {
post({
href,
data
href: href,
data: data
});
}, 'html'); // 'html' is necessary to keep returned data as a string
}

File diff suppressed because it is too large Load Diff

12364
dist/index-es.js vendored

File diff suppressed because one or more lines are too long

62
dist/index-es.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

12364
dist/index-umd.js vendored

File diff suppressed because one or more lines are too long

62
dist/index-umd.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,100 @@
(function () {
'use strict';
function _classCallCheck(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
}
}
function _defineProperties(target, props) {
for (var i = 0; i < props.length; i++) {
var descriptor = props[i];
descriptor.enumerable = descriptor.enumerable || false;
descriptor.configurable = true;
if ("value" in descriptor) descriptor.writable = true;
Object.defineProperty(target, descriptor.key, descriptor);
}
}
function _createClass(Constructor, protoProps, staticProps) {
if (protoProps) _defineProperties(Constructor.prototype, protoProps);
if (staticProps) _defineProperties(Constructor, staticProps);
return Constructor;
}
function _slicedToArray(arr, i) {
return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
}
function _toConsumableArray(arr) {
return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
}
function _arrayWithoutHoles(arr) {
if (Array.isArray(arr)) return _arrayLikeToArray(arr);
}
function _arrayWithHoles(arr) {
if (Array.isArray(arr)) return arr;
}
function _iterableToArray(iter) {
if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
}
function _iterableToArrayLimit(arr, i) {
if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
var _arr = [];
var _n = true;
var _d = false;
var _e = undefined;
try {
for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
_arr.push(_s.value);
if (i && _arr.length === i) break;
}
} catch (err) {
_d = true;
_e = err;
} finally {
try {
if (!_n && _i["return"] != null) _i["return"]();
} finally {
if (_d) throw _e;
}
}
return _arr;
}
function _unsupportedIterableToArray(o, minLen) {
if (!o) return;
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(o);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
}
function _arrayLikeToArray(arr, len) {
if (len == null || len > arr.length) len = arr.length;
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
return arr2;
}
function _nonIterableSpread() {
throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
function _nonIterableRest() {
throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
/**
* For parsing color values.
* @module RGBColor
@ -8,7 +102,7 @@
* @see https://www.phpied.com/rgb-color-parser-in-javascript/
* @license MIT
*/
const simpleColors = {
var simpleColors = {
aliceblue: 'f0f8ff',
antiquewhite: 'faebd7',
aqua: '00ffff',
@ -154,43 +248,59 @@
yellowgreen: '9acd32'
}; // array of color definition objects
const colorDefs = [{
var colorDefs = [{
re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
// re: /^rgb\((?<r>\d{1,3}),\s*(?<g>\d{1,3}),\s*(?<b>\d{1,3})\)$/,
example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
process(_, ...bits) {
return bits.map(b => Number.parseInt(b));
process: function process(_) {
for (var _len = arguments.length, bits = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
bits[_key - 1] = arguments[_key];
}
return bits.map(function (b) {
return Number.parseInt(b);
});
}
}, {
re: /^(\w{2})(\w{2})(\w{2})$/,
// re: /^(?<r>\w{2})(?<g>\w{2})(?<b>\w{2})$/,
example: ['#00ff00', '336699'],
process(_, ...bits) {
return bits.map(b => Number.parseInt(b, 16));
process: function process(_) {
for (var _len2 = arguments.length, bits = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
bits[_key2 - 1] = arguments[_key2];
}
return bits.map(function (b) {
return Number.parseInt(b, 16);
});
}
}, {
re: /^(\w)(\w)(\w)$/,
// re: /^(?<r>\w{1})(?<g>\w{1})(?<b>\w{1})$/,
example: ['#fb0', 'f0f'],
process(_, ...bits) {
return bits.map(b => Number.parseInt(b + b, 16));
process: function process(_) {
for (var _len3 = arguments.length, bits = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
bits[_key3 - 1] = arguments[_key3];
}
return bits.map(function (b) {
return Number.parseInt(b + b, 16);
});
}
}];
/**
* A class to parse color values.
*/
class RGBColor {
var RGBColor = /*#__PURE__*/function () {
/**
* @param {string} colorString
*/
constructor(colorString) {
function RGBColor(colorString) {
var _this = this;
_classCallCheck(this, RGBColor);
this.ok = false; // strip any leading #
if (colorString.charAt(0) === '#') {
@ -208,20 +318,24 @@
// search through the definitions to find a match
colorDefs.forEach(({
re,
process: processor
}) => {
const bits = re.exec(colorString);
colorDefs.forEach(function (_ref) {
var re = _ref.re,
processor = _ref.process;
var bits = re.exec(colorString);
if (bits) {
const [r, g, b] = processor(...bits);
Object.assign(this, {
r,
g,
b
var _processor = processor.apply(void 0, _toConsumableArray(bits)),
_processor2 = _slicedToArray(_processor, 3),
r = _processor2[0],
g = _processor2[1],
b = _processor2[2];
Object.assign(_this, {
r: r,
g: g,
b: b
});
this.ok = true;
_this.ok = true;
}
}); // validate/cleanup values
@ -235,18 +349,21 @@
*/
toRGB() {
_createClass(RGBColor, [{
key: "toRGB",
value: function toRGB() {
return 'rgb(' + this.r + ', ' + this.g + ', ' + this.b + ')';
}
/**
* @returns {string}
*/
toHex() {
let r = this.r.toString(16);
let g = this.g.toString(16);
let b = this.b.toString(16);
}, {
key: "toHex",
value: function toHex() {
var r = this.r.toString(16);
var g = this.g.toString(16);
var b = this.b.toString(16);
if (r.length === 1) {
r = '0' + r;
@ -267,43 +384,38 @@
* @returns {HTMLUListElement}
*/
static getHelpXML() {
const examples = [// add regexps
...colorDefs.flatMap(({
example
}) => {
}], [{
key: "getHelpXML",
value: function getHelpXML() {
var examples = [].concat(_toConsumableArray(colorDefs.flatMap(function (_ref2) {
var example = _ref2.example;
return example;
}), // add type-in colors
...Object.keys(simpleColors)];
const xml = document.createElement('ul');
})), _toConsumableArray(Object.keys(simpleColors)));
var xml = document.createElement('ul');
xml.setAttribute('id', 'rgbcolor-examples');
xml.append(...examples.map(example => {
xml.append.apply(xml, _toConsumableArray(examples.map(function (example) {
try {
const listItem = document.createElement('li');
const listColor = new RGBColor(example);
const exampleDiv = document.createElement('div');
exampleDiv.style.cssText = `
margin: 3px;
border: 1px solid black;
background: ${listColor.toHex()};
color: ${listColor.toHex()};`;
var listItem = document.createElement('li');
var listColor = new RGBColor(example);
var exampleDiv = document.createElement('div');
exampleDiv.style.cssText = "\n margin: 3px;\n border: 1px solid black;\n background: ".concat(listColor.toHex(), ";\n color: ").concat(listColor.toHex(), ";");
exampleDiv.append('test');
const listItemValue = ` ${example} -> ${listColor.toRGB()} -> ${listColor.toHex()}`;
var listItemValue = " ".concat(example, " -> ").concat(listColor.toRGB(), " -> ").concat(listColor.toHex());
listItem.append(exampleDiv, listItemValue);
return listItem;
} catch (e) {
return '';
}
}));
})));
return xml;
}
}]);
}
return RGBColor;
}();
/* globals jsPDF */
const jsPDFAPI = jsPDF.API;
const pdfSvgAttr = {
var jsPDFAPI = jsPDF.API;
var pdfSvgAttr = {
// allowed attributes. all others are removed from the preview.
g: ['stroke', 'fill', 'stroke-width'],
line: ['x1', 'y1', 'x2', 'y2', 'stroke', 'stroke-width'],
@ -316,35 +428,37 @@
text: ['x', 'y', 'font-size', 'font-family', 'text-anchor', 'font-weight', 'font-style', 'fill']
};
const attributeIsNotEmpty = function (node, attr) {
const attVal = attr ? node.getAttribute(attr) : node;
var attributeIsNotEmpty = function attributeIsNotEmpty(node, attr) {
var attVal = attr ? node.getAttribute(attr) : node;
return attVal !== '' && attVal !== null && attVal !== 'null';
};
const nodeIs = function (node, possible) {
var nodeIs = function nodeIs(node, possible) {
return possible.includes(node.tagName.toLowerCase());
};
const removeAttributes = function (node, attributes) {
const toRemove = [];
var removeAttributes = function removeAttributes(node, attributes) {
var toRemove = [];
[].forEach.call(node.attributes, function (a) {
if (attributeIsNotEmpty(a) && !attributes.includes(a.name.toLowerCase())) {
toRemove.push(a.name);
}
});
toRemove.forEach(a => {
toRemove.forEach(function (a) {
node.removeAttribute(a.name);
});
};
const numRgx = /[+-]?(?:\d+\.\d*|\d+|\.\d+)(?:[eE]\d+|[eE][+-]\d+|)/g;
var numRgx = /[+-]?(?:\d+\.\d*|\d+|\.\d+)(?:[eE]\d+|[eE][+-]\d+|)/g;
const getLinesOptionsOfPoly = function (node) {
let nums = node.getAttribute('points');
var getLinesOptionsOfPoly = function getLinesOptionsOfPoly(node) {
var nums = node.getAttribute('points');
nums = nums && nums.match(numRgx) || [];
if (nums && nums.length) {
nums = nums.map(n => Number(n));
nums = nums.map(function (n) {
return Number(n);
});
if (nums.length % 2) {
nums.length--;
@ -357,40 +471,43 @@
return undefined;
}
const [x, y] = nums,
var _nums = nums,
_nums2 = _slicedToArray(_nums, 2),
x = _nums2[0],
y = _nums2[1],
lines = [];
for (let i = 2; i < nums.length; i += 2) {
for (var i = 2; i < nums.length; i += 2) {
lines.push([nums[i] - nums[i - 2], nums[i + 1] - nums[i - 1]]);
}
return {
x,
y,
lines
x: x,
y: y,
lines: lines
};
};
const getLinesOptionsOfPath = function (node) {
const segList = node.pathSegList,
var getLinesOptionsOfPath = function getLinesOptionsOfPath(node) {
var segList = node.pathSegList,
n = segList.numberOfItems,
opsList = [];
let ops = {
var ops = {
lines: []
};
const curr = {
var curr = {
x: 0,
y: 0
};
const reflectControl = {
var reflectControl = {
x: 0,
y: 0
};
const toRelative = function (nums, relativeTo) {
const re = [];
var toRelative = function toRelative(nums, relativeTo) {
var re = [];
for (let i = 0; i < nums.length - 1; i += 2) {
for (var i = 0; i < nums.length - 1; i += 2) {
re[i] = nums[i] - relativeTo.x;
re[i + 1] = nums[i + 1] - relativeTo.y;
}
@ -398,24 +515,22 @@
return re;
};
const curveQToC = function (nums) {
const a = 2 / 3;
const re = [nums[0] * a, nums[1] * a, nums[2] + (nums[0] - nums[2]) * a, nums[3] + (nums[1] - nums[3]) * a, nums[2], nums[3]];
var curveQToC = function curveQToC(nums) {
var a = 2 / 3;
var re = [nums[0] * a, nums[1] * a, nums[2] + (nums[0] - nums[2]) * a, nums[3] + (nums[1] - nums[3]) * a, nums[2], nums[3]];
return re;
};
for (let i = 0, letterPrev; i < n; i++) {
const seg = segList.getItem(i);
const {
x1,
y1,
x2,
y2,
x,
y,
pathSegTypeAsLetter: letter
} = seg;
const isRelative = letter >= 'a'; // lowercase letter
for (var i = 0, letterPrev; i < n; i++) {
var seg = segList.getItem(i);
var x1 = seg.x1,
y1 = seg.y1,
x2 = seg.x2,
y2 = seg.y2,
x = seg.x,
y = seg.y,
letter = seg.pathSegTypeAsLetter;
var isRelative = letter >= 'a'; // lowercase letter
switch (letter) {
case 'M':
@ -489,7 +604,7 @@
case 'T':
{
const p1 = letterPrev && 'QqTt'.includes(letterPrev) ? reflectControl : {
var p1 = letterPrev && 'QqTt'.includes(letterPrev) ? reflectControl : {
x: 0,
y: 0
};
@ -501,13 +616,14 @@
case 't':
{
const p1 = letterPrev && 'QqTt'.includes(letterPrev) ? reflectControl : {
var _p = letterPrev && 'QqTt'.includes(letterPrev) ? reflectControl : {
x: 0,
y: 0
};
ops.lines.push([p1.x, p1.y, x, y]);
reflectControl.x = x - p1.x;
reflectControl.y = y - p1.y;
ops.lines.push([_p.x, _p.y, x, y]);
reflectControl.x = x - _p.x;
reflectControl.y = y - _p.y;
break;
}
@ -526,15 +642,15 @@
case 'S':
case 's':
{
const p1 = letterPrev && 'CcSs'.includes(letterPrev) ? reflectControl : {
var _p2 = letterPrev && 'CcSs'.includes(letterPrev) ? reflectControl : {
x: 0,
y: 0
};
if (isRelative) {
ops.lines.push([p1.x, p1.y, x2, y2, x, y]);
ops.lines.push([_p2.x, _p2.y, x2, y2, x, y]);
} else {
ops.lines.push([p1.x, p1.y].concat(toRelative([x2, y2, x, y], curr)));
ops.lines.push([_p2.x, _p2.y].concat(toRelative([x2, y2, x, y], curr)));
}
reflectControl.x = x - x2;
@ -592,21 +708,21 @@
return opsList;
};
const svgElementToPdf = function (element, pdf, options) {
var svgElementToPdf = function svgElementToPdf(element, pdf, options) {
// pdf is a jsPDF object
// console.log('options =', options);
const remove = options.removeInvalid === undefined ? false : options.removeInvalid;
const k = options.scale === undefined ? 1.0 : options.scale;
let colorMode = null;
var remove = options.removeInvalid === undefined ? false : options.removeInvalid;
var k = options.scale === undefined ? 1.0 : options.scale;
var colorMode = null;
[].forEach.call(element.children, function (node) {
// console.log('passing: ', node);
// let hasStrokeColor = false;
let hasFillColor = false;
let fillRGB;
var hasFillColor = false;
var fillRGB;
colorMode = null;
if (nodeIs(node, ['g', 'line', 'rect', 'ellipse', 'circle', 'polygon', 'polyline', 'path', 'text'])) {
const fillColor = node.getAttribute('fill');
var fillColor = node.getAttribute('fill');
if (attributeIsNotEmpty(fillColor) && node.getAttribute('fill-opacity') !== '0') {
fillRGB = new RGBColor(fillColor);
@ -629,10 +745,10 @@
pdf.setLineWidth(k * Number.parseInt(node.getAttribute('stroke-width')));
}
const strokeColor = node.getAttribute('stroke');
var strokeColor = node.getAttribute('stroke');
if (attributeIsNotEmpty(strokeColor) && node.getAttribute('stroke-width') !== '0' && node.getAttribute('stroke-opacity') !== '0') {
const strokeRGB = new RGBColor(strokeColor);
var strokeRGB = new RGBColor(strokeColor);
if (strokeRGB.ok) {
// hasStrokeColor = true;
@ -649,7 +765,7 @@
}
}
const tag = node.tagName.toLowerCase();
var tag = node.tagName.toLowerCase();
switch (tag) {
case 'svg':
@ -682,7 +798,7 @@
case 'polygon':
case 'polyline':
{
const linesOptions = getLinesOptionsOfPoly(node);
var linesOptions = getLinesOptionsOfPoly(node);
if (linesOptions) {
pdf.lines(linesOptions.lines, k * linesOptions.x, k * linesOptions.y, [k, k], colorMode, tag === 'polygon' // polygon is closed, polyline is not closed
@ -696,14 +812,14 @@
case 'path':
{
if (colorMode) {
const linesOptionsList = getLinesOptionsOfPath(node);
var linesOptionsList = getLinesOptionsOfPath(node);
if (linesOptionsList.length > 0) {
linesOptionsList.forEach(function (linesOptions) {
pdf.lines(linesOptions.lines, k * linesOptions.x, k * linesOptions.y, [k, k], null, linesOptions.closed);
}); // svg fill rule default is nonzero
const fillRule = node.getAttribute('fill-rule');
var fillRule = node.getAttribute('fill-rule');
if (fillRule === 'evenodd') {
// f* : fill using even-odd rule
@ -757,7 +873,7 @@
pdf.setTextColor(fillRGB.r, fillRGB.g, fillRGB.b);
}
let fontType = '';
var fontType = '';
if (node.hasAttribute('font-weight')) {
if (node.getAttribute('font-weight') === 'bold') {
@ -776,22 +892,22 @@
}
pdf.setFontType(fontType);
const pdfFontSize = node.hasAttribute('font-size') ? Number.parseInt(node.getAttribute('font-size')) : 16;
var pdfFontSize = node.hasAttribute('font-size') ? Number.parseInt(node.getAttribute('font-size')) : 16;
/**
*
* @param {Element} elem
* @returns {Float}
*/
const getWidth = elem => {
let box;
var getWidth = function getWidth(elem) {
var box;
try {
box = elem.getBBox(); // Firefox on MacOS will raise error here
} catch (err) {
// copy and append to body so that getBBox is available
const nodeCopy = elem.cloneNode(true);
const svg = elem.ownerSVGElement.cloneNode(false);
var nodeCopy = elem.cloneNode(true);
var svg = elem.ownerSVGElement.cloneNode(false);
svg.appendChild(nodeCopy);
document.body.appendChild(svg);
@ -810,7 +926,7 @@
}; // TODO: use more accurate positioning!!
let x,
var x,
y,
xOffset = 0;

View File

@ -142,7 +142,7 @@ var svgEditorLang_af = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_af = (function () {
layers: 'Layers',
del: 'Verwyder Laag',
move_down: 'Beweeg afbreek Down',
new: 'Nuwe Layer',
"new": 'Nuwe Layer',
rename: 'Rename Layer',
move_up: 'Beweeg afbreek Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_ar = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_ar = (function () {
layers: 'Layers',
del: 'حذف طبقة',
move_down: 'تحرك لأسفل طبقة',
new: 'طبقة جديدة',
"new": 'طبقة جديدة',
rename: 'تسمية الطبقة',
move_up: 'تحرك لأعلى طبقة',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_az = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_az = (function () {
layers: 'Layers',
del: 'Delete Layer',
move_down: 'Move Layer Down',
new: 'New Layer',
"new": 'New Layer',
rename: 'Rename Layer',
move_up: 'Move Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_be = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_be = (function () {
layers: 'Layers',
del: 'Выдаліць слой',
move_down: 'Перамясціць слой на',
new: 'Новы слой',
"new": 'Новы слой',
rename: 'Перайменаваць Слой',
move_up: 'Перамяшчэнне слоя да',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_bg = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_bg = (function () {
layers: 'Layers',
del: 'Изтриване на слой',
move_down: 'Move слой надолу',
new: 'Нов слой',
"new": 'Нов слой',
rename: 'Преименуване Layer',
move_up: 'Move Up Layer',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_ca = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_ca = (function () {
layers: 'Layers',
del: 'Eliminar capa',
move_down: 'Mou la capa de Down',
new: 'Nova capa',
"new": 'Nova capa',
rename: 'Canvieu el nom de la capa',
move_up: 'Mou la capa Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_cs = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_cs = (function () {
layers: 'Layers',
del: 'Odstranit vrstvu',
move_down: 'Přesunout vrstvu níž',
new: 'Přidat vrstvu',
"new": 'Přidat vrstvu',
rename: 'Přejmenovat vrstvu',
move_up: 'Přesunout vrstvu výš',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_cy = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_cy = (function () {
layers: 'Layers',
del: 'Dileu Haen',
move_down: 'Symud Haen i Lawr',
new: 'Haen Newydd',
"new": 'Haen Newydd',
rename: 'Ail-enwi Haen',
move_up: 'Symud Haen Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_da = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_da = (function () {
layers: 'Layers',
del: 'Slet Layer',
move_down: 'Flyt lag ned',
new: 'New Layer',
"new": 'New Layer',
rename: 'Omdøb Layer',
move_up: 'Flyt Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_de = (function () {
copy: 'Kopieren',
paste: 'Einfügen',
paste_in_place: 'Bei Originalposition einfügen',
delete: 'Löschen',
"delete": 'Löschen',
group: 'Gruppieren',
move_front: 'Nach ganz oben verschieben',
move_up: 'Hochschieben',
@ -154,7 +154,7 @@ var svgEditorLang_de = (function () {
layers: 'Ebenen',
del: 'Ebene löschen',
move_down: 'Ebene nach unten verschieben',
new: 'Neue Ebene',
"new": 'Neue Ebene',
rename: 'Ebene umbenennen',
move_up: 'Ebene nach oben verschieben',
dupe: 'Ebene duplizieren',

View File

@ -142,7 +142,7 @@ var svgEditorLang_el = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_el = (function () {
layers: 'Layers',
del: 'Διαγραφήστρώματος',
move_down: 'Μετακίνηση Layer Down',
new: 'Νέο Layer',
"new": 'Νέο Layer',
rename: 'Μετονομασία Layer',
move_up: 'Μετακίνηση Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_en = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_en = (function () {
layers: 'Layers',
del: 'Delete Layer',
move_down: 'Move Layer Down',
new: 'New Layer',
"new": 'New Layer',
rename: 'Rename Layer',
move_up: 'Move Layer Up',
dupe: 'Duplicate Layer...',

View File

@ -142,7 +142,7 @@ var svgEditorLang_es = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_es = (function () {
layers: 'Layers',
del: 'Suprimir capa',
move_down: 'Mover la capa hacia abajo',
new: 'Nueva capa',
"new": 'Nueva capa',
rename: 'Renombrar capa',
move_up: 'Mover la capa hacia arriba',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_et = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_et = (function () {
layers: 'Layers',
del: 'Kustuta Kiht',
move_down: 'Liiguta kiht alla',
new: 'Uus kiht',
"new": 'Uus kiht',
rename: 'Nimeta kiht',
move_up: 'Liiguta kiht üles',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_fa = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'حذف',
"delete": 'حذف',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_fa = (function () {
layers: 'Layers',
del: '‫حذف لایه‬',
move_down: '‫انتقال لایه به پایین‬',
new: '‫لایه جدید‬',
"new": '‫لایه جدید‬',
rename: '‫تغییر نام لایه‬',
move_up: '‫انتقال لایه به بالا‬',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_fi = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_fi = (function () {
layers: 'Layers',
del: 'Poista Layer',
move_down: 'Siirrä Layer alas',
new: 'New Layer',
"new": 'New Layer',
rename: 'Nimeä Layer',
move_up: 'Siirrä Layer',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_fr = (function () {
copy: 'Copier',
paste: 'Coller',
paste_in_place: 'Coller sur place',
delete: 'Supprimer',
"delete": 'Supprimer',
group: 'Grouper',
move_front: 'Placer au premier plan',
move_up: "Avancer d'un plan",
@ -154,7 +154,7 @@ var svgEditorLang_fr = (function () {
layers: 'Calques',
del: 'Supprimer le calque',
move_down: 'Descendre le calque',
new: 'Nouveau calque',
"new": 'Nouveau calque',
rename: 'Renommer le calque',
move_up: 'Monter le calque',
dupe: 'Dupliquer le calque',

View File

@ -142,7 +142,7 @@ var svgEditorLang_fy = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_fy = (function () {
layers: 'Layers',
del: 'Laach fuortsmite',
move_down: 'Laach omleech bringe',
new: 'Nije laach',
"new": 'Nije laach',
rename: 'Laach omneame',
move_up: 'Laach omheech bringe',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_ga = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_ga = (function () {
layers: 'Layers',
del: 'Scrios Sraith',
move_down: 'Bog Sraith Síos',
new: 'Sraith Nua',
"new": 'Sraith Nua',
rename: 'Athainmnigh Sraith',
move_up: 'Bog Sraith Suas',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_gl = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_gl = (function () {
layers: 'Layers',
del: 'Delete Layer',
move_down: 'Move capa inferior',
new: 'New Layer',
"new": 'New Layer',
rename: 'Rename Layer',
move_up: 'Move Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_he = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_he = (function () {
layers: 'Layers',
del: 'מחיקת שכבה',
move_down: 'הזז למטה שכבה',
new: 'שכבהחדשה',
"new": 'שכבהחדשה',
rename: 'שינוי שם שכבה',
move_up: 'העבר שכבה Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_hi = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_hi = (function () {
layers: 'Layers',
del: 'परत हटाएँ',
move_down: 'परत नीचे ले जाएँ',
new: 'नई परत',
"new": 'नई परत',
rename: 'परत का नाम बदलें',
move_up: 'परत ऊपर ले जाएँ',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_hr = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_hr = (function () {
layers: 'Layers',
del: 'Brisanje sloja',
move_down: 'Move Layer Down',
new: 'New Layer',
"new": 'New Layer',
rename: 'Preimenuj Layer',
move_up: 'Move Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_hu = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_hu = (function () {
layers: 'Layers',
del: 'Réteg törlése',
move_down: 'Mozgatása lefelé',
new: 'Új réteg',
"new": 'Új réteg',
rename: 'Réteg átnevezése',
move_up: 'Move Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_hy = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_hy = (function () {
layers: 'Layers',
del: 'Delete Layer',
move_down: 'Move Layer Down',
new: 'New Layer',
"new": 'New Layer',
rename: 'Rename Layer',
move_up: 'Move Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_id = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_id = (function () {
layers: 'Layers',
del: 'Hapus Layer',
move_down: 'Pindahkan Layer Bawah',
new: 'New Layer',
"new": 'New Layer',
rename: 'Rename Layer',
move_up: 'Pindahkan Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_is = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_is = (function () {
layers: 'Layers',
del: 'Eyða Lag',
move_down: 'Færa Layer Down',
new: 'Lag',
"new": 'Lag',
rename: 'Endurnefna Lag',
move_up: 'Færa Lag Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_it = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_it = (function () {
layers: 'Layers',
del: 'Elimina il livello',
move_down: 'Sposta indietro il livello',
new: 'Nuovo livello',
"new": 'Nuovo livello',
rename: 'Rinomina il livello',
move_up: 'Sposta avanti il livello',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_ja = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_ja = (function () {
layers: 'Layers',
del: 'レイヤの削除',
move_down: 'レイヤを下へ移動',
new: '新規レイヤ',
"new": '新規レイヤ',
rename: 'レイヤの名前を変更',
move_up: 'レイヤを上へ移動',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_ko = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_ko = (function () {
layers: 'Layers',
del: '레이어 삭제',
move_down: '레이어 아래로 이동',
new: '새 레이어',
"new": '새 레이어',
rename: '레이어 이름 바꾸기',
move_up: '레이어 위로 이동',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_lt = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_lt = (function () {
layers: 'Layers',
del: 'Ištrinti Layer',
move_down: 'Perkelti sluoksnį Žemyn',
new: 'New Layer',
"new": 'New Layer',
rename: 'Pervadinti sluoksnį',
move_up: 'Perkelti sluoksnį Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_lv = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_lv = (function () {
layers: 'Layers',
del: 'Dzēst Layer',
move_down: 'Pārvietot slāni uz leju',
new: 'New Layer',
"new": 'New Layer',
rename: 'Pārdēvēt Layer',
move_up: 'Pārvietot slāni uz augšu',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_mk = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_mk = (function () {
layers: 'Layers',
del: 'Избриши Слој',
move_down: 'Премести слој долу',
new: 'Нов слој',
"new": 'Нов слој',
rename: 'Преименувај слој',
move_up: 'Премести слој горе',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_ms = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_ms = (function () {
layers: 'Layers',
del: 'Padam Layer',
move_down: 'Pindah Layer Bawah',
new: 'New Layer',
"new": 'New Layer',
rename: 'Rename Layer',
move_up: 'Pindah Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_mt = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_mt = (function () {
layers: 'Layers',
del: 'Ħassar Layer',
move_down: 'Move Layer Down',
new: 'New Layer',
"new": 'New Layer',
rename: 'Semmi mill-ġdid Layer',
move_up: 'Move Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_nl = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_nl = (function () {
layers: 'Layers',
del: 'Delete laag',
move_down: 'Beweeg laag omlaag',
new: 'Nieuwe laag',
"new": 'Nieuwe laag',
rename: 'Hernoem laag',
move_up: 'Beweeg laag omhoog',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_no = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_no = (function () {
layers: 'Layers',
del: 'Slett laget',
move_down: 'Flytt laget ned',
new: 'Nytt lag',
"new": 'Nytt lag',
rename: 'Rename Layer',
move_up: 'Flytt Layer Up',
dupe: 'Duplicate Layer',

View File

@ -143,7 +143,7 @@ var svgEditorLang_pl = (function () {
copy: 'Kopiuj',
paste: 'Wklej',
paste_in_place: 'Wklej w miejscu',
delete: 'Usuń',
"delete": 'Usuń',
group: 'Grupuj',
move_front: 'Przenieś do przodu',
move_up: 'Przenieś warstwę w górę',
@ -155,7 +155,7 @@ var svgEditorLang_pl = (function () {
layers: 'Warstwy',
del: 'Usuń warstwę',
move_down: 'Przenieś warstwę w dół',
new: 'Nowa warstwa',
"new": 'Nowa warstwa',
rename: 'Zmień nazwę warstwy',
move_up: 'Przenieś warstwę w górę',
dupe: 'Duplikuj warstwę',

View File

@ -142,7 +142,7 @@ var svgEditorLang_pt_BR = (function () {
copy: 'Copiar',
paste: 'Colar',
paste_in_place: 'Colar no mesmo local',
delete: 'Deletar',
"delete": 'Deletar',
group: 'Agrupar',
move_front: 'Trazer para Frente',
move_up: 'Avançar',
@ -154,7 +154,7 @@ var svgEditorLang_pt_BR = (function () {
layers: 'Camadas',
del: 'Deletar Camada',
move_down: 'Enviar Camada para Trás',
new: 'Nova Camada',
"new": 'Nova Camada',
rename: 'Renomear Camada',
move_up: 'Trazer Camada para Frente',
dupe: 'Duplicar Camada',

View File

@ -142,7 +142,7 @@ var svgEditorLang_pt_PT = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_pt_PT = (function () {
layers: 'Layers',
del: 'Delete Layer',
move_down: 'Move camada para baixo',
new: 'New Layer',
"new": 'New Layer',
rename: 'Rename Layer',
move_up: 'Move Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_ro = (function () {
copy: 'Copiere',
paste: 'Reproducere',
paste_in_place: 'Reproducere pe loc',
delete: 'Ştergere',
"delete": 'Ştergere',
group: 'Group',
move_front: 'Pune in faţa',
move_up: 'Pune in spate',
@ -154,7 +154,7 @@ var svgEditorLang_ro = (function () {
layers: 'Straturi',
del: 'Ştergeţi Strat',
move_down: 'Mutare Strat în Jos',
new: 'Strat Nou',
"new": 'Strat Nou',
rename: 'Redenumiţi Stratul',
move_up: 'Mutare Strat în Sus',
dupe: 'Duplicaţi Stratul',

View File

@ -154,7 +154,7 @@ var svgEditorLang_ru = (function () {
layers: 'Слои',
del: 'Удалить слой',
move_down: 'Опустить слой',
new: 'Создать слой',
"new": 'Создать слой',
rename: 'Переименовать Слой',
move_up: 'Поднять слой',
dupe: 'Копировать слой',

View File

@ -142,7 +142,7 @@ var svgEditorLang_sk = (function () {
copy: 'Kópia',
paste: 'Vloženie',
paste_in_place: 'Vloženie na pôvodnom mieste',
delete: 'Zmazanie',
"delete": 'Zmazanie',
group: 'Group',
move_front: 'Vysuň navrch',
move_up: 'Vysuň vpred',
@ -154,7 +154,7 @@ var svgEditorLang_sk = (function () {
layers: 'Vrstvy',
del: 'Odstrániť vrstvu',
move_down: 'Presunúť vrstvu dole',
new: 'Nová vrstva',
"new": 'Nová vrstva',
rename: 'Premenovať vrstvu',
move_up: 'Presunúť vrstvu hore',
dupe: 'Zduplikovať vrstvu',

View File

@ -142,7 +142,7 @@ var svgEditorLang_sl = (function () {
copy: 'Kopiraj',
paste: 'Prilepi',
paste_in_place: 'Prilepi na mesto',
delete: 'Izbriši',
"delete": 'Izbriši',
group: 'Združi',
move_front: 'Postavi v ospredje',
move_up: 'Pomakni naporej',
@ -154,7 +154,7 @@ var svgEditorLang_sl = (function () {
layers: 'Sloji',
del: 'Izbriši sloj',
move_down: 'Premakni navzdol',
new: 'Nov sloj',
"new": 'Nov sloj',
rename: 'Preimenuj sloj',
move_up: 'Premakni navzgor',
dupe: 'Podvoji sloj',

View File

@ -142,7 +142,7 @@ var svgEditorLang_sq = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_sq = (function () {
layers: 'Layers',
del: 'Delete Layer',
move_down: 'Move Down Layer',
new: 'Re Shtresa',
"new": 'Re Shtresa',
rename: 'Rename Layer',
move_up: 'Move Up Layer',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_sr = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_sr = (function () {
layers: 'Layers',
del: 'Избриши слој',
move_down: 'Помери слој доле',
new: 'Нови слој',
"new": 'Нови слој',
rename: 'Преименуј слој',
move_up: 'Помери слој Горе',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_sv = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_sv = (function () {
layers: 'Layers',
del: 'Radera Layer',
move_down: 'Flytta Layer Down',
new: 'New Layer',
"new": 'New Layer',
rename: 'Byt namn på Layer',
move_up: 'Flytta Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_sw = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_sw = (function () {
layers: 'Layers',
del: 'Delete Layer',
move_down: 'Move Layer Down',
new: 'Mpya Layer',
"new": 'Mpya Layer',
rename: 'Rename Layer',
move_up: 'Move Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_test = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Move Layer Up',
@ -154,7 +154,7 @@ var svgEditorLang_test = (function () {
layers: 'Layers',
del: 'Delete Layer',
move_down: 'Move Layer Down',
new: 'New Layer',
"new": 'New Layer',
rename: 'Rename Layer',
move_up: 'Move Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_th = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_th = (function () {
layers: 'Layers',
del: 'Delete Layer',
move_down: 'ย้าย Layer ลง',
new: 'Layer ใหม่',
"new": 'Layer ใหม่',
rename: 'Layer เปลี่ยนชื่อ',
move_up: 'ย้าย Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_tl = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_tl = (function () {
layers: 'Layers',
del: 'Tanggalin Layer',
move_down: 'Ilipat Layer Down',
new: 'Bagong Layer',
"new": 'Bagong Layer',
rename: 'Palitan ang pangalan ng Layer',
move_up: 'Ilipat Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_tr = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_tr = (function () {
layers: 'Layers',
del: 'Delete Layer',
move_down: 'Katman Aşağı Taşı',
new: 'Yeni Katman',
"new": 'Yeni Katman',
rename: 'Rename Katman',
move_up: 'Up Katman Taşı',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_uk = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_uk = (function () {
layers: 'Layers',
del: 'Видалити шар',
move_down: 'Перемістити шар на',
new: 'Новий шар',
"new": 'Новий шар',
rename: 'Перейменувати Шар',
move_up: 'Переміщення шару до',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_vi = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_vi = (function () {
layers: 'Layers',
del: 'Xoá Layer',
move_down: 'Move Layer Down',
new: 'New Layer',
"new": 'New Layer',
rename: 'Đổi tên Layer',
move_up: 'Di chuyển Layer Up',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_yi = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_yi = (function () {
layers: 'Layers',
del: 'ויסמעקן לייַער',
move_down: 'קער לייַער דאָוון',
new: 'ניו לייַער',
"new": 'ניו לייַער',
rename: 'רענאַמע לייַער',
move_up: 'באַוועגן לייַער אַרויף',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_zh_CN = (function () {
copy: '复制',
paste: '粘贴',
paste_in_place: '粘贴到原位置',
delete: '删除',
"delete": '删除',
group: '组合',
move_front: '移至顶部',
move_up: '向上移动',
@ -154,7 +154,7 @@ var svgEditorLang_zh_CN = (function () {
layers: '图层',
del: '删除图层',
move_down: '向下移动图层',
new: '新建图层',
"new": '新建图层',
rename: '重命名图层',
move_up: '向上移动图层',
dupe: '复制图层',

View File

@ -142,7 +142,7 @@ var svgEditorLang_zh_HK = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_zh_HK = (function () {
layers: 'Layers',
del: '删除层',
move_down: '层向下移动',
new: '新层',
"new": '新层',
rename: '重命名层',
move_up: '移动层最多',
dupe: 'Duplicate Layer',

View File

@ -142,7 +142,7 @@ var svgEditorLang_zh_TW = (function () {
copy: 'Copy',
paste: 'Paste',
paste_in_place: 'Paste in Place',
delete: 'Delete',
"delete": 'Delete',
group: 'Group',
move_front: 'Bring to Front',
move_up: 'Bring Forward',
@ -154,7 +154,7 @@ var svgEditorLang_zh_TW = (function () {
layers: 'Layers',
del: '刪除圖層',
move_down: '向下移動圖層',
new: '新增圖層',
"new": '新增圖層',
rename: '重新命名圖層',
move_up: '向上移動圖層',
dupe: 'Duplicate Layer',

File diff suppressed because it is too large Load Diff

8088
dist/svgcanvas-iife.js vendored

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -10,7 +10,7 @@
"test": "test"
},
"engines": {
"node": ">=8.5.0"
"node": ">=10"
},
"scripts": {
"add-release": "git submodule add --depth=1 -b \"release-v$npm_config_release\" -- https://github.com/SVG-Edit/svgedit.git \"releases/svg-edit-$npm_config_release\"",
@ -39,11 +39,6 @@
"open": "run-p start open-no-start",
"open-cov-no-start": "open-cli http://localhost:8000/coverage/",
"open-cov": "run-p start open-cov-no-start",
"instrument:replace-html": "frs-replace \"../svgedit-config-es.js\" \"svgedit-config-es.js\" -i instrumented/svg-editor-es.html -o instrumented/svg-editor-es.html",
"instrument:replace-js": "frs-replace \"src/editor/svg-editor.js\" \"svg-editor.js\" -i svgedit-config-es.js -o instrumented/svgedit-config-es.js",
"instrument:copy-excluded": "node cypress/support/copy.js",
"copy-instrumented": "copyfiles -e \"**/*.js\" -u 1 \"src/editor/**/*\" instrumented && npm run instrument:replace-html && npm run instrument:replace-js && npm run instrument:copy-excluded",
"instrument": "rimraf instrumented && nyc instrument editor instrumented && npm run copy-instrumented",
"report": "run-s report-no-mochawesome mochawesome-cli",
"report-summary": "run-s report-text-summary mochawesome-cli-dot",
"license-badge": "license-badger --uncategorizedLicenseTemplate \"\\${license} (\\${name} (\\${version}))\" --filteredTypes=nonempty --textTemplate \"License types\n(project, deps, and bundled devDeps)\" --packageJson --production badges/licenses-badge.svg",
@ -54,17 +49,17 @@
"copy": "copyfiles -f node_modules/load-stylesheets/dist/index-es.js src/external/load-stylesheets && copyfiles -f node_modules/jamilih/dist/jml-es.js editor/external/jamilih && copyfiles -f node_modules/query-result/esm/index.js editor/external/query-result/esm && copyfiles -f node_modules/qr-manipulation/dist/index-es.js editor/external/qr-manipulation/dist && copyfiles -f node_modules/stackblur-canvas/dist/stackblur-es.js editor/external/stackblur-canvas/dist && copyfiles -f node_modules/regenerator-runtime/runtime.js editor/external/regenerator-runtime && copyfiles -f \"node_modules/core-js-bundle//minified*\" editor/external/core-js-bundle && copyfiles -f \"node_modules/underscore/underscore-*\" editor/jspdf && copyfiles -f \"node_modules/deparam/dist/deparam.esm.js\" editor/external/deparam",
"remark": "remark -q -f .",
"build-html": "babel-node --plugins @babel/plugin-transform-modules-commonjs build/build-html.js",
"eslint-fix": "eslint --cache --fix --ext js,md,html .",
"eslint": "eslint --max-warnings 0 --cache --ext js,md,html .",
"eslint-fix": "eslint --fix --ext js,md,html src",
"eslint": "eslint --ext js,html src",
"rollup": "rollup -c",
"build-by-config": "rollup -c rollup-config.config.js",
"prep-no-core-rollup": "run-s eslint build-html build-by-config",
"prep": "run-s prep-no-core-rollup rollup",
"prepublishOnly": "run-s license-badges copy prep build-docs",
"cypress:open-no-start": "cypress open",
"cy:instrument": "rimraf instrumented && cp -r src instrumented && nyc instrument --compact false src instrumented",
"cypress:instrument": "rimraf instrumented && cp -r src instrumented && nyc instrument --compact false src instrumented",
"cypress:open": "run-p start cypress:open-no-start",
"open-tests": "run-s cy:instrument cypress:open",
"open-tests": "run-s cypress:instrument cypress:open",
"cypress:merge": "mochawesome-merge \"cypress/results/mochaw*.json\" > mochawesome.json && marge mochawesome.json && mbg --file ./mochawesome.json --badge_output badges/tests-badge.svg",
"cypress:run-only": "rimraf \"cypress/results/mochaw*.json\" && rimraf \".nyc_output/*\" && cypress run",
"cypress:run-no-badge": "run-s -c cypress:run-only cypress:merge",
@ -78,10 +73,14 @@
"test-only": "run-s -c test-only-no-report report",
"test-no-cov-no-core-rollup": "run-s prep-no-core-rollup test-only",
"test-no-cov": "run-s prep test-only",
"test-no-core-rollup": "run-s instrument test-no-cov-no-core-rollup",
"test": "run-s cy:instrument test-no-cov"
"test-no-core-rollup": "run-s cypress:instrument test-no-cov-no-core-rollup",
"test": "run-s cypress:instrument test-no-cov"
},
"nyc": {
"statements": 37.51,
"branches": 28.8,
"lines": 38.46,
"functions": 47.27,
"exclude": [
"src/external/**",
"src/editor/jquery.min.js",
@ -122,7 +121,13 @@
},
"homepage": "https://github.com/SVG-Edit/svgedit#readme",
"browserslist": [
"> 2%"
">0%",
"not Opera < 59",
"not IE < 12",
"not Chrome < 75",
"not FireFox < 68",
"not Safari < 10",
"not ios_saf < 10"
],
"dependencies": {},
"devDependencies": {

View File

@ -1,4 +1,4 @@
/* eslint-disable import/unambiguous */
/* eslint-disable import/unambiguous, max-len */
/* globals SVGPathSeg, SVGPathSegMovetoRel, SVGPathSegMovetoAbs,
SVGPathSegMovetoRel, SVGPathSegLinetoRel, SVGPathSegLinetoAbs,
SVGPathSegLinetoHorizontalRel, SVGPathSegLinetoHorizontalAbs,
@ -596,7 +596,7 @@ if (!('SVGPathSegList' in window) || !('appendItem' in window.SVGPathSegList.pro
return [];
}
const owningPathSegList = this; // eslint-disable-line consistent-this
const owningPathSegList = this;
class Builder {
constructor () {

Some files were not shown because too many files have changed in this diff Show More