rebuilt dist

This commit is contained in:
Asturur 2016-11-27 14:12:13 +01:00
parent 79a634c8d7
commit 3785dccacf
5 changed files with 35 additions and 20 deletions

29
dist/fabric.js vendored
View file

@ -12108,7 +12108,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @lends fabric.Stati
* default to false
* since 1.7.0
* @type Boolean
* @default
* @default false
*/
statefullCache: false,
@ -12119,10 +12119,17 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @lends fabric.Stati
* default to false
* since 1.7.0
* @type Boolean
* @default
* @default true
*/
noScaleCache: true,
/**
* When set to `true`, object's cache will be rerendered next render call.
* @type Boolean
* @default false
*/
dirty: false,
/**
* List of properties to consider when checking if state
* of an object is changed (fabric.Object#hasStateChanged)
@ -25508,6 +25515,12 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot
*/
lockScalingFlip: true,
/**
* Override standard Object class values
* Textbox needs this on false
*/
noScaleCache: false,
/**
* Constructor. Some scaling related property values are forced. Visibility
* of controls is also fixed; only the rotation and width controls are
@ -25547,7 +25560,7 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot
this.dynamicMinWidth = 0;
// wrap lines
this._textLines = this._splitTextIntoLines();
this._textLines = this._splitTextIntoLines(ctx);
// if after wrapping, the width is smaller than dynamicMinWidth, change the width and re-wrap
if (this.dynamicMinWidth > this.width) {
this._set('width', this.dynamicMinWidth);
@ -25771,14 +25784,14 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot
* @returns {Array} Array of lines in the Textbox.
* @override
*/
_splitTextIntoLines: function() {
_splitTextIntoLines: function(ctx) {
var originalAlign = this.textAlign;
this.ctx.save();
this._setTextStyles(this.ctx);
ctx.save();
this._setTextStyles(ctx);
this.textAlign = 'left';
var lines = this._wrapText(this.ctx, this.text);
var lines = this._wrapText(ctx, this.text);
this.textAlign = originalAlign;
this.ctx.restore();
ctx.restore();
this._textLines = lines;
this._styleMap = this._generateStyleMap();
return lines;

10
dist/fabric.min.js vendored

File diff suppressed because one or more lines are too long

BIN
dist/fabric.min.js.gz vendored

Binary file not shown.

View file

@ -5857,6 +5857,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
objectCaching: objectCaching,
statefullCache: false,
noScaleCache: true,
dirty: false,
stateProperties: ("top left width height scaleX scaleY flipX flipY originX originY transformMatrix " + "stroke strokeWidth strokeDashArray strokeLineCap strokeLineJoin strokeMiterLimit " + "angle opacity fill fillRule globalCompositeOperation shadow clipTo visible backgroundColor " + "skewX skewY").split(" "),
cacheProperties: ("fill stroke strokeWidth strokeDashArray width height stroke strokeWidth strokeDashArray" + " strokeLineCap strokeLineJoin strokeMiterLimit fillRule backgroundColor").split(" "),
initialize: function(options) {
@ -12171,6 +12172,7 @@ fabric.util.object.extend(fabric.IText.prototype, {
__cachedLines: null,
lockScalingY: true,
lockScalingFlip: true,
noScaleCache: false,
initialize: function(text, options) {
this.callSuper("initialize", text, options);
this.setControlsVisibility(fabric.Textbox.getTextboxControlVisibility());
@ -12187,7 +12189,7 @@ fabric.util.object.extend(fabric.IText.prototype, {
this.clearContextTop();
}
this.dynamicMinWidth = 0;
this._textLines = this._splitTextIntoLines();
this._textLines = this._splitTextIntoLines(ctx);
if (this.dynamicMinWidth > this.width) {
this._set("width", this.dynamicMinWidth);
}
@ -12296,14 +12298,14 @@ fabric.util.object.extend(fabric.IText.prototype, {
}
return lines;
},
_splitTextIntoLines: function() {
_splitTextIntoLines: function(ctx) {
var originalAlign = this.textAlign;
this.ctx.save();
this._setTextStyles(this.ctx);
ctx.save();
this._setTextStyles(ctx);
this.textAlign = "left";
var lines = this._wrapText(this.ctx, this.text);
var lines = this._wrapText(ctx, this.text);
this.textAlign = originalAlign;
this.ctx.restore();
ctx.restore();
this._textLines = lines;
this._styleMap = this._generateStyleMap();
return lines;

View file

@ -792,7 +792,7 @@
* @default false
*/
dirty: false,
/**
* List of properties to consider when checking if state
* of an object is changed (fabric.Object#hasStateChanged)