8c9e40d349
also expect one directory higher; incorporates #207 (@iuyiuy) - Breaking change: Separate `extIconsPath` from `extPath` (not copying over icons) - Breaking change: Don't reference `custom.css` in HTML; can instead be referenced in JavaScript through the config file (provided in `svgedit-config-sample-iife.js`/`svgedit-config-sample-es.js` as `svgedit-custom.css` for better namespacing); incorporates #207 (@iuyiuy) - Breaking change: Remove minified jgraduate/spinbtn files (minified within Rollup routine) - Fix: Zoom when scrolled; incorporates #169 (@AndrolGenhald), adapting for conventions; also allow avoidance when shift key pressed - Fix: Update Atom feed reference in HTML - Fixes related to recent commits: Some path and method name fixes needed, function order, missing methods, variable scope declaration, no need for DOMContentLoaded listeners in modules, switch back to non-default export, avoid trimming nullish, deal with mock tests, fix `math.matrixMultiply`, use jquery-svg where needed for array/SVG attributes; add babel-polyfill and defer script to imagelib; other misc. fixes - Enhancement: Move config-sample.js out of `editor` directory - Enhancement: For `callback`-style extensions, also provide config object; add following to that object: buildCanvgCallback, canvg, decode64, encode64, executeAfterLoads, getTypeMap, isChrome, ieIE, NS, text2xml - Enhancement: Complete ES6 modules work (extensions, locales, tests), along with Babel; make Node build routine for converting modular source to non-modular, use `loadStylesheets` for modular stylehsheet defining (but parallel loading); - Enhancement: Add `stylesheets` config for modular but parallel stylesheet loading with `@default` option for simple inclusion/exclusion of defaults (if not going with default). - Refactoring: Clean up `svg-editor.html`: consistent indents; avoid extra lbs, avoid long lines - Refactoring: Avoid embedded API adding inline JavaScript listener - Refactoring: Move layers and context code to `draw.js` - Refactoring: Move `pathActions` from `svgcanvas.js` (though preserve aliases to these methods on `canvas`) and `convertPath` from `svgutils.js` to `path.js` - Refactoring: Move `getStrokedBBox` from `svgcanvas.js` (while keeping an alias) to `svgutils.js` (as `getStrokedBBoxDefaultVisible` to avoid conflict with existing) - Docs: Remove "dependencies" comments in code except where summarizing role of jQuery or a non-obvious dependency - Refactoring/Linting: Enfore `no-extra-semi` and `quote-props` rules - Refactoring: Further avoidance of quotes on properties (as possible) - Refactoring: Use `class` in place of functions where intended as classes - Refactoring: Consistency and granularity in extensions imports - Testing: Update QUnit to 2.6.1 (node_modules) and Sinon to 5.0.8 (and add sinon-test at 2.1.3) and enforce eslint-plugin-qunit linting rules; update custom extensions - Testing: Add node-static for automating (and accessing out-of-directory contents) - Testing: Avoid HTML attributes for styling - Testing: Add npm `test` script - Testing: Comment out unused jQuery SVG test - Testing: Add test1 and svgutils_performance_test to all tests page - Testing: Due apparently to Path having not been a formal class, the test was calling it without `new`; refactored now with sufficient mock data to take into account it is a class - npm: Update devDeps - npm: Add html modules and config build to test script
337 lines
7.6 KiB
JavaScript
337 lines
7.6 KiB
JavaScript
/* eslint-env qunit */
|
|
import {NS} from '../editor/svgedit.js';
|
|
import * as utilities from '../editor/svgutils.js';
|
|
import * as coords from '../editor/coords.js';
|
|
|
|
// log function
|
|
QUnit.log(function (details) {
|
|
if (window.console && window.console.log) {
|
|
window.console.log(details.result + ' :: ' + details.message);
|
|
}
|
|
});
|
|
|
|
const root = document.getElementById('root');
|
|
const svgroot = document.createElementNS(NS.SVG, 'svg');
|
|
svgroot.id = 'svgroot';
|
|
root.appendChild(svgroot);
|
|
const svg = document.createElementNS(NS.SVG, 'svg');
|
|
svgroot.appendChild(svg);
|
|
|
|
let elemId = 1;
|
|
function setUp () {
|
|
// Mock out editor context.
|
|
utilities.init({
|
|
getSVGRoot () { return svg; },
|
|
getDOMDocument () { return null; },
|
|
getDOMContainer () { return null; }
|
|
});
|
|
coords.init({
|
|
getGridSnapping () { return false; },
|
|
getDrawing () {
|
|
return {
|
|
getNextId () { return '' + elemId++; }
|
|
};
|
|
}
|
|
});
|
|
}
|
|
|
|
function tearDown () {
|
|
while (svg.hasChildNodes()) {
|
|
svg.removeChild(svg.firstChild);
|
|
}
|
|
}
|
|
|
|
QUnit.test('Test remapElement(translate) for rect', function (assert) {
|
|
assert.expect(4);
|
|
|
|
setUp();
|
|
|
|
const rect = document.createElementNS(NS.SVG, 'rect');
|
|
rect.setAttribute('x', '200');
|
|
rect.setAttribute('y', '150');
|
|
rect.setAttribute('width', '250');
|
|
rect.setAttribute('height', '120');
|
|
svg.appendChild(rect);
|
|
|
|
const attrs = {
|
|
x: '200',
|
|
y: '150',
|
|
width: '125',
|
|
height: '75'
|
|
};
|
|
|
|
// Create a translate.
|
|
const m = svg.createSVGMatrix();
|
|
m.a = 1; m.b = 0;
|
|
m.c = 0; m.d = 1;
|
|
m.e = 100; m.f = -50;
|
|
|
|
coords.remapElement(rect, attrs, m);
|
|
|
|
assert.equal(rect.getAttribute('x'), '300');
|
|
assert.equal(rect.getAttribute('y'), '100');
|
|
assert.equal(rect.getAttribute('width'), '125');
|
|
assert.equal(rect.getAttribute('height'), '75');
|
|
|
|
tearDown();
|
|
});
|
|
|
|
QUnit.test('Test remapElement(scale) for rect', function (assert) {
|
|
assert.expect(4);
|
|
setUp();
|
|
|
|
const rect = document.createElementNS(NS.SVG, 'rect');
|
|
rect.setAttribute('width', '250');
|
|
rect.setAttribute('height', '120');
|
|
svg.appendChild(rect);
|
|
|
|
const attrs = {
|
|
x: '0',
|
|
y: '0',
|
|
width: '250',
|
|
height: '120'
|
|
};
|
|
|
|
// Create a translate.
|
|
const m = svg.createSVGMatrix();
|
|
m.a = 2; m.b = 0;
|
|
m.c = 0; m.d = 0.5;
|
|
m.e = 0; m.f = 0;
|
|
|
|
coords.remapElement(rect, attrs, m);
|
|
|
|
assert.equal(rect.getAttribute('x'), '0');
|
|
assert.equal(rect.getAttribute('y'), '0');
|
|
assert.equal(rect.getAttribute('width'), '500');
|
|
assert.equal(rect.getAttribute('height'), '60');
|
|
|
|
tearDown();
|
|
});
|
|
|
|
QUnit.test('Test remapElement(translate) for circle', function (assert) {
|
|
assert.expect(3);
|
|
setUp();
|
|
|
|
const circle = document.createElementNS(NS.SVG, 'circle');
|
|
circle.setAttribute('cx', '200');
|
|
circle.setAttribute('cy', '150');
|
|
circle.setAttribute('r', '125');
|
|
svg.appendChild(circle);
|
|
|
|
const attrs = {
|
|
cx: '200',
|
|
cy: '150',
|
|
r: '125'
|
|
};
|
|
|
|
// Create a translate.
|
|
const m = svg.createSVGMatrix();
|
|
m.a = 1; m.b = 0;
|
|
m.c = 0; m.d = 1;
|
|
m.e = 100; m.f = -50;
|
|
|
|
coords.remapElement(circle, attrs, m);
|
|
|
|
assert.equal(circle.getAttribute('cx'), '300');
|
|
assert.equal(circle.getAttribute('cy'), '100');
|
|
assert.equal(circle.getAttribute('r'), '125');
|
|
|
|
tearDown();
|
|
});
|
|
|
|
QUnit.test('Test remapElement(scale) for circle', function (assert) {
|
|
assert.expect(3);
|
|
setUp();
|
|
|
|
const circle = document.createElementNS(NS.SVG, 'circle');
|
|
circle.setAttribute('cx', '200');
|
|
circle.setAttribute('cy', '150');
|
|
circle.setAttribute('r', '250');
|
|
svg.appendChild(circle);
|
|
|
|
const attrs = {
|
|
cx: '200',
|
|
cy: '150',
|
|
r: '250'
|
|
};
|
|
|
|
// Create a translate.
|
|
const m = svg.createSVGMatrix();
|
|
m.a = 2; m.b = 0;
|
|
m.c = 0; m.d = 0.5;
|
|
m.e = 0; m.f = 0;
|
|
|
|
coords.remapElement(circle, attrs, m);
|
|
|
|
assert.equal(circle.getAttribute('cx'), '400');
|
|
assert.equal(circle.getAttribute('cy'), '75');
|
|
// Radius is the minimum that fits in the new bounding box.
|
|
assert.equal(circle.getAttribute('r'), '125');
|
|
|
|
tearDown();
|
|
});
|
|
|
|
QUnit.test('Test remapElement(translate) for ellipse', function (assert) {
|
|
assert.expect(4);
|
|
setUp();
|
|
|
|
const ellipse = document.createElementNS(NS.SVG, 'ellipse');
|
|
ellipse.setAttribute('cx', '200');
|
|
ellipse.setAttribute('cy', '150');
|
|
ellipse.setAttribute('rx', '125');
|
|
ellipse.setAttribute('ry', '75');
|
|
svg.appendChild(ellipse);
|
|
|
|
const attrs = {
|
|
cx: '200',
|
|
cy: '150',
|
|
rx: '125',
|
|
ry: '75'
|
|
};
|
|
|
|
// Create a translate.
|
|
const m = svg.createSVGMatrix();
|
|
m.a = 1; m.b = 0;
|
|
m.c = 0; m.d = 1;
|
|
m.e = 100; m.f = -50;
|
|
|
|
coords.remapElement(ellipse, attrs, m);
|
|
|
|
assert.equal(ellipse.getAttribute('cx'), '300');
|
|
assert.equal(ellipse.getAttribute('cy'), '100');
|
|
assert.equal(ellipse.getAttribute('rx'), '125');
|
|
assert.equal(ellipse.getAttribute('ry'), '75');
|
|
|
|
tearDown();
|
|
});
|
|
|
|
QUnit.test('Test remapElement(scale) for ellipse', function (assert) {
|
|
assert.expect(4);
|
|
setUp();
|
|
|
|
const ellipse = document.createElementNS(NS.SVG, 'ellipse');
|
|
ellipse.setAttribute('cx', '200');
|
|
ellipse.setAttribute('cy', '150');
|
|
ellipse.setAttribute('rx', '250');
|
|
ellipse.setAttribute('ry', '120');
|
|
svg.appendChild(ellipse);
|
|
|
|
const attrs = {
|
|
cx: '200',
|
|
cy: '150',
|
|
rx: '250',
|
|
ry: '120'
|
|
};
|
|
|
|
// Create a translate.
|
|
const m = svg.createSVGMatrix();
|
|
m.a = 2; m.b = 0;
|
|
m.c = 0; m.d = 0.5;
|
|
m.e = 0; m.f = 0;
|
|
|
|
coords.remapElement(ellipse, attrs, m);
|
|
|
|
assert.equal(ellipse.getAttribute('cx'), '400');
|
|
assert.equal(ellipse.getAttribute('cy'), '75');
|
|
assert.equal(ellipse.getAttribute('rx'), '500');
|
|
assert.equal(ellipse.getAttribute('ry'), '60');
|
|
|
|
tearDown();
|
|
});
|
|
|
|
QUnit.test('Test remapElement(translate) for line', function (assert) {
|
|
assert.expect(4);
|
|
setUp();
|
|
|
|
const line = document.createElementNS(NS.SVG, 'line');
|
|
line.setAttribute('x1', '50');
|
|
line.setAttribute('y1', '100');
|
|
line.setAttribute('x2', '120');
|
|
line.setAttribute('y2', '200');
|
|
svg.appendChild(line);
|
|
|
|
const attrs = {
|
|
x1: '50',
|
|
y1: '100',
|
|
x2: '120',
|
|
y2: '200'
|
|
};
|
|
|
|
// Create a translate.
|
|
const m = svg.createSVGMatrix();
|
|
m.a = 1; m.b = 0;
|
|
m.c = 0; m.d = 1;
|
|
m.e = 100; m.f = -50;
|
|
|
|
coords.remapElement(line, attrs, m);
|
|
|
|
assert.equal(line.getAttribute('x1'), '150');
|
|
assert.equal(line.getAttribute('y1'), '50');
|
|
assert.equal(line.getAttribute('x2'), '220');
|
|
assert.equal(line.getAttribute('y2'), '150');
|
|
|
|
tearDown();
|
|
});
|
|
|
|
QUnit.test('Test remapElement(scale) for line', function (assert) {
|
|
assert.expect(4);
|
|
setUp();
|
|
|
|
const line = document.createElementNS(NS.SVG, 'line');
|
|
line.setAttribute('x1', '50');
|
|
line.setAttribute('y1', '100');
|
|
line.setAttribute('x2', '120');
|
|
line.setAttribute('y2', '200');
|
|
svg.appendChild(line);
|
|
|
|
const attrs = {
|
|
x1: '50',
|
|
y1: '100',
|
|
x2: '120',
|
|
y2: '200'
|
|
};
|
|
|
|
// Create a translate.
|
|
const m = svg.createSVGMatrix();
|
|
m.a = 2; m.b = 0;
|
|
m.c = 0; m.d = 0.5;
|
|
m.e = 0; m.f = 0;
|
|
|
|
coords.remapElement(line, attrs, m);
|
|
|
|
assert.equal(line.getAttribute('x1'), '100');
|
|
assert.equal(line.getAttribute('y1'), '50');
|
|
assert.equal(line.getAttribute('x2'), '240');
|
|
assert.equal(line.getAttribute('y2'), '100');
|
|
|
|
tearDown();
|
|
});
|
|
|
|
QUnit.test('Test remapElement(translate) for text', function (assert) {
|
|
assert.expect(2);
|
|
setUp();
|
|
|
|
const text = document.createElementNS(NS.SVG, 'text');
|
|
text.setAttribute('x', '50');
|
|
text.setAttribute('y', '100');
|
|
svg.appendChild(text);
|
|
|
|
const attrs = {
|
|
x: '50',
|
|
y: '100'
|
|
};
|
|
|
|
// Create a translate.
|
|
const m = svg.createSVGMatrix();
|
|
m.a = 1; m.b = 0;
|
|
m.c = 0; m.d = 1;
|
|
m.e = 100; m.f = -50;
|
|
|
|
coords.remapElement(text, attrs, m);
|
|
|
|
assert.equal(text.getAttribute('x'), '150');
|
|
assert.equal(text.getAttribute('y'), '50');
|
|
|
|
tearDown();
|
|
});
|