- Breaking change: Rename config file to svgedit-config-iife.js (or for the module version, svgedit-config-es.js);
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
This commit is contained in:
Brett Zamir
@@ -1,140 +1,159 @@
|
||||
/* eslint-env qunit */
|
||||
/* globals svgedit, equals */
|
||||
|
||||
// import './pathseg.js';
|
||||
import '../editor/pathseg.js';
|
||||
import {NS} from '../editor/svgedit.js';
|
||||
import * as utilities from '../editor/svgutils.js';
|
||||
import * as pathModule from '../editor/path.js';
|
||||
|
||||
// log function
|
||||
QUnit.log = function (details) {
|
||||
QUnit.log(function (details) {
|
||||
if (window.console && window.console.log) {
|
||||
window.console.log(details.result + ' :: ' + details.message);
|
||||
}
|
||||
};
|
||||
|
||||
test('Test svgedit.path.replacePathSeg', function () {
|
||||
expect(6);
|
||||
|
||||
const path = document.createElementNS(svgedit.NS.SVG, 'path');
|
||||
path.setAttribute('d', 'M0,0 L10,11 L20,21Z');
|
||||
svgedit.path.init();
|
||||
svgedit.path.Path(path);
|
||||
|
||||
equals(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'L');
|
||||
equals(path.pathSegList.getItem(1).x, 10);
|
||||
equals(path.pathSegList.getItem(1).y, 11);
|
||||
|
||||
svgedit.path.replacePathSeg(SVGPathSeg.PATHSEG_LINETO_REL, 1, [30, 31], path);
|
||||
|
||||
equals(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'l');
|
||||
equals(path.pathSegList.getItem(1).x, 30);
|
||||
equals(path.pathSegList.getItem(1).y, 31);
|
||||
});
|
||||
|
||||
test('Test svgedit.path.Segment.setType simple', function () {
|
||||
expect(9);
|
||||
|
||||
const path = document.createElementNS(svgedit.NS.SVG, 'path');
|
||||
path.setAttribute('d', 'M0,0 L10,11 L20,21Z');
|
||||
svgedit.path.init();
|
||||
svgedit.path.Path(path);
|
||||
|
||||
equals(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'L');
|
||||
equals(path.pathSegList.getItem(1).x, 10);
|
||||
equals(path.pathSegList.getItem(1).y, 11);
|
||||
|
||||
const segment = new svgedit.path.Segment(1, path.pathSegList.getItem(1));
|
||||
segment.setType(SVGPathSeg.PATHSEG_LINETO_REL, [30, 31]);
|
||||
equals(segment.item.pathSegTypeAsLetter, 'l');
|
||||
equals(segment.item.x, 30);
|
||||
equals(segment.item.y, 31);
|
||||
|
||||
// Also verify that the actual path changed.
|
||||
equals(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'l');
|
||||
equals(path.pathSegList.getItem(1).x, 30);
|
||||
equals(path.pathSegList.getItem(1).y, 31);
|
||||
});
|
||||
|
||||
test('Test svgedit.path.Segment.setType with control points', function () {
|
||||
expect(14);
|
||||
|
||||
// Setup the dom for a mock control group.
|
||||
const svg = document.createElementNS(svgedit.NS.SVG, 'svg');
|
||||
const path = document.createElementNS(svgedit.NS.SVG, 'path');
|
||||
path.setAttribute('d', 'M0,0 C11,12 13,14 15,16 Z');
|
||||
svg.appendChild(path);
|
||||
const selectorParentGroup = document.createElementNS(svgedit.NS.SVG, 'g');
|
||||
function getMockContext (svg) {
|
||||
svg = svg || document.createElementNS(NS.SVG, 'svg');
|
||||
const selectorParentGroup = document.createElementNS(NS.SVG, 'g');
|
||||
selectorParentGroup.setAttribute('id', 'selectorParentGroup');
|
||||
svg.appendChild(selectorParentGroup);
|
||||
const mockContext = {
|
||||
return {
|
||||
getDOMDocument () { return svg; },
|
||||
getDOMContainer () { return svg; },
|
||||
getSVGRoot () { return svg; },
|
||||
getCurrentZoom () { return 1; }
|
||||
};
|
||||
svgedit.path.init(mockContext);
|
||||
svgedit.utilities.init(mockContext);
|
||||
const segment = new svgedit.path.Segment(1, path.pathSegList.getItem(1));
|
||||
segment.path = new svgedit.path.Path(path);
|
||||
}
|
||||
|
||||
equals(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'C');
|
||||
equals(path.pathSegList.getItem(1).x1, 11);
|
||||
equals(path.pathSegList.getItem(1).y1, 12);
|
||||
equals(path.pathSegList.getItem(1).x2, 13);
|
||||
equals(path.pathSegList.getItem(1).y2, 14);
|
||||
equals(path.pathSegList.getItem(1).x, 15);
|
||||
equals(path.pathSegList.getItem(1).y, 16);
|
||||
QUnit.test('Test svgedit.path.replacePathSeg', function (assert) {
|
||||
assert.expect(6);
|
||||
|
||||
const path = document.createElementNS(NS.SVG, 'path');
|
||||
path.setAttribute('d', 'M0,0 L10,11 L20,21Z');
|
||||
|
||||
const mockContext = getMockContext();
|
||||
pathModule.init(mockContext);
|
||||
utilities.init(mockContext);
|
||||
new pathModule.Path(path); // eslint-disable-line no-new
|
||||
|
||||
assert.equal(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'L');
|
||||
assert.equal(path.pathSegList.getItem(1).x, 10);
|
||||
assert.equal(path.pathSegList.getItem(1).y, 11);
|
||||
|
||||
pathModule.replacePathSeg(SVGPathSeg.PATHSEG_LINETO_REL, 1, [30, 31], path);
|
||||
|
||||
assert.equal(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'l');
|
||||
assert.equal(path.pathSegList.getItem(1).x, 30);
|
||||
assert.equal(path.pathSegList.getItem(1).y, 31);
|
||||
});
|
||||
|
||||
QUnit.test('Test svgedit.path.Segment.setType simple', function (assert) {
|
||||
assert.expect(9);
|
||||
|
||||
const path = document.createElementNS(NS.SVG, 'path');
|
||||
path.setAttribute('d', 'M0,0 L10,11 L20,21Z');
|
||||
|
||||
const mockContext = getMockContext();
|
||||
pathModule.init(mockContext);
|
||||
utilities.init(mockContext);
|
||||
new pathModule.Path(path); // eslint-disable-line no-new
|
||||
|
||||
assert.equal(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'L');
|
||||
assert.equal(path.pathSegList.getItem(1).x, 10);
|
||||
assert.equal(path.pathSegList.getItem(1).y, 11);
|
||||
|
||||
const segment = new pathModule.Segment(1, path.pathSegList.getItem(1));
|
||||
segment.setType(SVGPathSeg.PATHSEG_LINETO_REL, [30, 31]);
|
||||
assert.equal(segment.item.pathSegTypeAsLetter, 'l');
|
||||
assert.equal(segment.item.x, 30);
|
||||
assert.equal(segment.item.y, 31);
|
||||
|
||||
// Also verify that the actual path changed.
|
||||
assert.equal(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'l');
|
||||
assert.equal(path.pathSegList.getItem(1).x, 30);
|
||||
assert.equal(path.pathSegList.getItem(1).y, 31);
|
||||
});
|
||||
|
||||
QUnit.test('Test svgedit.path.Segment.setType with control points', function (assert) {
|
||||
assert.expect(14);
|
||||
|
||||
// Setup the dom for a mock control group.
|
||||
const svg = document.createElementNS(NS.SVG, 'svg');
|
||||
const path = document.createElementNS(NS.SVG, 'path');
|
||||
path.setAttribute('d', 'M0,0 C11,12 13,14 15,16 Z');
|
||||
svg.appendChild(path);
|
||||
|
||||
const mockContext = getMockContext(svg);
|
||||
pathModule.init(mockContext);
|
||||
utilities.init(mockContext);
|
||||
const segment = new pathModule.Segment(1, path.pathSegList.getItem(1));
|
||||
segment.path = new pathModule.Path(path);
|
||||
|
||||
assert.equal(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'C');
|
||||
assert.equal(path.pathSegList.getItem(1).x1, 11);
|
||||
assert.equal(path.pathSegList.getItem(1).y1, 12);
|
||||
assert.equal(path.pathSegList.getItem(1).x2, 13);
|
||||
assert.equal(path.pathSegList.getItem(1).y2, 14);
|
||||
assert.equal(path.pathSegList.getItem(1).x, 15);
|
||||
assert.equal(path.pathSegList.getItem(1).y, 16);
|
||||
|
||||
segment.setType(SVGPathSeg.PATHSEG_CURVETO_CUBIC_REL, [30, 31, 32, 33, 34, 35]);
|
||||
equals(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'c');
|
||||
equals(path.pathSegList.getItem(1).x1, 32);
|
||||
equals(path.pathSegList.getItem(1).y1, 33);
|
||||
equals(path.pathSegList.getItem(1).x2, 34);
|
||||
equals(path.pathSegList.getItem(1).y2, 35);
|
||||
equals(path.pathSegList.getItem(1).x, 30);
|
||||
equals(path.pathSegList.getItem(1).y, 31);
|
||||
assert.equal(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'c');
|
||||
assert.equal(path.pathSegList.getItem(1).x1, 32);
|
||||
assert.equal(path.pathSegList.getItem(1).y1, 33);
|
||||
assert.equal(path.pathSegList.getItem(1).x2, 34);
|
||||
assert.equal(path.pathSegList.getItem(1).y2, 35);
|
||||
assert.equal(path.pathSegList.getItem(1).x, 30);
|
||||
assert.equal(path.pathSegList.getItem(1).y, 31);
|
||||
});
|
||||
|
||||
test('Test svgedit.path.Segment.move', function () {
|
||||
expect(6);
|
||||
QUnit.test('Test svgedit.path.Segment.move', function (assert) {
|
||||
assert.expect(6);
|
||||
|
||||
const path = document.createElementNS(svgedit.NS.SVG, 'path');
|
||||
const path = document.createElementNS(NS.SVG, 'path');
|
||||
path.setAttribute('d', 'M0,0 L10,11 L20,21Z');
|
||||
svgedit.path.init();
|
||||
svgedit.path.Path(path);
|
||||
|
||||
equals(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'L');
|
||||
equals(path.pathSegList.getItem(1).x, 10);
|
||||
equals(path.pathSegList.getItem(1).y, 11);
|
||||
const mockContext = getMockContext();
|
||||
pathModule.init(mockContext);
|
||||
utilities.init(mockContext);
|
||||
new pathModule.Path(path); // eslint-disable-line no-new
|
||||
|
||||
const segment = new svgedit.path.Segment(1, path.pathSegList.getItem(1));
|
||||
assert.equal(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'L');
|
||||
assert.equal(path.pathSegList.getItem(1).x, 10);
|
||||
assert.equal(path.pathSegList.getItem(1).y, 11);
|
||||
|
||||
const segment = new pathModule.Segment(1, path.pathSegList.getItem(1));
|
||||
segment.move(-3, 4);
|
||||
equals(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'L');
|
||||
equals(path.pathSegList.getItem(1).x, 7);
|
||||
equals(path.pathSegList.getItem(1).y, 15);
|
||||
assert.equal(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'L');
|
||||
assert.equal(path.pathSegList.getItem(1).x, 7);
|
||||
assert.equal(path.pathSegList.getItem(1).y, 15);
|
||||
});
|
||||
|
||||
test('Test svgedit.path.Segment.moveCtrl', function () {
|
||||
expect(14);
|
||||
QUnit.test('Test svgedit.path.Segment.moveCtrl', function (assert) {
|
||||
assert.expect(14);
|
||||
|
||||
const path = document.createElementNS(svgedit.NS.SVG, 'path');
|
||||
const path = document.createElementNS(NS.SVG, 'path');
|
||||
path.setAttribute('d', 'M0,0 C11,12 13,14 15,16 Z');
|
||||
svgedit.path.init();
|
||||
svgedit.path.Path(path);
|
||||
|
||||
equals(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'C');
|
||||
equals(path.pathSegList.getItem(1).x1, 11);
|
||||
equals(path.pathSegList.getItem(1).y1, 12);
|
||||
equals(path.pathSegList.getItem(1).x2, 13);
|
||||
equals(path.pathSegList.getItem(1).y2, 14);
|
||||
equals(path.pathSegList.getItem(1).x, 15);
|
||||
equals(path.pathSegList.getItem(1).y, 16);
|
||||
const mockContext = getMockContext();
|
||||
pathModule.init(mockContext);
|
||||
utilities.init(mockContext);
|
||||
new pathModule.Path(path); // eslint-disable-line no-new
|
||||
|
||||
const segment = new svgedit.path.Segment(1, path.pathSegList.getItem(1));
|
||||
assert.equal(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'C');
|
||||
assert.equal(path.pathSegList.getItem(1).x1, 11);
|
||||
assert.equal(path.pathSegList.getItem(1).y1, 12);
|
||||
assert.equal(path.pathSegList.getItem(1).x2, 13);
|
||||
assert.equal(path.pathSegList.getItem(1).y2, 14);
|
||||
assert.equal(path.pathSegList.getItem(1).x, 15);
|
||||
assert.equal(path.pathSegList.getItem(1).y, 16);
|
||||
|
||||
const segment = new pathModule.Segment(1, path.pathSegList.getItem(1));
|
||||
segment.moveCtrl(1, 100, -200);
|
||||
equals(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'C');
|
||||
equals(path.pathSegList.getItem(1).x1, 111);
|
||||
equals(path.pathSegList.getItem(1).y1, -188);
|
||||
equals(path.pathSegList.getItem(1).x2, 13);
|
||||
equals(path.pathSegList.getItem(1).y2, 14);
|
||||
equals(path.pathSegList.getItem(1).x, 15);
|
||||
equals(path.pathSegList.getItem(1).y, 16);
|
||||
assert.equal(path.pathSegList.getItem(1).pathSegTypeAsLetter, 'C');
|
||||
assert.equal(path.pathSegList.getItem(1).x1, 111);
|
||||
assert.equal(path.pathSegList.getItem(1).y1, -188);
|
||||
assert.equal(path.pathSegList.getItem(1).x2, 13);
|
||||
assert.equal(path.pathSegList.getItem(1).y2, 14);
|
||||
assert.equal(path.pathSegList.getItem(1).x, 15);
|
||||
assert.equal(path.pathSegList.getItem(1).y, 16);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user