diff --git a/.babelrc b/.babelrc index 9772b939..ece1d876 100644 --- a/.babelrc +++ b/.babelrc @@ -1,13 +1,5 @@ { "presets": [ - [ - "env", - { - "modules": false - } - ] - ], - "plugins": [ - "external-helpers" + ["@babel/preset-env"] ] } diff --git a/dist/canvg.js b/dist/canvg.js index 19eb3e4b..04004879 100644 --- a/dist/canvg.js +++ b/dist/canvg.js @@ -1,155 +1,228 @@ var canvg = (function (exports) { 'use strict'; - var asyncToGenerator = function (fn) { - return function () { - var gen = fn.apply(this, arguments); - return new Promise(function (resolve, reject) { - function step(key, arg) { - try { - var info = gen[key](arg); - var value = info.value; - } catch (error) { - reject(error); - return; - } + 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 { - return Promise.resolve(value).then(function (value) { - step("next", value); - }, function (err) { - step("throw", err); - }); - } + 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); } - return step("next"); + function _throw(err) { + asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); + } + + _next(undefined); }); }; - }; + } - var classCallCheck = function (instance, Constructor) { + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } - }; + } - var createClass = 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 _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); } + } - return function (Constructor, protoProps, staticProps) { - if (protoProps) defineProperties(Constructor.prototype, protoProps); - if (staticProps) defineProperties(Constructor, staticProps); - return Constructor; - }; - }(); + function _createClass(Constructor, protoProps, staticProps) { + if (protoProps) _defineProperties(Constructor.prototype, protoProps); + if (staticProps) _defineProperties(Constructor, staticProps); + return Constructor; + } - var get = function get(object, property, receiver) { - if (object === null) object = Function.prototype; - var desc = Object.getOwnPropertyDescriptor(object, property); - - if (desc === undefined) { - var parent = Object.getPrototypeOf(object); - - if (parent === null) { - return undefined; - } else { - return get(parent, property, receiver); - } - } else if ("value" in desc) { - return desc.value; - } else { - var getter = desc.get; - - if (getter === undefined) { - return undefined; - } - - return getter.call(receiver); - } - }; - - var inherits = function (subClass, superClass) { + function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { - throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); + throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, - enumerable: false, writable: true, configurable: true } }); - if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; - }; + if (superClass) _setPrototypeOf(subClass, superClass); + } - var possibleConstructorReturn = function (self, call) { - if (!self) { + function _getPrototypeOf(o) { + _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { + return o.__proto__ || Object.getPrototypeOf(o); + }; + return _getPrototypeOf(o); + } + + function _setPrototypeOf(o, p) { + _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { + o.__proto__ = p; + return o; + }; + + return _setPrototypeOf(o, p); + } + + function isNativeReflectConstruct() { + if (typeof Reflect === "undefined" || !Reflect.construct) return false; + if (Reflect.construct.sham) return false; + if (typeof Proxy === "function") return true; + + try { + Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); + return true; + } catch (e) { + return false; + } + } + + function _construct(Parent, args, Class) { + if (isNativeReflectConstruct()) { + _construct = Reflect.construct; + } else { + _construct = function _construct(Parent, args, Class) { + var a = [null]; + a.push.apply(a, args); + var Constructor = Function.bind.apply(Parent, a); + var instance = new Constructor(); + if (Class) _setPrototypeOf(instance, Class.prototype); + return instance; + }; + } + + return _construct.apply(null, arguments); + } + + function _assertThisInitialized(self) { + if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } - return call && (typeof call === "object" || typeof call === "function") ? call : self; - }; + return self; + } - var slicedToArray = function () { - function sliceIterator(arr, i) { - 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"]) _i["return"](); - } finally { - if (_d) throw _e; - } - } - - return _arr; + function _possibleConstructorReturn(self, call) { + if (call && (typeof call === "object" || typeof call === "function")) { + return call; } - return function (arr, i) { - if (Array.isArray(arr)) { - return arr; - } else if (Symbol.iterator in Object(arr)) { - return sliceIterator(arr, i); - } else { - throw new TypeError("Invalid attempt to destructure non-iterable instance"); - } - }; - }(); + return _assertThisInitialized(self); + } - var toConsumableArray = function (arr) { + function _superPropBase(object, property) { + while (!Object.prototype.hasOwnProperty.call(object, property)) { + object = _getPrototypeOf(object); + if (object === null) break; + } + + return object; + } + + function _get(target, property, receiver) { + if (typeof Reflect !== "undefined" && Reflect.get) { + _get = Reflect.get; + } else { + _get = function _get(target, property, receiver) { + var base = _superPropBase(target, property); + + if (!base) return; + var desc = Object.getOwnPropertyDescriptor(base, property); + + if (desc.get) { + return desc.get.call(receiver); + } + + return desc.value; + }; + } + + return _get(target, property, receiver || target); + } + + function _slicedToArray(arr, i) { + return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); + } + + function _toConsumableArray(arr) { + return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); + } + + function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { - for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i]; + for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) arr2[i] = arr[i]; return arr2; - } else { - return Array.from(arr); } - }; + } + + function _arrayWithHoles(arr) { + if (Array.isArray(arr)) return arr; + } + + function _iterableToArray(iter) { + if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); + } + + function _iterableToArrayLimit(arr, i) { + 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 _nonIterableSpread() { + throw new TypeError("Invalid attempt to spread non-iterable instance"); + } + + function _nonIterableRest() { + throw new TypeError("Invalid attempt to destructure non-iterable instance"); + } /** * For parsing color values @@ -302,9 +375,8 @@ var canvg = (function (exports) { whitesmoke: 'f5f5f5', yellow: 'ffff00', yellowgreen: '9acd32' - }; + }; // array of color definition objects - // array of color definition objects var colorDefs = [{ re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/, example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'], @@ -324,131 +396,138 @@ var canvg = (function (exports) { return [parseInt(bits[1] + bits[1], 16), parseInt(bits[2] + bits[2], 16), parseInt(bits[3] + bits[3], 16)]; } }]; - /** * A class to parse color values */ - var RGBColor = function () { + var RGBColor = + /*#__PURE__*/ + function () { /** * @param {string} colorString */ function RGBColor(colorString) { - classCallCheck(this, RGBColor); + _classCallCheck(this, RGBColor); - this.ok = false; + this.ok = false; // strip any leading # - // strip any leading # if (colorString.charAt(0) === '#') { // remove # if any colorString = colorString.substr(1, 6); } colorString = colorString.replace(/ /g, ''); - colorString = colorString.toLowerCase(); - - // before getting into regexps, try simple matches + colorString = colorString.toLowerCase(); // before getting into regexps, try simple matches // and overwrite the input + if (colorString in simpleColors) { colorString = simpleColors[colorString]; - } - // end of simple type-in colors - + } // end of simple type-in colors // search through the definitions to find a match + + for (var i = 0; i < colorDefs.length; i++) { var re = colorDefs[i].re; - var processor = colorDefs[i].process; var bits = re.exec(colorString); + if (bits) { var _processor = processor(bits), - _processor2 = slicedToArray(_processor, 3), + _processor2 = _slicedToArray(_processor, 3), r = _processor2[0], g = _processor2[1], b = _processor2[2]; - Object.assign(this, { r: r, g: g, b: b }); + Object.assign(this, { + r: r, + g: g, + b: b + }); this.ok = true; } - } + } // validate/cleanup values + - // validate/cleanup values this.r = this.r < 0 || isNaN(this.r) ? 0 : this.r > 255 ? 255 : this.r; this.g = this.g < 0 || isNaN(this.g) ? 0 : this.g > 255 ? 255 : this.g; this.b = this.b < 0 || isNaN(this.b) ? 0 : this.b > 255 ? 255 : this.b; - } + } // some getters - // some getters /** * @returns {string} */ - createClass(RGBColor, [{ - key: 'toRGB', + _createClass(RGBColor, [{ + key: "toRGB", value: function toRGB() { return 'rgb(' + this.r + ', ' + this.g + ', ' + this.b + ')'; } - /** * @returns {string} */ }, { - key: 'toHex', + 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; } + if (g.length === 1) { g = '0' + g; } + if (b.length === 1) { b = '0' + b; } + return '#' + r + g + b; } - /** * help * @returns {HTMLUListElement} */ }, { - key: 'getHelpXML', + key: "getHelpXML", value: function getHelpXML() { - var examples = []; - // add regexps + var examples = []; // add regexps + for (var i = 0; i < colorDefs.length; i++) { var example = colorDefs[i].example; for (var j = 0; j < example.length; j++) { examples[examples.length] = example[j]; } - } - // add type-in colors - examples.push.apply(examples, toConsumableArray(Object.keys(simpleColors))); + } // add type-in colors + + examples.push.apply(examples, _toConsumableArray(Object.keys(simpleColors))); var xml = document.createElement('ul'); xml.setAttribute('id', 'rgbcolor-examples'); + for (var _i = 0; _i < examples.length; _i++) { try { var listItem = document.createElement('li'); var listColor = new RGBColor(examples[_i]); var exampleDiv = document.createElement('div'); - exampleDiv.style.cssText = 'margin: 3px;\nborder: 1px solid black;\nbackground: ' + listColor.toHex() + ';\ncolor: ' + listColor.toHex() + ';'; + exampleDiv.style.cssText = "margin: 3px;\nborder: 1px solid black;\nbackground: ".concat(listColor.toHex(), ";\ncolor: ").concat(listColor.toHex(), ";"); exampleDiv.append('test'); - var listItemValue = ' ' + examples[_i] + ' -> ' + listColor.toRGB() + ' -> ' + listColor.toHex(); + var listItemValue = " ".concat(examples[_i], " -> ").concat(listColor.toRGB(), " -> ").concat(listColor.toHex()); listItem.append(exampleDiv, listItemValue); xml.append(listItem); } catch (e) {} } + return xml; } }]); + return RGBColor; }(); @@ -492,11 +571,8 @@ var canvg = (function (exports) { FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - var mulTable = [512, 512, 456, 512, 328, 456, 335, 512, 405, 328, 271, 456, 388, 335, 292, 512, 454, 405, 364, 328, 298, 271, 496, 456, 420, 388, 360, 335, 312, 292, 273, 512, 482, 454, 428, 405, 383, 364, 345, 328, 312, 298, 284, 271, 259, 496, 475, 456, 437, 420, 404, 388, 374, 360, 347, 335, 323, 312, 302, 292, 282, 273, 265, 512, 497, 482, 468, 454, 441, 428, 417, 405, 394, 383, 373, 364, 354, 345, 337, 328, 320, 312, 305, 298, 291, 284, 278, 271, 265, 259, 507, 496, 485, 475, 465, 456, 446, 437, 428, 420, 412, 404, 396, 388, 381, 374, 367, 360, 354, 347, 341, 335, 329, 323, 318, 312, 307, 302, 297, 292, 287, 282, 278, 273, 269, 265, 261, 512, 505, 497, 489, 482, 475, 468, 461, 454, 447, 441, 435, 428, 422, 417, 411, 405, 399, 394, 389, 383, 378, 373, 368, 364, 359, 354, 350, 345, 341, 337, 332, 328, 324, 320, 316, 312, 309, 305, 301, 298, 294, 291, 287, 284, 281, 278, 274, 271, 268, 265, 262, 259, 257, 507, 501, 496, 491, 485, 480, 475, 470, 465, 460, 456, 451, 446, 442, 437, 433, 428, 424, 420, 416, 412, 408, 404, 400, 396, 392, 388, 385, 381, 377, 374, 370, 367, 363, 360, 357, 354, 350, 347, 344, 341, 338, 335, 332, 329, 326, 323, 320, 318, 315, 312, 310, 307, 304, 302, 299, 297, 294, 292, 289, 287, 285, 282, 280, 278, 275, 273, 271, 269, 267, 265, 263, 261, 259]; - var shgTable = [9, 11, 12, 13, 13, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24]; - /** * @param {string|HTMLCanvasElement} canvas * @param {Integer} topX @@ -506,10 +582,13 @@ var canvg = (function (exports) { * @throws {Error} * @returns {ImageData} See {@link https://html.spec.whatwg.org/multipage/canvas.html#imagedata} */ + + function getImageDataFromCanvas(canvas, topX, topY, width, height) { if (typeof canvas === 'string') { canvas = document.getElementById(canvas); } + if (!canvas || !('getContext' in canvas)) { return; } @@ -522,7 +601,6 @@ var canvg = (function (exports) { throw new Error('unable to access image data: ' + e); } } - /** * @param {HTMLCanvasElement} canvas * @param {Integer} topX @@ -532,19 +610,18 @@ var canvg = (function (exports) { * @param {Float} radius * @returns {undefined} */ + + function processCanvasRGBA(canvas, topX, topY, width, height, radius) { if (isNaN(radius) || radius < 1) { return; } + radius |= 0; - var imageData = getImageDataFromCanvas(canvas, topX, topY, width, height); - imageData = processImageDataRGBA(imageData, topX, topY, width, height, radius); - canvas.getContext('2d').putImageData(imageData, topX, topY); } - /** * @param {ImageData} imageData * @param {Integer} topX @@ -554,72 +631,46 @@ var canvg = (function (exports) { * @param {Float} radius * @returns {ImageData} */ + + function processImageDataRGBA(imageData, topX, topY, width, height, radius) { var pixels = imageData.data; + var x, y, i, p, yp, yi, yw, rSum, gSum, bSum, aSum, rOutSum, gOutSum, bOutSum, aOutSum, rInSum, gInSum, bInSum, aInSum, pr, pg, pb, pa, rbs; + var div = radius + radius + 1; // const w4 = width << 2; - var x = void 0, - y = void 0, - i = void 0, - p = void 0, - yp = void 0, - yi = void 0, - yw = void 0, - rSum = void 0, - gSum = void 0, - bSum = void 0, - aSum = void 0, - rOutSum = void 0, - gOutSum = void 0, - bOutSum = void 0, - aOutSum = void 0, - rInSum = void 0, - gInSum = void 0, - bInSum = void 0, - aInSum = void 0, - pr = void 0, - pg = void 0, - pb = void 0, - pa = void 0, - rbs = void 0; - - var div = radius + radius + 1; - // const w4 = width << 2; var widthMinus1 = width - 1; var heightMinus1 = height - 1; var radiusPlus1 = radius + 1; var sumFactor = radiusPlus1 * (radiusPlus1 + 1) / 2; - var stackStart = new BlurStack(); var stack = stackStart; - var stackEnd = void 0; + var stackEnd; + for (i = 1; i < div; i++) { stack = stack.next = new BlurStack(); + if (i === radiusPlus1) { stackEnd = stack; } } + stack.next = stackStart; var stackIn = null; var stackOut = null; - yw = yi = 0; - var mulSum = mulTable[radius]; var shgSum = shgTable[radius]; for (y = 0; y < height; y++) { rInSum = gInSum = bInSum = aInSum = rSum = gSum = bSum = aSum = 0; - rOutSum = radiusPlus1 * (pr = pixels[yi]); gOutSum = radiusPlus1 * (pg = pixels[yi + 1]); bOutSum = radiusPlus1 * (pb = pixels[yi + 2]); aOutSum = radiusPlus1 * (pa = pixels[yi + 3]); - rSum += sumFactor * pr; gSum += sumFactor * pg; bSum += sumFactor * pb; aSum += sumFactor * pa; - stack = stackStart; for (i = 0; i < radiusPlus1; i++) { @@ -636,19 +687,19 @@ var canvg = (function (exports) { gSum += (stack.g = pg = pixels[p + 1]) * rbs; bSum += (stack.b = pb = pixels[p + 2]) * rbs; aSum += (stack.a = pa = pixels[p + 3]) * rbs; - rInSum += pr; gInSum += pg; bInSum += pb; aInSum += pa; - stack = stack.next; } stackIn = stackStart; stackOut = stackEnd; + for (x = 0; x < width; x++) { pixels[yi + 3] = pa = aSum * mulSum >> shgSum; + if (pa !== 0) { pa = 255 / pa; pixels[yi] = (rSum * mulSum >> shgSum) * pa; @@ -662,57 +713,46 @@ var canvg = (function (exports) { gSum -= gOutSum; bSum -= bOutSum; aSum -= aOutSum; - rOutSum -= stackIn.r; gOutSum -= stackIn.g; bOutSum -= stackIn.b; aOutSum -= stackIn.a; - p = yw + ((p = x + radius + 1) < widthMinus1 ? p : widthMinus1) << 2; - rInSum += stackIn.r = pixels[p]; gInSum += stackIn.g = pixels[p + 1]; bInSum += stackIn.b = pixels[p + 2]; aInSum += stackIn.a = pixels[p + 3]; - rSum += rInSum; gSum += gInSum; bSum += bInSum; aSum += aInSum; - stackIn = stackIn.next; - rOutSum += pr = stackOut.r; gOutSum += pg = stackOut.g; bOutSum += pb = stackOut.b; aOutSum += pa = stackOut.a; - rInSum -= pr; gInSum -= pg; bInSum -= pb; aInSum -= pa; - stackOut = stackOut.next; - yi += 4; } + yw += width; } for (x = 0; x < width; x++) { gInSum = bInSum = aInSum = rInSum = gSum = bSum = aSum = rSum = 0; - yi = x << 2; rOutSum = radiusPlus1 * (pr = pixels[yi]); gOutSum = radiusPlus1 * (pg = pixels[yi + 1]); bOutSum = radiusPlus1 * (pb = pixels[yi + 2]); aOutSum = radiusPlus1 * (pa = pixels[yi + 3]); - rSum += sumFactor * pr; gSum += sumFactor * pg; bSum += sumFactor * pb; aSum += sumFactor * pa; - stack = stackStart; for (i = 0; i < radiusPlus1; i++) { @@ -727,17 +767,14 @@ var canvg = (function (exports) { for (i = 1; i <= radius; i++) { yi = yp + x << 2; - rSum += (stack.r = pr = pixels[yi]) * (rbs = radiusPlus1 - i); gSum += (stack.g = pg = pixels[yi + 1]) * rbs; bSum += (stack.b = pb = pixels[yi + 2]) * rbs; aSum += (stack.a = pa = pixels[yi + 3]) * rbs; - rInSum += pr; gInSum += pg; bInSum += pb; aInSum += pa; - stack = stack.next; if (i < heightMinus1) { @@ -748,9 +785,11 @@ var canvg = (function (exports) { yi = x; stackIn = stackStart; stackOut = stackEnd; + for (y = 0; y < height; y++) { p = yi << 2; pixels[p + 3] = pa = aSum * mulSum >> shgSum; + if (pa > 0) { pa = 255 / pa; pixels[p] = (rSum * mulSum >> shgSum) * pa; @@ -764,44 +803,38 @@ var canvg = (function (exports) { gSum -= gOutSum; bSum -= bOutSum; aSum -= aOutSum; - rOutSum -= stackIn.r; gOutSum -= stackIn.g; bOutSum -= stackIn.b; aOutSum -= stackIn.a; - p = x + ((p = y + radiusPlus1) < heightMinus1 ? p : heightMinus1) * width << 2; - rSum += rInSum += stackIn.r = pixels[p]; gSum += gInSum += stackIn.g = pixels[p + 1]; bSum += bInSum += stackIn.b = pixels[p + 2]; aSum += aInSum += stackIn.a = pixels[p + 3]; - stackIn = stackIn.next; - rOutSum += pr = stackOut.r; gOutSum += pg = stackOut.g; bOutSum += pb = stackOut.b; aOutSum += pa = stackOut.a; - rInSum -= pr; gInSum -= pg; bInSum -= pb; aInSum -= pa; - stackOut = stackOut.next; - yi += width; } } + return imageData; } - /** * */ + + var BlurStack = function BlurStack() { - classCallCheck(this, BlurStack); + _classCallCheck(this, BlurStack); this.r = 0; this.g = 0; @@ -810,10 +843,7 @@ var canvg = (function (exports) { this.next = null; }; - /* eslint-disable new-cap */ - var canvasRGBA_ = processCanvasRGBA; - /** * @callback module:canvg.StackBlurCanvasRGBA * @param {string} id @@ -833,10 +863,10 @@ var canvg = (function (exports) { * @function module:canvg.setStackBlurCanvasRGBA * @param {module:canvg.StackBlurCanvasRGBA} cb Will be passed the canvas ID, x, y, width, height, blurRadius */ + var setStackBlurCanvasRGBA = function setStackBlurCanvasRGBA(cb) { canvasRGBA_ = cb; }; - /** * @typedef {PlainObject} module:canvg.CanvgOptions * @property {boolean} opts.ignoreMouse true => ignore mouse events @@ -860,11 +890,12 @@ var canvg = (function (exports) { * @param {module:canvg.CanvgOptions} [opts] Optional hash of options * @returns {Promise} All the function after the first render is completed with dom */ + var canvg = function canvg(target, s, opts) { // no parameters if (target == null && s == null && opts == null) { var svgTags = document.querySelectorAll('svg'); - return Promise.all([].concat(toConsumableArray(svgTags)).map(function (svgTag) { + return Promise.all(_toConsumableArray(svgTags).map(function (svgTag) { var c = document.createElement('canvas'); c.width = svgTag.clientWidth; c.height = svgTag.clientHeight; @@ -878,54 +909,61 @@ var canvg = (function (exports) { if (typeof target === 'string') { target = document.getElementById(target); - } + } // store class on canvas + - // store class on canvas if (target.svg != null) target.svg.stop(); - var svg = build(opts || {}); - // on i.e. 8 for flash canvas, we can't assign the property so check for it + var svg = build(opts || {}); // on i.e. 8 for flash canvas, we can't assign the property so check for it + if (!(target.childNodes.length === 1 && target.childNodes[0].nodeName === 'OBJECT')) { target.svg = svg; } var ctx = target.getContext('2d'); + if (typeof s.documentElement !== 'undefined') { // load from xml doc return svg.loadXmlDoc(ctx, s); } + if (s.substr(0, 1) === '<') { // load from xml string return svg.loadXml(ctx, s); - } - // load from url + } // load from url + + return svg.load(ctx, s); }; - /** * @param {module:canvg.CanvgOptions} opts * @returns {object} * @todo Flesh out exactly what object is returned here (after updating to latest and reincluding our changes here and those of StackBlur) */ - function build(opts) { - var svg = { opts: opts }; + function build(opts) { + var svg = { + opts: opts + }; svg.FRAMERATE = 30; svg.MAX_VIRTUAL_PIXELS = 30000; svg.log = function (msg) {}; + if (svg.opts.log === true && typeof console !== 'undefined') { svg.log = function (msg) { console.log(msg); }; - } + } // globals + - // globals svg.init = function (ctx) { var uniqueId = 0; + svg.UniqueId = function () { uniqueId++; return 'canvg' + uniqueId; }; + svg.Definitions = {}; svg.Styles = {}; svg.Animations = []; @@ -937,7 +975,10 @@ var canvg = (function (exports) { this.viewPorts = []; }, SetCurrent: function SetCurrent(width, height) { - this.viewPorts.push({ width: width, height: height }); + this.viewPorts.push({ + width: width, + height: height + }); }, RemoveCurrent: function RemoveCurrent() { this.viewPorts.pop(); @@ -959,28 +1000,29 @@ var canvg = (function (exports) { } }; }; - svg.init(); - // images loaded + svg.init(); // images loaded + svg.ImagesLoaded = function () { return svg.Images.every(function (img) { return img.loaded; }); - }; + }; // trim + - // trim svg.trim = function (s) { return s.replace(/^\s+|\s+$/g, ''); - }; + }; // compress spaces + - // compress spaces svg.compressSpaces = function (s) { return s.replace(/[\s\r\t\n]+/gm, ' '); - }; + }; // ajax + - // ajax svg.ajax = function (url, asynch) { var AJAX = window.XMLHttpRequest ? new XMLHttpRequest() : new window.ActiveXObject('Microsoft.XMLHTTP'); + if (asynch) { return new Promise(function (resolve, reject) { var req = AJAX.open('GET', url, true); @@ -994,9 +1036,9 @@ var canvg = (function (exports) { AJAX.open('GET', url, false); AJAX.send(null); return AJAX.responseText; - }; + }; // parse xml + - // parse xml svg.parseXml = function (xml) { if (window.DOMParser) { var parser = new DOMParser(); @@ -1008,10 +1050,10 @@ var canvg = (function (exports) { xmlDoc.loadXML(xml); return xmlDoc; } - }; - - // text extensions + }; // text extensions // get the text baseline + + var textBaselineMapping = { baseline: 'alphabetic', 'before-edge': 'top', @@ -1026,141 +1068,139 @@ var canvg = (function (exports) { mathematical: 'alphabetic' }; - svg.Property = function () { + svg.Property = + /*#__PURE__*/ + function () { function Property(name, value) { - classCallCheck(this, Property); + _classCallCheck(this, Property); this.name = name; this.value = value; } - createClass(Property, [{ - key: 'getValue', + _createClass(Property, [{ + key: "getValue", value: function getValue() { return this.value; } }, { - key: 'hasValue', + key: "hasValue", value: function hasValue() { return this.value != null && this.value !== ''; - } - - // return the numerical value of the property + } // return the numerical value of the property }, { - key: 'numValue', + key: "numValue", value: function numValue() { if (!this.hasValue()) return 0; - var n = parseFloat(this.value); + if ((this.value + '').match(/%$/)) { n = n / 100.0; } + return n; } }, { - key: 'valueOrDefault', + key: "valueOrDefault", value: function valueOrDefault(def) { if (this.hasValue()) return this.value; return def; } }, { - key: 'numValueOrDefault', + key: "numValueOrDefault", value: function numValueOrDefault(def) { if (this.hasValue()) return this.numValue(); return def; - } - - // color extensions + } // color extensions // augment the current color value with the opacity }, { - key: 'addOpacity', + key: "addOpacity", value: function addOpacity(opacityProp) { var newValue = this.value; + if (opacityProp.value != null && opacityProp.value !== '' && typeof this.value === 'string') { // can only add opacity to colors, not patterns var color = new RGBColor(this.value); + if (color.ok) { newValue = 'rgba(' + color.r + ', ' + color.g + ', ' + color.b + ', ' + opacityProp.numValue() + ')'; } } - return new svg.Property(this.name, newValue); - } - // definition extensions + return new svg.Property(this.name, newValue); + } // definition extensions // get the definition from the definitions table }, { - key: 'getDefinition', + key: "getDefinition", value: function getDefinition() { var name = this.value.match(/#([^)'"]+)/); + if (name) { name = name[1]; } + if (!name) { name = this.value; } + return svg.Definitions[name]; } }, { - key: 'isUrlDefinition', + key: "isUrlDefinition", value: function isUrlDefinition() { return this.value.startsWith('url('); } }, { - key: 'getFillStyleDefinition', + key: "getFillStyleDefinition", value: function getFillStyleDefinition(e, opacityProp) { - var def = this.getDefinition(); + var def = this.getDefinition(); // gradient - // gradient if (def != null && def.createGradient) { return def.createGradient(svg.ctx, e, opacityProp); - } + } // pattern + - // pattern if (def != null && def.createPattern) { if (def.getHrefAttribute().hasValue()) { var pt = def.attribute('patternTransform'); def = def.getHrefAttribute().getDefinition(); + if (pt.hasValue()) { def.attribute('patternTransform', true).value = pt.value; } } + return def.createPattern(svg.ctx, e); } return null; - } - - // length extensions + } // length extensions }, { - key: 'getDPI', + key: "getDPI", value: function getDPI(viewPort) { return 96.0; // TODO: compute? } }, { - key: 'getEM', + key: "getEM", value: function getEM(viewPort) { var em = 12; - var fontSize = new svg.Property('fontSize', svg.Font.Parse(svg.ctx.font).fontSize); if (fontSize.hasValue()) em = fontSize.toPixels(viewPort); - return em; } }, { - key: 'getUnits', + key: "getUnits", value: function getUnits() { var s = this.value + ''; return s.replace(/[0-9.-]/g, ''); - } - - // get the length as pixels + } // get the length as pixels }, { - key: 'toPixels', + key: "toPixels", value: function toPixels(viewPort, processPercent) { if (!this.hasValue()) return 0; var s = this.value + ''; @@ -1176,26 +1216,22 @@ var canvg = (function (exports) { var n = this.numValue(); if (processPercent && n < 1.0) return n * svg.ViewPort.ComputeSize(viewPort); return n; - } - - // time extensions + } // time extensions // get the time as milliseconds }, { - key: 'toMilliseconds', + key: "toMilliseconds", value: function toMilliseconds() { if (!this.hasValue()) return 0; var s = this.value + ''; if (s.match(/s$/)) return this.numValue() * 1000; if (s.match(/ms$/)) return this.numValue(); return this.numValue(); - } - - // angle extensions + } // angle extensions // get the angle as radians }, { - key: 'toRadians', + key: "toRadians", value: function toRadians() { if (!this.hasValue()) return 0; var s = this.value + ''; @@ -1205,21 +1241,21 @@ var canvg = (function (exports) { return this.numValue() * (Math.PI / 180.0); } }, { - key: 'toTextBaseline', + key: "toTextBaseline", value: function toTextBaseline() { if (!this.hasValue()) return null; return textBaselineMapping[this.value]; } }]); - return Property; - }(); - // fonts + return Property; + }(); // fonts + + svg.Font = { Styles: 'normal|italic|oblique|inherit', Variants: 'normal|small-caps|inherit', Weights: 'normal|bold|bolder|lighter|100|200|300|400|500|600|700|800|900|inherit', - CreateFont: function CreateFont(fontStyle, fontVariant, fontWeight, fontSize, fontFamily, inherit) { var f = inherit != null ? this.Parse(inherit) : this.CreateFont('', '', '', '', '', svg.ctx.font); return { @@ -1238,66 +1274,77 @@ var canvg = (function (exports) { var f = {}; var d = svg.trim(svg.compressSpaces(s || '')).split(' '); - var set$$1 = { - fontSize: false, fontStyle: false, fontWeight: false, fontVariant: false + var set = { + fontSize: false, + fontStyle: false, + fontWeight: false, + fontVariant: false }; var ff = ''; d.forEach(function (d) { - if (!set$$1.fontStyle && _this.Styles.includes(d)) { + if (!set.fontStyle && _this.Styles.includes(d)) { if (d !== 'inherit') { f.fontStyle = d; } - set$$1.fontStyle = true; - } else if (!set$$1.fontVariant && _this.Variants.includes(d)) { + + set.fontStyle = true; + } else if (!set.fontVariant && _this.Variants.includes(d)) { if (d !== 'inherit') { f.fontVariant = d; } - set$$1.fontStyle = set$$1.fontVariant = true; - } else if (!set$$1.fontWeight && _this.Weights.includes(d)) { + + set.fontStyle = set.fontVariant = true; + } else if (!set.fontWeight && _this.Weights.includes(d)) { if (d !== 'inherit') { f.fontWeight = d; } - set$$1.fontStyle = set$$1.fontVariant = set$$1.fontWeight = true; - } else if (!set$$1.fontSize) { + + set.fontStyle = set.fontVariant = set.fontWeight = true; + } else if (!set.fontSize) { if (d !== 'inherit') { f.fontSize = d.split('/')[0]; } - set$$1.fontStyle = set$$1.fontVariant = set$$1.fontWeight = set$$1.fontSize = true; + + set.fontStyle = set.fontVariant = set.fontWeight = set.fontSize = true; } else { if (d !== 'inherit') { ff += d; } } }); + if (ff !== '') { f.fontFamily = ff; } + return f; } - }; + }; // points and paths - // points and paths svg.ToNumberArray = function (s) { var a = svg.trim(svg.compressSpaces((s || '').replace(/,/g, ' '))).split(' '); return a.map(function (a) { return parseFloat(a); }); }; - svg.Point = function () { + + svg.Point = + /*#__PURE__*/ + function () { function _class(x, y) { - classCallCheck(this, _class); + _classCallCheck(this, _class); this.x = x; this.y = y; } - createClass(_class, [{ - key: 'angleTo', + _createClass(_class, [{ + key: "angleTo", value: function angleTo(p) { return Math.atan2(p.y - this.y, p.x - this.x); } }, { - key: 'applyTransform', + key: "applyTransform", value: function applyTransform(v) { var xp = this.x * v[0] + this.y * v[2] + v[4]; var yp = this.x * v[1] + this.y * v[3] + v[5]; @@ -1305,6 +1352,7 @@ var canvg = (function (exports) { this.y = yp; } }]); + return _class; }(); @@ -1312,19 +1360,25 @@ var canvg = (function (exports) { var a = svg.ToNumberArray(s); return new svg.Point(a[0], a[1]); }; + svg.CreatePath = function (s) { var a = svg.ToNumberArray(s); var path = []; + for (var i = 0; i < a.length; i += 2) { path.push(new svg.Point(a[i], a[i + 1])); } - return path; - }; - // bounding box - svg.BoundingBox = function () { + return path; + }; // bounding box + + + svg.BoundingBox = + /*#__PURE__*/ + function () { function _class2(x1, y1, x2, y2) { - classCallCheck(this, _class2); + _classCallCheck(this, _class2); + // pass in initial points if you want this.x1 = Number.NaN; this.y1 = Number.NaN; @@ -1334,34 +1388,35 @@ var canvg = (function (exports) { this.addPoint(x2, y2); } - createClass(_class2, [{ - key: 'x', + _createClass(_class2, [{ + key: "x", value: function x() { return this.x1; } }, { - key: 'y', + key: "y", value: function y() { return this.y1; } }, { - key: 'width', + key: "width", value: function width() { return this.x2 - this.x1; } }, { - key: 'height', + key: "height", value: function height() { return this.y2 - this.y1; } }, { - key: 'addPoint', + key: "addPoint", value: function addPoint(x, y) { if (x != null) { if (isNaN(this.x1) || isNaN(this.x2)) { this.x1 = x; this.x2 = x; } + if (x < this.x1) this.x1 = x; if (x > this.x2) this.x2 = x; } @@ -1371,37 +1426,42 @@ var canvg = (function (exports) { this.y1 = y; this.y2 = y; } + if (y < this.y1) this.y1 = y; if (y > this.y2) this.y2 = y; } } }, { - key: 'addX', + key: "addX", value: function addX(x) { this.addPoint(x, null); } }, { - key: 'addY', + key: "addY", value: function addY(y) { this.addPoint(null, y); } }, { - key: 'addBoundingBox', + key: "addBoundingBox", value: function addBoundingBox(bb) { this.addPoint(bb.x1, bb.y1); this.addPoint(bb.x2, bb.y2); } }, { - key: 'addQuadraticCurve', + key: "addQuadraticCurve", value: function addQuadraticCurve(p0x, p0y, p1x, p1y, p2x, p2y) { var cp1x = p0x + 2 / 3 * (p1x - p0x); // CP1 = QP0 + 2/3 *(QP1-QP0) + var cp1y = p0y + 2 / 3 * (p1y - p0y); // CP1 = QP0 + 2/3 *(QP1-QP0) + var cp2x = cp1x + 1 / 3 * (p2x - p0x); // CP2 = CP1 + 1/3 *(QP2-QP0) + var cp2y = cp1y + 1 / 3 * (p2y - p0y); // CP2 = CP1 + 1/3 *(QP2-QP0) + this.addBezierCurve(p0x, p0y, cp1x, cp2x, cp1y, cp2y, p2x, p2y); } }, { - key: 'addBezierCurve', + key: "addBezierCurve", value: function addBezierCurve(p0x, p0y, p1x, p1y, p2x, p2y, p3x, p3y) { var _this2 = this; @@ -1423,23 +1483,28 @@ var canvg = (function (exports) { var c = 3 * p1[i] - 3 * p0[i]; if (a === 0) { - if (b === 0) return 'continue'; + if (b === 0) return "continue"; var t = -c / b; + if (t > 0 && t < 1) { if (i === 0) _this2.addX(f(t)); if (i === 1) _this2.addY(f(t)); } - return 'continue'; + + return "continue"; } var b2ac = Math.pow(b, 2) - 4 * c * a; - if (b2ac < 0) return 'continue'; + if (b2ac < 0) return "continue"; var t1 = (-b + Math.sqrt(b2ac)) / (2 * a); + if (t1 > 0 && t1 < 1) { if (i === 0) _this2.addX(f(t1)); if (i === 1) _this2.addY(f(t1)); } + var t2 = (-b - Math.sqrt(b2ac)) / (2 * a); + if (t2 > 0 && t2 < 1) { if (i === 0) _this2.addX(f(t2)); if (i === 1) _this2.addY(f(t2)); @@ -1449,57 +1514,66 @@ var canvg = (function (exports) { for (var i = 0; i <= 1; i++) { var _ret = _loop(i); - if (_ret === 'continue') continue; + if (_ret === "continue") continue; } } }, { - key: 'isPointInBox', + key: "isPointInBox", value: function isPointInBox(x, y) { return this.x1 <= x && x <= this.x2 && this.y1 <= y && y <= this.y2; } }]); - return _class2; - }(); - // transforms - svg.Transform = function () { + return _class2; + }(); // transforms + + + svg.Transform = + /*#__PURE__*/ + function () { function _class3(v) { var _this6 = this; - classCallCheck(this, _class3); + _classCallCheck(this, _class3); this.Type = { translate: function translate(s) { - classCallCheck(this, translate); + _classCallCheck(this, translate); this.p = svg.CreatePoint(s); + this.apply = function (ctx) { ctx.translate(this.p.x || 0.0, this.p.y || 0.0); }; + this.unapply = function (ctx) { ctx.translate(-1.0 * this.p.x || 0.0, -1.0 * this.p.y || 0.0); }; + this.applyToPoint = function (p) { p.applyTransform([1, 0, 0, 1, this.p.x || 0.0, this.p.y || 0.0]); }; }, rotate: function rotate(s) { - classCallCheck(this, rotate); + _classCallCheck(this, rotate); var a = svg.ToNumberArray(s); this.angle = new svg.Property('angle', a[0]); this.cx = a[1] || 0; this.cy = a[2] || 0; + this.apply = function (ctx) { ctx.translate(this.cx, this.cy); ctx.rotate(this.angle.toRadians()); ctx.translate(-this.cx, -this.cy); }; + this.unapply = function (ctx) { ctx.translate(this.cx, this.cy); ctx.rotate(-1.0 * this.angle.toRadians()); ctx.translate(-this.cx, -this.cy); }; + this.applyToPoint = function (p) { var a = this.angle.toRadians(); p.applyTransform([1, 0, 0, 1, this.p.x || 0.0, this.p.y || 0.0]); @@ -1508,40 +1582,48 @@ var canvg = (function (exports) { }; }, scale: function scale(s) { - classCallCheck(this, scale); + _classCallCheck(this, scale); this.p = svg.CreatePoint(s); + this.apply = function (ctx) { ctx.scale(this.p.x || 1.0, this.p.y || this.p.x || 1.0); }; + this.unapply = function (ctx) { ctx.scale(1.0 / this.p.x || 1.0, 1.0 / this.p.y || this.p.x || 1.0); }; + this.applyToPoint = function (p) { p.applyTransform([this.p.x || 0.0, 0, 0, this.p.y || 0.0, 0, 0]); }; }, matrix: function matrix(s) { - classCallCheck(this, matrix); + _classCallCheck(this, matrix); this.m = svg.ToNumberArray(s); + this.apply = function (ctx) { ctx.transform(this.m[0], this.m[1], this.m[2], this.m[3], this.m[4], this.m[5]); }; + this.applyToPoint = function (p) { p.applyTransform(this.m); }; } }; Object.assign(this.Type, { - SkewBase: function (_Type$matrix) { - inherits(SkewBase, _Type$matrix); + SkewBase: + /*#__PURE__*/ + function (_this$Type$matrix) { + _inherits(SkewBase, _this$Type$matrix); function SkewBase(s) { - classCallCheck(this, SkewBase); + var _this3; - var _this3 = possibleConstructorReturn(this, (SkewBase.__proto__ || Object.getPrototypeOf(SkewBase)).call(this, s)); + _classCallCheck(this, SkewBase); + _this3 = _possibleConstructorReturn(this, _getPrototypeOf(SkewBase).call(this, s)); _this3.angle = new svg.Property('angle', s); return _this3; } @@ -1550,28 +1632,34 @@ var canvg = (function (exports) { }(this.Type.matrix) }); Object.assign(this.Type, { - skewX: function (_Type$SkewBase) { - inherits(skewX, _Type$SkewBase); + skewX: + /*#__PURE__*/ + function (_this$Type$SkewBase) { + _inherits(skewX, _this$Type$SkewBase); function skewX(s) { - classCallCheck(this, skewX); + var _this4; - var _this4 = possibleConstructorReturn(this, (skewX.__proto__ || Object.getPrototypeOf(skewX)).call(this, s)); + _classCallCheck(this, skewX); + _this4 = _possibleConstructorReturn(this, _getPrototypeOf(skewX).call(this, s)); _this4.m = [1, 0, Math.tan(_this4.angle.toRadians()), 1, 0, 0]; return _this4; } return skewX; }(this.Type.SkewBase), - skewY: function (_Type$SkewBase2) { - inherits(skewY, _Type$SkewBase2); + skewY: + /*#__PURE__*/ + function (_this$Type$SkewBase2) { + _inherits(skewY, _this$Type$SkewBase2); function skewY(s) { - classCallCheck(this, skewY); + var _this5; - var _this5 = possibleConstructorReturn(this, (skewY.__proto__ || Object.getPrototypeOf(skewY)).call(this, s)); + _classCallCheck(this, skewY); + _this5 = _possibleConstructorReturn(this, _getPrototypeOf(skewY).call(this, s)); _this5.m = [1, Math.tan(_this5.angle.toRadians()), 0, 1, 0, 0]; return _this5; } @@ -1579,7 +1667,6 @@ var canvg = (function (exports) { return skewY; }(this.Type.SkewBase) }); - var data = svg.trim(svg.compressSpaces(v)).replace(/\)([a-zA-Z])/g, ') $1').replace(/\)(\s?,\s?)/g, ') ').split(/\s(?=[a-z])/); this.transforms = data.map(function (d) { var type = svg.trim(d.split('(')[0]); @@ -1590,53 +1677,59 @@ var canvg = (function (exports) { }); } - createClass(_class3, [{ - key: 'apply', + _createClass(_class3, [{ + key: "apply", value: function apply(ctx) { this.transforms.forEach(function (transform) { transform.apply(ctx); }); } }, { - key: 'unapply', + key: "unapply", value: function unapply(ctx) { for (var i = this.transforms.length - 1; i >= 0; i--) { this.transforms[i].unapply(ctx); } } }, { - key: 'applyToPoint', + key: "applyToPoint", value: function applyToPoint(p) { this.transforms.forEach(function (transform) { transform.applyToPoint(p); }); } }]); - return _class3; - }(); - // aspect ratio + return _class3; + }(); // aspect ratio + + svg.AspectRatio = function (ctx, aspectRatio, width, desiredWidth, height, desiredHeight, minX, minY, refX, refY) { // aspect ratio - https://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute aspectRatio = svg.compressSpaces(aspectRatio); aspectRatio = aspectRatio.replace(/^defer\s/, ''); // ignore defer - var align = aspectRatio.split(' ')[0] || 'xMidYMid'; - var meetOrSlice = aspectRatio.split(' ')[1] || 'meet'; - // calculate scale + var align = aspectRatio.split(' ')[0] || 'xMidYMid'; + var meetOrSlice = aspectRatio.split(' ')[1] || 'meet'; // calculate scale + var scaleX = width / desiredWidth; var scaleY = height / desiredHeight; var scaleMin = Math.min(scaleX, scaleY); var scaleMax = Math.max(scaleX, scaleY); + if (meetOrSlice === 'meet') { - desiredWidth *= scaleMin;desiredHeight *= scaleMin; + desiredWidth *= scaleMin; + desiredHeight *= scaleMin; } + if (meetOrSlice === 'slice') { - desiredWidth *= scaleMax;desiredHeight *= scaleMax; + desiredWidth *= scaleMax; + desiredHeight *= scaleMax; } refX = new svg.Property('refX', refX); refY = new svg.Property('refY', refY); + if (refX.hasValue() && refY.hasValue()) { ctx.translate(-scaleMin * refX.toPixels('x'), -scaleMin * refY.toPixels('y')); } else { @@ -1645,92 +1738,104 @@ var canvg = (function (exports) { if (align.match(/YMid$/) && (meetOrSlice === 'meet' && scaleMin === scaleX || meetOrSlice === 'slice' && scaleMax === scaleX)) ctx.translate(0, height / 2.0 - desiredHeight / 2.0); if (align.match(/^xMax/) && (meetOrSlice === 'meet' && scaleMin === scaleY || meetOrSlice === 'slice' && scaleMax === scaleY)) ctx.translate(width - desiredWidth, 0); if (align.match(/YMax$/) && (meetOrSlice === 'meet' && scaleMin === scaleX || meetOrSlice === 'slice' && scaleMax === scaleX)) ctx.translate(0, height - desiredHeight); - } + } // scale - // scale - if (align === 'none') ctx.scale(scaleX, scaleY);else if (meetOrSlice === 'meet') ctx.scale(scaleMin, scaleMin);else if (meetOrSlice === 'slice') ctx.scale(scaleMax, scaleMax); - // translate + if (align === 'none') ctx.scale(scaleX, scaleY);else if (meetOrSlice === 'meet') ctx.scale(scaleMin, scaleMin);else if (meetOrSlice === 'slice') ctx.scale(scaleMax, scaleMax); // translate + ctx.translate(minX == null ? 0 : -minX, minY == null ? 0 : -minY); - }; + }; // elements + - // elements svg.Element = {}; - svg.EmptyProperty = new svg.Property('EMPTY', ''); - svg.Element.ElementBase = function () { + svg.Element.ElementBase = + /*#__PURE__*/ + function () { function _class4(node) { var _this7 = this; - classCallCheck(this, _class4); + _classCallCheck(this, _class4); this.captureTextNodes = arguments[1]; // Argument from inheriting class + this.attributes = {}; this.styles = {}; this.children = []; + if (node != null && node.nodeType === 1) { // ELEMENT_NODE // add children - [].concat(toConsumableArray(node.childNodes)).forEach(function (childNode) { + _toConsumableArray(node.childNodes).forEach(function (childNode) { if (childNode.nodeType === 1) { _this7.addChild(childNode, true); // ELEMENT_NODE + } + if (_this7.captureTextNodes && (childNode.nodeType === 3 || childNode.nodeType === 4)) { var text = childNode.nodeValue || childNode.text || ''; + if (svg.trim(svg.compressSpaces(text)) !== '') { _this7.addChild(new svg.Element.tspan(childNode), false); // TEXT_NODE + } } - }); + }); // add attributes - // add attributes - [].concat(toConsumableArray(node.attributes)).forEach(function (_ref) { + + _toConsumableArray(node.attributes).forEach(function (_ref) { var nodeName = _ref.nodeName, nodeValue = _ref.nodeValue; - _this7.attributes[nodeName] = new svg.Property(nodeName, nodeValue); - }); - // add tag styles + }); // add tag styles + + var styles = svg.Styles[node.nodeName]; + if (styles != null) { for (var name in styles) { this.styles[name] = styles[name]; } - } + } // add class styles + - // add class styles if (this.attribute('class').hasValue()) { var classes = svg.compressSpaces(this.attribute('class').value).split(' '); classes.forEach(function (clss) { styles = svg.Styles['.' + clss]; + if (styles != null) { for (var _name in styles) { _this7.styles[_name] = styles[_name]; } } + styles = svg.Styles[node.nodeName + '.' + clss]; + if (styles != null) { for (var _name2 in styles) { _this7.styles[_name2] = styles[_name2]; } } }); - } + } // add id styles + - // add id styles if (this.attribute('id').hasValue()) { var _styles = svg.Styles['#' + this.attribute('id').value]; + if (_styles != null) { for (var _name3 in _styles) { this.styles[_name3] = _styles[_name3]; } } - } + } // add inline styles + - // add inline styles if (this.attribute('style').hasValue()) { var _styles2 = this.attribute('style').value.split(';'); + _styles2.forEach(function (style) { if (svg.trim(style) !== '') { var _style$split = style.split(':'), @@ -1742,60 +1847,62 @@ var canvg = (function (exports) { _this7.styles[_name4] = new svg.Property(_name4, value); } }); - } + } // add id + - // add id if (this.attribute('id').hasValue()) { if (svg.Definitions[this.attribute('id').value] == null) { svg.Definitions[this.attribute('id').value] = this; } } } - } - - // get or create attribute + } // get or create attribute - createClass(_class4, [{ - key: 'attribute', + _createClass(_class4, [{ + key: "attribute", value: function attribute(name, createIfNotExists) { var a = this.attributes[name]; if (a != null) return a; if (createIfNotExists === true) { - a = new svg.Property(name, '');this.attributes[name] = a; + a = new svg.Property(name, ''); + this.attributes[name] = a; } + return a || svg.EmptyProperty; } }, { - key: 'getHrefAttribute', + key: "getHrefAttribute", value: function getHrefAttribute() { for (var a in this.attributes) { if (a.match(/:href$/)) { return this.attributes[a]; } } - return svg.EmptyProperty; - } - // get or create style, crawls up node tree + return svg.EmptyProperty; + } // get or create style, crawls up node tree }, { - key: 'style', + key: "style", value: function style(name, createIfNotExists, skipAncestors) { var s = this.styles[name]; if (s != null) return s; - var a = this.attribute(name); + if (a != null && a.hasValue()) { this.styles[name] = a; // move up to me to cache + return a; } if (skipAncestors !== true) { var p = this.parent; + if (p != null) { var ps = p.style(name); + if (ps != null && ps.hasValue()) { return ps; } @@ -1803,23 +1910,22 @@ var canvg = (function (exports) { } if (createIfNotExists === true) { - s = new svg.Property(name, '');this.styles[name] = s; + s = new svg.Property(name, ''); + this.styles[name] = s; } - return s || svg.EmptyProperty; - } - // base render + return s || svg.EmptyProperty; + } // base render }, { - key: 'render', + key: "render", value: function render(ctx) { // don't render display=none - if (this.style('display').value === 'none') return; + if (this.style('display').value === 'none') return; // don't render visibility=hidden - // don't render visibility=hidden if (this.style('visibility').value === 'hidden') return; - ctx.save(); + if (this.attribute('mask').hasValue()) { // mask var mask = this.attribute('mask').getDefinition(); @@ -1833,57 +1939,55 @@ var canvg = (function (exports) { this.renderChildren(ctx); this.clearContext(ctx); } - ctx.restore(); - } - // base set context + ctx.restore(); + } // base set context }, { - key: 'setContext', - value: function setContext(ctx) {} - // OVERRIDE ME! - - + key: "setContext", + value: function setContext(ctx) {} // OVERRIDE ME! // base clear context }, { - key: 'clearContext', - value: function clearContext(ctx) {} - // OVERRIDE ME! - - + key: "clearContext", + value: function clearContext(ctx) {} // OVERRIDE ME! // base render children }, { - key: 'renderChildren', + key: "renderChildren", value: function renderChildren(ctx) { this.children.forEach(function (child) { child.render(ctx); }); } }, { - key: 'addChild', + key: "addChild", value: function addChild(childNode, create) { var child = create ? svg.CreateElement(childNode) : childNode; child.parent = this; + if (child.type !== 'title') { this.children.push(child); } } }]); + return _class4; }(); - svg.Element.RenderedElementBase = function (_svg$Element$ElementB) { - inherits(_class5, _svg$Element$ElementB); + svg.Element.RenderedElementBase = + /*#__PURE__*/ + function (_svg$Element$ElementB) { + _inherits(_class5, _svg$Element$ElementB); function _class5() { - classCallCheck(this, _class5); - return possibleConstructorReturn(this, (_class5.__proto__ || Object.getPrototypeOf(_class5)).apply(this, arguments)); + _classCallCheck(this, _class5); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class5).apply(this, arguments)); } - createClass(_class5, [{ - key: 'setContext', + _createClass(_class5, [{ + key: "setContext", value: function setContext(ctx) { // fill if (this.style('fill').isUrlDefinition()) { @@ -1894,35 +1998,44 @@ var canvg = (function (exports) { if (fillStyle.value === 'currentColor') fillStyle.value = this.style('color').value; ctx.fillStyle = fillStyle.value === 'none' ? 'rgba(0,0,0,0)' : fillStyle.value; } + if (this.style('fill-opacity').hasValue()) { var _fillStyle = new svg.Property('fill', ctx.fillStyle); + _fillStyle = _fillStyle.addOpacity(this.style('fill-opacity')); ctx.fillStyle = _fillStyle.value; - } + } // stroke + - // stroke if (this.style('stroke').isUrlDefinition()) { var _fs = this.style('stroke').getFillStyleDefinition(this, this.style('stroke-opacity')); + if (_fs != null) ctx.strokeStyle = _fs; } else if (this.style('stroke').hasValue()) { var strokeStyle = this.style('stroke'); if (strokeStyle.value === 'currentColor') strokeStyle.value = this.style('color').value; ctx.strokeStyle = strokeStyle.value === 'none' ? 'rgba(0,0,0,0)' : strokeStyle.value; } + if (this.style('stroke-opacity').hasValue()) { var _strokeStyle = new svg.Property('stroke', ctx.strokeStyle); + _strokeStyle = _strokeStyle.addOpacity(this.style('stroke-opacity')); ctx.strokeStyle = _strokeStyle.value; } + if (this.style('stroke-width').hasValue()) { var newLineWidth = this.style('stroke-width').toPixels(); ctx.lineWidth = newLineWidth === 0 ? 0.001 : newLineWidth; // browsers don't respect 0 } + if (this.style('stroke-linecap').hasValue()) ctx.lineCap = this.style('stroke-linecap').value; if (this.style('stroke-linejoin').hasValue()) ctx.lineJoin = this.style('stroke-linejoin').value; if (this.style('stroke-miterlimit').hasValue()) ctx.miterLimit = this.style('stroke-miterlimit').value; + if (this.style('stroke-dasharray').hasValue() && this.style('stroke-dasharray').value !== 'none') { var gaps = svg.ToNumberArray(this.style('stroke-dasharray').value); + if (typeof ctx.setLineDash !== 'undefined') { ctx.setLineDash(gaps); } else if (typeof ctx.webkitLineDash !== 'undefined') { @@ -1932,6 +2045,7 @@ var canvg = (function (exports) { } var offset = this.style('stroke-dashoffset').numValueOrDefault(1); + if (typeof ctx.lineDashOffset !== 'undefined') { ctx.lineDashOffset = offset; } else if (typeof ctx.webkitLineDashOffset !== 'undefined') { @@ -1939,53 +2053,58 @@ var canvg = (function (exports) { } else if (typeof ctx.mozDashOffset !== 'undefined') { ctx.mozDashOffset = offset; } - } + } // font + - // font if (typeof ctx.font !== 'undefined') { ctx.font = svg.Font.CreateFont(this.style('font-style').value, this.style('font-variant').value, this.style('font-weight').value, this.style('font-size').hasValue() ? this.style('font-size').toPixels() + 'px' : '', this.style('font-family').value).toString(); - } + } // transform + - // transform if (this.attribute('transform').hasValue()) { var transform = new svg.Transform(this.attribute('transform').value); transform.apply(ctx); - } + } // clip + - // clip if (this.style('clip-path', false, true).hasValue()) { var clip = this.style('clip-path', false, true).getDefinition(); if (clip != null) clip.apply(ctx); - } + } // opacity + - // opacity if (this.style('opacity').hasValue()) { ctx.globalAlpha = this.style('opacity').numValue(); } } }]); + return _class5; }(svg.Element.ElementBase); - svg.Element.PathElementBase = function (_svg$Element$Rendered) { - inherits(_class6, _svg$Element$Rendered); + svg.Element.PathElementBase = + /*#__PURE__*/ + function (_svg$Element$Rendered) { + _inherits(_class6, _svg$Element$Rendered); function _class6() { - classCallCheck(this, _class6); - return possibleConstructorReturn(this, (_class6.__proto__ || Object.getPrototypeOf(_class6)).apply(this, arguments)); + _classCallCheck(this, _class6); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class6).apply(this, arguments)); } - createClass(_class6, [{ - key: 'path', + _createClass(_class6, [{ + key: "path", value: function path(ctx) { if (ctx != null) ctx.beginPath(); return new svg.BoundingBox(); } }, { - key: 'renderChildren', + key: "renderChildren", value: function renderChildren(ctx) { this.path(ctx); svg.Mouse.checkPath(this, ctx); + if (ctx.fillStyle !== '') { if (this.style('fill-rule').valueOrDefault('inherit') !== 'inherit') { ctx.fill(this.style('fill-rule').value); @@ -1993,85 +2112,95 @@ var canvg = (function (exports) { ctx.fill(); } } - if (ctx.strokeStyle !== '') ctx.stroke(); + if (ctx.strokeStyle !== '') ctx.stroke(); var markers = this.getMarkers(); + if (markers != null) { if (this.style('marker-start').isUrlDefinition()) { var marker = this.style('marker-start').getDefinition(); marker.render(ctx, markers[0][0], markers[0][1]); } + if (this.style('marker-mid').isUrlDefinition()) { var _marker = this.style('marker-mid').getDefinition(); + for (var i = 1; i < markers.length - 1; i++) { _marker.render(ctx, markers[i][0], markers[i][1]); } } + if (this.style('marker-end').isUrlDefinition()) { var _marker2 = this.style('marker-end').getDefinition(); + _marker2.render(ctx, markers[markers.length - 1][0], markers[markers.length - 1][1]); } } } }, { - key: 'getBoundingBox', + key: "getBoundingBox", value: function getBoundingBox() { return this.path(); } }, { - key: 'getMarkers', + key: "getMarkers", value: function getMarkers() { return null; } }]); - return _class6; - }(svg.Element.RenderedElementBase); - // svg element - svg.Element.svg = function (_svg$Element$Rendered2) { - inherits(_class7, _svg$Element$Rendered2); + return _class6; + }(svg.Element.RenderedElementBase); // svg element + + + svg.Element.svg = + /*#__PURE__*/ + function (_svg$Element$Rendered2) { + _inherits(_class7, _svg$Element$Rendered2); function _class7() { - classCallCheck(this, _class7); - return possibleConstructorReturn(this, (_class7.__proto__ || Object.getPrototypeOf(_class7)).apply(this, arguments)); + _classCallCheck(this, _class7); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class7).apply(this, arguments)); } - createClass(_class7, [{ - key: 'clearContext', + _createClass(_class7, [{ + key: "clearContext", value: function clearContext(ctx) { - get(_class7.prototype.__proto__ || Object.getPrototypeOf(_class7.prototype), 'clearContext', this).call(this, ctx); + _get(_getPrototypeOf(_class7.prototype), "clearContext", this).call(this, ctx); + svg.ViewPort.RemoveCurrent(); } }, { - key: 'setContext', + key: "setContext", value: function setContext(ctx) { // initial values and defaults ctx.strokeStyle = 'rgba(0,0,0,0)'; ctx.lineCap = 'butt'; ctx.lineJoin = 'miter'; ctx.miterLimit = 4; + if (typeof ctx.font !== 'undefined' && typeof window.getComputedStyle !== 'undefined') { ctx.font = window.getComputedStyle(ctx.canvas).getPropertyValue('font'); } - get(_class7.prototype.__proto__ || Object.getPrototypeOf(_class7.prototype), 'setContext', this).call(this, ctx); + _get(_getPrototypeOf(_class7.prototype), "setContext", this).call(this, ctx); // create new view port + - // create new view port if (!this.attribute('x').hasValue()) this.attribute('x', true).value = 0; if (!this.attribute('y').hasValue()) this.attribute('y', true).value = 0; ctx.translate(this.attribute('x').toPixels('x'), this.attribute('y').toPixels('y')); - var width = svg.ViewPort.width(); var height = svg.ViewPort.height(); - if (!this.attribute('width').hasValue()) this.attribute('width', true).value = '100%'; if (!this.attribute('height').hasValue()) this.attribute('height', true).value = '100%'; + if (typeof this.root === 'undefined') { width = this.attribute('width').toPixels('x'); height = this.attribute('height').toPixels('y'); - var x = 0; var y = 0; + if (this.attribute('refX').hasValue() && this.attribute('refY').hasValue()) { x = -this.attribute('refX').toPixels('x'); y = -this.attribute('refY').toPixels('y'); @@ -2087,37 +2216,39 @@ var canvg = (function (exports) { ctx.clip(); } } - svg.ViewPort.SetCurrent(width, height); - // viewbox + svg.ViewPort.SetCurrent(width, height); // viewbox + if (this.attribute('viewBox').hasValue()) { var viewBox = svg.ToNumberArray(this.attribute('viewBox').value); var minX = viewBox[0]; var minY = viewBox[1]; width = viewBox[2]; height = viewBox[3]; - svg.AspectRatio(ctx, this.attribute('preserveAspectRatio').value, svg.ViewPort.width(), width, svg.ViewPort.height(), height, minX, minY, this.attribute('refX').value, this.attribute('refY').value); - svg.ViewPort.RemoveCurrent(); svg.ViewPort.SetCurrent(viewBox[2], viewBox[3]); } } }]); - return _class7; - }(svg.Element.RenderedElementBase); - // rect element - svg.Element.rect = function (_svg$Element$PathElem) { - inherits(_class8, _svg$Element$PathElem); + return _class7; + }(svg.Element.RenderedElementBase); // rect element + + + svg.Element.rect = + /*#__PURE__*/ + function (_svg$Element$PathElem) { + _inherits(_class8, _svg$Element$PathElem); function _class8() { - classCallCheck(this, _class8); - return possibleConstructorReturn(this, (_class8.__proto__ || Object.getPrototypeOf(_class8)).apply(this, arguments)); + _classCallCheck(this, _class8); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class8).apply(this, arguments)); } - createClass(_class8, [{ - key: 'path', + _createClass(_class8, [{ + key: "path", value: function path(ctx) { var x = this.attribute('x').toPixels('x'); var y = this.attribute('y').toPixels('y'); @@ -2129,6 +2260,7 @@ var canvg = (function (exports) { if (this.attribute('ry').hasValue() && !this.attribute('rx').hasValue()) rx = ry; rx = Math.min(rx, width / 2.0); ry = Math.min(ry, height / 2.0); + if (ctx != null) { ctx.beginPath(); ctx.moveTo(x + rx, y); @@ -2146,20 +2278,24 @@ var canvg = (function (exports) { return new svg.BoundingBox(x, y, x + width, y + height); } }]); - return _class8; - }(svg.Element.PathElementBase); - // circle element - svg.Element.circle = function (_svg$Element$PathElem2) { - inherits(_class9, _svg$Element$PathElem2); + return _class8; + }(svg.Element.PathElementBase); // circle element + + + svg.Element.circle = + /*#__PURE__*/ + function (_svg$Element$PathElem2) { + _inherits(_class9, _svg$Element$PathElem2); function _class9() { - classCallCheck(this, _class9); - return possibleConstructorReturn(this, (_class9.__proto__ || Object.getPrototypeOf(_class9)).apply(this, arguments)); + _classCallCheck(this, _class9); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class9).apply(this, arguments)); } - createClass(_class9, [{ - key: 'path', + _createClass(_class9, [{ + key: "path", value: function path(ctx) { var cx = this.attribute('cx').toPixels('x'); var cy = this.attribute('cy').toPixels('y'); @@ -2174,21 +2310,26 @@ var canvg = (function (exports) { return new svg.BoundingBox(cx - r, cy - r, cx + r, cy + r); } }]); - return _class9; - }(svg.Element.PathElementBase); - // ellipse element + return _class9; + }(svg.Element.PathElementBase); // ellipse element + + var KAPPA = 4 * ((Math.sqrt(2) - 1) / 3); - svg.Element.ellipse = function (_svg$Element$PathElem3) { - inherits(_class10, _svg$Element$PathElem3); + + svg.Element.ellipse = + /*#__PURE__*/ + function (_svg$Element$PathElem3) { + _inherits(_class10, _svg$Element$PathElem3); function _class10() { - classCallCheck(this, _class10); - return possibleConstructorReturn(this, (_class10.__proto__ || Object.getPrototypeOf(_class10)).apply(this, arguments)); + _classCallCheck(this, _class10); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class10).apply(this, arguments)); } - createClass(_class10, [{ - key: 'path', + _createClass(_class10, [{ + key: "path", value: function path(ctx) { var rx = this.attribute('rx').toPixels('x'); var ry = this.attribute('ry').toPixels('y'); @@ -2208,25 +2349,29 @@ var canvg = (function (exports) { return new svg.BoundingBox(cx - rx, cy - ry, cx + rx, cy + ry); } }]); - return _class10; - }(svg.Element.PathElementBase); - // line element - svg.Element.line = function (_svg$Element$PathElem4) { - inherits(_class11, _svg$Element$PathElem4); + return _class10; + }(svg.Element.PathElementBase); // line element + + + svg.Element.line = + /*#__PURE__*/ + function (_svg$Element$PathElem4) { + _inherits(_class11, _svg$Element$PathElem4); function _class11() { - classCallCheck(this, _class11); - return possibleConstructorReturn(this, (_class11.__proto__ || Object.getPrototypeOf(_class11)).apply(this, arguments)); + _classCallCheck(this, _class11); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class11).apply(this, arguments)); } - createClass(_class11, [{ - key: 'getPoints', + _createClass(_class11, [{ + key: "getPoints", value: function getPoints() { return [new svg.Point(this.attribute('x1').toPixels('x'), this.attribute('y1').toPixels('y')), new svg.Point(this.attribute('x2').toPixels('x'), this.attribute('y2').toPixels('y'))]; } }, { - key: 'path', + key: "path", value: function path(ctx) { var points = this.getPoints(); @@ -2239,99 +2384,116 @@ var canvg = (function (exports) { return new svg.BoundingBox(points[0].x, points[0].y, points[1].x, points[1].y); } }, { - key: 'getMarkers', + key: "getMarkers", value: function getMarkers() { var points = this.getPoints(); var a = points[0].angleTo(points[1]); return [[points[0], a], [points[1], a]]; } }]); - return _class11; - }(svg.Element.PathElementBase); - // polyline element - svg.Element.polyline = function (_svg$Element$PathElem5) { - inherits(_class12, _svg$Element$PathElem5); + return _class11; + }(svg.Element.PathElementBase); // polyline element + + + svg.Element.polyline = + /*#__PURE__*/ + function (_svg$Element$PathElem5) { + _inherits(_class12, _svg$Element$PathElem5); function _class12(node) { - classCallCheck(this, _class12); + var _this8; - var _this15 = possibleConstructorReturn(this, (_class12.__proto__ || Object.getPrototypeOf(_class12)).call(this, node)); + _classCallCheck(this, _class12); - _this15.points = svg.CreatePath(_this15.attribute('points').value); - return _this15; + _this8 = _possibleConstructorReturn(this, _getPrototypeOf(_class12).call(this, node)); + _this8.points = svg.CreatePath(_this8.attribute('points').value); + return _this8; } - createClass(_class12, [{ - key: 'path', + _createClass(_class12, [{ + key: "path", value: function path(ctx) { - var _points$ = this.points[0], - x = _points$.x, - y = _points$.y; - + var _this$points$ = this.points[0], + x = _this$points$.x, + y = _this$points$.y; var bb = new svg.BoundingBox(x, y); + if (ctx != null) { ctx.beginPath(); ctx.moveTo(x, y); } - for (var i = 1; i < this.points.length; i++) { - var _points$i = this.points[i], - _x = _points$i.x, - _y = _points$i.y; + for (var i = 1; i < this.points.length; i++) { + var _this$points$i = this.points[i], + _x = _this$points$i.x, + _y = _this$points$i.y; bb.addPoint(_x, _y); if (ctx != null) ctx.lineTo(_x, _y); } + return bb; } }, { - key: 'getMarkers', + key: "getMarkers", value: function getMarkers() { var markers = []; + for (var i = 0; i < this.points.length - 1; i++) { markers.push([this.points[i], this.points[i].angleTo(this.points[i + 1])]); } + markers.push([this.points[this.points.length - 1], markers[markers.length - 1][1]]); return markers; } }]); - return _class12; - }(svg.Element.PathElementBase); - // polygon element - svg.Element.polygon = function (_svg$Element$polyline) { - inherits(_class13, _svg$Element$polyline); + return _class12; + }(svg.Element.PathElementBase); // polygon element + + + svg.Element.polygon = + /*#__PURE__*/ + function (_svg$Element$polyline) { + _inherits(_class13, _svg$Element$polyline); function _class13() { - classCallCheck(this, _class13); - return possibleConstructorReturn(this, (_class13.__proto__ || Object.getPrototypeOf(_class13)).apply(this, arguments)); + _classCallCheck(this, _class13); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class13).apply(this, arguments)); } - createClass(_class13, [{ - key: 'path', + _createClass(_class13, [{ + key: "path", value: function path(ctx) { - var bb = get(_class13.prototype.__proto__ || Object.getPrototypeOf(_class13.prototype), 'path', this).call(this, ctx); + var bb = _get(_getPrototypeOf(_class13.prototype), "path", this).call(this, ctx); + if (ctx != null) { ctx.lineTo(this.points[0].x, this.points[0].y); ctx.closePath(); } + return bb; } }]); - return _class13; - }(svg.Element.polyline); - // path element - svg.Element.path = function (_svg$Element$PathElem6) { - inherits(_class14, _svg$Element$PathElem6); + return _class13; + }(svg.Element.polyline); // path element + + + svg.Element.path = + /*#__PURE__*/ + function (_svg$Element$PathElem6) { + _inherits(_class14, _svg$Element$PathElem6); function _class14(node) { - classCallCheck(this, _class14); + var _this9; - var _this17 = possibleConstructorReturn(this, (_class14.__proto__ || Object.getPrototypeOf(_class14)).call(this, node)); + _classCallCheck(this, _class14); - var d = _this17.attribute('d').value - // TODO: convert to real lexer based on https://www.w3.org/TR/SVG11/paths.html#PathDataBNF + _this9 = _possibleConstructorReturn(this, _getPrototypeOf(_class14).call(this, node)); + + var d = _this9.attribute('d').value // TODO: convert to real lexer based on https://www.w3.org/TR/SVG11/paths.html#PathDataBNF .replace(/,/gm, ' ') // get rid of all commas .replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm, '$1 $2') // separate commands from commands .replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm, '$1 $2') // separate commands from commands @@ -2340,11 +2502,13 @@ var canvg = (function (exports) { .replace(/([0-9])([+-])/gm, '$1 $2') // separate digits when no comma .replace(/(\.[0-9]*)(\.)/gm, '$1 $2') // separate digits when no comma .replace(/([Aa](\s+[0-9]+){3})\s+([01])\s*([01])/gm, '$1 $3 $4 '); // shorthand elliptical arc path syntax - d = svg.compressSpaces(d); // compress multiple spaces - d = svg.trim(d); - _this17.PathParser = { - tokens: d.split(' '), + + d = svg.compressSpaces(d); // compress multiple spaces + + d = svg.trim(d); + _this9.PathParser = { + tokens: d.split(' '), reset: function reset() { this.i = -1; this.command = ''; @@ -2376,6 +2540,7 @@ var canvg = (function (exports) { case 'z': return true; } + return false; }, getToken: function getToken() { @@ -2406,9 +2571,9 @@ var canvg = (function (exports) { getReflectedControlPoint: function getReflectedControlPoint() { if (this.previousCommand.toLowerCase() !== 'c' && this.previousCommand.toLowerCase() !== 's' && this.previousCommand.toLowerCase() !== 'q' && this.previousCommand.toLowerCase() !== 't') { return this.current; - } + } // reflect point + - // reflect point var p = new svg.Point(2 * this.current.x - this.control.x, 2 * this.current.y - this.control.y); return p; }, @@ -2417,6 +2582,7 @@ var canvg = (function (exports) { p.x += this.current.x; p.y += this.current.y; } + return p; }, addMarker: function addMarker(p, from, priorTo) { @@ -2424,6 +2590,7 @@ var canvg = (function (exports) { if (priorTo != null && this.angles.length > 0 && this.angles[this.angles.length - 1] == null) { this.angles[this.angles.length - 1] = this.points[this.points.length - 1].angleTo(priorTo); } + this.addMarkerAngle(p, from == null ? null : from.angleTo(p)); }, addMarkerAngle: function addMarkerAngle(p, a) { @@ -2444,22 +2611,24 @@ var canvg = (function (exports) { } } } + return this.angles; } }; - return _this17; + return _this9; } - createClass(_class14, [{ - key: 'path', + _createClass(_class14, [{ + key: "path", value: function path(ctx) { var pp = this.PathParser; pp.reset(); - var bb = new svg.BoundingBox(); if (ctx != null) ctx.beginPath(); + while (!pp.isEnd()) { pp.nextCommand(); + switch (pp.command) { case 'M': case 'm': @@ -2468,23 +2637,31 @@ var canvg = (function (exports) { bb.addPoint(p.x, p.y); if (ctx != null) ctx.moveTo(p.x, p.y); pp.start = pp.current; + while (!pp.isCommandOrEnd()) { var _p = pp.getAsCurrentPoint(); + pp.addMarker(_p, pp.start); bb.addPoint(_p.x, _p.y); if (ctx != null) ctx.lineTo(_p.x, _p.y); } + break; + case 'L': case 'l': while (!pp.isCommandOrEnd()) { - var _c = pp.current; + var c = pp.current; + var _p2 = pp.getAsCurrentPoint(); - pp.addMarker(_p2, _c); + + pp.addMarker(_p2, c); bb.addPoint(_p2.x, _p2.y); if (ctx != null) ctx.lineTo(_p2.x, _p2.y); } + break; + case 'H': case 'h': while (!pp.isCommandOrEnd()) { @@ -2494,17 +2671,22 @@ var canvg = (function (exports) { bb.addPoint(pp.current.x, pp.current.y); if (ctx != null) ctx.lineTo(pp.current.x, pp.current.y); } + break; + case 'V': case 'v': while (!pp.isCommandOrEnd()) { var _newP = new svg.Point(pp.current.x, (pp.isRelativeCommand() ? pp.current.y : 0) + pp.getScalar()); + pp.addMarker(_newP, pp.current); pp.current = _newP; bb.addPoint(pp.current.x, pp.current.y); if (ctx != null) ctx.lineTo(pp.current.x, pp.current.y); } + break; + case 'C': case 'c': while (!pp.isCommandOrEnd()) { @@ -2516,42 +2698,61 @@ var canvg = (function (exports) { bb.addBezierCurve(curr.x, curr.y, p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y); if (ctx != null) ctx.bezierCurveTo(p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y); } + break; + case 'S': case 's': while (!pp.isCommandOrEnd()) { var _curr = pp.current; + var _p3 = pp.getReflectedControlPoint(); + var _cntrl = pp.getAsControlPoint(); + var _cp = pp.getAsCurrentPoint(); + pp.addMarker(_cp, _cntrl, _p3); bb.addBezierCurve(_curr.x, _curr.y, _p3.x, _p3.y, _cntrl.x, _cntrl.y, _cp.x, _cp.y); if (ctx != null) ctx.bezierCurveTo(_p3.x, _p3.y, _cntrl.x, _cntrl.y, _cp.x, _cp.y); } + break; + case 'Q': case 'q': while (!pp.isCommandOrEnd()) { var _curr2 = pp.current; + var _cntrl2 = pp.getAsControlPoint(); + var _cp2 = pp.getAsCurrentPoint(); + pp.addMarker(_cp2, _cntrl2, _cntrl2); bb.addQuadraticCurve(_curr2.x, _curr2.y, _cntrl2.x, _cntrl2.y, _cp2.x, _cp2.y); if (ctx != null) ctx.quadraticCurveTo(_cntrl2.x, _cntrl2.y, _cp2.x, _cp2.y); } + break; + case 'T': case 't': while (!pp.isCommandOrEnd()) { var _curr3 = pp.current; + var _cntrl3 = pp.getReflectedControlPoint(); + pp.control = _cntrl3; + var _cp3 = pp.getAsCurrentPoint(); + pp.addMarker(_cp3, _cntrl3, _cntrl3); bb.addQuadraticCurve(_curr3.x, _curr3.y, _cntrl3.x, _cntrl3.y, _cp3.x, _cp3.y); if (ctx != null) ctx.quadraticCurveTo(_cntrl3.x, _cntrl3.y, _cp3.x, _cp3.y); } + break; + case 'A': case 'a': var _loop2 = function _loop2() { @@ -2561,59 +2762,61 @@ var canvg = (function (exports) { var xAxisRotation = pp.getScalar() * (Math.PI / 180.0); var largeArcFlag = pp.getScalar(); var sweepFlag = pp.getScalar(); - var cp = pp.getAsCurrentPoint(); - - // Conversion from endpoint to center parameterization + var cp = pp.getAsCurrentPoint(); // Conversion from endpoint to center parameterization // https://www.w3.org/TR/SVG11/implnote.html#ArcConversionEndpointToCenter - // x1', y1' - var currp = new svg.Point(Math.cos(xAxisRotation) * (curr.x - cp.x) / 2.0 + Math.sin(xAxisRotation) * (curr.y - cp.y) / 2.0, -Math.sin(xAxisRotation) * (curr.x - cp.x) / 2.0 + Math.cos(xAxisRotation) * (curr.y - cp.y) / 2.0); - // adjust radii + + var currp = new svg.Point(Math.cos(xAxisRotation) * (curr.x - cp.x) / 2.0 + Math.sin(xAxisRotation) * (curr.y - cp.y) / 2.0, -Math.sin(xAxisRotation) * (curr.x - cp.x) / 2.0 + Math.cos(xAxisRotation) * (curr.y - cp.y) / 2.0); // adjust radii + var l = Math.pow(currp.x, 2) / Math.pow(rx, 2) + Math.pow(currp.y, 2) / Math.pow(ry, 2); + if (l > 1) { rx *= Math.sqrt(l); ry *= Math.sqrt(l); - } - // cx', cy' + } // cx', cy' + + var s = (largeArcFlag === sweepFlag ? -1 : 1) * Math.sqrt((Math.pow(rx, 2) * Math.pow(ry, 2) - Math.pow(rx, 2) * Math.pow(currp.y, 2) - Math.pow(ry, 2) * Math.pow(currp.x, 2)) / (Math.pow(rx, 2) * Math.pow(currp.y, 2) + Math.pow(ry, 2) * Math.pow(currp.x, 2))); if (isNaN(s)) s = 0; - var cpp = new svg.Point(s * rx * currp.y / ry, s * -ry * currp.x / rx); - // cx, cy - var centp = new svg.Point((curr.x + cp.x) / 2.0 + Math.cos(xAxisRotation) * cpp.x - Math.sin(xAxisRotation) * cpp.y, (curr.y + cp.y) / 2.0 + Math.sin(xAxisRotation) * cpp.x + Math.cos(xAxisRotation) * cpp.y); - // vector magnitude + var cpp = new svg.Point(s * rx * currp.y / ry, s * -ry * currp.x / rx); // cx, cy + + var centp = new svg.Point((curr.x + cp.x) / 2.0 + Math.cos(xAxisRotation) * cpp.x - Math.sin(xAxisRotation) * cpp.y, (curr.y + cp.y) / 2.0 + Math.sin(xAxisRotation) * cpp.x + Math.cos(xAxisRotation) * cpp.y); // vector magnitude + var m = function m(v) { return Math.sqrt(Math.pow(v[0], 2) + Math.pow(v[1], 2)); - }; - // ratio between two vectors + }; // ratio between two vectors + + var r = function r(u, v) { return (u[0] * v[0] + u[1] * v[1]) / (m(u) * m(v)); - }; - // angle between two vectors + }; // angle between two vectors + + var a = function a(u, v) { return (u[0] * v[1] < u[1] * v[0] ? -1 : 1) * Math.acos(r(u, v)); - }; - // initial angle - var a1 = a([1, 0], [(currp.x - cpp.x) / rx, (currp.y - cpp.y) / ry]); - // angle delta + }; // initial angle + + + var a1 = a([1, 0], [(currp.x - cpp.x) / rx, (currp.y - cpp.y) / ry]); // angle delta + var u = [(currp.x - cpp.x) / rx, (currp.y - cpp.y) / ry]; var v = [(-currp.x - cpp.x) / rx, (-currp.y - cpp.y) / ry]; var ad = a(u, v); if (r(u, v) <= -1) ad = Math.PI; - if (r(u, v) >= 1) ad = 0; + if (r(u, v) >= 1) ad = 0; // for markers - // for markers var dir = 1 - sweepFlag ? 1.0 : -1.0; var ah = a1 + dir * (ad / 2.0); var halfWay = new svg.Point(centp.x + rx * Math.cos(ah), centp.y + ry * Math.sin(ah)); pp.addMarkerAngle(halfWay, ah - dir * Math.PI / 2); pp.addMarkerAngle(cp, ah - dir * Math.PI); - bb.addPoint(cp.x, cp.y); // TODO: this is too naive, make it better + if (ctx != null) { var _r = rx > ry ? rx : ry; + var sx = rx > ry ? 1 : rx / ry; var sy = rx > ry ? ry / rx : 1; - ctx.translate(centp.x, centp.y); ctx.rotate(xAxisRotation); ctx.scale(sx, sy); @@ -2627,7 +2830,9 @@ var canvg = (function (exports) { while (!pp.isCommandOrEnd()) { _loop2(); } + break; + case 'Z': case 'z': if (ctx != null) ctx.closePath(); @@ -2638,51 +2843,54 @@ var canvg = (function (exports) { return bb; } }, { - key: 'getMarkers', + key: "getMarkers", value: function getMarkers() { var points = this.PathParser.getMarkerPoints(); var angles = this.PathParser.getMarkerAngles(); - var markers = points.map(function (point, i) { return [point, angles[i]]; }); return markers; } }]); - return _class14; - }(svg.Element.PathElementBase); - // pattern element - svg.Element.pattern = function (_svg$Element$ElementB2) { - inherits(_class15, _svg$Element$ElementB2); + return _class14; + }(svg.Element.PathElementBase); // pattern element + + + svg.Element.pattern = + /*#__PURE__*/ + function (_svg$Element$ElementB2) { + _inherits(_class15, _svg$Element$ElementB2); function _class15() { - classCallCheck(this, _class15); - return possibleConstructorReturn(this, (_class15.__proto__ || Object.getPrototypeOf(_class15)).apply(this, arguments)); + _classCallCheck(this, _class15); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class15).apply(this, arguments)); } - createClass(_class15, [{ - key: 'createPattern', + _createClass(_class15, [{ + key: "createPattern", value: function createPattern(ctx, element) { var width = this.attribute('width').toPixels('x', true); - var height = this.attribute('height').toPixels('y', true); + var height = this.attribute('height').toPixels('y', true); // render me using a temporary svg element - // render me using a temporary svg element var tempSvg = new svg.Element.svg(); tempSvg.attributes['viewBox'] = new svg.Property('viewBox', this.attribute('viewBox').value); tempSvg.attributes['width'] = new svg.Property('width', width + 'px'); tempSvg.attributes['height'] = new svg.Property('height', height + 'px'); tempSvg.attributes['transform'] = new svg.Property('transform', this.attribute('patternTransform').value); tempSvg.children = this.children; - var c = document.createElement('canvas'); c.width = width; c.height = height; var cctx = c.getContext('2d'); + if (this.attribute('x').hasValue() && this.attribute('y').hasValue()) { cctx.translate(this.attribute('x').toPixels('x', true), this.attribute('y').toPixels('y', true)); - } - // render 3x3 grid so when we transform there's no white space on edges + } // render 3x3 grid so when we transform there's no white space on edges + + for (var x = -1; x <= 1; x++) { for (var y = -1; y <= 1; y++) { cctx.save(); @@ -2691,31 +2899,35 @@ var canvg = (function (exports) { cctx.restore(); } } + var pattern = ctx.createPattern(c, 'repeat'); return pattern; } }]); - return _class15; - }(svg.Element.ElementBase); - // marker element - svg.Element.marker = function (_svg$Element$ElementB3) { - inherits(_class16, _svg$Element$ElementB3); + return _class15; + }(svg.Element.ElementBase); // marker element + + + svg.Element.marker = + /*#__PURE__*/ + function (_svg$Element$ElementB3) { + _inherits(_class16, _svg$Element$ElementB3); function _class16() { - classCallCheck(this, _class16); - return possibleConstructorReturn(this, (_class16.__proto__ || Object.getPrototypeOf(_class16)).apply(this, arguments)); + _classCallCheck(this, _class16); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class16).apply(this, arguments)); } - createClass(_class16, [{ - key: 'render', + _createClass(_class16, [{ + key: "render", value: function render(ctx, point, angle) { ctx.translate(point.x, point.y); if (this.attribute('orient').valueOrDefault('auto') === 'auto') ctx.rotate(angle); if (this.attribute('markerUnits').valueOrDefault('strokeWidth') === 'strokeWidth') ctx.scale(ctx.lineWidth, ctx.lineWidth); - ctx.save(); + ctx.save(); // render me using a temporary svg element - // render me using a temporary svg element var tempSvg = new svg.Element.svg(); tempSvg.attributes['viewBox'] = new svg.Property('viewBox', this.attribute('viewBox').value); tempSvg.attributes['refX'] = new svg.Property('refX', this.attribute('refX').value); @@ -2726,61 +2938,67 @@ var canvg = (function (exports) { tempSvg.attributes['stroke'] = new svg.Property('stroke', this.attribute('stroke').valueOrDefault('none')); tempSvg.children = this.children; tempSvg.render(ctx); - ctx.restore(); if (this.attribute('markerUnits').valueOrDefault('strokeWidth') === 'strokeWidth') ctx.scale(1 / ctx.lineWidth, 1 / ctx.lineWidth); if (this.attribute('orient').valueOrDefault('auto') === 'auto') ctx.rotate(-angle); ctx.translate(-point.x, -point.y); } }]); - return _class16; - }(svg.Element.ElementBase); - // definitions element - svg.Element.defs = function (_svg$Element$ElementB4) { - inherits(_class17, _svg$Element$ElementB4); + return _class16; + }(svg.Element.ElementBase); // definitions element + + + svg.Element.defs = + /*#__PURE__*/ + function (_svg$Element$ElementB4) { + _inherits(_class17, _svg$Element$ElementB4); function _class17() { - classCallCheck(this, _class17); - return possibleConstructorReturn(this, (_class17.__proto__ || Object.getPrototypeOf(_class17)).apply(this, arguments)); + _classCallCheck(this, _class17); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class17).apply(this, arguments)); } - createClass(_class17, [{ - key: 'render', - value: function render(ctx) { - // NOOP + _createClass(_class17, [{ + key: "render", + value: function render(ctx) {// NOOP } }]); - return _class17; - }(svg.Element.ElementBase); - // base for gradients - svg.Element.GradientBase = function (_svg$Element$ElementB5) { - inherits(_class18, _svg$Element$ElementB5); + return _class17; + }(svg.Element.ElementBase); // base for gradients + + + svg.Element.GradientBase = + /*#__PURE__*/ + function (_svg$Element$ElementB5) { + _inherits(_class18, _svg$Element$ElementB5); function _class18(node) { - classCallCheck(this, _class18); + var _this10; - var _this21 = possibleConstructorReturn(this, (_class18.__proto__ || Object.getPrototypeOf(_class18)).call(this, node)); + _classCallCheck(this, _class18); - _this21.gradientUnits = _this21.attribute('gradientUnits').valueOrDefault('objectBoundingBox'); + _this10 = _possibleConstructorReturn(this, _getPrototypeOf(_class18).call(this, node)); + _this10.gradientUnits = _this10.attribute('gradientUnits').valueOrDefault('objectBoundingBox'); + _this10.stops = []; - _this21.stops = []; - _this21.children.forEach(function (child) { + _this10.children.forEach(function (child) { if (child.type === 'stop') { - _this21.stops.push(child); + _this10.stops.push(child); } }); - return _this21; + + return _this10; } - createClass(_class18, [{ - key: 'getGradient', - value: function getGradient() { - // OVERRIDE ME! + _createClass(_class18, [{ + key: "getGradient", + value: function getGradient() {// OVERRIDE ME! } }, { - key: 'createGradient', + key: "createGradient", value: function createGradient(ctx, element, parentOpacityProp) { var stopsContainer = this.getHrefAttribute().hasValue() ? this.getHrefAttribute().getDefinition() : this; @@ -2789,6 +3007,7 @@ var canvg = (function (exports) { var p = new svg.Property('color', color); return p.addOpacity(parentOpacityProp).value; } + return color; }; @@ -2797,57 +3016,56 @@ var canvg = (function (exports) { stopsContainer.stops.forEach(function (_ref2) { var offset = _ref2.offset, color = _ref2.color; - g.addColorStop(offset, addParentOpacity(color)); }); if (this.attribute('gradientTransform').hasValue()) { // render as transformed pattern on temporary canvas var rootView = svg.ViewPort.viewPorts[0]; - var rect = new svg.Element.rect(); rect.attributes['x'] = new svg.Property('x', -svg.MAX_VIRTUAL_PIXELS / 3.0); rect.attributes['y'] = new svg.Property('y', -svg.MAX_VIRTUAL_PIXELS / 3.0); rect.attributes['width'] = new svg.Property('width', svg.MAX_VIRTUAL_PIXELS); rect.attributes['height'] = new svg.Property('height', svg.MAX_VIRTUAL_PIXELS); - var group = new svg.Element.g(); group.attributes['transform'] = new svg.Property('transform', this.attribute('gradientTransform').value); group.children = [rect]; - var tempSvg = new svg.Element.svg(); tempSvg.attributes['x'] = new svg.Property('x', 0); tempSvg.attributes['y'] = new svg.Property('y', 0); tempSvg.attributes['width'] = new svg.Property('width', rootView.width); tempSvg.attributes['height'] = new svg.Property('height', rootView.height); tempSvg.children = [group]; - - var _c2 = document.createElement('canvas'); - _c2.width = rootView.width; - _c2.height = rootView.height; - var tempCtx = _c2.getContext('2d'); + var c = document.createElement('canvas'); + c.width = rootView.width; + c.height = rootView.height; + var tempCtx = c.getContext('2d'); tempCtx.fillStyle = g; tempSvg.render(tempCtx); - return tempCtx.createPattern(_c2, 'no-repeat'); + return tempCtx.createPattern(c, 'no-repeat'); } return g; } }]); - return _class18; - }(svg.Element.ElementBase); - // linear gradient element - svg.Element.linearGradient = function (_svg$Element$Gradient) { - inherits(_class19, _svg$Element$Gradient); + return _class18; + }(svg.Element.ElementBase); // linear gradient element + + + svg.Element.linearGradient = + /*#__PURE__*/ + function (_svg$Element$Gradient) { + _inherits(_class19, _svg$Element$Gradient); function _class19() { - classCallCheck(this, _class19); - return possibleConstructorReturn(this, (_class19.__proto__ || Object.getPrototypeOf(_class19)).apply(this, arguments)); + _classCallCheck(this, _class19); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class19).apply(this, arguments)); } - createClass(_class19, [{ - key: 'getGradient', + _createClass(_class19, [{ + key: "getGradient", value: function getGradient(ctx, element) { var useBB = this.gradientUnits === 'objectBoundingBox' && element.getBoundingBox; var bb = useBB ? element.getBoundingBox() : null; @@ -2863,105 +3081,112 @@ var canvg = (function (exports) { var y1 = useBB ? bb.y() + bb.height() * this.attribute('y1').numValue() : this.attribute('y1').toPixels('y'); var x2 = useBB ? bb.x() + bb.width() * this.attribute('x2').numValue() : this.attribute('x2').toPixels('x'); var y2 = useBB ? bb.y() + bb.height() * this.attribute('y2').numValue() : this.attribute('y2').toPixels('y'); - if (x1 === x2 && y1 === y2) return null; return ctx.createLinearGradient(x1, y1, x2, y2); } }]); - return _class19; - }(svg.Element.GradientBase); - // radial gradient element - svg.Element.radialGradient = function (_svg$Element$Gradient2) { - inherits(_class20, _svg$Element$Gradient2); + return _class19; + }(svg.Element.GradientBase); // radial gradient element + + + svg.Element.radialGradient = + /*#__PURE__*/ + function (_svg$Element$Gradient2) { + _inherits(_class20, _svg$Element$Gradient2); function _class20() { - classCallCheck(this, _class20); - return possibleConstructorReturn(this, (_class20.__proto__ || Object.getPrototypeOf(_class20)).apply(this, arguments)); + _classCallCheck(this, _class20); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class20).apply(this, arguments)); } - createClass(_class20, [{ - key: 'getGradient', + _createClass(_class20, [{ + key: "getGradient", value: function getGradient(ctx, element) { var useBB = this.gradientUnits === 'objectBoundingBox' && element.getBoundingBox; var bb = useBB ? element.getBoundingBox() : null; - if (!this.attribute('cx').hasValue()) this.attribute('cx', true).value = '50%'; if (!this.attribute('cy').hasValue()) this.attribute('cy', true).value = '50%'; if (!this.attribute('r').hasValue()) this.attribute('r', true).value = '50%'; - var cx = useBB ? bb.x() + bb.width() * this.attribute('cx').numValue() : this.attribute('cx').toPixels('x'); var cy = useBB ? bb.y() + bb.height() * this.attribute('cy').numValue() : this.attribute('cy').toPixels('y'); - var fx = cx; var fy = cy; + if (this.attribute('fx').hasValue()) { fx = useBB ? bb.x() + bb.width() * this.attribute('fx').numValue() : this.attribute('fx').toPixels('x'); } + if (this.attribute('fy').hasValue()) { fy = useBB ? bb.y() + bb.height() * this.attribute('fy').numValue() : this.attribute('fy').toPixels('y'); } var r = useBB ? (bb.width() + bb.height()) / 2.0 * this.attribute('r').numValue() : this.attribute('r').toPixels(); - return ctx.createRadialGradient(fx, fy, 0, cx, cy, r); } }]); - return _class20; - }(svg.Element.GradientBase); - // gradient stop element - svg.Element.stop = function (_svg$Element$ElementB6) { - inherits(_class21, _svg$Element$ElementB6); + return _class20; + }(svg.Element.GradientBase); // gradient stop element + + + svg.Element.stop = + /*#__PURE__*/ + function (_svg$Element$ElementB6) { + _inherits(_class21, _svg$Element$ElementB6); function _class21(node) { - classCallCheck(this, _class21); + var _this11; - var _this24 = possibleConstructorReturn(this, (_class21.__proto__ || Object.getPrototypeOf(_class21)).call(this, node)); + _classCallCheck(this, _class21); - _this24.offset = _this24.attribute('offset').numValue(); - if (_this24.offset < 0) _this24.offset = 0; - if (_this24.offset > 1) _this24.offset = 1; + _this11 = _possibleConstructorReturn(this, _getPrototypeOf(_class21).call(this, node)); + _this11.offset = _this11.attribute('offset').numValue(); + if (_this11.offset < 0) _this11.offset = 0; + if (_this11.offset > 1) _this11.offset = 1; - var stopColor = _this24.style('stop-color'); - if (_this24.style('stop-opacity').hasValue()) { - stopColor = stopColor.addOpacity(_this24.style('stop-opacity')); + var stopColor = _this11.style('stop-color'); + + if (_this11.style('stop-opacity').hasValue()) { + stopColor = stopColor.addOpacity(_this11.style('stop-opacity')); } - _this24.color = stopColor.value; - return _this24; + + _this11.color = stopColor.value; + return _this11; } return _class21; - }(svg.Element.ElementBase); + }(svg.Element.ElementBase); // animation base element - // animation base element - svg.Element.AnimateBase = function (_svg$Element$ElementB7) { - inherits(_class22, _svg$Element$ElementB7); + + svg.Element.AnimateBase = + /*#__PURE__*/ + function (_svg$Element$ElementB7) { + _inherits(_class22, _svg$Element$ElementB7); function _class22(node) { - classCallCheck(this, _class22); + var _this12; - var _this25 = possibleConstructorReturn(this, (_class22.__proto__ || Object.getPrototypeOf(_class22)).call(this, node)); + _classCallCheck(this, _class22); - svg.Animations.push(_this25); - - _this25.duration = 0.0; - _this25.begin = _this25.attribute('begin').toMilliseconds(); - _this25.maxDuration = _this25.begin + _this25.attribute('dur').toMilliseconds(); - - _this25.initialValue = null; - _this25.initialUnits = ''; - _this25.removed = false; - - _this25.from = _this25.attribute('from'); - _this25.to = _this25.attribute('to'); - _this25.values = _this25.attribute('values'); - if (_this25.values.hasValue()) _this25.values.value = _this25.values.value.split(';'); - return _this25; + _this12 = _possibleConstructorReturn(this, _getPrototypeOf(_class22).call(this, node)); + svg.Animations.push(_assertThisInitialized(_assertThisInitialized(_this12))); + _this12.duration = 0.0; + _this12.begin = _this12.attribute('begin').toMilliseconds(); + _this12.maxDuration = _this12.begin + _this12.attribute('dur').toMilliseconds(); + _this12.initialValue = null; + _this12.initialUnits = ''; + _this12.removed = false; + _this12.from = _this12.attribute('from'); + _this12.to = _this12.attribute('to'); + _this12.values = _this12.attribute('values'); + if (_this12.values.hasValue()) _this12.values.value = _this12.values.value.split(';'); + return _this12; } - createClass(_class22, [{ - key: 'getProperty', + _createClass(_class22, [{ + key: "getProperty", value: function getProperty() { var attributeType = this.attribute('attributeType').value; var attributeName = this.attribute('attributeName').value; @@ -2969,24 +3194,25 @@ var canvg = (function (exports) { if (attributeType === 'CSS') { return this.parent.style(attributeName, true); } + return this.parent.attribute(attributeName, true); } }, { - key: 'calcValue', + key: "calcValue", value: function calcValue() { // OVERRIDE ME! return ''; } }, { - key: 'update', + key: "update", value: function update(delta) { // set initial value if (this.initialValue == null) { this.initialValue = this.getProperty().value; this.initialUnits = this.getProperty().getUnits(); - } + } // if we're past the end time + - // if we're past the end time if (this.duration > this.maxDuration) { // loop for indefinitely repeating animations if (this.attribute('repeatCount').value === 'indefinite' || this.attribute('repeatDur').value === 'indefinite') { @@ -3000,12 +3226,14 @@ var canvg = (function (exports) { this.getProperty().value = this.parent.animationFrozen ? this.parent.animationFrozenValue : this.initialValue; return true; } + return false; } - this.duration = this.duration + delta; - // if we're past the begin time + this.duration = this.duration + delta; // if we're past the begin time + var updated = false; + if (this.begin < this.duration) { var newValue = this.calcValue(); // tween @@ -3020,14 +3248,15 @@ var canvg = (function (exports) { } return updated; - } - - // fraction of duration we've covered + } // fraction of duration we've covered }, { - key: 'progress', + key: "progress", value: function progress() { - var ret = { progress: (this.duration - this.begin) / (this.maxDuration - this.begin) }; + var ret = { + progress: (this.duration - this.begin) / (this.maxDuration - this.begin) + }; + if (this.values.hasValue()) { var p = ret.progress * (this.values.value.length - 1); var lb = Math.floor(p), @@ -3039,45 +3268,53 @@ var canvg = (function (exports) { ret.from = this.from; ret.to = this.to; } + return ret; } }]); - return _class22; - }(svg.Element.ElementBase); - // animate element - svg.Element.animate = function (_svg$Element$AnimateB) { - inherits(_class23, _svg$Element$AnimateB); + return _class22; + }(svg.Element.ElementBase); // animate element + + + svg.Element.animate = + /*#__PURE__*/ + function (_svg$Element$AnimateB) { + _inherits(_class23, _svg$Element$AnimateB); function _class23() { - classCallCheck(this, _class23); - return possibleConstructorReturn(this, (_class23.__proto__ || Object.getPrototypeOf(_class23)).apply(this, arguments)); + _classCallCheck(this, _class23); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class23).apply(this, arguments)); } - createClass(_class23, [{ - key: 'calcValue', + _createClass(_class23, [{ + key: "calcValue", value: function calcValue() { - var p = this.progress(); + var p = this.progress(); // tween value linearly - // tween value linearly var newValue = p.from.numValue() + (p.to.numValue() - p.from.numValue()) * p.progress; return newValue + this.initialUnits; } }]); - return _class23; - }(svg.Element.AnimateBase); - // animate color element - svg.Element.animateColor = function (_svg$Element$AnimateB2) { - inherits(_class24, _svg$Element$AnimateB2); + return _class23; + }(svg.Element.AnimateBase); // animate color element + + + svg.Element.animateColor = + /*#__PURE__*/ + function (_svg$Element$AnimateB2) { + _inherits(_class24, _svg$Element$AnimateB2); function _class24() { - classCallCheck(this, _class24); - return possibleConstructorReturn(this, (_class24.__proto__ || Object.getPrototypeOf(_class24)).apply(this, arguments)); + _classCallCheck(this, _class24); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class24).apply(this, arguments)); } - createClass(_class24, [{ - key: 'calcValue', + _createClass(_class24, [{ + key: "calcValue", value: function calcValue() { var p = this.progress(); var from = new RGBColor(p.from.value); @@ -3085,32 +3322,36 @@ var canvg = (function (exports) { if (from.ok && to.ok) { // tween color linearly - var _r2 = from.r + (to.r - from.r) * p.progress; + var r = from.r + (to.r - from.r) * p.progress; var g = from.g + (to.g - from.g) * p.progress; - var _b = from.b + (to.b - from.b) * p.progress; - return 'rgb(' + parseInt(_r2, 10) + ',' + parseInt(g, 10) + ',' + parseInt(_b, 10) + ')'; + var b = from.b + (to.b - from.b) * p.progress; + return 'rgb(' + parseInt(r, 10) + ',' + parseInt(g, 10) + ',' + parseInt(b, 10) + ')'; } + return this.attribute('from').value; } }]); - return _class24; - }(svg.Element.AnimateBase); - // animate transform element - svg.Element.animateTransform = function (_svg$Element$animate) { - inherits(_class25, _svg$Element$animate); + return _class24; + }(svg.Element.AnimateBase); // animate transform element + + + svg.Element.animateTransform = + /*#__PURE__*/ + function (_svg$Element$animate) { + _inherits(_class25, _svg$Element$animate); function _class25() { - classCallCheck(this, _class25); - return possibleConstructorReturn(this, (_class25.__proto__ || Object.getPrototypeOf(_class25)).apply(this, arguments)); + _classCallCheck(this, _class25); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class25).apply(this, arguments)); } - createClass(_class25, [{ - key: 'calcValue', + _createClass(_class25, [{ + key: "calcValue", value: function calcValue() { - var p = this.progress(); + var p = this.progress(); // tween value linearly - // tween value linearly var from = svg.ToNumberArray(p.from.value); var to = svg.ToNumberArray(p.to.value); var newValue = ''; @@ -3120,124 +3361,144 @@ var canvg = (function (exports) { return newValue; } }]); - return _class25; - }(svg.Element.animate); - // font element - svg.Element.font = function (_svg$Element$ElementB8) { - inherits(_class26, _svg$Element$ElementB8); + return _class25; + }(svg.Element.animate); // font element + + + svg.Element.font = + /*#__PURE__*/ + function (_svg$Element$ElementB8) { + _inherits(_class26, _svg$Element$ElementB8); function _class26(node) { - classCallCheck(this, _class26); + var _this13; - var _this29 = possibleConstructorReturn(this, (_class26.__proto__ || Object.getPrototypeOf(_class26)).call(this, node)); + _classCallCheck(this, _class26); - _this29.horizAdvX = _this29.attribute('horiz-adv-x').numValue(); + _this13 = _possibleConstructorReturn(this, _getPrototypeOf(_class26).call(this, node)); + _this13.horizAdvX = _this13.attribute('horiz-adv-x').numValue(); + _this13.isRTL = false; + _this13.isArabic = false; + _this13.fontFace = null; + _this13.missingGlyph = null; + _this13.glyphs = []; - _this29.isRTL = false; - _this29.isArabic = false; - _this29.fontFace = null; - _this29.missingGlyph = null; - _this29.glyphs = []; - _this29.children.forEach(function (child) { + _this13.children.forEach(function (child) { if (child.type === 'font-face') { - _this29.fontFace = child; + _this13.fontFace = child; + if (child.style('font-family').hasValue()) { - svg.Definitions[child.style('font-family').value] = _this29; + svg.Definitions[child.style('font-family').value] = _assertThisInitialized(_assertThisInitialized(_this13)); } } else if (child.type === 'missing-glyph') { - _this29.missingGlyph = child; + _this13.missingGlyph = child; } else if (child.type === 'glyph') { if (child.arabicForm !== '') { - _this29.isRTL = true; - _this29.isArabic = true; - if (typeof _this29.glyphs[child.unicode] === 'undefined') { - _this29.glyphs[child.unicode] = []; + _this13.isRTL = true; + _this13.isArabic = true; + + if (typeof _this13.glyphs[child.unicode] === 'undefined') { + _this13.glyphs[child.unicode] = []; } - _this29.glyphs[child.unicode][child.arabicForm] = child; + + _this13.glyphs[child.unicode][child.arabicForm] = child; } else { - _this29.glyphs[child.unicode] = child; + _this13.glyphs[child.unicode] = child; } } }); - return _this29; + + return _this13; } return _class26; - }(svg.Element.ElementBase); + }(svg.Element.ElementBase); // font-face element - // font-face element - svg.Element.fontface = function (_svg$Element$ElementB9) { - inherits(_class27, _svg$Element$ElementB9); + + svg.Element.fontface = + /*#__PURE__*/ + function (_svg$Element$ElementB9) { + _inherits(_class27, _svg$Element$ElementB9); function _class27(node) { - classCallCheck(this, _class27); + var _this14; - var _this30 = possibleConstructorReturn(this, (_class27.__proto__ || Object.getPrototypeOf(_class27)).call(this, node)); + _classCallCheck(this, _class27); - _this30.ascent = _this30.attribute('ascent').value; - _this30.descent = _this30.attribute('descent').value; - _this30.unitsPerEm = _this30.attribute('units-per-em').numValue(); - return _this30; + _this14 = _possibleConstructorReturn(this, _getPrototypeOf(_class27).call(this, node)); + _this14.ascent = _this14.attribute('ascent').value; + _this14.descent = _this14.attribute('descent').value; + _this14.unitsPerEm = _this14.attribute('units-per-em').numValue(); + return _this14; } return _class27; - }(svg.Element.ElementBase); + }(svg.Element.ElementBase); // missing-glyph element - // missing-glyph element - svg.Element.missingglyph = function (_svg$Element$path) { - inherits(_class28, _svg$Element$path); + + svg.Element.missingglyph = + /*#__PURE__*/ + function (_svg$Element$path) { + _inherits(_class28, _svg$Element$path); function _class28(node) { - classCallCheck(this, _class28); + var _this15; - var _this31 = possibleConstructorReturn(this, (_class28.__proto__ || Object.getPrototypeOf(_class28)).call(this, node)); + _classCallCheck(this, _class28); - _this31.horizAdvX = 0; - return _this31; + _this15 = _possibleConstructorReturn(this, _getPrototypeOf(_class28).call(this, node)); + _this15.horizAdvX = 0; + return _this15; } return _class28; - }(svg.Element.path); + }(svg.Element.path); // glyph element - // glyph element - svg.Element.glyph = function (_svg$Element$path2) { - inherits(_class29, _svg$Element$path2); + + svg.Element.glyph = + /*#__PURE__*/ + function (_svg$Element$path2) { + _inherits(_class29, _svg$Element$path2); function _class29(node) { - classCallCheck(this, _class29); + var _this16; - var _this32 = possibleConstructorReturn(this, (_class29.__proto__ || Object.getPrototypeOf(_class29)).call(this, node)); + _classCallCheck(this, _class29); - _this32.horizAdvX = _this32.attribute('horiz-adv-x').numValue(); - _this32.unicode = _this32.attribute('unicode').value; - _this32.arabicForm = _this32.attribute('arabic-form').value; - return _this32; + _this16 = _possibleConstructorReturn(this, _getPrototypeOf(_class29).call(this, node)); + _this16.horizAdvX = _this16.attribute('horiz-adv-x').numValue(); + _this16.unicode = _this16.attribute('unicode').value; + _this16.arabicForm = _this16.attribute('arabic-form').value; + return _this16; } return _class29; - }(svg.Element.path); + }(svg.Element.path); // text element - // text element - svg.Element.text = function (_svg$Element$Rendered3) { - inherits(_class30, _svg$Element$Rendered3); + + svg.Element.text = + /*#__PURE__*/ + function (_svg$Element$Rendered3) { + _inherits(_class30, _svg$Element$Rendered3); function _class30(node) { - classCallCheck(this, _class30); - return possibleConstructorReturn(this, (_class30.__proto__ || Object.getPrototypeOf(_class30)).call(this, node, true)); + _classCallCheck(this, _class30); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class30).call(this, node, true)); } - createClass(_class30, [{ - key: 'setContext', + _createClass(_class30, [{ + key: "setContext", value: function setContext(ctx) { - get(_class30.prototype.__proto__ || Object.getPrototypeOf(_class30.prototype), 'setContext', this).call(this, ctx); + _get(_getPrototypeOf(_class30.prototype), "setContext", this).call(this, ctx); var textBaseline = this.style('dominant-baseline').toTextBaseline(); if (textBaseline == null) textBaseline = this.style('alignment-baseline').toTextBaseline(); if (textBaseline != null) ctx.textBaseline = textBaseline; } }, { - key: 'getBoundingBox', + key: "getBoundingBox", value: function getBoundingBox() { var x = this.attribute('x').toPixels('x'); var y = this.attribute('y').toPixels('y'); @@ -3245,36 +3506,42 @@ var canvg = (function (exports) { return new svg.BoundingBox(x, y - fontSize, x + Math.floor(fontSize * 2.0 / 3.0) * this.children[0].getText().length, y); } }, { - key: 'renderChildren', + key: "renderChildren", value: function renderChildren(ctx) { - var _this34 = this; + var _this17 = this; this.x = this.attribute('x').toPixels('x'); this.y = this.attribute('y').toPixels('y'); this.x += this.getAnchorDelta(ctx, this, 0); this.children.forEach(function (child, i) { - _this34.renderChild(ctx, _this34, i); + _this17.renderChild(ctx, _this17, i); }); } }, { - key: 'getAnchorDelta', + key: "getAnchorDelta", value: function getAnchorDelta(ctx, parent, startI) { var textAnchor = this.style('text-anchor').valueOrDefault('start'); + if (textAnchor !== 'start') { var width = 0; + for (var i = startI; i < parent.children.length; i++) { var child = parent.children[i]; if (i > startI && child.attribute('x').hasValue()) break; // new group + width += child.measureTextRecursive(ctx); } + return -1 * (textAnchor === 'end' ? width : width / 2.0); } + return 0; } }, { - key: 'renderChild', + key: "renderChild", value: function renderChild(ctx, parent, i) { var child = parent.children[i]; + if (child.attribute('x').hasValue()) { child.x = child.attribute('x').toPixels('x') + this.getAnchorDelta(ctx, parent, i); if (child.attribute('dx').hasValue()) child.x += child.attribute('dx').toPixels('x'); @@ -3283,6 +3550,7 @@ var canvg = (function (exports) { if (child.attribute('dx').hasValue()) this.x += child.attribute('dx').toPixels('x'); child.x = this.x; } + this.x = child.x + child.measureText(ctx); if (child.attribute('y').hasValue()) { @@ -3293,8 +3561,8 @@ var canvg = (function (exports) { if (child.attribute('dy').hasValue()) this.y += child.attribute('dy').toPixels('y'); child.y = this.y; } - this.y = child.y; + this.y = child.y; child.render(ctx); for (var _i = 0; _i < child.children.length; _i++) { @@ -3302,28 +3570,34 @@ var canvg = (function (exports) { } } }]); - return _class30; - }(svg.Element.RenderedElementBase); - // text base - svg.Element.TextElementBase = function (_svg$Element$Rendered4) { - inherits(_class31, _svg$Element$Rendered4); + return _class30; + }(svg.Element.RenderedElementBase); // text base + + + svg.Element.TextElementBase = + /*#__PURE__*/ + function (_svg$Element$Rendered4) { + _inherits(_class31, _svg$Element$Rendered4); function _class31() { - classCallCheck(this, _class31); - return possibleConstructorReturn(this, (_class31.__proto__ || Object.getPrototypeOf(_class31)).apply(this, arguments)); + _classCallCheck(this, _class31); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class31).apply(this, arguments)); } - createClass(_class31, [{ - key: 'getGlyph', + _createClass(_class31, [{ + key: "getGlyph", value: function getGlyph(font, text, i) { var c = text[i]; var glyph = null; + if (font.isArabic) { var arabicForm = 'isolated'; if ((i === 0 || text[i - 1] === ' ') && i < text.length - 2 && text[i + 1] !== ' ') arabicForm = 'terminal'; if (i > 0 && text[i - 1] !== ' ' && i < text.length - 2 && text[i + 1] !== ' ') arabicForm = 'medial'; if (i > 0 && text[i - 1] !== ' ' && (i === text.length - 1 || text[i + 1] === ' ')) arabicForm = 'initial'; + if (typeof font.glyphs[c] !== 'undefined') { glyph = font.glyphs[c][arabicForm]; if (glyph == null && font.glyphs[c].type === 'glyph') glyph = font.glyphs[c]; @@ -3331,20 +3605,22 @@ var canvg = (function (exports) { } else { glyph = font.glyphs[c]; } + if (glyph == null) glyph = font.missingGlyph; return glyph; } }, { - key: 'renderChildren', + key: "renderChildren", value: function renderChildren(ctx) { var customFont = this.parent.style('font-family').getDefinition(); + if (customFont != null) { var fontSize = this.parent.style('font-size').numValueOrDefault(svg.Font.Parse(svg.ctx.font).fontSize); var fontStyle = this.parent.style('font-style').valueOrDefault(svg.Font.Parse(svg.ctx.font).fontStyle); var text = this.getText(); if (customFont.isRTL) text = text.split('').reverse().join(''); - var dx = svg.ToNumberArray(this.parent.attribute('dx').value); + for (var i = 0; i < text.length; i++) { var glyph = this.getGlyph(customFont, text, i); var scale = fontSize / customFont.fontFace.unitsPerEm; @@ -3358,12 +3634,13 @@ var canvg = (function (exports) { ctx.lineWidth = lw; ctx.scale(1 / scale, -1 / scale); ctx.translate(-this.x, -this.y); - this.x += fontSize * (glyph.horizAdvX || customFont.horizAdvX) / customFont.fontFace.unitsPerEm; + if (typeof dx[i] !== 'undefined' && !isNaN(dx[i])) { this.x += dx[i]; } } + return; } @@ -3371,12 +3648,11 @@ var canvg = (function (exports) { if (ctx.strokeStyle !== '') ctx.strokeText(svg.compressSpaces(this.getText()), this.x, this.y); } }, { - key: 'getText', - value: function getText() { - // OVERRIDE ME + key: "getText", + value: function getText() {// OVERRIDE ME } }, { - key: 'measureTextRecursive', + key: "measureTextRecursive", value: function measureTextRecursive(ctx) { var width = this.measureText(ctx); this.children.forEach(function (child) { @@ -3385,28 +3661,31 @@ var canvg = (function (exports) { return width; } }, { - key: 'measureText', + key: "measureText", value: function measureText(ctx) { var customFont = this.parent.style('font-family').getDefinition(); + if (customFont != null) { var fontSize = this.parent.style('font-size').numValueOrDefault(svg.Font.Parse(svg.ctx.font).fontSize); var measure = 0; var text = this.getText(); if (customFont.isRTL) text = text.split('').reverse().join(''); var dx = svg.ToNumberArray(this.parent.attribute('dx').value); + for (var i = 0; i < text.length; i++) { var glyph = this.getGlyph(customFont, text, i); measure += (glyph.horizAdvX || customFont.horizAdvX) * fontSize / customFont.fontFace.unitsPerEm; + if (typeof dx[i] !== 'undefined' && !isNaN(dx[i])) { measure += dx[i]; } } + return measure; } var textToMeasure = svg.compressSpaces(this.getText()); if (!ctx.measureText) return textToMeasure.length * 10; - ctx.save(); this.setContext(ctx); @@ -3417,81 +3696,96 @@ var canvg = (function (exports) { return width; } }]); - return _class31; - }(svg.Element.RenderedElementBase); - // tspan - svg.Element.tspan = function (_svg$Element$TextElem) { - inherits(_class32, _svg$Element$TextElem); + return _class31; + }(svg.Element.RenderedElementBase); // tspan + + + svg.Element.tspan = + /*#__PURE__*/ + function (_svg$Element$TextElem) { + _inherits(_class32, _svg$Element$TextElem); function _class32(node) { - classCallCheck(this, _class32); + var _this18; - var _this36 = possibleConstructorReturn(this, (_class32.__proto__ || Object.getPrototypeOf(_class32)).call(this, node, true)); + _classCallCheck(this, _class32); - _this36.text = node.nodeValue || node.text || ''; - return _this36; + _this18 = _possibleConstructorReturn(this, _getPrototypeOf(_class32).call(this, node, true)); + _this18.text = node.nodeValue || node.text || ''; + return _this18; } - createClass(_class32, [{ - key: 'getText', + _createClass(_class32, [{ + key: "getText", value: function getText() { return this.text; } }]); - return _class32; - }(svg.Element.TextElementBase); - // tref - svg.Element.tref = function (_svg$Element$TextElem2) { - inherits(_class33, _svg$Element$TextElem2); + return _class32; + }(svg.Element.TextElementBase); // tref + + + svg.Element.tref = + /*#__PURE__*/ + function (_svg$Element$TextElem2) { + _inherits(_class33, _svg$Element$TextElem2); function _class33() { - classCallCheck(this, _class33); - return possibleConstructorReturn(this, (_class33.__proto__ || Object.getPrototypeOf(_class33)).apply(this, arguments)); + _classCallCheck(this, _class33); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class33).apply(this, arguments)); } - createClass(_class33, [{ - key: 'getText', + _createClass(_class33, [{ + key: "getText", value: function getText() { var element = this.getHrefAttribute().getDefinition(); if (element != null) return element.children[0].getText(); } }]); - return _class33; - }(svg.Element.TextElementBase); - // a element - svg.Element.a = function (_svg$Element$TextElem3) { - inherits(_class34, _svg$Element$TextElem3); + return _class33; + }(svg.Element.TextElementBase); // a element + + + svg.Element.a = + /*#__PURE__*/ + function (_svg$Element$TextElem3) { + _inherits(_class34, _svg$Element$TextElem3); function _class34(node) { - classCallCheck(this, _class34); + var _this19; - var _this38 = possibleConstructorReturn(this, (_class34.__proto__ || Object.getPrototypeOf(_class34)).call(this, node)); + _classCallCheck(this, _class34); - _this38.hasText = true; - [].concat(toConsumableArray(node.childNodes)).forEach(function (childNode) { + _this19 = _possibleConstructorReturn(this, _getPrototypeOf(_class34).call(this, node)); + _this19.hasText = true; + + _toConsumableArray(node.childNodes).forEach(function (childNode) { if (childNode.nodeType !== 3) { - _this38.hasText = false; + _this19.hasText = false; } - }); - // this might contain text - _this38.text = _this38.hasText ? node.childNodes[0].nodeValue : ''; - return _this38; + }); // this might contain text + + + _this19.text = _this19.hasText ? node.childNodes[0].nodeValue : ''; + return _this19; } - createClass(_class34, [{ - key: 'getText', + _createClass(_class34, [{ + key: "getText", value: function getText() { return this.text; } }, { - key: 'renderChildren', + key: "renderChildren", value: function renderChildren(ctx) { if (this.hasText) { // render as text element - get(_class34.prototype.__proto__ || Object.getPrototypeOf(_class34.prototype), 'renderChildren', this).call(this, ctx); + _get(_getPrototypeOf(_class34.prototype), "renderChildren", this).call(this, ctx); + var fontSize = new svg.Property('fontSize', svg.Font.Parse(svg.ctx.font).fontSize); svg.Mouse.checkBoundingBox(this, new svg.BoundingBox(this.x, this.y - fontSize.toPixels('y'), this.x + this.measureText(ctx), this.y)); } else { @@ -3503,70 +3797,82 @@ var canvg = (function (exports) { } } }, { - key: 'onclick', + key: "onclick", value: function onclick() { window.open(this.getHrefAttribute().value); } }, { - key: 'onmousemove', + key: "onmousemove", value: function onmousemove() { svg.ctx.canvas.style.cursor = 'pointer'; } }]); - return _class34; - }(svg.Element.TextElementBase); - // image element - svg.Element.image = function (_svg$Element$Rendered5) { - inherits(_class35, _svg$Element$Rendered5); + return _class34; + }(svg.Element.TextElementBase); // image element + + + svg.Element.image = + /*#__PURE__*/ + function (_svg$Element$Rendered5) { + _inherits(_class35, _svg$Element$Rendered5); function _class35(node) { - classCallCheck(this, _class35); + var _this20; - var _this39 = possibleConstructorReturn(this, (_class35.__proto__ || Object.getPrototypeOf(_class35)).call(this, node)); + _classCallCheck(this, _class35); + + _this20 = _possibleConstructorReturn(this, _getPrototypeOf(_class35).call(this, node)); + + var href = _this20.getHrefAttribute().value; - var href = _this39.getHrefAttribute().value; if (href === '') { - return possibleConstructorReturn(_this39); + return _possibleConstructorReturn(_this20); } - _this39._isSvg = href.match(/\.svg$/); - svg.Images.push(_this39); - _this39.loaded = false; - if (!_this39._isSvg) { - _this39.img = document.createElement('img'); + _this20._isSvg = href.match(/\.svg$/); + svg.Images.push(_assertThisInitialized(_assertThisInitialized(_this20))); + _this20.loaded = false; + + if (!_this20._isSvg) { + _this20.img = document.createElement('img'); + if (svg.opts.useCORS === true) { - _this39.img.crossOrigin = 'Anonymous'; + _this20.img.crossOrigin = 'Anonymous'; } - var self = _this39; - _this39.img.onload = function () { + + var self = _assertThisInitialized(_assertThisInitialized(_this20)); + + _this20.img.onload = function () { self.loaded = true; }; - _this39.img.onerror = function () { + + _this20.img.onerror = function () { svg.log('ERROR: image "' + href + '" not found'); self.loaded = true; }; - _this39.img.src = href; + + _this20.img.src = href; } else { svg.ajax(href, true).then(function (img) { - _this39.img = img; - _this39.loaded = true; + _this20.img = img; + _this20.loaded = true; }); } - return _this39; + + return _this20; } - createClass(_class35, [{ - key: 'renderChildren', + _createClass(_class35, [{ + key: "renderChildren", value: function renderChildren(ctx) { var x = this.attribute('x').toPixels('x'); var y = this.attribute('y').toPixels('y'); - var width = this.attribute('width').toPixels('x'); var height = this.attribute('height').toPixels('y'); if (width === 0 || height === 0) return; - ctx.save(); + if (this._isSvg) { ctx.drawSvg(this.img, x, y, width, height); } else { @@ -3574,10 +3880,11 @@ var canvg = (function (exports) { svg.AspectRatio(ctx, this.attribute('preserveAspectRatio').value, width, this.img.width, height, this.img.height, 0, 0); ctx.drawImage(this.img, 0, 0); } + ctx.restore(); } }, { - key: 'getBoundingBox', + key: "getBoundingBox", value: function getBoundingBox() { var x = this.attribute('x').toPixels('x'); var y = this.attribute('y').toPixels('y'); @@ -3586,20 +3893,24 @@ var canvg = (function (exports) { return new svg.BoundingBox(x, y, x + width, y + height); } }]); - return _class35; - }(svg.Element.RenderedElementBase); - // group element - svg.Element.g = function (_svg$Element$Rendered6) { - inherits(_class36, _svg$Element$Rendered6); + return _class35; + }(svg.Element.RenderedElementBase); // group element + + + svg.Element.g = + /*#__PURE__*/ + function (_svg$Element$Rendered6) { + _inherits(_class36, _svg$Element$Rendered6); function _class36() { - classCallCheck(this, _class36); - return possibleConstructorReturn(this, (_class36.__proto__ || Object.getPrototypeOf(_class36)).apply(this, arguments)); + _classCallCheck(this, _class36); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class36).apply(this, arguments)); } - createClass(_class36, [{ - key: 'getBoundingBox', + _createClass(_class36, [{ + key: "getBoundingBox", value: function getBoundingBox() { var bb = new svg.BoundingBox(); this.children.forEach(function (child) { @@ -3608,50 +3919,60 @@ var canvg = (function (exports) { return bb; } }]); - return _class36; - }(svg.Element.RenderedElementBase); - // symbol element - svg.Element.symbol = function (_svg$Element$Rendered7) { - inherits(_class37, _svg$Element$Rendered7); + return _class36; + }(svg.Element.RenderedElementBase); // symbol element + + + svg.Element.symbol = + /*#__PURE__*/ + function (_svg$Element$Rendered7) { + _inherits(_class37, _svg$Element$Rendered7); function _class37() { - classCallCheck(this, _class37); - return possibleConstructorReturn(this, (_class37.__proto__ || Object.getPrototypeOf(_class37)).apply(this, arguments)); + _classCallCheck(this, _class37); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class37).apply(this, arguments)); } - createClass(_class37, [{ - key: 'render', - value: function render(ctx) { - // NO RENDER + _createClass(_class37, [{ + key: "render", + value: function render(ctx) {// NO RENDER } }]); - return _class37; - }(svg.Element.RenderedElementBase); - // style element - svg.Element.style = function (_svg$Element$ElementB10) { - inherits(_class38, _svg$Element$ElementB10); + return _class37; + }(svg.Element.RenderedElementBase); // style element + + + svg.Element.style = + /*#__PURE__*/ + function (_svg$Element$ElementB10) { + _inherits(_class38, _svg$Element$ElementB10); function _class38(node) { - classCallCheck(this, _class38); + var _this21; - // text, or spaces then CDATA - var _this42 = possibleConstructorReturn(this, (_class38.__proto__ || Object.getPrototypeOf(_class38)).call(this, node)); + _classCallCheck(this, _class38); + + _this21 = _possibleConstructorReturn(this, _getPrototypeOf(_class38).call(this, node)); // text, or spaces then CDATA var css = ''; - [].concat(toConsumableArray(node.childNodes)).forEach(function (_ref3) { - var nodeValue = _ref3.nodeValue; + _toConsumableArray(node.childNodes).forEach(function (_ref3) { + var nodeValue = _ref3.nodeValue; css += nodeValue; }); + css = css.replace(/(\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/)|(^[\s]*\/\/.*)/gm, ''); // remove comments + css = svg.compressSpaces(css); // replace whitespace + var cssDefs = css.split('}'); cssDefs.forEach(function (cssDef) { if (svg.trim(cssDef) !== '') { var _cssDef$split = cssDef.split('{'), - _cssDef$split2 = slicedToArray(_cssDef$split, 2), + _cssDef$split2 = _slicedToArray(_cssDef$split, 2), cssClasses = _cssDef$split2[0], cssProps = _cssDef$split2[1]; @@ -3659,17 +3980,20 @@ var canvg = (function (exports) { cssProps = cssProps.split(';'); cssClasses.forEach(function (cssClass) { cssClass = svg.trim(cssClass); + if (cssClass !== '') { var props = {}; cssProps.forEach(function (cssProp) { var prop = cssProp.indexOf(':'); var name = cssProp.substr(0, prop); var value = cssProp.substr(prop + 1, cssProp.length - prop); + if (name != null && value != null) { props[svg.trim(name)] = new svg.Property(svg.trim(name), svg.trim(value)); } }); svg.Styles[cssClass] = props; + if (cssClass === '@font-face') { var fontFamily = props['font-family'].value.replace(/"/g, ''); var srcs = props['src'].value.split(','); @@ -3677,11 +4001,12 @@ var canvg = (function (exports) { if (src.includes('format("svg")')) { var urlStart = src.indexOf('url'); var urlEnd = src.indexOf(')', urlStart); - var url = src.substr(urlStart + 5, urlEnd - urlStart - 6); - // Can this ajax safely be converted to async? + var url = src.substr(urlStart + 5, urlEnd - urlStart - 6); // Can this ajax safely be converted to async? + var doc = svg.parseXml(svg.ajax(url)); var fonts = doc.getElementsByTagName('font'); - [].concat(toConsumableArray(fonts)).forEach(function (font) { + + _toConsumableArray(fonts).forEach(function (font) { font = svg.CreateElement(font); svg.Definitions[fontFamily] = font; }); @@ -3692,53 +4017,56 @@ var canvg = (function (exports) { }); } }); - return _this42; + return _this21; } return _class38; - }(svg.Element.ElementBase); + }(svg.Element.ElementBase); // use element - // use element - svg.Element.use = function (_svg$Element$Rendered8) { - inherits(_class39, _svg$Element$Rendered8); + + svg.Element.use = + /*#__PURE__*/ + function (_svg$Element$Rendered8) { + _inherits(_class39, _svg$Element$Rendered8); function _class39(node) { - classCallCheck(this, _class39); + var _this22; - var _this43 = possibleConstructorReturn(this, (_class39.__proto__ || Object.getPrototypeOf(_class39)).call(this, node)); + _classCallCheck(this, _class39); - _this43._el = _this43.getHrefAttribute().getDefinition(); - return _this43; + _this22 = _possibleConstructorReturn(this, _getPrototypeOf(_class39).call(this, node)); + _this22._el = _this22.getHrefAttribute().getDefinition(); + return _this22; } - createClass(_class39, [{ - key: 'setContext', + _createClass(_class39, [{ + key: "setContext", value: function setContext(ctx) { - get(_class39.prototype.__proto__ || Object.getPrototypeOf(_class39.prototype), 'setContext', this).call(this, ctx); + _get(_getPrototypeOf(_class39.prototype), "setContext", this).call(this, ctx); + if (this.attribute('x').hasValue()) ctx.translate(this.attribute('x').toPixels('x'), 0); if (this.attribute('y').hasValue()) ctx.translate(0, this.attribute('y').toPixels('y')); } }, { - key: 'path', + key: "path", value: function path(ctx) { var element = this._el; - if (element != null) element.path(ctx); } }, { - key: 'getBoundingBox', + key: "getBoundingBox", value: function getBoundingBox() { var element = this._el; - if (element != null) return element.getBoundingBox(); } }, { - key: 'renderChildren', + key: "renderChildren", value: function renderChildren(ctx) { var element = this._el; if (element != null) { var tempSvg = element; + if (element.type === 'symbol') { // render me using a temporary svg element in symbol cases (https://www.w3.org/TR/SVG/struct.html#UseElement) tempSvg = new svg.Element.svg(); @@ -3748,11 +4076,13 @@ var canvg = (function (exports) { tempSvg.attributes['overflow'] = new svg.Property('overflow', element.attribute('overflow').value); tempSvg.children = element.children; } + if (tempSvg.type === 'svg') { // if symbol or svg, inherit width/height from me if (this.attribute('width').hasValue()) tempSvg.attributes['width'] = new svg.Property('width', this.attribute('width').value); if (this.attribute('height').hasValue()) tempSvg.attributes['height'] = new svg.Property('height', this.attribute('height').value); } + var oldParent = tempSvg.parent; tempSvg.parent = null; tempSvg.render(ctx); @@ -3760,20 +4090,24 @@ var canvg = (function (exports) { } } }]); - return _class39; - }(svg.Element.RenderedElementBase); - // mask element - svg.Element.mask = function (_svg$Element$ElementB11) { - inherits(_class40, _svg$Element$ElementB11); + return _class39; + }(svg.Element.RenderedElementBase); // mask element + + + svg.Element.mask = + /*#__PURE__*/ + function (_svg$Element$ElementB11) { + _inherits(_class40, _svg$Element$ElementB11); function _class40() { - classCallCheck(this, _class40); - return possibleConstructorReturn(this, (_class40.__proto__ || Object.getPrototypeOf(_class40)).apply(this, arguments)); + _classCallCheck(this, _class40); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class40).apply(this, arguments)); } - createClass(_class40, [{ - key: 'apply', + _createClass(_class40, [{ + key: "apply", value: function apply(ctx, element) { // render as temp svg var x = this.attribute('x').toPixels('x'); @@ -3790,18 +4124,16 @@ var canvg = (function (exports) { y = Math.floor(bb.y1); width = Math.floor(bb.width()); height = Math.floor(bb.height()); - } + } // temporarily remove mask to avoid recursion + - // temporarily remove mask to avoid recursion var mask = element.attribute('mask').value; element.attribute('mask').value = ''; - var cMask = document.createElement('canvas'); cMask.width = x + width; cMask.height = y + height; var maskCtx = cMask.getContext('2d'); this.renderChildren(maskCtx); - var c = document.createElement('canvas'); c.width = x + width; c.height = y + height; @@ -3810,43 +4142,47 @@ var canvg = (function (exports) { tempCtx.globalCompositeOperation = 'destination-in'; tempCtx.fillStyle = maskCtx.createPattern(cMask, 'no-repeat'); tempCtx.fillRect(0, 0, x + width, y + height); - ctx.fillStyle = tempCtx.createPattern(c, 'no-repeat'); - ctx.fillRect(0, 0, x + width, y + height); + ctx.fillRect(0, 0, x + width, y + height); // reassign mask - // reassign mask element.attribute('mask').value = mask; } }, { - key: 'render', - value: function render(ctx) { - // NO RENDER + key: "render", + value: function render(ctx) {// NO RENDER } }]); - return _class40; - }(svg.Element.ElementBase); - // clip element - svg.Element.clipPath = function (_svg$Element$ElementB12) { - inherits(_class41, _svg$Element$ElementB12); + return _class40; + }(svg.Element.ElementBase); // clip element + + + svg.Element.clipPath = + /*#__PURE__*/ + function (_svg$Element$ElementB12) { + _inherits(_class41, _svg$Element$ElementB12); function _class41() { - classCallCheck(this, _class41); - return possibleConstructorReturn(this, (_class41.__proto__ || Object.getPrototypeOf(_class41)).apply(this, arguments)); + _classCallCheck(this, _class41); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class41).apply(this, arguments)); } - createClass(_class41, [{ - key: 'apply', + _createClass(_class41, [{ + key: "apply", value: function apply(ctx) { this.children.forEach(function (child) { if (typeof child.path !== 'undefined') { var transform = null; + if (child.attribute('transform').hasValue()) { transform = new svg.Transform(child.attribute('transform').value); transform.apply(ctx); } + child.path(ctx); ctx.clip(); + if (transform) { transform.unapply(ctx); } @@ -3854,37 +4190,38 @@ var canvg = (function (exports) { }); } }, { - key: 'render', - value: function render(ctx) { - // NO RENDER + key: "render", + value: function render(ctx) {// NO RENDER } }]); - return _class41; - }(svg.Element.ElementBase); - // filters - svg.Element.filter = function (_svg$Element$ElementB13) { - inherits(_class42, _svg$Element$ElementB13); + return _class41; + }(svg.Element.ElementBase); // filters + + + svg.Element.filter = + /*#__PURE__*/ + function (_svg$Element$ElementB13) { + _inherits(_class42, _svg$Element$ElementB13); function _class42() { - classCallCheck(this, _class42); - return possibleConstructorReturn(this, (_class42.__proto__ || Object.getPrototypeOf(_class42)).apply(this, arguments)); + _classCallCheck(this, _class42); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class42).apply(this, arguments)); } - createClass(_class42, [{ - key: 'apply', + _createClass(_class42, [{ + key: "apply", value: function apply(ctx, element) { // render as temp svg var bb = element.getBoundingBox(); var x = Math.floor(bb.x1); var y = Math.floor(bb.y1); var width = Math.floor(bb.width()); - var height = Math.floor(bb.height()); + var height = Math.floor(bb.height()); // temporarily remove filter to avoid recursion - // temporarily remove filter to avoid recursion var filter = element.style('filter').value; element.style('filter').value = ''; - var px = 0, py = 0; this.children.forEach(function (child) { @@ -3892,65 +4229,67 @@ var canvg = (function (exports) { px = Math.max(px, efd); py = Math.max(py, efd); }); - var c = document.createElement('canvas'); c.width = width + 2 * px; c.height = height + 2 * py; var tempCtx = c.getContext('2d'); tempCtx.translate(-x + px, -y + py); - element.render(tempCtx); + element.render(tempCtx); // apply filters - // apply filters this.children.forEach(function (child) { child.apply(tempCtx, 0, 0, width + 2 * px, height + 2 * py); - }); + }); // render on me - // render on me - ctx.drawImage(c, 0, 0, width + 2 * px, height + 2 * py, x - px, y - py, width + 2 * px, height + 2 * py); + ctx.drawImage(c, 0, 0, width + 2 * px, height + 2 * py, x - px, y - py, width + 2 * px, height + 2 * py); // reassign filter - // reassign filter element.style('filter', true).value = filter; } }, { - key: 'render', - value: function render(ctx) { - // NO RENDER + key: "render", + value: function render(ctx) {// NO RENDER } }]); + return _class42; }(svg.Element.ElementBase); - svg.Element.feMorphology = function (_svg$Element$ElementB14) { - inherits(_class43, _svg$Element$ElementB14); + svg.Element.feMorphology = + /*#__PURE__*/ + function (_svg$Element$ElementB14) { + _inherits(_class43, _svg$Element$ElementB14); function _class43() { - classCallCheck(this, _class43); - return possibleConstructorReturn(this, (_class43.__proto__ || Object.getPrototypeOf(_class43)).apply(this, arguments)); + _classCallCheck(this, _class43); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class43).apply(this, arguments)); } - createClass(_class43, [{ - key: 'apply', - value: function apply(ctx, x, y, width, height) { - // TODO: implement + _createClass(_class43, [{ + key: "apply", + value: function apply(ctx, x, y, width, height) {// TODO: implement } }]); + return _class43; }(svg.Element.ElementBase); - svg.Element.feComposite = function (_svg$Element$ElementB15) { - inherits(_class44, _svg$Element$ElementB15); + svg.Element.feComposite = + /*#__PURE__*/ + function (_svg$Element$ElementB15) { + _inherits(_class44, _svg$Element$ElementB15); function _class44() { - classCallCheck(this, _class44); - return possibleConstructorReturn(this, (_class44.__proto__ || Object.getPrototypeOf(_class44)).apply(this, arguments)); + _classCallCheck(this, _class44); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class44).apply(this, arguments)); } - createClass(_class44, [{ - key: 'apply', - value: function apply(ctx, x, y, width, height) { - // TODO: implement + _createClass(_class44, [{ + key: "apply", + value: function apply(ctx, x, y, width, height) {// TODO: implement } }]); + return _class44; }(svg.Element.ElementBase); @@ -3962,89 +4301,105 @@ var canvg = (function (exports) { img[y * width * 4 + x * 4 + rgba] = val; } - svg.Element.feColorMatrix = function (_svg$Element$ElementB16) { - inherits(_class45, _svg$Element$ElementB16); + svg.Element.feColorMatrix = + /*#__PURE__*/ + function (_svg$Element$ElementB16) { + _inherits(_class45, _svg$Element$ElementB16); function _class45(node) { - classCallCheck(this, _class45); + var _this23; - var _this49 = possibleConstructorReturn(this, (_class45.__proto__ || Object.getPrototypeOf(_class45)).call(this, node)); + _classCallCheck(this, _class45); - var matrix = svg.ToNumberArray(_this49.attribute('values').value); - switch (_this49.attribute('type').valueOrDefault('matrix')) {// https://www.w3.org/TR/SVG/filters.html#feColorMatrixElement + _this23 = _possibleConstructorReturn(this, _getPrototypeOf(_class45).call(this, node)); + var matrix = svg.ToNumberArray(_this23.attribute('values').value); + + switch (_this23.attribute('type').valueOrDefault('matrix')) { + // https://www.w3.org/TR/SVG/filters.html#feColorMatrixElement case 'saturate': var s = matrix[0]; matrix = [0.213 + 0.787 * s, 0.715 - 0.715 * s, 0.072 - 0.072 * s, 0, 0, 0.213 - 0.213 * s, 0.715 + 0.285 * s, 0.072 - 0.072 * s, 0, 0, 0.213 - 0.213 * s, 0.715 - 0.715 * s, 0.072 + 0.928 * s, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1]; break; + case 'hueRotate': var a = matrix[0] * Math.PI / 180.0; - var _c3 = function _c3(m1, m2, m3) { + + var c = function c(m1, m2, m3) { return m1 + Math.cos(a) * m2 + Math.sin(a) * m3; }; - matrix = [_c3(0.213, 0.787, -0.213), _c3(0.715, -0.715, -0.715), _c3(0.072, -0.072, 0.928), 0, 0, _c3(0.213, -0.213, 0.143), _c3(0.715, 0.285, 0.140), _c3(0.072, -0.072, -0.283), 0, 0, _c3(0.213, -0.213, -0.787), _c3(0.715, -0.715, 0.715), _c3(0.072, 0.928, 0.072), 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1]; + + matrix = [c(0.213, 0.787, -0.213), c(0.715, -0.715, -0.715), c(0.072, -0.072, 0.928), 0, 0, c(0.213, -0.213, 0.143), c(0.715, 0.285, 0.140), c(0.072, -0.072, -0.283), 0, 0, c(0.213, -0.213, -0.787), c(0.715, -0.715, 0.715), c(0.072, 0.928, 0.072), 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1]; break; + case 'luminanceToAlpha': matrix = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.2125, 0.7154, 0.0721, 0, 0, 0, 0, 0, 0, 1]; break; } - _this49.matrix = matrix; - _this49._m = function (i, v) { + _this23.matrix = matrix; + + _this23._m = function (i, v) { var mi = matrix[i]; return mi * (mi < 0 ? v - 255 : v); }; - return _this49; + + return _this23; } - createClass(_class45, [{ - key: 'apply', + _createClass(_class45, [{ + key: "apply", value: function apply(ctx, x, y, width, height) { - var m = this._m; - // assuming x==0 && y==0 for now + var m = this._m; // assuming x==0 && y==0 for now var srcData = ctx.getImageData(0, 0, width, height); + for (var _y2 = 0; _y2 < height; _y2++) { for (var _x2 = 0; _x2 < width; _x2++) { - var _r3 = imGet(srcData.data, _x2, _y2, width, height, 0); + var r = imGet(srcData.data, _x2, _y2, width, height, 0); var g = imGet(srcData.data, _x2, _y2, width, height, 1); - var _b2 = imGet(srcData.data, _x2, _y2, width, height, 2); + var b = imGet(srcData.data, _x2, _y2, width, height, 2); var a = imGet(srcData.data, _x2, _y2, width, height, 3); - imSet(srcData.data, _x2, _y2, width, height, 0, m(0, _r3) + m(1, g) + m(2, _b2) + m(3, a) + m(4, 1)); - imSet(srcData.data, _x2, _y2, width, height, 1, m(5, _r3) + m(6, g) + m(7, _b2) + m(8, a) + m(9, 1)); - imSet(srcData.data, _x2, _y2, width, height, 2, m(10, _r3) + m(11, g) + m(12, _b2) + m(13, a) + m(14, 1)); - imSet(srcData.data, _x2, _y2, width, height, 3, m(15, _r3) + m(16, g) + m(17, _b2) + m(18, a) + m(19, 1)); + imSet(srcData.data, _x2, _y2, width, height, 0, m(0, r) + m(1, g) + m(2, b) + m(3, a) + m(4, 1)); + imSet(srcData.data, _x2, _y2, width, height, 1, m(5, r) + m(6, g) + m(7, b) + m(8, a) + m(9, 1)); + imSet(srcData.data, _x2, _y2, width, height, 2, m(10, r) + m(11, g) + m(12, b) + m(13, a) + m(14, 1)); + imSet(srcData.data, _x2, _y2, width, height, 3, m(15, r) + m(16, g) + m(17, b) + m(18, a) + m(19, 1)); } } + ctx.clearRect(0, 0, width, height); ctx.putImageData(srcData, 0, 0); } }]); + return _class45; }(svg.Element.ElementBase); - svg.Element.feGaussianBlur = function (_svg$Element$ElementB17) { - inherits(_class46, _svg$Element$ElementB17); + svg.Element.feGaussianBlur = + /*#__PURE__*/ + function (_svg$Element$ElementB17) { + _inherits(_class46, _svg$Element$ElementB17); function _class46(node) { - classCallCheck(this, _class46); + var _this24; - var _this50 = possibleConstructorReturn(this, (_class46.__proto__ || Object.getPrototypeOf(_class46)).call(this, node)); + _classCallCheck(this, _class46); - _this50.blurRadius = Math.floor(_this50.attribute('stdDeviation').numValue()); - _this50.extraFilterDistance = _this50.blurRadius; - return _this50; + _this24 = _possibleConstructorReturn(this, _getPrototypeOf(_class46).call(this, node)); + _this24.blurRadius = Math.floor(_this24.attribute('stdDeviation').numValue()); + _this24.extraFilterDistance = _this24.blurRadius; + return _this24; } - createClass(_class46, [{ - key: 'apply', + _createClass(_class46, [{ + key: "apply", value: function apply(ctx, x, y, width, height) { if (typeof canvasRGBA_ === 'undefined') { svg.log('ERROR: `setStackBlurCanvasRGBA` must be run for blur to work'); return; - } - - // Todo: This might not be a problem anymore with out `instanceof` fix + } // Todo: This might not be a problem anymore with out `instanceof` fix // StackBlur requires canvas be on document + + ctx.canvas.id = svg.UniqueId(); ctx.canvas.style.display = 'none'; document.body.append(ctx.canvas); @@ -4052,53 +4407,65 @@ var canvg = (function (exports) { ctx.canvas.remove(); } }]); - return _class46; - }(svg.Element.ElementBase); - // title element, do nothing - svg.Element.title = function (_svg$Element$ElementB18) { - inherits(_class47, _svg$Element$ElementB18); + return _class46; + }(svg.Element.ElementBase); // title element, do nothing + + + svg.Element.title = + /*#__PURE__*/ + function (_svg$Element$ElementB18) { + _inherits(_class47, _svg$Element$ElementB18); function _class47(node) { - classCallCheck(this, _class47); - return possibleConstructorReturn(this, (_class47.__proto__ || Object.getPrototypeOf(_class47)).call(this)); + _classCallCheck(this, _class47); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class47).call(this)); } return _class47; - }(svg.Element.ElementBase); + }(svg.Element.ElementBase); // desc element, do nothing - // desc element, do nothing - svg.Element.desc = function (_svg$Element$ElementB19) { - inherits(_class48, _svg$Element$ElementB19); + + svg.Element.desc = + /*#__PURE__*/ + function (_svg$Element$ElementB19) { + _inherits(_class48, _svg$Element$ElementB19); function _class48(node) { - classCallCheck(this, _class48); - return possibleConstructorReturn(this, (_class48.__proto__ || Object.getPrototypeOf(_class48)).call(this)); + _classCallCheck(this, _class48); + + return _possibleConstructorReturn(this, _getPrototypeOf(_class48).call(this)); } return _class48; }(svg.Element.ElementBase); - svg.Element.MISSING = function (_svg$Element$ElementB20) { - inherits(_class49, _svg$Element$ElementB20); + svg.Element.MISSING = + /*#__PURE__*/ + function (_svg$Element$ElementB20) { + _inherits(_class49, _svg$Element$ElementB20); function _class49(node) { - classCallCheck(this, _class49); + var _this25; - var _this53 = possibleConstructorReturn(this, (_class49.__proto__ || Object.getPrototypeOf(_class49)).call(this)); + _classCallCheck(this, _class49); + _this25 = _possibleConstructorReturn(this, _getPrototypeOf(_class49).call(this)); svg.log('ERROR: Element \'' + node.nodeName + '\' not yet implemented.'); - return _this53; + return _this25; } return _class49; - }(svg.Element.ElementBase); + }(svg.Element.ElementBase); // element factory + - // element factory svg.CreateElement = function (node) { var className = node.nodeName.replace(/^[^:]+:/, '') // remove namespace .replace(/-/g, ''); // remove dashes - var e = void 0; + + var e; + if (typeof svg.Element[className] !== 'undefined') { e = new svg.Element[className](node); } else { @@ -4107,11 +4474,15 @@ var canvg = (function (exports) { e.type = node.nodeName; return e; - }; + }; // load from url - // load from url - svg.load = function () { - var _ref4 = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(ctx, url) { + + svg.load = + /*#__PURE__*/ + function () { + var _ref4 = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee(ctx, url) { var dom; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { @@ -4122,10 +4493,10 @@ var canvg = (function (exports) { case 2: dom = _context.sent; - return _context.abrupt('return', svg.loadXml(ctx, dom)); + return _context.abrupt("return", svg.loadXml(ctx, dom)); case 4: - case 'end': + case "end": return _context.stop(); } } @@ -4135,44 +4506,47 @@ var canvg = (function (exports) { return function (_x3, _x4) { return _ref4.apply(this, arguments); }; - }(); + }(); // load from xml + - // load from xml svg.loadXml = function (ctx, xml) { return svg.loadXmlDoc(ctx, svg.parseXml(xml)); }; svg.loadXmlDoc = function (ctx, dom) { - var res = void 0; + var res; svg.init(ctx); var mapXY = function mapXY(p) { var e = ctx.canvas; + while (e) { p.x -= e.offsetLeft; p.y -= e.offsetTop; e = e.offsetParent; } + if (window.scrollX) p.x += window.scrollX; if (window.scrollY) p.y += window.scrollY; return p; - }; + }; // bind mouse + - // bind mouse if (svg.opts.ignoreMouse !== true) { ctx.canvas.onclick = function (e) { var args = e != null ? [e.clientX, e.clientY] : [event.clientX, event.clientY]; - var _mapXY = mapXY(new (Function.prototype.bind.apply(svg.Point, [null].concat(args)))()), + var _mapXY = mapXY(_construct(svg.Point, args)), x = _mapXY.x, y = _mapXY.y; svg.Mouse.onclick(x, y); }; + ctx.canvas.onmousemove = function (e) { var args = e != null ? [e.clientX, e.clientY] : [event.clientX, event.clientY]; - var _mapXY2 = mapXY(new (Function.prototype.bind.apply(svg.Point, [null].concat(args)))()), + var _mapXY2 = mapXY(_construct(svg.Point, args)), x = _mapXY2.x, y = _mapXY2.y; @@ -4181,12 +4555,13 @@ var canvg = (function (exports) { } var e = svg.CreateElement(dom.documentElement); - e.root = true; + e.root = true; // render loop - // render loop var isFirstRender = true; + var draw = function draw(resolve) { svg.ViewPort.Clear(); + if (ctx.canvas.parentNode) { svg.ViewPort.SetCurrent(ctx.canvas.parentNode.clientWidth, ctx.canvas.parentNode.clientHeight); } @@ -4197,25 +4572,31 @@ var canvg = (function (exports) { ctx.canvas.width = e.style('width').toPixels('x'); ctx.canvas.style.width = ctx.canvas.width + 'px'; } + if (e.style('height').hasValue()) { ctx.canvas.height = e.style('height').toPixels('y'); ctx.canvas.style.height = ctx.canvas.height + 'px'; } } + var cWidth = ctx.canvas.clientWidth || ctx.canvas.width; var cHeight = ctx.canvas.clientHeight || ctx.canvas.height; + if (svg.opts.ignoreDimensions === true && e.style('width').hasValue() && e.style('height').hasValue()) { cWidth = e.style('width').toPixels('x'); cHeight = e.style('height').toPixels('y'); } + svg.ViewPort.SetCurrent(cWidth, cHeight); if (svg.opts.offsetX != null) { e.attribute('x', true).value = svg.opts.offsetX; } + if (svg.opts.offsetY != null) { e.attribute('y', true).value = svg.opts.offsetY; } + if (svg.opts.scaleWidth != null || svg.opts.scaleHeight != null) { var viewBox = svg.ToNumberArray(e.attribute('viewBox').value); var xRatio = null, @@ -4240,6 +4621,7 @@ var canvg = (function (exports) { if (xRatio == null) { xRatio = yRatio; } + if (yRatio == null) { yRatio = xRatio; } @@ -4248,13 +4630,15 @@ var canvg = (function (exports) { e.attribute('height', true).value = svg.opts.scaleHeight; e.attribute('viewBox', true).value = '0 0 ' + cWidth * xRatio + ' ' + cHeight * yRatio; e.attribute('preserveAspectRatio', true).value = 'none'; - } + } // clear and render + - // clear and render if (svg.opts.ignoreClear !== true) { ctx.clearRect(0, 0, cWidth, cHeight); } + e.render(ctx); + if (isFirstRender) { isFirstRender = false; resolve(dom); @@ -4268,28 +4652,28 @@ var canvg = (function (exports) { if (waitingForImages && svg.ImagesLoaded()) { waitingForImages = false; needUpdate = true; - } + } // need update from mouse events? + - // need update from mouse events? if (svg.opts.ignoreMouse !== true) { needUpdate = needUpdate | svg.Mouse.hasEvents(); - } + } // need update from animations? + - // need update from animations? if (svg.opts.ignoreAnimation !== true) { svg.Animations.forEach(function (animation) { needUpdate = needUpdate | animation.update(1000 / svg.FRAMERATE); }); - } + } // need update from redraw? + - // need update from redraw? if (typeof svg.opts.forceRedraw === 'function') { if (svg.opts.forceRedraw() === true) { needUpdate = true; } - } + } // render if needed + - // render if needed if (needUpdate) { draw(res); svg.Mouse.runEvents(); // run and clear our events @@ -4301,6 +4685,7 @@ var canvg = (function (exports) { draw(resolve); return; } + res = resolve; }); }; @@ -4318,7 +4703,9 @@ var canvg = (function (exports) { }, onclick: function onclick(x, y) { this.events.push({ - type: 'onclick', x: x, y: y, + type: 'onclick', + x: x, + y: y, run: function run(e) { if (e.onclick) e.onclick(); } @@ -4326,59 +4713,56 @@ var canvg = (function (exports) { }, onmousemove: function onmousemove(x, y) { this.events.push({ - type: 'onmousemove', x: x, y: y, + type: 'onmousemove', + x: x, + y: y, run: function run(e) { if (e.onmousemove) e.onmousemove(); } }); }, - - eventElements: [], - checkPath: function checkPath(element, ctx) { - var _this54 = this; + var _this26 = this; this.events.forEach(function (_ref5, i) { var x = _ref5.x, y = _ref5.y; if (ctx.isPointInPath && ctx.isPointInPath(x, y)) { - _this54.eventElements[i] = element; + _this26.eventElements[i] = element; } }); }, checkBoundingBox: function checkBoundingBox(element, bb) { - var _this55 = this; + var _this27 = this; this.events.forEach(function (_ref6, i) { var x = _ref6.x, y = _ref6.y; if (bb.isPointInBox(x, y)) { - _this55.eventElements[i] = element; + _this27.eventElements[i] = element; } }); }, runEvents: function runEvents() { - var _this56 = this; + var _this28 = this; svg.ctx.canvas.style.cursor = ''; - this.events.forEach(function (e, i) { - var element = _this56.eventElements[i]; + var element = _this28.eventElements[i]; + while (element) { e.run(element); element = element.parent; } - }); + }); // done running, clear - // done running, clear this.events = []; this.eventElements = []; } }; - return svg; } diff --git a/dist/dom-polyfill.js b/dist/dom-polyfill.js index 37c2375c..3ace743b 100644 --- a/dist/dom-polyfill.js +++ b/dist/dom-polyfill.js @@ -2,13 +2,13 @@ 'use strict'; // From https://github.com/inexorabletash/polyfill/blob/master/dom.js - function mixin(o, ps) { if (!o) return; Object.keys(ps).forEach(function (p) { if (p in o || p in o.prototype) { return; } + try { Object.defineProperty(o.prototype, p, Object.getOwnPropertyDescriptor(ps, p)); } catch (ex) { @@ -22,9 +22,11 @@ nodes = nodes.map(function (node) { return !(node instanceof Node) ? document.createTextNode(node) : node; }); + if (nodes.length === 1) { return nodes[0]; } + var node = document.createDocumentFragment(); nodes.forEach(function (n) { node.appendChild(n); @@ -34,7 +36,7 @@ var ParentNode = { prepend: function prepend() { - for (var _len = arguments.length, nodes = Array(_len), _key = 0; _key < _len; _key++) { + for (var _len = arguments.length, nodes = new Array(_len), _key = 0; _key < _len; _key++) { nodes[_key] = arguments[_key]; } @@ -42,7 +44,7 @@ this.insertBefore(nodes, this.firstChild); }, append: function append() { - for (var _len2 = arguments.length, nodes = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + for (var _len2 = arguments.length, nodes = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { nodes[_key2] = arguments[_key2]; } @@ -50,12 +52,10 @@ this.appendChild(nodes); } }; - mixin(Document || HTMLDocument, ParentNode); // HTMLDocument for IE8 - mixin(DocumentFragment, ParentNode); - mixin(Element, ParentNode); - // Mixin ChildNode + mixin(DocumentFragment, ParentNode); + mixin(Element, ParentNode); // Mixin ChildNode // https://dom.spec.whatwg.org/#interface-childnode var ChildNode = { @@ -64,13 +64,14 @@ if (!parent) return; var viablePreviousSibling = this.previousSibling; - for (var _len3 = arguments.length, nodes = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) { + 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; } + var node = convertNodesIntoANode(nodes); parent.insertBefore(node, viablePreviousSibling ? viablePreviousSibling.nextSibling : parent.firstChild); }, @@ -79,13 +80,14 @@ if (!parent) return; var viableNextSibling = this.nextSibling; - for (var _len4 = arguments.length, nodes = Array(_len4), _key4 = 0; _key4 < _len4; _key4++) { + 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; } + var node = convertNodesIntoANode(nodes); parent.insertBefore(node, viableNextSibling); }, @@ -94,13 +96,14 @@ if (!parent) return; var viableNextSibling = this.nextSibling; - for (var _len5 = arguments.length, nodes = Array(_len5), _key5 = 0; _key5 < _len5; _key5++) { + 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; } + var node = convertNodesIntoANode(nodes); if (this.parentNode === parent) { @@ -113,10 +116,10 @@ if (!this.parentNode) { return; } + this.parentNode.removeChild(this); } }; - mixin(DocumentType, ChildNode); mixin(Element, ChildNode); mixin(CharacterData, ChildNode); diff --git a/dist/extensions/ext-arrows.js b/dist/extensions/ext-arrows.js index 83e9615f..90ff8a20 100644 --- a/dist/extensions/ext-arrows.js +++ b/dist/extensions/ext-arrows.js @@ -1,36 +1,44 @@ var svgEditorExtension_arrows = (function () { 'use strict'; - var asyncToGenerator = function (fn) { - return function () { - var gen = fn.apply(this, arguments); - return new Promise(function (resolve, reject) { - function step(key, arg) { - try { - var info = gen[key](arg); - var value = info.value; - } catch (error) { - reject(error); - return; - } + 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 { - return Promise.resolve(value).then(function (value) { - step("next", value); - }, function (err) { - step("throw", err); - }); - } + 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); } - return step("next"); + function _throw(err) { + asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); + } + + _next(undefined); }); }; - }; + } /* globals jQuery */ + /** * ext-arrows.js * @@ -42,34 +50,38 @@ var svgEditorExtension_arrows = (function () { var extArrows = { name: 'arrows', init: function () { - var _ref = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(S) { + var _init = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee2(S) { 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) { + colorChanged = function _ref9(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); + if (!marker) { return; } var curColor = $(marker).children().attr('fill'); var curD = $(marker).children().attr('d'); + if (curColor === color) { return; } var allMarkers = $(defs).find('marker'); - var newMarker = null; - // Different color, check if already made + 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; @@ -80,15 +92,12 @@ var svgEditorExtension_arrows = (function () { // 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 + ')'); + $(elem).attr('marker-' + type, 'url(#' + newMarker.id + ')'); // Check if last marker can be removed - // Check if last marker can be removed var remove = true; $(S.svgcontent).find('line, polyline, path, polygon').each(function () { var elem = this; @@ -98,28 +107,29 @@ var svgEditorExtension_arrows = (function () { return remove; } }); + if (!remove) { return false; } - }); + }); // Not found, so can safely remove - // Not found, so can safely remove if (remove) { $(marker).remove(); } }); }; - setArrow = function setArrow() { + setArrow = function _ref8() { resetMarker(); - var type = this.value; + if (type === 'none') { return; - } + } // Set marker on element + - // Set marker on element var dir = 'fw'; + if (type === 'mid_bk') { type = 'mid'; dir = 'bk'; @@ -137,10 +147,9 @@ var svgEditorExtension_arrows = (function () { svgCanvas.call('changed', selElems); }; - addMarker = function addMarker(dir, type, id) { + addMarker = function _ref7(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') { @@ -148,6 +157,7 @@ var svgEditorExtension_arrows = (function () { } var marker = svgCanvas.getElem(id); + if (!marker) { marker = addElem({ element: 'marker', @@ -160,6 +170,7 @@ var svgEditorExtension_arrows = (function () { markerHeight: 5, orient: 'auto', style: 'pointer-events:none' // Currently needed for Opera + } }); var arrow = addElem({ @@ -174,25 +185,26 @@ var svgEditorExtension_arrows = (function () { } marker.setAttribute('refX', data.refx); - return marker; }; - resetMarker = function resetMarker() { + resetMarker = function _ref6() { var el = selElems[0]; el.removeAttribute('marker-start'); el.removeAttribute('marker-mid'); el.removeAttribute('marker-end'); }; - showPanel = function showPanel(on) { + showPanel = function _ref5(on) { $('#arrow_panel').toggle(on); + if (on) { var el = selElems[0]; var end = el.getAttribute('marker-end'); var start = el.getAttribute('marker-start'); var mid = el.getAttribute('marker-mid'); - var val = void 0; + var val; + if (end && start) { val = 'both'; } else if (end) { @@ -201,6 +213,7 @@ var svgEditorExtension_arrows = (function () { val = 'start'; } else if (mid) { val = 'mid'; + if (mid.includes('bk')) { val = 'mid_bk'; } @@ -214,26 +227,30 @@ var svgEditorExtension_arrows = (function () { } }; - getLinked = function getLinked(elem, attr) { + getLinked = function _ref4(elem, attr) { var str = elem.getAttribute(attr); + if (!str) { return null; } + var m = str.match(/\(#(.*)\)/); + if (!m || m.length !== 2) { return null; } + return svgCanvas.getElem(m[1]); }; - unsetArrowNonce = function unsetArrowNonce(window) { + unsetArrowNonce = function _ref3(window) { randomizeIds = false; arrowprefix = prefix; pathdata.fw.id = arrowprefix + 'fw'; pathdata.bk.id = arrowprefix + 'bk'; }; - setArrowNonce = function setArrowNonce(window, n) { + setArrowNonce = function _ref2(window, n) { randomizeIds = true; arrowprefix = prefix + n + '_'; pathdata.fw.id = arrowprefix + 'fw'; @@ -250,9 +267,7 @@ var svgEditorExtension_arrows = (function () { $ = jQuery; // {svgcontent} = S, addElem = svgCanvas.addSVGElementFromJson, nonce = S.nonce, prefix = 'se_arrow_'; - selElems = void 0, arrowprefix = void 0, randomizeIds = S.randomize_ids; - - + randomizeIds = S.randomize_ids; svgCanvas.bind('setnonce', setArrowNonce); svgCanvas.bind('unsetnonce', unsetArrowNonce); @@ -263,8 +278,16 @@ var svgEditorExtension_arrows = (function () { } 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' } + 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' + } }; contextTools = [{ type: 'select', @@ -275,56 +298,56 @@ var svgEditorExtension_arrows = (function () { change: setArrow } }]; - return _context2.abrupt('return', { + return _context2.abrupt("return", { name: strings.name, context_tools: strings.contextTools.map(function (contextTool, i) { return Object.assign(contextTools[i], contextTool); }), callback: function callback() { - $('#arrow_panel').hide(); - // Set ID so it can be translated in locale file + $('#arrow_panel').hide(); // Set ID so it can be translated in locale file + $('#arrow_list option')[0].id = 'connector_no_arrow'; }, addLangData: function () { - var _ref3 = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref2) { - var lang = _ref2.lang, - importLocale = _ref2.importLocale; - var strings; + var _addLangData = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee(_ref) { + var lang, importLocale, strings; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { case 0: - _context.next = 2; + lang = _ref.lang, importLocale = _ref.importLocale; + _context.next = 3; return importLocale(); - case 2: + case 3: strings = _context.sent; - return _context.abrupt('return', { + return _context.abrupt("return", { data: strings.langList }); - case 4: - case 'end': + case 5: + case "end": return _context.stop(); } } }, _callee, this); })); - function addLangData(_x2) { - return _ref3.apply(this, arguments); - } - - return addLangData; + return function addLangData(_x2) { + return _addLangData.apply(this, arguments); + }; }(), selectedChanged: function selectedChanged(opts) { // Use this to update the current selected elements selElems = opts.elems; - var markerElems = ['line', 'path', 'polyline', 'polygon']; var i = selElems.length; + while (i--) { var elem = selElems[i]; + if (elem && markerElems.includes(elem.tagName)) { if (opts.selectedElement && !opts.multiselected) { showPanel(true); @@ -338,6 +361,7 @@ var svgEditorExtension_arrows = (function () { }, 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'); // const mid = elem.getAttribute('marker-mid'); @@ -349,18 +373,16 @@ var svgEditorExtension_arrows = (function () { }); case 22: - case 'end': + case "end": return _context2.stop(); } } }, _callee2, this); })); - function init(_x) { - return _ref.apply(this, arguments); - } - - return init; + return function init(_x) { + return _init.apply(this, arguments); + }; }() }; diff --git a/dist/extensions/ext-closepath.js b/dist/extensions/ext-closepath.js index efa7cfd0..fe4fad06 100644 --- a/dist/extensions/ext-closepath.js +++ b/dist/extensions/ext-closepath.js @@ -1,36 +1,44 @@ var svgEditorExtension_closepath = (function () { 'use strict'; - var asyncToGenerator = function (fn) { - return function () { - var gen = fn.apply(this, arguments); - return new Promise(function (resolve, reject) { - function step(key, arg) { - try { - var info = gen[key](arg); - var value = info.value; - } catch (error) { - reject(error); - return; - } + 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 { - return Promise.resolve(value).then(function (value) { - step("next", value); - }, function (err) { - step("throw", err); - }); - } + 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); } - return step("next"); + function _throw(err) { + asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); + } + + _next(undefined); }); }; - }; + } /* globals jQuery */ + /** * ext-closepath.js * @@ -39,27 +47,27 @@ var svgEditorExtension_closepath = (function () { * @copyright 2010 Jeff Schiller * */ - // This extension adds a simple button to the contextual panel for paths // The button toggles whether the path is open or closed var extClosepath = { name: 'closepath', init: function () { - var _ref2 = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref) { - var importLocale = _ref.importLocale; - var strings, $, svgEditor, selElems, updateButton, showPanel, toggleClosed, buttons; + var _init = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee(_ref) { + var importLocale, strings, $, svgEditor, selElems, updateButton, showPanel, toggleClosed, buttons; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { case 0: - _context.next = 2; + importLocale = _ref.importLocale; + _context.next = 3; return importLocale(); - case 2: + case 3: strings = _context.sent; $ = jQuery; svgEditor = this; - selElems = void 0; updateButton = function updateButton(path) { var seglist = path.pathSegList, @@ -72,8 +80,10 @@ var svgEditorExtension_closepath = (function () { showPanel = function showPanel(on) { $('#closepath_panel').toggle(on); + if (on) { var path = selElems[0]; + if (path) { updateButton(path); } @@ -82,15 +92,17 @@ var svgEditorExtension_closepath = (function () { toggleClosed = function toggleClosed() { var path = selElems[0]; + if (path) { var seglist = path.pathSegList, - last = seglist.numberOfItems - 1; - // is closed + last = seglist.numberOfItems - 1; // is closed + if (seglist.getItem(last).pathSegType === 1) { seglist.removeItem(last); } else { seglist.appendItem(path.createSVGPathSegClosePath()); } + updateButton(path); } }; @@ -116,7 +128,7 @@ var svgEditorExtension_closepath = (function () { } } }]; - return _context.abrupt('return', { + return _context.abrupt("return", { name: strings.name, svgicons: svgEditor.curConfig.extIconsPath + 'closepath_icons.svg', buttons: strings.buttons.map(function (button, i) { @@ -128,8 +140,10 @@ var svgEditorExtension_closepath = (function () { selectedChanged: function selectedChanged(opts) { selElems = opts.elems; var i = selElems.length; + while (i--) { var elem = selElems[i]; + if (elem && elem.tagName === 'path') { if (opts.selectedElement && !opts.multiselected) { showPanel(true); @@ -144,18 +158,16 @@ var svgEditorExtension_closepath = (function () { }); case 11: - case 'end': + case "end": return _context.stop(); } } }, _callee, this); })); - function init(_x) { - return _ref2.apply(this, arguments); - } - - return init; + return function init(_x) { + return _init.apply(this, arguments); + }; }() }; diff --git a/dist/extensions/ext-connector.js b/dist/extensions/ext-connector.js index 1d325cae..d2821767 100644 --- a/dist/extensions/ext-connector.js +++ b/dist/extensions/ext-connector.js @@ -1,36 +1,44 @@ var svgEditorExtension_connector = (function () { 'use strict'; - var asyncToGenerator = function (fn) { - return function () { - var gen = fn.apply(this, arguments); - return new Promise(function (resolve, reject) { - function step(key, arg) { - try { - var info = gen[key](arg); - var value = info.value; - } catch (error) { - reject(error); - return; - } + 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 { - return Promise.resolve(value).then(function (value) { - step("next", value); - }, function (err) { - step("throw", err); - }); - } + 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); } - return step("next"); + function _throw(err) { + asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); + } + + _next(undefined); }); }; - }; + } /* globals jQuery */ + /** * ext-connector.js * @@ -39,20 +47,22 @@ var svgEditorExtension_connector = (function () { * @copyright 2010 Alexis Deveria * */ - var extConnector = { name: 'connector', init: function () { - var _ref = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(S) { + var _init = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee2(S) { 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 _callee2$(_context2) { while (1) { switch (_context2.prev = _context2.next) { case 0: - init = function init() { + init = function _ref9() { // Make sure all connectors have data set $(svgcontent).find('*').each(function () { var conn = this.getAttributeNS(seNs, 'connector'); + if (conn) { this.setAttribute('class', connSel.substr(1)); var connData = conn.split(' '); @@ -61,104 +71,102 @@ var svgEditorExtension_connector = (function () { $(this).data('c_start', connData[0]).data('c_end', connData[1]).data('start_bb', sbb).data('end_bb', ebb); svgCanvas.getEditorNS(true); } - }); - // updateConnectors(); + }); // updateConnectors(); }; - updateConnectors = function updateConnectors(elems) { + updateConnectors = function _ref8(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) { // Update line with element var i = connections.length; + while (i--) { var conn = connections[i]; var line = conn.connector; - var elem = conn.elem; + var elem = conn.elem; // const sw = line.getAttribute('stroke-width') * 5; - // const sw = line.getAttribute('stroke-width') * 5; + var pre = conn.is_start ? 'start' : 'end'; // Update bbox for this element - var pre = conn.is_start ? 'start' : 'end'; - - // Update bbox for this element var bb = svgCanvas.getStrokedBBox([elem]); bb.x = conn.start_x; bb.y = conn.start_y; elData(line, pre + '_bb', bb); - /* const addOffset = */elData(line, pre + '_off'); + /* const addOffset = */ - var altPre = conn.is_start ? 'end' : 'start'; + elData(line, pre + '_off'); + var altPre = conn.is_start ? 'end' : 'start'; // Get center pt of connected element - // 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; + var srcY = bb2.y + bb2.height / 2; // Set point of element being moved - // 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); + setPoint(line, conn.is_start ? 0 : 'end', pt.x, pt.y, true); // Set point of connected element - // Set point of connected element 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); + setPoint(line, conn.is_start ? 'end' : 0, pt2.x, pt2.y, true); // Update points attribute manually for webkit - // 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(' ')); } } } }; - findConnectors = function findConnectors() { + findConnectors = function _ref7() { var elems = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : selElems; - var connectors = $(svgcontent).find(connSel); - connections = []; + connections = []; // Loop through connectors to see if one is connected to the element - // Loop through connectors to see if one is connected to the element connectors.each(function () { - var addThis = void 0; + var addThis; + function add() { if (elems.includes(this)) { // Pretend this element is selected addThis = true; } - } + } // Grab the ends + - // Grab the ends var parts = []; ['start', 'end'].forEach(function (pos, i) { var key = 'c_' + pos; var part = elData(this, key); + if (part == null) { part = document.getElementById(this.attributes['se:connector'].value.split(' ')[i]); elData(this, 'c_' + pos, part.id); elData(this, pos + '_bb', svgCanvas.getStrokedBBox([part])); } else part = document.getElementById(part); + parts.push(part); }.bind(this)); for (var i = 0; i < 2; i++) { var cElem = parts[i]; + addThis = false; // The connected element might be part of a selected group - addThis = false; - // The connected element might be part of a selected group $(cElem).parents().each(add); if (!cElem || !cElem.parentNode) { $(this).remove(); continue; } + if (elems.includes(cElem) || addThis) { var bb = svgCanvas.getStrokedBBox([cElem]); connections.push({ @@ -173,59 +181,59 @@ var svgEditorExtension_connector = (function () { }); }; - updateLine = function updateLine(diffX, diffY) { + updateLine = function _ref6(diffX, diffY) { // Update line with element var i = connections.length; + while (i--) { var conn = connections[i]; - var line = conn.connector; - // const {elem} = conn; - - var pre = conn.is_start ? 'start' : 'end'; - // const sw = line.getAttribute('stroke-width') * 5; + var line = conn.connector; // const {elem} = conn; + var pre = conn.is_start ? 'start' : 'end'; // const sw = line.getAttribute('stroke-width') * 5; // Update bbox for this element + var bb = elData(line, pre + '_bb'); bb.x = conn.start_x + diffX; bb.y = conn.start_y + diffY; elData(line, pre + '_bb', bb); + var altPre = conn.is_start ? 'end' : 'start'; // Get center pt of connected element - var 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; + var srcY = bb2.y + bb2.height / 2; // Set point of element being moved - // Set point of element being moved var pt = getBBintersect(srcX, srcY, bb, getOffset(pre, line)); // $(line).data(pre+'_off')?sw:0 - setPoint(line, conn.is_start ? 0 : 'end', pt.x, pt.y, true); - // Set point of connected element + setPoint(line, conn.is_start ? 0 : 'end', pt.x, pt.y, true); // Set point of connected element + 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); } }; - setPoint = function setPoint(elem, pos, x, y, setMid) { + setPoint = function _ref5(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 + } // 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(' ')); } @@ -237,25 +245,26 @@ var svgEditorExtension_connector = (function () { } }; - showPanel = function showPanel(on) { + showPanel = function _ref4(on) { var connRules = $('#connector_rules'); + if (!connRules.length) { connRules = $('').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'); - + getOffset = function _ref3(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) { + getBBintersect = function _ref2(x, y, bb, offset) { if (offset) { offset -= 0; bb = $.extend({}, bb); @@ -269,10 +278,9 @@ var svgEditorExtension_connector = (function () { var midY = bb.y + bb.height / 2; var lenX = x - midX; var lenY = y - midY; - var slope = Math.abs(lenY / lenX); + var ratio; - var ratio = void 0; if (slope < bb.height / bb.width) { ratio = bb.width / 2 / Math.abs(lenX); } else { @@ -295,12 +303,7 @@ var svgEditorExtension_connector = (function () { case 15: strings = _context2.sent; - startX = void 0, startY = void 0, curLine = void 0, startElem = void 0, endElem = void 0, seNs = void 0, svgcontent = S.svgcontent, started = false, connections = [], selElems = []; - - /** - * - * @param {Element[]} [elem=selElems] Array of elements - */ + svgcontent = S.svgcontent, started = false, connections = [], selElems = []; // Do once (function () { @@ -320,9 +323,7 @@ var svgEditorExtension_connector = (function () { }; seNs = svgCanvas.getEditorNS(); - })(); - - // Do on reset + })(); // Do on reset // $(svgroot).parent().mousemove(function (e) { @@ -335,7 +336,6 @@ var svgEditorExtension_connector = (function () { // // // // } // }); - buttons = [{ id: 'mode_connect', type: 'mode', @@ -351,37 +351,37 @@ var svgEditorExtension_connector = (function () { } } }]; - return _context2.abrupt('return', { + return _context2.abrupt("return", { name: strings.name, svgicons: svgEditor.curConfig.imgPath + 'conn.svg', buttons: strings.buttons.map(function (button, i) { return Object.assign(buttons[i], button); }), addLangData: function () { - var _ref3 = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref2) { - var lang = _ref2.lang, - importLocale = _ref2.importLocale; + var _addLangData = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee(_ref) { + var lang, importLocale; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { case 0: - return _context.abrupt('return', { + lang = _ref.lang, importLocale = _ref.importLocale; + return _context.abrupt("return", { data: strings.langList }); - case 1: - case 'end': + case 2: + case "end": return _context.stop(); } } }, _callee, this); })); - function addLangData(_x3) { - return _ref3.apply(this, arguments); - } - - return addLangData; + return function addLangData(_x2) { + return _addLangData.apply(this, arguments); + }; }(), mouseDown: function mouseDown(opts) { var e = opts.event; @@ -390,28 +390,23 @@ var svgEditorExtension_connector = (function () { var mode = svgCanvas.getMode(); var initStroke = svgEditor.curConfig.initStroke; - if (mode === 'connector') { if (started) { return; } var mouseTarget = e.target; - var parents = $(mouseTarget).parents(); if ($.inArray(svgcontent, parents) !== -1) { // Connectable element - // If child of foreignObject, use parent var fo = $(mouseTarget).closest('foreignObject'); - startElem = fo.length ? fo[0] : mouseTarget; + startElem = fo.length ? fo[0] : mouseTarget; // Get center of source element - // Get center of source element 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', @@ -427,23 +422,23 @@ var svgEditorExtension_connector = (function () { }); elData(curLine, 'start_bb', bb); } + return { started: true }; } + if (mode === 'select') { findConnectors(); } }, mouseMove: function mouseMove(opts) { - var zoom = svgCanvas.getZoom(); - // const e = opts.event; + var zoom = svgCanvas.getZoom(); // const e = opts.event; + var x = opts.mouse_x / zoom; var y = opts.mouse_y / zoom; - var diffX = x - startX, diffY = y - startY; - var mode = svgCanvas.getMode(); if (mode === 'connector' && started) { @@ -452,22 +447,22 @@ var svgEditorExtension_connector = (function () { 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, 0, pt.x, pt.y, true); - - // Set end point setPoint(curLine, 'end', x, y, true); } else if (mode === 'select') { var slen = selElems.length; + while (slen--) { - var 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 svgCanvas.removeFromSelection([elem]); svgCanvas.getTransformList(elem).clear(); } } + if (connections.length) { updateLine(diffX, diffY); } @@ -475,15 +470,17 @@ var svgEditorExtension_connector = (function () { }, mouseUp: function mouseUp(opts) { // const zoom = svgCanvas.getZoom(); - var e = opts.event; - // , x = opts.mouse_x / zoom, + var e = opts.event; // , x = opts.mouse_x / zoom, // , y = opts.mouse_y / zoom, + var mouseTarget = e.target; if (svgCanvas.getMode() !== 'connector') { return; } + var fo = $(mouseTarget).closest('foreignObject'); + if (fo.length) { mouseTarget = fo[0]; } @@ -499,6 +496,7 @@ var svgEditorExtension_connector = (function () { started: started }; } + if ($.inArray(svgcontent, parents) === -1) { // Not a valid target element, so remove line $(curLine).remove(); @@ -508,21 +506,23 @@ var svgEditorExtension_connector = (function () { element: null, started: started }; - } - // Valid end element - endElem = mouseTarget; + } // Valid end element + + endElem = mouseTarget; var startId = startElem.id, endId = endElem.id; var connStr = startId + ' ' + endId; - var altStr = endId + ' ' + startId; - // Don't create connector if one already exists + var altStr = endId + ' ' + startId; // Don't create connector if one already exists + var dupe = $(svgcontent).find(connSel).filter(function () { var conn = this.getAttributeNS(seNs, 'connector'); + if (conn === connStr || conn === altStr) { return true; } }); + if (dupe.length) { $(curLine).remove(); return { @@ -533,7 +533,6 @@ var svgEditorExtension_connector = (function () { } 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); @@ -559,16 +558,18 @@ var svgEditorExtension_connector = (function () { if (svgCanvas.getMode() === 'connector') { svgCanvas.setMode('select'); - } + } // Use this to update the current selected elements + - // Use this to update the current selected elements selElems = opts.elems; - var i = selElems.length; + while (i--) { var elem = selElems[i]; + if (elem && elData(elem, 'c_start')) { selManager.requestSelector(elem).showGrips(false); + if (opts.selectedElement && !opts.multiselected) { // TODO: Set up context tools and hide most regular line tools showPanel(true); @@ -579,17 +580,19 @@ var svgEditorExtension_connector = (function () { showPanel(false); } } + updateConnectors(); }, elementChanged: function elementChanged(opts) { var elem = opts.elems[0]; + if (elem && elem.tagName === 'svg' && elem.id === 'svgcontent') { // Update svgcontent (can change on import) svgcontent = elem; init(); - } + } // Has marker, so change offset + - // Has marker, so change offset if (elem && (elem.getAttribute('marker-start') || elem.getAttribute('marker-mid') || elem.getAttribute('marker-end'))) { var start = elem.getAttribute('marker-start'); var mid = elem.getAttribute('marker-mid'); @@ -599,15 +602,12 @@ var svgEditorExtension_connector = (function () { if (elem.tagName === 'line' && mid) { // Convert to polyline to accept mid-arrow - 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', @@ -626,10 +626,12 @@ var svgEditorExtension_connector = (function () { svgCanvas.addToSelection([pline]); elem = pline; } - } - // Update line if it's a connector + } // Update line if it's a connector + + if (elem.getAttribute('class') === connSel.substr(1)) { var _start = getElem(elData(elem, 'c_start')); + updateConnectors([_start]); } else { updateConnectors(); @@ -641,16 +643,17 @@ var svgEditorExtension_connector = (function () { if ('se:connector' in elem.attr) { elem.attr['se:connector'] = elem.attr['se:connector'].split(' ').map(function (oldID) { return input.changes[oldID]; - }).join(' '); - - // Check validity - the field would be something like 'svg_21 svg_22', but + }).join(' '); // Check validity - the field would be something like 'svg_21 svg_22', but // if one end is missing, it would be 'svg_21' and therefore fail this test + if (!/. ./.test(elem.attr['se:connector'])) { remove.push(elem.attr.id); } } }); - return { remove: remove }; + return { + remove: remove + }; }, toolButtonStateUpdate: function toolButtonStateUpdate(opts) { if (opts.nostroke) { @@ -658,23 +661,22 @@ var svgEditorExtension_connector = (function () { svgEditor.clickSelect(); } } + $('#mode_connect').toggleClass('disabled', opts.nostroke); } }); case 20: - case 'end': + case "end": return _context2.stop(); } } }, _callee2, this); })); - function init(_x) { - return _ref.apply(this, arguments); - } - - return init; + return function init(_x) { + return _init.apply(this, arguments); + }; }() }; diff --git a/dist/extensions/ext-eyedropper.js b/dist/extensions/ext-eyedropper.js index 0f9b50b9..d8a007e2 100644 --- a/dist/extensions/ext-eyedropper.js +++ b/dist/extensions/ext-eyedropper.js @@ -1,36 +1,44 @@ var svgEditorExtension_eyedropper = (function () { 'use strict'; - var asyncToGenerator = function (fn) { - return function () { - var gen = fn.apply(this, arguments); - return new Promise(function (resolve, reject) { - function step(key, arg) { - try { - var info = gen[key](arg); - var value = info.value; - } catch (error) { - reject(error); - return; - } + 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 { - return Promise.resolve(value).then(function (value) { - step("next", value); - }, function (err) { - step("throw", err); - }); - } + 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); } - return step("next"); + function _throw(err) { + asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); + } + + _next(undefined); }); }; - }; + } /* globals jQuery */ + /** * ext-eyedropper.js * @@ -39,30 +47,33 @@ var svgEditorExtension_eyedropper = (function () { * @copyright 2010 Jeff Schiller * */ - var extEyedropper = { name: 'eyedropper', init: function () { - var _ref = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(S) { + var _init = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee(S) { 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) { + getStyle = function _ref(opts) { // if we are in eyedropper mode, we don't want to disable the eye-dropper tool var mode = svgCanvas.getMode(); + if (mode === 'eyedropper') { return; } - var tool = $('#tool_eyedropper'); - // enable-eye-dropper if one element is selected + var tool = $('#tool_eyedropper'); // enable-eye-dropper if one element is selected + var elem = null; + if (!opts.multiselected && opts.elems[0] && !['svg', 'g', 'use'].includes(opts.elems[0].nodeName)) { elem = opts.elems[0]; - tool.removeClass('disabled'); - // grab the current style + tool.removeClass('disabled'); // grab the current style + currentStyle.fillPaint = elem.getAttribute('fill') || 'black'; currentStyle.fillOpacity = elem.getAttribute('fill-opacity') || 1.0; currentStyle.strokePaint = elem.getAttribute('stroke'); @@ -71,8 +82,7 @@ var svgEditorExtension_eyedropper = (function () { currentStyle.strokeDashArray = elem.getAttribute('stroke-dasharray'); currentStyle.strokeLinecap = elem.getAttribute('stroke-linecap'); currentStyle.strokeLinejoin = elem.getAttribute('stroke-linejoin'); - currentStyle.opacity = elem.getAttribute('opacity') || 1.0; - // disable eye-dropper tool + currentStyle.opacity = elem.getAttribute('opacity') || 1.0; // disable eye-dropper tool } else { tool.addClass('disabled'); } @@ -88,9 +98,12 @@ var svgEditorExtension_eyedropper = (function () { 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, + fillPaint: 'red', + fillOpacity: 1.0, + strokePaint: 'black', + strokeOpacity: 1.0, + strokeWidth: 5, + strokeDashArray: null, opacity: 1.0, strokeLinecap: 'butt', strokeLinejoin: 'miter' @@ -105,19 +118,18 @@ var svgEditorExtension_eyedropper = (function () { } } }]; - return _context.abrupt('return', { + return _context.abrupt("return", { name: strings.name, svgicons: svgEditor.curConfig.extIconsPath + 'eyedropper-icon.xml', 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: function mouseDown(opts) { var mode = svgCanvas.getMode(); + if (mode === 'eyedropper') { var e = opts.event; var target = e.target; @@ -133,27 +145,35 @@ var svgEditorExtension_eyedropper = (function () { if (currentStyle.fillPaint) { change(target, 'fill', currentStyle.fillPaint); } + if (currentStyle.fillOpacity) { change(target, 'fill-opacity', currentStyle.fillOpacity); } + if (currentStyle.strokePaint) { change(target, 'stroke', currentStyle.strokePaint); } + if (currentStyle.strokeOpacity) { change(target, 'stroke-opacity', currentStyle.strokeOpacity); } + if (currentStyle.strokeWidth) { change(target, 'stroke-width', currentStyle.strokeWidth); } + if (currentStyle.strokeDashArray) { change(target, 'stroke-dasharray', currentStyle.strokeDashArray); } + if (currentStyle.opacity) { change(target, 'opacity', currentStyle.opacity); } + if (currentStyle.strokeLinecap) { change(target, 'stroke-linecap', currentStyle.strokeLinecap); } + if (currentStyle.strokeLinejoin) { change(target, 'stroke-linejoin', currentStyle.strokeLinejoin); } @@ -165,18 +185,16 @@ var svgEditorExtension_eyedropper = (function () { }); case 9: - case 'end': + case "end": return _context.stop(); } } }, _callee, this); })); - function init(_x) { - return _ref.apply(this, arguments); - } - - return init; + return function init(_x) { + return _init.apply(this, arguments); + }; }() }; diff --git a/dist/extensions/ext-foreignobject.js b/dist/extensions/ext-foreignobject.js index 13544a0f..81db9f8c 100644 --- a/dist/extensions/ext-foreignobject.js +++ b/dist/extensions/ext-foreignobject.js @@ -1,36 +1,44 @@ var svgEditorExtension_foreignobject = (function () { 'use strict'; - var asyncToGenerator = function (fn) { - return function () { - var gen = fn.apply(this, arguments); - return new Promise(function (resolve, reject) { - function step(key, arg) { - try { - var info = gen[key](arg); - var value = info.value; - } catch (error) { - reject(error); - return; - } + 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 { - return Promise.resolve(value).then(function (value) { - step("next", value); - }, function (err) { - step("throw", err); - }); - } + 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); } - return step("next"); + function _throw(err) { + asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); + } + + _next(undefined); }); }; - }; + } /* globals jQuery */ + /** * ext-foreignobject.js * @@ -39,30 +47,32 @@ var svgEditorExtension_foreignobject = (function () { * @copyright 2010 Jacques Distler, 2010 Alexis Deveria * */ - var extForeignobject = { name: 'foreignobject', init: function () { - var _ref = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(S) { + var _init = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee(S) { var svgEditor, text2xml, NS, importLocale, $, svgCanvas, svgdoc, strings, properlySourceSizeTextArea, showPanel, toggleSourceButtons, selElems, started, newFO, editingforeign, setForeignString, showForeignEditor, setAttr, buttons, contextTools; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { case 0: - setAttr = function setAttr(attr, val) { + setAttr = function _ref5(attr, val) { svgCanvas.changeSelectedAttribute(attr, val); svgCanvas.call('changed', selElems); }; - showForeignEditor = function showForeignEditor() { + showForeignEditor = function _ref4() { var elt = selElems[0]; + if (!elt || editingforeign) { return; } + editingforeign = true; toggleSourceButtons(true); elt.removeAttribute('fill'); - var str = svgCanvas.svgToString(elt, 0); $('#svg_source_textarea').val(str); $('#svg_source_editor').fadeIn(); @@ -70,12 +80,13 @@ var svgEditorExtension_foreignobject = (function () { $('#svg_source_textarea').focus(); }; - setForeignString = function setForeignString(xmlString) { + setForeignString = function _ref3(xmlString) { var elt = selElems[0]; + try { // convert string into XML document - var newDoc = text2xml('' + xmlString + ''); - // run it through our sanitizer to remove anything we do not support + var newDoc = text2xml('' + xmlString + ''); // run it through our sanitizer to remove anything we do not support + svgCanvas.sanitizeSvg(newDoc.documentElement); elt.replaceWith(svgdoc.importNode(newDoc.documentElement.firstChild, true)); svgCanvas.call('changed', [elt]); @@ -88,16 +99,18 @@ var svgEditorExtension_foreignobject = (function () { return true; }; - toggleSourceButtons = function toggleSourceButtons(on) { + toggleSourceButtons = function _ref2(on) { $('#tool_source_save, #tool_source_cancel').toggle(!on); $('#foreign_save, #foreign_cancel').toggle(on); }; - showPanel = function showPanel(on) { + showPanel = function _ref(on) { var fcRules = $('#fc_rules'); + if (!fcRules.length) { fcRules = $('').appendTo('head'); } + fcRules.text(!on ? '' : ' #tool_topath { display: none !important; }'); $('#foreignObject_panel').toggle(on); }; @@ -119,8 +132,7 @@ var svgEditorExtension_foreignobject = (function () { $('#svg_source_textarea').css('height', height); }; - selElems = void 0, started = void 0, newFO = void 0, editingforeign = false; - + editingforeign = false; /** * This function sets the content of element elt to the input XML. * @param {string} xmlString - The XML text @@ -179,7 +191,7 @@ var svgEditorExtension_foreignobject = (function () { } } }]; - return _context.abrupt('return', { + return _context.abrupt("return", { name: strings.name, svgicons: svgEditor.curConfig.extIconsPath + 'foreignobject-icons.xml', buttons: strings.buttons.map(function (button, i) { @@ -196,12 +208,14 @@ var svgEditorExtension_foreignobject = (function () { editingforeign = false; $('#svg_source_textarea').blur(); toggleSourceButtons(false); - }; + }; // TODO: Needs to be done after orig icon loads + - // 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', 'foreign_save').unbind().appendTo('#tool_source_back').click(function () { + + /* const save = */ + $('#tool_source_save').clone().hide().attr('id', 'foreign_save').unbind().appendTo('#tool_source_back').click(function () { if (!editingforeign) { return; } @@ -211,22 +225,23 @@ var svgEditorExtension_foreignobject = (function () { if (!ok) { return false; } + endChanges(); }); } else { endChanges(); - } - // setSelectMode(); - }); + } // setSelectMode(); - /* const cancel = */$('#tool_source_cancel').clone().hide().attr('id', 'foreign_cancel').unbind().appendTo('#tool_source_back').click(function () { + }); + /* const cancel = */ + + $('#tool_source_cancel').clone().hide().attr('id', 'foreign_cancel').unbind().appendTo('#tool_source_back').click(function () { endChanges(); }); }, 3000); }, mouseDown: function mouseDown(opts) { // const e = opts.event; - if (svgCanvas.getMode() === 'foreign') { started = true; newFO = svgCanvas.addSVGElementFromJson({ @@ -235,7 +250,8 @@ var svgEditorExtension_foreignobject = (function () { x: opts.start_x, y: opts.start_y, id: svgCanvas.getNextId(), - 'font-size': 16, // cur_text.font_size, + 'font-size': 16, + // cur_text.font_size, width: '48', height: '20', style: 'pointer-events:inherit' @@ -246,11 +262,11 @@ var svgEditorExtension_foreignobject = (function () { m.setAttribute('display', 'inline'); var mi = svgdoc.createElementNS(NS.MATH, 'mi'); mi.setAttribute('mathvariant', 'normal'); - mi.textContent = '\u03A6'; + mi.textContent = "\u03A6"; var mo = svgdoc.createElementNS(NS.MATH, 'mo'); - mo.textContent = '\u222A'; + mo.textContent = "\u222A"; var mi2 = svgdoc.createElementNS(NS.MATH, 'mi'); - mi2.textContent = '\u2133'; + mi2.textContent = "\u2133"; m.append(mi, mo, mi2); newFO.append(m); return { @@ -264,7 +280,6 @@ var svgEditorExtension_foreignobject = (function () { var attrs = $(newFO).attr(['width', 'height']); var keep = attrs.width !== '0' || attrs.height !== '0'; svgCanvas.addToSelection([newFO], true); - return { keep: keep, element: newFO @@ -274,10 +289,11 @@ var svgEditorExtension_foreignobject = (function () { 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.tagName === 'foreignObject') { if (opts.selectedElement && !opts.multiselected) { $('#foreign_font_size').val(elem.getAttribute('font-size')); @@ -292,24 +308,20 @@ var svgEditorExtension_foreignobject = (function () { } } }, - elementChanged: function elementChanged(opts) { - // const elem = opts.elems[0]; - } + elementChanged: function elementChanged(opts) {} }); case 18: - case 'end': + case "end": return _context.stop(); } } }, _callee, this); })); - function init(_x) { - return _ref.apply(this, arguments); - } - - return init; + return function init(_x) { + return _init.apply(this, arguments); + }; }() }; diff --git a/dist/extensions/ext-grid.js b/dist/extensions/ext-grid.js index ee7ec5c2..9eb33479 100644 --- a/dist/extensions/ext-grid.js +++ b/dist/extensions/ext-grid.js @@ -1,36 +1,44 @@ var svgEditorExtension_grid = (function () { 'use strict'; - var asyncToGenerator = function (fn) { - return function () { - var gen = fn.apply(this, arguments); - return new Promise(function (resolve, reject) { - function step(key, arg) { - try { - var info = gen[key](arg); - var value = info.value; - } catch (error) { - reject(error); - return; - } + 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 { - return Promise.resolve(value).then(function (value) { - step("next", value); - }, function (err) { - step("throw", err); - }); - } + 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); } - return step("next"); + function _throw(err) { + asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); + } + + _next(undefined); }); }; - }; + } /* globals jQuery */ + /** * ext-grid.js * @@ -39,71 +47,72 @@ var svgEditorExtension_grid = (function () { * @copyright 2010 Redou Mine, 2010 Alexis Deveria * */ - var extGrid = { name: 'grid', init: function () { - var _ref2 = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref) { - var NS = _ref.NS, - getTypeMap = _ref.getTypeMap, - importLocale = _ref.importLocale; - var strings, svgEditor, $, svgCanvas, svgdoc, assignAttributes, hcanvas, canvBG, units, intervals, showGrid, canvasGrid, gridPattern, gridimg, gridBox, updateGrid, gridUpdate, buttons; + var _init = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee(_ref) { + var NS, getTypeMap, importLocale, strings, svgEditor, $, svgCanvas, svgdoc, assignAttributes, hcanvas, canvBG, units, intervals, showGrid, canvasGrid, gridPattern, gridimg, gridBox, updateGrid, gridUpdate, buttons; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { case 0: - gridUpdate = function gridUpdate() { + gridUpdate = function _ref3() { if (showGrid) { updateGrid(svgCanvas.getZoom()); } + $('#canvasGrid').toggle(showGrid); $('#view_grid').toggleClass('push_button_pressed tool_button'); }; - updateGrid = function updateGrid(zoom) { + updateGrid = function _ref2(zoom) { // TODO: Try this with elements, then compare performance difference var unit = units[svgEditor.curConfig.baseUnit]; // 1 = 1px - var uMulti = unit * zoom; - // Calculate the main number interval + + var uMulti = unit * zoom; // Calculate the main number interval + var rawM = 100 / uMulti; var multi = 1; + for (var i = 0; i < intervals.length; i++) { var num = intervals[i]; multi = num; + if (rawM <= num) { break; } } - var bigInt = multi * uMulti; - // Set the canvas size to the width of the container + 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 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); @@ -112,22 +121,19 @@ var svgEditorExtension_grid = (function () { svgCanvas.setHref(gridimg, datauri); }; - _context.next = 4; + NS = _ref.NS, getTypeMap = _ref.getTypeMap, importLocale = _ref.importLocale; + _context.next = 5; return importLocale(); - case 4: + case 5: strings = _context.sent; svgEditor = this; $ = jQuery; 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'); - canvasGrid = svgdoc.createElementNS(NS.SVG, 'svg'); - assignAttributes(canvasGrid, { id: 'canvasGrid', width: '100%', @@ -137,22 +143,20 @@ var svgEditorExtension_grid = (function () { overflow: 'visible', display: 'none' }); - canvBG.append(canvasGrid); + canvBG.append(canvasGrid); // grid-pattern - // grid-pattern gridPattern = svgdoc.createElementNS(NS.SVG, 'pattern'); - assignAttributes(gridPattern, { id: 'gridpattern', patternUnits: 'userSpaceOnUse', - x: 0, // -(value.strokeWidth / 2), // position for strokewidth - y: 0, // -(value.strokeWidth / 2), // position for strokewidth + x: 0, + // -(value.strokeWidth / 2), // position for strokewidth + y: 0, + // -(value.strokeWidth / 2), // position for strokewidth width: 100, height: 100 }); - gridimg = svgdoc.createElementNS(NS.SVG, 'image'); - assignAttributes(gridimg, { x: 0, y: 0, @@ -160,11 +164,9 @@ var svgEditorExtension_grid = (function () { height: 100 }); gridPattern.append(gridimg); - $('#svgroot defs').append(gridPattern); + $('#svgroot defs').append(gridPattern); // grid-box - // grid-box gridBox = svgdoc.createElementNS(NS.SVG, 'rect'); - assignAttributes(gridBox, { width: '100%', height: '100%', @@ -176,7 +178,6 @@ var svgEditorExtension_grid = (function () { style: 'pointer-events: none; display:visible;' }); $('#canvasGrid').append(gridBox); - buttons = [{ id: 'view_grid', icon: svgEditor.curConfig.extIconsPath + 'grid.png', @@ -189,10 +190,9 @@ var svgEditorExtension_grid = (function () { } } }]; - return _context.abrupt('return', { + return _context.abrupt("return", { name: strings.name, svgicons: svgEditor.curConfig.extIconsPath + 'grid-icon.xml', - zoomChanged: function zoomChanged(zoom) { if (showGrid) { updateGrid(zoom); @@ -203,25 +203,22 @@ var svgEditorExtension_grid = (function () { gridUpdate(); } }, - buttons: strings.buttons.map(function (button, i) { return Object.assign(buttons[i], button); }) }); - case 25: - case 'end': + case 26: + case "end": return _context.stop(); } } }, _callee, this); })); - function init(_x) { - return _ref2.apply(this, arguments); - } - - return init; + return function init(_x) { + return _init.apply(this, arguments); + }; }() }; diff --git a/dist/extensions/ext-helloworld.js b/dist/extensions/ext-helloworld.js index 66dca48e..9f3257dd 100644 --- a/dist/extensions/ext-helloworld.js +++ b/dist/extensions/ext-helloworld.js @@ -1,74 +1,82 @@ var svgEditorExtension_helloworld = (function () { 'use strict'; - var asyncToGenerator = function (fn) { - return function () { - var gen = fn.apply(this, arguments); - return new Promise(function (resolve, reject) { - function step(key, arg) { - try { - var info = gen[key](arg); - var value = info.value; - } catch (error) { - reject(error); - return; - } - - if (info.done) { - resolve(value); - } else { - return Promise.resolve(value).then(function (value) { - step("next", value); - }, function (err) { - step("throw", err); - }); - } - } - - return step("next"); - }); - }; - }; - - var slicedToArray = function () { - function sliceIterator(arr, i) { - 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"]) _i["return"](); - } finally { - if (_d) throw _e; - } - } - - return _arr; + function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { + try { + var info = gen[key](arg); + var value = info.value; + } catch (error) { + reject(error); + return; } - return function (arr, i) { - if (Array.isArray(arr)) { - return arr; - } else if (Symbol.iterator in Object(arr)) { - return sliceIterator(arr, i); - } else { - throw new TypeError("Invalid attempt to destructure non-iterable instance"); - } + 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) || _nonIterableRest(); + } + + function _arrayWithHoles(arr) { + if (Array.isArray(arr)) return arr; + } + + function _iterableToArrayLimit(arr, i) { + 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 _nonIterableRest() { + throw new TypeError("Invalid attempt to destructure non-iterable instance"); + } /* globals jQuery */ + /** * ext-helloworld.js * @@ -86,42 +94,39 @@ var svgEditorExtension_helloworld = (function () { var extHelloworld = { name: 'helloworld', init: function () { - var _ref2 = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref) { - var importLocale = _ref.importLocale; - var strings, svgEditor, $, svgCanvas; + var _init = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee(_ref) { + var importLocale, strings, svgEditor, $, svgCanvas; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { case 0: - _context.next = 2; + importLocale = _ref.importLocale; + _context.next = 3; return importLocale(); - case 2: + case 3: strings = _context.sent; svgEditor = this; $ = jQuery; svgCanvas = svgEditor.canvas; - return _context.abrupt('return', { + 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 svgicons: svgEditor.curConfig.extIconsPath + 'helloworld-icon.xml', - // Multiple buttons can be added in this array buttons: [{ // Must match the icon ID in helloworld-icon.xml id: 'hello_world', - // Fallback, e.g., for `file:///` access icon: svgEditor.curConfig.extIconsPath + 'helloworld.png', - // This indicates that the button will be added to the "mode" // button panel on the left side type: 'mode', - // Tooltip text title: strings.buttons[0].title, - // Events events: { click: function click() { @@ -139,52 +144,46 @@ var svgEditorExtension_helloworld = (function () { if (svgCanvas.getMode() === 'hello_world') { // The returned object must include "started" with // a value of true in order for mouseUp to be triggered - return { started: true }; + return { + started: true + }; } }, - - // 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: function mouseUp(opts) { // Check the mode on mouseup if (svgCanvas.getMode() === 'hello_world') { - var zoom = svgCanvas.getZoom(); + var zoom = svgCanvas.getZoom(); // Get the actual coordinate by dividing by the zoom value - // Get the actual coordinate by dividing by the zoom value var x = opts.mouse_x / zoom; - var y = opts.mouse_y / zoom; + var y = opts.mouse_y / zoom; // We do our own formatting - // We do our own formatting var text = strings.text; - - [['x', x], ['y', y]].forEach(function (_ref3) { - var _ref4 = slicedToArray(_ref3, 2), - prop = _ref4[0], - val = _ref4[1]; + [['x', x], ['y', y]].forEach(function (_ref2) { + var _ref3 = _slicedToArray(_ref2, 2), + prop = _ref3[0], + val = _ref3[1]; text = text.replace('{' + prop + '}', val); - }); + }); // Show the text using the custom alert function - // Show the text using the custom alert function $.alert(text); } } }); - case 7: - case 'end': + case 8: + case "end": return _context.stop(); } } }, _callee, this); })); - function init(_x) { - return _ref2.apply(this, arguments); - } - - return init; + return function init(_x) { + return _init.apply(this, arguments); + }; }() }; diff --git a/dist/extensions/ext-imagelib.js b/dist/extensions/ext-imagelib.js index fbccecd3..7ce2c824 100644 --- a/dist/extensions/ext-imagelib.js +++ b/dist/extensions/ext-imagelib.js @@ -1,42 +1,58 @@ var svgEditorExtension_imagelib = (function () { 'use strict'; - var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { - return typeof obj; - } : function (obj) { - return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; - }; + function _typeof(obj) { + 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; + }; + } - var asyncToGenerator = function (fn) { + 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 gen = fn.apply(this, arguments); + var self = this, + args = arguments; return new Promise(function (resolve, reject) { - function step(key, arg) { - try { - var info = gen[key](arg); - var value = info.value; - } catch (error) { - reject(error); - return; - } + var gen = fn.apply(self, args); - if (info.done) { - resolve(value); - } else { - return Promise.resolve(value).then(function (value) { - step("next", value); - }, function (err) { - step("throw", err); - }); - } + function _next(value) { + asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } - return step("next"); + function _throw(err) { + asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); + } + + _next(undefined); }); }; - }; + } /* globals jQuery */ + /** * ext-imagelib.js * @@ -48,33 +64,29 @@ var svgEditorExtension_imagelib = (function () { var extImagelib = { name: 'imagelib', init: function () { - var _ref2 = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref) { - var decode64 = _ref.decode64, - importLocale = _ref.importLocale, - dropXMLInternalSubset = _ref.dropXMLInternalSubset; - var imagelibStrings, modularVersion, svgEditor, $, uiStrings, svgCanvas, extIconsPath, allowedImageLibOrigins, closeBrowser, importImage, pending, mode, multiArr, transferStopped, preview, submit, toggleMulti, showBrowser, buttons; + var _init = _asyncToGenerator( + /*#__PURE__*/ + regeneratorRuntime.mark(function _callee(_ref) { + var decode64, importLocale, dropXMLInternalSubset, imagelibStrings, modularVersion, svgEditor, $, uiStrings, svgCanvas, extIconsPath, allowedImageLibOrigins, closeBrowser, importImage, pending, mode, multiArr, transferStopped, preview, submit, toggleMulti, showBrowser, buttons; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { case 0: - showBrowser = function showBrowser() { + showBrowser = function _ref9() { var browser = $('#imgbrowse'); + if (!browser.length) { $('
' + '
').insertAfter('#svg_docprops'); browser = $('#imgbrowse'); - var allLibs = imagelibStrings.select_lib; - var libOpts = $('