Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-03-16 22:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rebuilt dist

Browse source
This commit is contained in:
Asturur 2016-09-05 20:20:15 +02:00
parent 86e99899bc
commit 79b4684947
4 changed files with 49 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
dist/fabric.js vendored
View file

@ -18389,6 +18389,9 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
canvasEl.getContext('2d').drawImage(imgElement, 0, 0, imgElement.width, imgElement.height);
filters.forEach(function(filter) {
if (!filter) {
return;
}
if (forResizing) {
scaleX = _this.scaleX < minimumScale ? _this.scaleX : 1;
scaleY = _this.scaleY < minimumScale ? _this.scaleY : 1;
@ -18403,8 +18406,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
scaleX = filter.scaleX;
scaleY = filter.scaleY;
}
filter && filter.applyTo(canvasEl, scaleX, scaleY);
if (!forResizing && filter && filter.type === 'Resize') {
filter.applyTo(canvasEl, scaleX, scaleY);
if (!forResizing && filter.type === 'Resize') {
_this.width *= filter.scaleX;
_this.height *= filter.scaleY;
}
@ -18416,7 +18419,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
if (fabric.isLikelyNode) {
replacement.src = canvasEl.toBuffer(undefined, fabric.Image.pngCompression);
// onload doesn't fire in some node versions, so we invoke callback manually
_this._element = replacement; // !forResizing && (_this._filteredEl = replacement);
_this._element = replacement;
!forResizing && (_this._filteredEl = replacement);
callback && callback(_this);
}
else {
@ -21108,7 +21112,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
char = chars[i];
width = ctx.measureText(char).width + additionalSpace;
ctx[method](char, left, top);
left += width;
left += width > 0 ? width : 0;
}
}
else {
@ -21169,7 +21173,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
additionalSpace = charCount * this._getWidthOfCharSpacing();
width += additionalSpace;
}
return width;
return width > 0 ? width : 0;
},
/**
@ -21419,12 +21423,13 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
_measureLine: function(ctx, lineIndex) {
var line = this._textLines[lineIndex],
width = ctx.measureText(line).width,
additionalSpace = 0, charCount;
additionalSpace = 0, charCount, finalWidth;
if (this.charSpacing !== 0) {
charCount = line.split('').length;
additionalSpace = (charCount - 1) * this._getWidthOfCharSpacing();
}
return width + additionalSpace;
finalWidth = width + additionalSpace;
return finalWidth > 0 ? finalWidth : 0;
},
/**
@ -22367,7 +22372,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
}
boundaries = {
top: topOffset,
left: leftOffset,
left: leftOffset > 0 ? leftOffset : 0,
lineLeft: lineLeftOffset
};
this.cursorOffsetCache = boundaries;
@ -22451,7 +22456,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
ctx.fillRect(
boundaries.left + lineOffset,
boundaries.top + boundaries.topOffset,
boxWidth,
boxWidth > 0 ? boxWidth : 0,
lineHeight);
boundaries.topOffset += realLineHeight;
@ -22530,7 +22535,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
_renderChar: function(method, ctx, lineIndex, i, _char, left, top, lineHeight) {
var charWidth, charHeight, shouldFill, shouldStroke,
decl = this._getStyleDeclaration(lineIndex, i),
offset, textDecoration, chars;
offset, textDecoration, chars, additionalSpace, _charWidth;
if (decl) {
charHeight = this._getHeightOfChar(ctx, _char, lineIndex, i);
@ -22554,13 +22559,15 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
this._removeShadow(ctx);
}
if (this.charSpacing !== 0) {
additionalSpace = this._getWidthOfCharSpacing();
chars = _char.split('');
charWidth = 0;
for (var j = 0, len = chars.length, char; j < len; j++) {
char = chars[j];
shouldFill && ctx.fillText(char, left + charWidth, top);
shouldStroke && ctx.strokeText(char, left + charWidth, top);
charWidth += ctx.measureText(char).width + this._getWidthOfCharSpacing();
_charWidth = ctx.measureText(char).width + additionalSpace;
charWidth += _charWidth > 0 ? _charWidth : 0;
}
}
else {
@ -22869,7 +22876,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
width += this._getWidthOfCharSpacing();
}
ctx.restore();
return width;
return width > 0 ? width : 0
},
/**
@ -22911,7 +22918,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
width -= this._getWidthOfCharSpacing();
}
this._isMeasuring = false;
return width;
return width > 0 ? width : 0;
},
/**
@ -25235,7 +25242,7 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot
}
line += word;
infixWidth = this._measureText(ctx, infix, lineIndex, offset) + additionalSpace;
infixWidth = this._measureText(ctx, infix, lineIndex, offset);
offset++;
lineJustStarted = false;
// keep track of largest word

14
dist/fabric.min.js vendored
View file

File diff suppressed because one or more lines are too long

BIN
dist/fabric.min.js.gz vendored
View file

Binary file not shown.

35
dist/fabric.require.js vendored
View file

@ -4761,7 +4761,7 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, {
},
_initWrapperElement: function() {
this.wrapperEl = fabric.util.wrapElement(this.lowerCanvasEl, "div", {
"class": this.containerClass
class: this.containerClass
});
fabric.util.setStyle(this.wrapperEl, {
width: this.getWidth() + "px",
@ -8788,6 +8788,9 @@ fabric.util.object.extend(fabric.Object.prototype, {
canvasEl.height = imgElement.height;
canvasEl.getContext("2d").drawImage(imgElement, 0, 0, imgElement.width, imgElement.height);
filters.forEach(function(filter) {
if (!filter) {
return;
}
if (forResizing) {
scaleX = _this.scaleX < minimumScale ? _this.scaleX : 1;
scaleY = _this.scaleY < minimumScale ? _this.scaleY : 1;
@ -8801,8 +8804,8 @@ fabric.util.object.extend(fabric.Object.prototype, {
scaleX = filter.scaleX;
scaleY = filter.scaleY;
}
filter && filter.applyTo(canvasEl, scaleX, scaleY);
if (!forResizing && filter && filter.type === "Resize") {
filter.applyTo(canvasEl, scaleX, scaleY);
if (!forResizing && filter.type === "Resize") {
_this.width *= filter.scaleX;
_this.height *= filter.scaleY;
}
@ -8812,6 +8815,7 @@ fabric.util.object.extend(fabric.Object.prototype, {
if (fabric.isLikelyNode) {
replacement.src = canvasEl.toBuffer(undefined, fabric.Image.pngCompression);
_this._element = replacement;
!forResizing && (_this._filteredEl = replacement);
callback && callback(_this);
} else {
replacement.onload = function() {
@ -9885,7 +9889,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass({
char = chars[i];
width = ctx.measureText(char).width + additionalSpace;
ctx[method](char, left, top);
left += width;
left += width > 0 ? width : 0;
}
} else {
ctx[method](chars, left, top);
@ -9917,7 +9921,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass({
additionalSpace = charCount * this._getWidthOfCharSpacing();
width += additionalSpace;
}
return width;
return width > 0 ? width : 0;
},
_getLeftOffset: function() {
return -this.width / 2;
@ -10044,12 +10048,13 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass({
return 0;
},
_measureLine: function(ctx, lineIndex) {
var line = this._textLines[lineIndex], width = ctx.measureText(line).width, additionalSpace = 0, charCount;
var line = this._textLines[lineIndex], width = ctx.measureText(line).width, additionalSpace = 0, charCount, finalWidth;
if (this.charSpacing !== 0) {
charCount = line.split("").length;
additionalSpace = (charCount - 1) * this._getWidthOfCharSpacing();
}
return width + additionalSpace;
finalWidth = width + additionalSpace;
return finalWidth > 0 ? finalWidth : 0;
},
_renderTextDecoration: function(ctx) {
if (!this.textDecoration) {
@ -10467,7 +10472,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass({
}
boundaries = {
top: topOffset,
left: leftOffset,
left: leftOffset > 0 ? leftOffset : 0,
lineLeft: lineLeftOffset
};
this.cursorOffsetCache = boundaries;
@ -10510,7 +10515,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass({
if (this.lineHeight < 1 || i === endLine && this.lineHeight > 1) {
lineHeight /= this.lineHeight;
}
ctx.fillRect(boundaries.left + lineOffset, boundaries.top + boundaries.topOffset, boxWidth, lineHeight);
ctx.fillRect(boundaries.left + lineOffset, boundaries.top + boundaries.topOffset, boxWidth > 0 ? boxWidth : 0, lineHeight);
boundaries.topOffset += realLineHeight;
}
},
@ -10543,7 +10548,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass({
}
},
_renderChar: function(method, ctx, lineIndex, i, _char, left, top, lineHeight) {
var charWidth, charHeight, shouldFill, shouldStroke, decl = this._getStyleDeclaration(lineIndex, i), offset, textDecoration, chars;
var charWidth, charHeight, shouldFill, shouldStroke, decl = this._getStyleDeclaration(lineIndex, i), offset, textDecoration, chars, additionalSpace, _charWidth;
if (decl) {
charHeight = this._getHeightOfChar(ctx, _char, lineIndex, i);
shouldStroke = decl.stroke;
@ -10561,13 +10566,15 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass({
this._removeShadow(ctx);
}
if (this.charSpacing !== 0) {
additionalSpace = this._getWidthOfCharSpacing();
chars = _char.split("");
charWidth = 0;
for (var j = 0, len = chars.length, char; j < len; j++) {
char = chars[j];
shouldFill && ctx.fillText(char, left + charWidth, top);
shouldStroke && ctx.strokeText(char, left + charWidth, top);
charWidth += ctx.measureText(char).width + this._getWidthOfCharSpacing();
_charWidth = ctx.measureText(char).width + additionalSpace;
charWidth += _charWidth > 0 ? _charWidth : 0;
}
} else {
shouldFill && ctx.fillText(_char, left, top);
@ -10719,7 +10726,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass({
width += this._getWidthOfCharSpacing();
}
ctx.restore();
return width;
return width > 0 ? width : 0;
},
_getHeightOfChar: function(ctx, lineIndex, charIndex) {
var style = this._getStyleDeclaration(lineIndex, charIndex);
@ -10740,7 +10747,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass({
width -= this._getWidthOfCharSpacing();
}
this._isMeasuring = false;
return width;
return width > 0 ? width : 0;
},
_getWidthOfSpace: function(ctx, lineIndex) {
if (this.__widthOfSpace[lineIndex]) {
@ -12047,7 +12054,7 @@ fabric.util.object.extend(fabric.IText.prototype, {
line += infix;
}
line += word;
infixWidth = this._measureText(ctx, infix, lineIndex, offset) + additionalSpace;
infixWidth = this._measureText(ctx, infix, lineIndex, offset);
offset++;
lineJustStarted = false;
if (wordWidth > largestWordWidth) {