Comparing version 5.2.4 to 5.3.0
/*! Fabric.js Copyright 2008-2015, Printio (Juriy Zaytsev, Maxim Chernyak) */ | ||
var fabric = fabric || { version: '5.2.4' }; | ||
var fabric = fabric || { version: '5.3.0' }; | ||
if (typeof exports !== 'undefined') { | ||
@@ -5,0 +5,0 @@ exports.fabric = fabric; |
@@ -5,3 +5,3 @@ { | ||
"homepage": "http://fabricjs.com/", | ||
"version": "5.2.4", | ||
"version": "5.3.0", | ||
"author": "Juriy Zaytsev <kangax@gmail.com>", | ||
@@ -8,0 +8,0 @@ "contributors": [ |
@@ -254,9 +254,10 @@ (function() { | ||
* @param {HTMLImageElement|HTMLCanvasElement} textureImageSource A source for the texture data. | ||
* @param {Number} filterType gl.NEAREST or gl.LINEAR usually, webgl numeri constants | ||
* @returns {WebGLTexture} | ||
*/ | ||
createTexture: function(gl, width, height, textureImageSource) { | ||
createTexture: function(gl, width, height, textureImageSource, filterType) { | ||
var texture = gl.createTexture(); | ||
gl.bindTexture(gl.TEXTURE_2D, texture); | ||
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST); | ||
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST); | ||
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, filterType || gl.NEAREST); | ||
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, filterType || gl.NEAREST); | ||
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE); | ||
@@ -263,0 +264,0 @@ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE); |
@@ -19,3 +19,3 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.prototype */ { | ||
'; left: ' + style.left + '; z-index: -999; opacity: 0; width: 1px; height: 1px; font-size: 1px;' + | ||
' paddingーtop: ' + style.fontSize + ';'; | ||
' padding-top: ' + style.fontSize + ';'; | ||
@@ -22,0 +22,0 @@ if (this.hiddenTextareaContainer) { |
@@ -1238,2 +1238,3 @@ (function(global) { | ||
prevStyle.fontStyle !== thisStyle.fontStyle || | ||
prevStyle.textBackgroundColor !== thisStyle.textBackgroundColor || | ||
prevStyle.deltaY !== thisStyle.deltaY) || | ||
@@ -1272,3 +1273,3 @@ (forTextSpans && | ||
//check if style exists for this character | ||
if (thisStyle) { | ||
if (thisStyle && Object.keys(thisStyle).length > 0) { | ||
var styleChanged = fabric.util.hasStyleChanged(prevStyle, thisStyle, true); | ||
@@ -1275,0 +1276,0 @@ if (styleChanged) { |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
2602815
60247