Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-23 20:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add tests for sourcePath changes (#4108)

Browse source 
* modified path
* added tests
This commit is contained in:
Andrea Bogazzi 2017-07-18 08:38:19 +02:00 committed by GitHub
parent 6702fe6dc6
commit 5367cfa8e3
4 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/shapes/path.class.js
View file

@ -473,7 +473,7 @@
* @return {Object} object representation of an instance
*/
toObject: function(propertiesToInclude) {
var o = extend(this.callSuper('toObject', ['sourcePath', 'pathOffset'].concat(propertiesToInclude)), {
var o = extend(this.callSuper('toObject', propertiesToInclude), {
path: this.path.map(function(item) { return item.slice(); }),
top: this.top,
left: this.left,
@ -487,11 +487,10 @@
* @return {Object} object representation of an instance
*/
toDatalessObject: function(propertiesToInclude) {
var o = this.toObject(propertiesToInclude);
if (this.sourcePath) {
o.path = this.sourcePath;
var o = this.toObject(['sourcePath'].concat(propertiesToInclude));
if (o.sourcePath) {
delete o.path;
}
delete o.sourcePath;
return o;
},
@ -913,15 +912,11 @@
* @param {Function} [callback] Callback to invoke when an fabric.Path instance is created
*/
fabric.Path.fromObject = function(object, callback) {
if (typeof object.path === 'string') {
var pathUrl = object.path;
if (typeof object.sourcePath === 'string') {
var pathUrl = object.sourcePath;
fabric.loadSVGFromURL(pathUrl, function (elements) {
var path = elements[0];
delete object.path;
path.setOptions(object);
path.set('sourcePath', pathUrl);
callback && callback(path);
});
}

2
test/unit/canvas.js
View file

@ -57,7 +57,7 @@
var PATH_DATALESS_JSON = '{"objects":[{"type":"path","originX":"left","originY":"top","left":100,"top":100,"width":200,"height":200,"fill":"rgb(0,0,0)",' +
'"stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeLineJoin":"miter","strokeMiterLimit":10,' +
'"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,' +
'"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"pathOffset":{"x":200,"y":200},"path":"http://example.com/"}]}';
'"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"sourcePath":"http://example.com/"}]}';
var RECT_JSON = '{"objects":[{"type":"rect","originX":"left","originY":"top","left":0,"top":0,"width":10,"height":10,"fill":"rgb(0,0,0)",' +
'"stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeLineJoin":"miter","strokeMiterLimit":10,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,' +

2
test/unit/canvas_static.js
View file

@ -43,7 +43,7 @@
var PATH_DATALESS_JSON = '{"objects":[{"type":"path","originX":"left","originY":"top","left":100,"top":100,"width":200,"height":200,"fill":"rgb(0,0,0)",' +
'"stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeLineJoin":"miter","strokeMiterLimit":10,' +
'"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,' +
'"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"pathOffset":{"x":200,"y":200},"path":"http://example.com/"}]}';
'"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"sourcePath":"http://example.com/"}]}';
var RECT_JSON = '{"objects":[{"type":"rect","originX":"left","originY":"top","left":0,"top":0,"width":10,"height":10,"fill":"rgb(0,0,0)",' +
'"stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeLineJoin":"miter","strokeMiterLimit":10,' +

30
test/unit/path.js
View file

@ -22,7 +22,6 @@
'flipY': false,
'opacity': 1,
'path': [['M', 100, 100], ['L', 300, 100], ['L', 200, 300], ['z']],
'pathOffset': { x: 200, y: 200 },
'shadow': null,
'visible': true,
'backgroundColor': '',
@ -133,14 +132,20 @@
asyncTest('toDatalessObject', function() {
makePathObject(function(path) {
ok(typeof path.toDatalessObject == 'function');
deepEqual(path.toDatalessObject(), REFERENCE_PATH_OBJECT);
ok(typeof path.toDatalessObject === 'function');
deepEqual(path.toDatalessObject(), REFERENCE_PATH_OBJECT, 'if not sourcePath the object is same');
start();
});
});
asyncTest('toDatalessObject with sourcePath', function() {
makePathObject(function(path) {
var src = 'http://example.com/';
path.sourcePath = src;
deepEqual(path.toDatalessObject(), fabric.util.object.extend(fabric.util.object.clone(REFERENCE_PATH_OBJECT), {
path: src
}));
var clonedRef = fabric.util.object.clone(REFERENCE_PATH_OBJECT);
clonedRef.sourcePath = src;
delete clonedRef.path;
deepEqual(path.toDatalessObject(), clonedRef, 'if sourcePath the object looses path');
start();
});
});
@ -153,7 +158,16 @@
});
asyncTest('fromObject', function() {
ok(typeof fabric.Path.fromObject == 'function');
ok(typeof fabric.Path.fromObject === 'function');
fabric.Path.fromObject(REFERENCE_PATH_OBJECT, function(path) {
ok(path instanceof fabric.Path);
deepEqual(path.toObject(), REFERENCE_PATH_OBJECT);
start();
});
});
asyncTest('fromObject with sourcePath', function() {
ok(typeof fabric.Path.fromObject === 'function');
fabric.Path.fromObject(REFERENCE_PATH_OBJECT, function(path) {
ok(path instanceof fabric.Path);
deepEqual(path.toObject(), REFERENCE_PATH_OBJECT);
@ -162,7 +176,7 @@
});
asyncTest('fromElement', function() {
ok(typeof fabric.Path.fromElement == 'function');
ok(typeof fabric.Path.fromElement === 'function');
var elPath = fabric.document.createElement('path');
elPath.setAttribute('d', 'M 100 100 L 300 100 L 200 300 z');