Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gradient fix parsing floats #4637

Merged
merged 5 commits into from
Jan 20, 2018
Merged

Gradient fix parsing floats #4637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
941aa7d
fixed gradient parsing and circle width/height leak
asturur Jan 19, 2018
2b359c5
added a small test
asturur Jan 19, 2018
9db8494
fix lint
asturur Jan 19, 2018
e31d73d
test re enabled
asturur Jan 19, 2018
b5330a9
fixed tests
asturur Jan 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gradient.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@
options[prop] = 0;
}
propValue = parseFloat(options[prop], 10);
if (typeof options[prop] === 'string' && /^\d+%$/.test(options[prop])) {
if (typeof options[prop] === 'string' && /^(\d+\.\d+)%|(\d+)%$/.test(options[prop])) {
multFactor = 0.01;
}
else {
Expand Down
11 changes: 4 additions & 7 deletions src/shapes/circle.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
'use strict';

var fabric = global.fabric || (global.fabric = { }),
pi = Math.PI,
extend = fabric.util.object.extend;
pi = Math.PI;

if (fabric.Circle) {
fabric.warn('fabric.Circle is already defined.');
Expand Down Expand Up @@ -174,13 +173,11 @@
* @static
* @memberOf fabric.Circle
* @param {SVGElement} element Element to parse
* @param {Object} [options] Options object
* @param {Function} [callback] Options callback invoked after parsing is finished
* @param {Object} [options] Options object
* @throws {Error} If value of `r` attribute is missing or invalid
*/
fabric.Circle.fromElement = function(element, callback, options) {
options || (options = { });

fabric.Circle.fromElement = function(element, callback) {
var parsedAttributes = fabric.parseAttributes(element, fabric.Circle.ATTRIBUTE_NAMES);

if (!isValidRadius(parsedAttributes)) {
Expand All @@ -189,7 +186,7 @@

parsedAttributes.left = (parsedAttributes.left || 0) - parsedAttributes.radius;
parsedAttributes.top = (parsedAttributes.top || 0) - parsedAttributes.radius;
callback(new fabric.Circle(extend(parsedAttributes, options)));
callback(new fabric.Circle(parsedAttributes));
};

/**
Expand Down
9 changes: 3 additions & 6 deletions src/shapes/ellipse.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
'use strict';

var fabric = global.fabric || (global.fabric = { }),
piBy2 = Math.PI * 2,
extend = fabric.util.object.extend;
piBy2 = Math.PI * 2;

if (fabric.Ellipse) {
fabric.warn('fabric.Ellipse is already defined.');
Expand Down Expand Up @@ -161,18 +160,16 @@
* @static
* @memberOf fabric.Ellipse
* @param {SVGElement} element Element to parse
* @param {Object} [options] Options object
* @param {Function} [callback] Options callback invoked after parsing is finished
* @return {fabric.Ellipse}
*/
fabric.Ellipse.fromElement = function(element, callback, options) {
options || (options = { });
fabric.Ellipse.fromElement = function(element, callback) {

var parsedAttributes = fabric.parseAttributes(element, fabric.Ellipse.ATTRIBUTE_NAMES);

parsedAttributes.left = (parsedAttributes.left || 0) - parsedAttributes.rx;
parsedAttributes.top = (parsedAttributes.top || 0) - parsedAttributes.ry;
callback(new fabric.Ellipse(extend(parsedAttributes, options)));
callback(new fabric.Ellipse(parsedAttributes));
};
/* _FROM_SVG_END_ */

Expand Down
2 changes: 1 addition & 1 deletion test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ testrunner.run({
'./test/unit/intersection.js',
'./test/unit/stateful.js'
],
tests: ['./test/unit/pattern.js'],
// tests: ['./test/unit/pattern.js'],
}, function(err, report) {
if (err) {
console.log(err);
Expand Down
67 changes: 67 additions & 0 deletions test/unit/gradient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
var SVG_INTERNALRADIUS = '<radialGradient id="SVGID_0" gradientUnits="userSpaceOnUse" cx="50" cy="150" r="50" fx="-50" fy="-40">\n<stop offset="20%" style="stop-color:red;stop-opacity: undefined"/>\n<stop offset="100%" style="stop-color:green;stop-opacity: 0"/>\n</radialGradient>\n';
var SVG_SWAPPED = '<radialGradient id="SVGID_0" gradientUnits="userSpaceOnUse" cx="-50" cy="-40" r="50" fx="50" fy="150">\n<stop offset="20%" style="stop-color:green;stop-opacity: 0"/>\n<stop offset="100%" style="stop-color:red;stop-opacity: undefined"/>\n</radialGradient>\n';


QUnit.test('constructor linearGradient', function(assert) {
assert.ok(fabric.Gradient);

Expand Down Expand Up @@ -226,6 +227,72 @@
assert.equal(gradient.colorStops[0].opacity, 0);
});

QUnit.test('fromElement linearGradient with floats percentage - objectBoundingBox', function(assert) {
assert.ok(typeof fabric.Gradient.fromElement === 'function');

var element = fabric.document.createElement('linearGradient');
element.setAttribute('gradientUnits', 'objectBoundingBox');
element.setAttribute('x1', '10%');
element.setAttribute('y1', '0.2%');
element.setAttribute('x2', '200');
element.setAttribute('y2', '20%');
var stop1 = fabric.document.createElement('stop');
var stop2 = fabric.document.createElement('stop');

stop1.setAttribute('offset', '0%');
stop1.setAttribute('stop-color', 'white');

stop2.setAttribute('offset', '100%');
stop2.setAttribute('stop-color', 'black');
stop2.setAttribute('stop-opacity', '0');

element.appendChild(stop1);
element.appendChild(stop2);

var object = new fabric.Object({ width: 200, height: 200 });
var gradient = fabric.Gradient.fromElement(element, object);

assert.ok(gradient instanceof fabric.Gradient);

assert.equal(gradient.coords.x1, 20);
assert.equal(gradient.coords.y1, 0.4);
assert.equal(gradient.coords.x2, 40000);
assert.equal(gradient.coords.y2, 40);
});

QUnit.test('fromElement linearGradient with floats percentage - userSpaceOnUse', function(assert) {
assert.ok(typeof fabric.Gradient.fromElement === 'function');

var element = fabric.document.createElement('linearGradient');
element.setAttribute('gradientUnits', 'userSpaceOnUse');
element.setAttribute('x1', '10%');
element.setAttribute('y1', '0.2%');
element.setAttribute('x2', '200');
element.setAttribute('y2', '20%');
var stop1 = fabric.document.createElement('stop');
var stop2 = fabric.document.createElement('stop');

stop1.setAttribute('offset', '0%');
stop1.setAttribute('stop-color', 'white');

stop2.setAttribute('offset', '100%');
stop2.setAttribute('stop-color', 'black');
stop2.setAttribute('stop-opacity', '0');

element.appendChild(stop1);
element.appendChild(stop2);

var object = new fabric.Object({ width: 200, height: 200 });
var gradient = fabric.Gradient.fromElement(element, object);

assert.ok(gradient instanceof fabric.Gradient);

assert.equal(gradient.coords.x1, 0.1);
assert.equal(gradient.coords.y1, 0.002);
assert.equal(gradient.coords.x2, 200);
assert.equal(gradient.coords.y2, 0.2);
});

QUnit.test('fromElement linearGradient with Infinity', function(assert) {
assert.ok(typeof fabric.Gradient.fromElement === 'function');

Expand Down