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
276 lines
8.5 KiB
JavaScript
276 lines
8.5 KiB
JavaScript
(function () {
|
|
'use strict';
|
|
|
|
/* globals jQuery */
|
|
/*
|
|
* ext-polygon.js
|
|
*
|
|
*
|
|
* Copyright(c) 2010 CloudCanvas, Inc.
|
|
* All rights reserved
|
|
*
|
|
*/
|
|
|
|
svgEditor.addExtension('polygon', function (S) {
|
|
var $ = jQuery;
|
|
var svgCanvas = svgEditor.canvas;
|
|
var selElems = void 0,
|
|
|
|
// svgdoc = S.svgroot.parentNode.ownerDocument,
|
|
// newFOG, newFOGParent, newDef, newImageName, newMaskID, modeChangeG,
|
|
// edg = 0,
|
|
// undoCommand = 'Not image';
|
|
started = void 0,
|
|
newFO = void 0;
|
|
|
|
// const ccZoom;
|
|
// const wEl, hEl;
|
|
// const wOffset, hOffset;
|
|
// const ccRBG;
|
|
// const ccOpacity;
|
|
// const brushW, brushH;
|
|
|
|
// const ccDebug = document.getElementById('debugpanel');
|
|
|
|
/* 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);
|
|
}; */
|
|
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; }');
|
|
$('#polygon_panel').toggle(on);
|
|
}
|
|
|
|
/*
|
|
function toggleSourceButtons(on){
|
|
$('#tool_source_save, #tool_source_cancel').toggle(!on);
|
|
$('#polygon_save, #polygon_cancel').toggle(on);
|
|
}
|
|
*/
|
|
|
|
function setAttr(attr, val) {
|
|
svgCanvas.changeSelectedAttribute(attr, val);
|
|
S.call('changed', selElems);
|
|
}
|
|
|
|
function cot(n) {
|
|
return 1 / Math.tan(n);
|
|
}
|
|
|
|
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,
|
|
* based on the itex contained in string.
|
|
* @param {string} tex The itex text.
|
|
* @returns This function returns false if the set was unsuccessful, true otherwise.
|
|
*/
|
|
/*
|
|
function setItexString(tex) {
|
|
const mathns = 'http://www.w3.org/1998/Math/MathML',
|
|
xmlnsns = 'http://www.w3.org/2000/xmlns/',
|
|
ajaxEndpoint = '../../itex';
|
|
const elt = selElems[0];
|
|
try {
|
|
const math = svgdoc.createElementNS(mathns, 'math');
|
|
math.setAttributeNS(xmlnsns, 'xmlns', mathns);
|
|
math.setAttribute('display', 'inline');
|
|
const semantics = document.createElementNS(mathns, 'semantics');
|
|
const annotation = document.createElementNS(mathns, 'annotation');
|
|
annotation.setAttribute('encoding', 'application/x-tex');
|
|
annotation.textContent = tex;
|
|
const mrow = document.createElementNS(mathns, 'mrow');
|
|
semantics.appendChild(mrow);
|
|
semantics.appendChild(annotation);
|
|
math.appendChild(semantics);
|
|
// make an AJAX request to the server, to get the MathML
|
|
$.post(ajaxEndpoint, {tex, display: 'inline'}, function(data){
|
|
const children = data.documentElement.childNodes;
|
|
while (children.length > 0) {
|
|
mrow.appendChild(svgdoc.adoptNode(children[0], true));
|
|
}
|
|
S.sanitizeSvg(math);
|
|
S.call('changed', [elt]);
|
|
});
|
|
elt.replaceChild(math, elt.firstChild);
|
|
S.call('changed', [elt]);
|
|
svgCanvas.clearSelection();
|
|
} catch(e) {
|
|
console.log(e);
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
*/
|
|
return {
|
|
name: 'polygon',
|
|
svgicons: svgEditor.curConfig.extIconsPath + 'polygon-icons.svg',
|
|
buttons: [{
|
|
id: 'tool_polygon',
|
|
type: 'mode',
|
|
title: 'Polygon Tool',
|
|
position: 11,
|
|
events: {
|
|
click: function click() {
|
|
svgCanvas.setMode('polygon');
|
|
showPanel(true);
|
|
}
|
|
}
|
|
}],
|
|
|
|
context_tools: [{
|
|
type: 'input',
|
|
panel: 'polygon_panel',
|
|
title: 'Number of Sides',
|
|
id: 'polySides',
|
|
label: 'sides',
|
|
size: 3,
|
|
defval: 5,
|
|
events: {
|
|
change: function change() {
|
|
setAttr('sides', this.value);
|
|
}
|
|
}
|
|
}],
|
|
|
|
callback: function callback() {
|
|
$('#polygon_panel').hide();
|
|
|
|
// TODO: Needs to be done after orig icon loads
|
|
setTimeout(function () {
|
|
// Create source save/cancel buttons
|
|
/* const save = */$('#tool_source_save').clone().hide().attr('id', 'polygon_save').unbind().appendTo('#tool_source_back').click(function () {
|
|
{
|
|
return;
|
|
}
|
|
// }
|
|
// setSelectMode();
|
|
});
|
|
|
|
/* const cancel = */$('#tool_source_cancel').clone().hide().attr('id', 'polygon_cancel').unbind().appendTo('#tool_source_back').click(function () {
|
|
});
|
|
}, 3000);
|
|
},
|
|
mouseDown: function mouseDown(opts) {
|
|
// const e = opts.event;
|
|
var rgb = svgCanvas.getColor('fill');
|
|
// const ccRgbEl = rgb.substring(1, rgb.length);
|
|
var sRgb = svgCanvas.getColor('stroke');
|
|
// ccSRgbEl = sRgb.substring(1, rgb.length);
|
|
var sWidth = svgCanvas.getStrokeWidth();
|
|
|
|
if (svgCanvas.getMode() === 'polygon') {
|
|
started = true;
|
|
|
|
newFO = S.addSvgElementFromJson({
|
|
element: 'polygon',
|
|
attr: {
|
|
cx: opts.start_x,
|
|
cy: opts.start_y,
|
|
id: S.getNextId(),
|
|
shape: 'regularPoly',
|
|
sides: document.getElementById('polySides').value,
|
|
orient: 'x',
|
|
edge: 0,
|
|
fill: rgb,
|
|
strokecolor: sRgb,
|
|
strokeWidth: sWidth
|
|
}
|
|
});
|
|
|
|
return {
|
|
started: true
|
|
};
|
|
}
|
|
},
|
|
mouseMove: function mouseMove(opts) {
|
|
if (!started) {
|
|
return;
|
|
}
|
|
if (svgCanvas.getMode() === 'polygon') {
|
|
// const e = opts.event;
|
|
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.setAttributeNS(null, 'edge', edg);
|
|
|
|
var inradius = edg / 2 * cot(Math.PI / sides);
|
|
var circumradius = inradius * sec(Math.PI / sides);
|
|
var points = '';
|
|
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 + ' ';
|
|
}
|
|
|
|
// const poly = newFO.createElementNS(NS.SVG, 'polygon');
|
|
newFO.setAttributeNS(null, 'points', points);
|
|
newFO.setAttributeNS(null, 'fill', fill);
|
|
newFO.setAttributeNS(null, 'stroke', strokecolor);
|
|
newFO.setAttributeNS(null, 'stroke-width', strokeWidth);
|
|
// newFO.setAttributeNS(null, 'transform', 'rotate(-90)');
|
|
// const shape = newFO.getAttributeNS(null, 'shape');
|
|
// newFO.appendChild(poly);
|
|
// DrawPoly(cx, cy, sides, edg, orient);
|
|
return {
|
|
started: true
|
|
};
|
|
}
|
|
},
|
|
mouseUp: function mouseUp(opts) {
|
|
if (svgCanvas.getMode() === 'polygon') {
|
|
var attrs = $(newFO).attr('edge');
|
|
var keep = attrs.edge !== '0';
|
|
// svgCanvas.addToSelection([newFO], true);
|
|
return {
|
|
keep: keep,
|
|
element: newFO
|
|
};
|
|
}
|
|
},
|
|
selectedChanged: function selectedChanged(opts) {
|
|
// Use this to update the current selected elements
|
|
selElems = opts.elems;
|
|
|
|
var i = selElems.length;
|
|
while (i--) {
|
|
var elem = selElems[i];
|
|
if (elem && elem.getAttributeNS(null, 'shape') === 'regularPoly') {
|
|
if (opts.selectedElement && !opts.multiselected) {
|
|
$('#polySides').val(elem.getAttribute('sides'));
|
|
|
|
showPanel(true);
|
|
} else {
|
|
showPanel(false);
|
|
}
|
|
} else {
|
|
showPanel(false);
|
|
}
|
|
}
|
|
},
|
|
elementChanged: function elementChanged(opts) {
|
|
// const elem = opts.elems[0];
|
|
}
|
|
};
|
|
});
|
|
|
|
}());
|