mirror of
https://github.com/konvajs/konva.git
synced 2025-04-05 20:48:28 +08:00
build for 1.7.1
This commit is contained in:
Anton Lavrenov
parent
9306768267
commit
4cfd893d6f
259
konva.js
259
konva.js
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* Konva JavaScript Framework v1.7.0
|
||||
* Konva JavaScript Framework v1.7.1
|
||||
* http://konvajs.github.io/
|
||||
* Licensed under the MIT or GPL Version 2 licenses.
|
||||
* Date: Sun Oct 08 2017
|
||||
* Date: Wed Oct 11 2017
|
||||
*
|
||||
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
|
||||
* Modified work Copyright (C) 2014 - 2017 by Anton Lavrenov (Konva)
|
||||
@ -28,7 +28,7 @@
|
||||
*/
|
||||
|
||||
// runtime check for already included Konva
|
||||
(function(global) {
|
||||
(function() {
|
||||
'use strict';
|
||||
/**
|
||||
* @namespace Konva
|
||||
@ -38,7 +38,7 @@
|
||||
|
||||
var Konva = {
|
||||
// public
|
||||
version: '1.7.0',
|
||||
version: '1.7.1',
|
||||
|
||||
// private
|
||||
stages: [],
|
||||
@ -49,6 +49,10 @@
|
||||
listenClickTap: false,
|
||||
inDblClickWindow: false,
|
||||
|
||||
isBrowser:
|
||||
typeof window !== 'undefined' &&
|
||||
{}.toString.call(window) === '[object Window]',
|
||||
|
||||
// configurations
|
||||
enableTrace: false,
|
||||
traceArrMax: 100,
|
||||
@ -196,12 +200,14 @@
|
||||
_parseUA: function(userAgent) {
|
||||
var ua = userAgent.toLowerCase(),
|
||||
// jQuery UA regex
|
||||
match = /(chrome)[ /]([\w.]+)/.exec(ua) ||
|
||||
/(webkit)[ /]([\w.]+)/.exec(ua) ||
|
||||
/(opera)(?:.*version|)[ /]([\w.]+)/.exec(ua) ||
|
||||
/(msie) ([\w.]+)/.exec(ua) ||
|
||||
(ua.indexOf('compatible') < 0 &&
|
||||
/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua)) || [],
|
||||
match =
|
||||
/(chrome)[ /]([\w.]+)/.exec(ua) ||
|
||||
/(webkit)[ /]([\w.]+)/.exec(ua) ||
|
||||
/(opera)(?:.*version|)[ /]([\w.]+)/.exec(ua) ||
|
||||
/(msie) ([\w.]+)/.exec(ua) ||
|
||||
(ua.indexOf('compatible') < 0 &&
|
||||
/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua)) ||
|
||||
[],
|
||||
// adding mobile flag as well
|
||||
mobile = !!userAgent.match(
|
||||
/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i
|
||||
@ -221,9 +227,10 @@
|
||||
UA: undefined
|
||||
};
|
||||
|
||||
var glob = typeof global !== 'undefined'
|
||||
? global
|
||||
: typeof window !== 'undefined'
|
||||
var glob =
|
||||
typeof global !== 'undefined'
|
||||
? global
|
||||
: typeof window !== 'undefined'
|
||||
? window
|
||||
: typeof WorkerGlobalScope !== 'undefined' ? self : {};
|
||||
|
||||
@ -239,25 +246,6 @@
|
||||
Konva.global = glob;
|
||||
|
||||
if (typeof exports === 'object') {
|
||||
// runtime-check for browserify and nw.js (node-webkit)
|
||||
if (glob.window && glob.window.document) {
|
||||
Konva.document = glob.window.document;
|
||||
Konva.window = glob.window;
|
||||
} else {
|
||||
// Node. Does not work with strict CommonJS, but
|
||||
// only CommonJS-like enviroments that support module.exports,
|
||||
// like Node.
|
||||
var Canvas = require('canvas');
|
||||
var JSDOM = require('jsdom').JSDOM;
|
||||
|
||||
Konva.window = new JSDOM(
|
||||
'<!DOCTYPE html><html><head></head><body></body></html>'
|
||||
).window;
|
||||
Konva.document = Konva.window.document;
|
||||
Konva.window.Image = Canvas.Image;
|
||||
Konva._nodeCanvas = Canvas;
|
||||
Konva.isNode = true;
|
||||
}
|
||||
module.exports = Konva;
|
||||
return;
|
||||
} else if (typeof define === 'function' && define.amd) {
|
||||
@ -268,7 +256,7 @@
|
||||
}
|
||||
Konva.document = document;
|
||||
Konva.window = window;
|
||||
})(typeof global !== 'undefined' ? global : window);
|
||||
})();
|
||||
|
||||
/*eslint-disable eqeqeq, no-cond-assign, no-empty*/
|
||||
(function() {
|
||||
@ -280,7 +268,9 @@
|
||||
* @memberof Konva
|
||||
*/
|
||||
Konva.Collection = function() {
|
||||
var args = [].slice.call(arguments), length = args.length, i = 0;
|
||||
var args = [].slice.call(arguments),
|
||||
length = args.length,
|
||||
i = 0;
|
||||
|
||||
this.length = length;
|
||||
for (; i < length; i++) {
|
||||
@ -312,7 +302,9 @@
|
||||
* @memberof Konva.Collection.prototype
|
||||
*/
|
||||
Konva.Collection.prototype.toArray = function() {
|
||||
var arr = [], len = this.length, n;
|
||||
var arr = [],
|
||||
len = this.length,
|
||||
n;
|
||||
|
||||
for (n = 0; n < len; n++) {
|
||||
arr.push(this[n]);
|
||||
@ -326,7 +318,9 @@
|
||||
* @param {Array} arr
|
||||
*/
|
||||
Konva.Collection.toCollection = function(arr) {
|
||||
var collection = new Konva.Collection(), len = arr.length, n;
|
||||
var collection = new Konva.Collection(),
|
||||
len = arr.length,
|
||||
n;
|
||||
|
||||
for (n = 0; n < len; n++) {
|
||||
collection.push(arr[n]);
|
||||
@ -337,7 +331,8 @@
|
||||
// map one method by it's name
|
||||
Konva.Collection._mapMethod = function(methodName) {
|
||||
Konva.Collection.prototype[methodName] = function() {
|
||||
var len = this.length, i;
|
||||
var len = this.length,
|
||||
i;
|
||||
|
||||
var args = [].slice.call(arguments);
|
||||
for (i = 0; i < len; i++) {
|
||||
@ -792,7 +787,8 @@
|
||||
* other utils
|
||||
*/
|
||||
_hasMethods: function(obj) {
|
||||
var names = [], key;
|
||||
var names = [],
|
||||
key;
|
||||
|
||||
for (key in obj) {
|
||||
if (!obj.hasOwnProperty(key)) {
|
||||
@ -816,18 +812,15 @@
|
||||
);
|
||||
},
|
||||
createCanvasElement: function() {
|
||||
var canvas = Konva.isNode
|
||||
? new Konva._nodeCanvas()
|
||||
: Konva.document.createElement('canvas');
|
||||
var canvas = Konva.isBrowser
|
||||
? Konva.document.createElement('canvas')
|
||||
: new Konva._nodeCanvas();
|
||||
// on some environments canvas.style is readonly
|
||||
try {
|
||||
canvas.style = canvas.style || {};
|
||||
} catch (e) {}
|
||||
return canvas;
|
||||
},
|
||||
isBrowser: function() {
|
||||
return typeof exports !== 'object';
|
||||
},
|
||||
_isInDocument: function(el) {
|
||||
while ((el = el.parentNode)) {
|
||||
if (el == Konva.document) {
|
||||
@ -837,7 +830,11 @@
|
||||
return false;
|
||||
},
|
||||
_simplifyArray: function(arr) {
|
||||
var retArr = [], len = arr.length, util = Konva.Util, n, val;
|
||||
var retArr = [],
|
||||
len = arr.length,
|
||||
util = Konva.Util,
|
||||
n,
|
||||
val;
|
||||
|
||||
for (n = 0; n < len; n++) {
|
||||
val = arr[n];
|
||||
@ -1138,7 +1135,10 @@
|
||||
return [p1x, p1y, p2x, p2y];
|
||||
},
|
||||
_expandPoints: function(p, tension) {
|
||||
var len = p.length, allPoints = [], n, cp;
|
||||
var len = p.length,
|
||||
allPoints = [],
|
||||
n,
|
||||
cp;
|
||||
|
||||
for (n = 2; n < len - 2; n += 2) {
|
||||
cp = Konva.Util._getControlPoints(
|
||||
@ -1212,7 +1212,9 @@
|
||||
pt.x,
|
||||
pt.y
|
||||
);
|
||||
var px = proj[0], py = proj[1], pdist = proj[2];
|
||||
var px = proj[0],
|
||||
py = proj[1],
|
||||
pdist = proj[2];
|
||||
if (pdist < dist) {
|
||||
pc.x = px;
|
||||
pc.y = py;
|
||||
@ -1222,7 +1224,9 @@
|
||||
return pc;
|
||||
},
|
||||
_prepareArrayForTween: function(startArray, endArray, isClosed) {
|
||||
var n, start = [], end = [];
|
||||
var n,
|
||||
start = [],
|
||||
end = [];
|
||||
if (startArray.length > endArray.length) {
|
||||
var temp = endArray;
|
||||
endArray = startArray;
|
||||
@ -1289,8 +1293,14 @@
|
||||
(function() {
|
||||
'use strict';
|
||||
// calculate pixel ratio
|
||||
var canvas = Konva.Util.createCanvasElement(),
|
||||
context = canvas.getContext('2d'),
|
||||
|
||||
var _pixelRatio;
|
||||
function getDevicePixelRatio() {
|
||||
if (_pixelRatio) {
|
||||
return _pixelRatio;
|
||||
}
|
||||
var canvas = Konva.Util.createCanvasElement();
|
||||
var context = canvas.getContext('2d');
|
||||
_pixelRatio = (function() {
|
||||
var devicePixelRatio = Konva.window.devicePixelRatio || 1,
|
||||
backingStoreRatio =
|
||||
@ -1302,6 +1312,8 @@
|
||||
1;
|
||||
return devicePixelRatio / backingStoreRatio;
|
||||
})();
|
||||
return _pixelRatio;
|
||||
}
|
||||
|
||||
/**
|
||||
* Canvas Renderer constructor
|
||||
@ -1327,7 +1339,8 @@
|
||||
init: function(config) {
|
||||
var conf = config || {};
|
||||
|
||||
var pixelRatio = conf.pixelRatio || Konva.pixelRatio || _pixelRatio;
|
||||
var pixelRatio =
|
||||
conf.pixelRatio || Konva.pixelRatio || getDevicePixelRatio();
|
||||
|
||||
this.pixelRatio = pixelRatio;
|
||||
this._canvas = Konva.Util.createCanvasElement();
|
||||
@ -1390,7 +1403,8 @@
|
||||
this.width = this._canvas.width = width * this.pixelRatio;
|
||||
this._canvas.style.width = width + 'px';
|
||||
|
||||
var pixelRatio = this.pixelRatio, _context = this.getContext()._context;
|
||||
var pixelRatio = this.pixelRatio,
|
||||
_context = this.getContext()._context;
|
||||
_context.scale(pixelRatio, pixelRatio);
|
||||
},
|
||||
/**
|
||||
@ -1403,7 +1417,8 @@
|
||||
// take into account pixel ratio
|
||||
this.height = this._canvas.height = height * this.pixelRatio;
|
||||
this._canvas.style.height = height + 'px';
|
||||
var pixelRatio = this.pixelRatio, _context = this.getContext()._context;
|
||||
var pixelRatio = this.pixelRatio,
|
||||
_context = this.getContext()._context;
|
||||
_context.scale(pixelRatio, pixelRatio);
|
||||
},
|
||||
/**
|
||||
@ -1461,7 +1476,8 @@
|
||||
|
||||
Konva.SceneCanvas = function(config) {
|
||||
var conf = config || {};
|
||||
var width = conf.width || 0, height = conf.height || 0;
|
||||
var width = conf.width || 0,
|
||||
height = conf.height || 0;
|
||||
|
||||
Konva.Canvas.call(this, conf);
|
||||
this.context = new Konva.SceneContext(this);
|
||||
@ -1472,7 +1488,8 @@
|
||||
|
||||
Konva.HitCanvas = function(config) {
|
||||
var conf = config || {};
|
||||
var width = conf.width || 0, height = conf.height || 0;
|
||||
var width = conf.width || 0,
|
||||
height = conf.height || 0;
|
||||
|
||||
Konva.Canvas.call(this, conf);
|
||||
this.context = new Konva.HitContext(this);
|
||||
@ -7236,18 +7253,24 @@
|
||||
a = 0;
|
||||
|
||||
// Find the largest radius
|
||||
var rad, rMax = Math.sqrt(xMid * xMid + yMid * yMid);
|
||||
var rad,
|
||||
rMax = Math.sqrt(xMid * xMid + yMid * yMid);
|
||||
x = xSize - xMid;
|
||||
y = ySize - yMid;
|
||||
rad = Math.sqrt(x * x + y * y);
|
||||
rMax = rad > rMax ? rad : rMax;
|
||||
|
||||
// We'll be uisng y as the radius, and x as the angle (theta=t)
|
||||
var rSize = ySize, tSize = xSize, radius, theta;
|
||||
var rSize = ySize,
|
||||
tSize = xSize,
|
||||
radius,
|
||||
theta;
|
||||
|
||||
// We want to cover all angles (0-360) and we need to convert to
|
||||
// radians (*PI/180)
|
||||
var conversion = 360 / tSize * Math.PI / 180, sin, cos;
|
||||
var conversion = 360 / tSize * Math.PI / 180,
|
||||
sin,
|
||||
cos;
|
||||
|
||||
// var x1, x2, x1i, x2i, y1, y2, y1i, y2i, scale;
|
||||
|
||||
@ -7309,7 +7332,8 @@
|
||||
a = 0;
|
||||
|
||||
// Find the largest radius
|
||||
var rad, rMax = Math.sqrt(xMid * xMid + yMid * yMid);
|
||||
var rad,
|
||||
rMax = Math.sqrt(xMid * xMid + yMid * yMid);
|
||||
x = xSize - xMid;
|
||||
y = ySize - yMid;
|
||||
rad = Math.sqrt(x * x + y * y);
|
||||
@ -7358,7 +7382,6 @@
|
||||
//Konva.Filters.FromPolar = Konva.Util._FilterWrapDoubleBuffer(FromPolar);
|
||||
|
||||
// create a temporary canvas for working - shared between multiple calls
|
||||
var tempCanvas = Konva.Util.createCanvasElement();
|
||||
|
||||
/*
|
||||
* Kaleidoscope Filter.
|
||||
@ -7373,7 +7396,8 @@
|
||||
* node.kaleidoscopeAngle(45);
|
||||
*/
|
||||
Konva.Filters.Kaleidoscope = function(imageData) {
|
||||
var xSize = imageData.width, ySize = imageData.height;
|
||||
var xSize = imageData.width,
|
||||
ySize = imageData.height;
|
||||
|
||||
var x, y, xoff, i, r, g, b, a, srcPos, dstPos;
|
||||
var power = Math.round(this.kaleidoscopePower());
|
||||
@ -7385,6 +7409,7 @@
|
||||
}
|
||||
|
||||
// Work with our shared buffer canvas
|
||||
var tempCanvas = Konva.Util.createCanvasElement();
|
||||
tempCanvas.width = xSize;
|
||||
tempCanvas.height = ySize;
|
||||
var scratchData = tempCanvas
|
||||
@ -7410,7 +7435,9 @@
|
||||
// Copy the offset region to 0
|
||||
// Depending on the size of filter and location of the offset we may need
|
||||
// to copy the section backwards to prevent it from rewriting itself
|
||||
var xStart = 0, xEnd = sectionSize, xDelta = 1;
|
||||
var xStart = 0,
|
||||
xEnd = sectionSize,
|
||||
xDelta = 1;
|
||||
if (offset + minSectionSize > xSize) {
|
||||
xStart = sectionSize;
|
||||
xEnd = 0;
|
||||
@ -9987,7 +10014,9 @@
|
||||
* @memberof Konva.Stage.prototype
|
||||
*/
|
||||
clear: function() {
|
||||
var layers = this.children, len = layers.length, n;
|
||||
var layers = this.children,
|
||||
len = layers.length,
|
||||
n;
|
||||
|
||||
for (n = 0; n < len; n++) {
|
||||
layers[n].clear();
|
||||
@ -10196,7 +10225,10 @@
|
||||
|
||||
// draw layer and append canvas to container
|
||||
layer.draw();
|
||||
this.content.appendChild(layer.canvas._canvas);
|
||||
|
||||
if (Konva.isBrowser) {
|
||||
this.content.appendChild(layer.canvas._canvas);
|
||||
}
|
||||
|
||||
// chainable
|
||||
return this;
|
||||
@ -10216,6 +10248,9 @@
|
||||
return this.getChildren();
|
||||
},
|
||||
_bindContentEvents: function() {
|
||||
if (!Konva.isBrowser) {
|
||||
return;
|
||||
}
|
||||
for (var n = 0; n < eventsLength; n++) {
|
||||
addEvent(this, EVENTS[n]);
|
||||
}
|
||||
@ -10470,7 +10505,8 @@
|
||||
},
|
||||
_touchmove: function(evt) {
|
||||
this._setPointerPosition(evt);
|
||||
var dd = Konva.DD, shape;
|
||||
var dd = Konva.DD,
|
||||
shape;
|
||||
if (!Konva.isDragging()) {
|
||||
shape = this.getIntersection(this.getPointerPosition());
|
||||
if (shape && shape.isListening()) {
|
||||
@ -10502,7 +10538,9 @@
|
||||
this._fire(CONTENT_WHEEL, { evt: evt });
|
||||
},
|
||||
_setPointerPosition: function(evt) {
|
||||
var contentPosition = this._getContentPosition(), x = null, y = null;
|
||||
var contentPosition = this._getContentPosition(),
|
||||
x = null,
|
||||
y = null;
|
||||
evt = evt ? evt : window.event;
|
||||
|
||||
// touch events
|
||||
@ -10536,14 +10574,18 @@
|
||||
};
|
||||
},
|
||||
_buildDOM: function() {
|
||||
// the buffer canvas pixel ratio must be 1 because it is used as an
|
||||
// intermediate canvas before copying the result onto a scene canvas.
|
||||
// not setting it to 1 will result in an over compensation
|
||||
this.bufferCanvas = new Konva.SceneCanvas();
|
||||
this.bufferHitCanvas = new Konva.HitCanvas({ pixelRatio: 1 });
|
||||
|
||||
if (!Konva.isBrowser) {
|
||||
return;
|
||||
}
|
||||
var container = this.getContainer();
|
||||
if (!container) {
|
||||
if (Konva.Util.isBrowser()) {
|
||||
throw 'Stage has no container. A container is required.';
|
||||
} else {
|
||||
// automatically create element for jsdom in nodejs env
|
||||
container = Konva.document.createElement(DIV);
|
||||
}
|
||||
throw 'Stage has no container. A container is required.';
|
||||
}
|
||||
// clear content inside container
|
||||
container.innerHTML = EMPTY_STRING;
|
||||
@ -10553,18 +10595,16 @@
|
||||
this.content.style.position = RELATIVE;
|
||||
this.content.className = KONVA_CONTENT;
|
||||
this.content.setAttribute('role', 'presentation');
|
||||
container.appendChild(this.content);
|
||||
|
||||
// the buffer canvas pixel ratio must be 1 because it is used as an
|
||||
// intermediate canvas before copying the result onto a scene canvas.
|
||||
// not setting it to 1 will result in an over compensation
|
||||
this.bufferCanvas = new Konva.SceneCanvas();
|
||||
this.bufferHitCanvas = new Konva.HitCanvas({ pixelRatio: 1 });
|
||||
container.appendChild(this.content);
|
||||
|
||||
this._resizeDOM();
|
||||
},
|
||||
_onContent: function(typesStr, handler) {
|
||||
var types = typesStr.split(SPACE), len = types.length, n, baseEvent;
|
||||
var types = typesStr.split(SPACE),
|
||||
len = types.length,
|
||||
n,
|
||||
baseEvent;
|
||||
|
||||
for (n = 0; n < len; n++) {
|
||||
baseEvent = types[n];
|
||||
@ -12365,7 +12405,8 @@
|
||||
|
||||
// methods
|
||||
_drag: function(evt) {
|
||||
var dd = Konva.DD, node = dd.node;
|
||||
var dd = Konva.DD,
|
||||
node = dd.node;
|
||||
if (node) {
|
||||
if (!dd.isDragging) {
|
||||
var pos = node.getStage().getPointerPosition();
|
||||
@ -12413,7 +12454,9 @@
|
||||
}
|
||||
},
|
||||
_endDragBefore: function(evt) {
|
||||
var dd = Konva.DD, node = dd.node, layer;
|
||||
var dd = Konva.DD,
|
||||
node = dd.node,
|
||||
layer;
|
||||
|
||||
if (node) {
|
||||
layer = node.getLayer();
|
||||
@ -12520,7 +12563,8 @@
|
||||
* @memberof Konva.Node.prototype
|
||||
*/
|
||||
Konva.Node.prototype.stopDrag = function() {
|
||||
var dd = Konva.DD, evt = {};
|
||||
var dd = Konva.DD,
|
||||
evt = {};
|
||||
dd._endDragBefore(evt);
|
||||
dd._endDragAfter(evt);
|
||||
};
|
||||
@ -12658,15 +12702,17 @@
|
||||
* node.draggable(false);
|
||||
*/
|
||||
|
||||
var html = Konva.document.documentElement;
|
||||
html.addEventListener('mouseup', Konva.DD._endDragBefore, true);
|
||||
html.addEventListener('touchend', Konva.DD._endDragBefore, true);
|
||||
if (Konva.isBrowser) {
|
||||
var html = Konva.document.documentElement;
|
||||
html.addEventListener('mouseup', Konva.DD._endDragBefore, true);
|
||||
html.addEventListener('touchend', Konva.DD._endDragBefore, true);
|
||||
|
||||
html.addEventListener('mousemove', Konva.DD._drag);
|
||||
html.addEventListener('touchmove', Konva.DD._drag);
|
||||
html.addEventListener('mousemove', Konva.DD._drag);
|
||||
html.addEventListener('touchmove', Konva.DD._drag);
|
||||
|
||||
html.addEventListener('mouseup', Konva.DD._endDragAfter, false);
|
||||
html.addEventListener('touchend', Konva.DD._endDragAfter, false);
|
||||
html.addEventListener('mouseup', Konva.DD._endDragAfter, false);
|
||||
html.addEventListener('touchend', Konva.DD._endDragAfter, false);
|
||||
}
|
||||
})();
|
||||
|
||||
(function() {
|
||||
@ -14156,8 +14202,15 @@
|
||||
'letterSpacing'
|
||||
],
|
||||
// cached variables
|
||||
attrChangeListLen = ATTR_CHANGE_LIST.length,
|
||||
attrChangeListLen = ATTR_CHANGE_LIST.length;
|
||||
var dummyContext;
|
||||
function getDummyContext() {
|
||||
if (dummyContext) {
|
||||
return dummyContext;
|
||||
}
|
||||
dummyContext = Konva.Util.createCanvasElement().getContext(CONTEXT_2D);
|
||||
return dummyContext;
|
||||
}
|
||||
|
||||
/**
|
||||
* Text constructor
|
||||
@ -14328,7 +14381,9 @@
|
||||
|
||||
// draw text lines
|
||||
for (n = 0; n < textArrLen; n++) {
|
||||
var obj = textArr[n], text = obj.text, width = obj.width;
|
||||
var obj = textArr[n],
|
||||
text = obj.text,
|
||||
width = obj.width;
|
||||
|
||||
// horizontal alignment
|
||||
context.save();
|
||||
@ -14390,7 +14445,8 @@
|
||||
context.restore();
|
||||
},
|
||||
_hitFunc: function(context) {
|
||||
var width = this.getWidth(), height = this.getHeight();
|
||||
var width = this.getWidth(),
|
||||
height = this.getHeight();
|
||||
|
||||
context.beginPath();
|
||||
context.rect(0, 0, width, height);
|
||||
@ -14433,7 +14489,7 @@
|
||||
this.attrs.height === AUTO || this.attrs.height === undefined;
|
||||
return isAuto
|
||||
? this.getTextHeight() * this.textArr.length * this.getLineHeight() +
|
||||
this.getPadding() * 2
|
||||
this.getPadding() * 2
|
||||
: this.attrs.height;
|
||||
},
|
||||
/**
|
||||
@ -14455,7 +14511,9 @@
|
||||
return this.textHeight;
|
||||
},
|
||||
_getTextSize: function(text) {
|
||||
var _context = dummyContext, fontSize = this.getFontSize(), metrics;
|
||||
var _context = getDummyContext(),
|
||||
fontSize = this.getFontSize(),
|
||||
metrics;
|
||||
|
||||
_context.save();
|
||||
_context.font = this._getContextFont();
|
||||
@ -14502,7 +14560,7 @@
|
||||
var latterSpacing = this.getLetterSpacing();
|
||||
var length = text.length;
|
||||
return (
|
||||
dummyContext.measureText(text).width +
|
||||
getDummyContext().measureText(text).width +
|
||||
(length ? latterSpacing * (length - 1) : 0)
|
||||
);
|
||||
},
|
||||
@ -14524,8 +14582,8 @@
|
||||
wrapAtWord = wrap !== CHAR && shouldWrap;
|
||||
|
||||
this.textArr = [];
|
||||
dummyContext.save();
|
||||
dummyContext.font = this._getContextFont();
|
||||
getDummyContext().save();
|
||||
getDummyContext().font = this._getContextFont();
|
||||
for (var i = 0, max = lines.length; i < max; ++i) {
|
||||
var line = lines[i];
|
||||
|
||||
@ -14540,7 +14598,10 @@
|
||||
* use binary search to find the longest substring that
|
||||
* that would fit in the specified width
|
||||
*/
|
||||
var low = 0, high = line.length, match = '', matchWidth = 0;
|
||||
var low = 0,
|
||||
high = line.length,
|
||||
match = '',
|
||||
matchWidth = 0;
|
||||
while (low < high) {
|
||||
var mid = (low + high) >>> 1,
|
||||
substr = line.slice(0, mid + 1),
|
||||
@ -14613,7 +14674,7 @@
|
||||
break;
|
||||
}
|
||||
}
|
||||
dummyContext.restore();
|
||||
getDummyContext().restore();
|
||||
this.textHeight = fontSize;
|
||||
// var maxTextWidth = 0;
|
||||
// for(var j = 0; j < this.textArr.length; j++) {
|
||||
|
||||
8
konva.min.js
vendored
8
konva.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "konva",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.1",
|
||||
"author": "Anton Lavrenov",
|
||||
"files": [
|
||||
"README.md",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user