lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2026-03-03 16:58:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactored setLineDash a bit, added comments, and added a context trace assertion that tests line dash

Browse Source
This commit is contained in:
Eric Rowell
2013-09-14 00:56:17 -07:00
parent 659d0409b3
commit 6131385a4e
3 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Context.js
View File

@@ -2,6 +2,8 @@
var COMMA = ',', var COMMA = ',',
OPEN_PAREN = '(', OPEN_PAREN = '(',
CLOSE_PAREN = ')', CLOSE_PAREN = ')',
OPEN_PAREN_BRACKET = '([',
CLOSE_BRACKET_PAREN = '])',
EMPTY_STRING = '', EMPTY_STRING = '',
EQUALS = '=', EQUALS = '=',
SET = 'set', SET = 'set',
@@ -29,6 +31,7 @@
'rotate', 'rotate',
'save', 'save',
'scale', 'scale',
'setLineDash',
'setTransform', 'setTransform',
'stroke', 'stroke',
'strokeText', 'strokeText',
@@ -291,6 +294,25 @@
var a = arguments; var a = arguments;
this._context.scale(a[0], a[1]); this._context.scale(a[0], a[1]);
}, },
setLineDash: function() {
var a = arguments,
_context = this._context;
// works for Chrome and IE11
if(this._context.setLineDash) {
_context.setLineDash(a[0]);
}
// verified that this works in firefox
else if('mozDash' in _context) {
_context.mozDash = a[0];
}
// does not currently work for Safari
else if('webkitLineDash' in _context) {
_context.webkitLineDash = a[0];
}
// no support for IE9 and IE10
},
setTransform: function() { setTransform: function() {
var a = arguments; var a = arguments;
this._context.setTransform(a[0], a[1], a[2], a[3], a[4], a[5]); this._context.setTransform(a[0], a[1], a[2], a[3], a[4], a[5]);
@@ -326,7 +348,12 @@
that[methodName] = function() { that[methodName] = function() {
args = _roundArrValues(Array.prototype.slice.call(arguments, 0)); args = _roundArrValues(Array.prototype.slice.call(arguments, 0));
ret = origMethod.apply(that, arguments); ret = origMethod.apply(that, arguments);
that._trace(methodName + OPEN_PAREN + args.join(COMMA) + CLOSE_PAREN); if (Kinetic.Util._isArray(args[0])) {
that._trace(methodName + OPEN_PAREN_BRACKET + args.join(COMMA) + CLOSE_BRACKET_PAREN);
}
else {
that._trace(methodName + OPEN_PAREN + args.join(COMMA) + CLOSE_PAREN);
}
return ret; return ret;
}; };
})(CONTEXT_METHODS[n]); })(CONTEXT_METHODS[n]);
@@ -451,8 +478,7 @@
} }
}, },
_stroke: function(shape, skipShadow) { _stroke: function(shape, skipShadow) {
var _context = this._context, var stroke = shape.getStroke(),
stroke = shape.getStroke(),
strokeWidth = shape.getStrokeWidth(), strokeWidth = shape.getStrokeWidth(),
dashArray = shape.getDashArray(); dashArray = shape.getDashArray();
@@ -463,15 +489,7 @@
} }
this._applyLineCap(shape); this._applyLineCap(shape);
if(dashArray && shape.getDashArrayEnabled()) { if(dashArray && shape.getDashArrayEnabled()) {
if(_context.setLineDash) { this.setLineDash(dashArray);
_context.setLineDash(dashArray);
}
else if('mozDash' in _context) {
_context.mozDash = dashArray;
}
else if('webkitLineDash' in _context) {
_context.webkitLineDash = dashArray;
}
} }
if(!skipShadow && shape.hasShadow()) { if(!skipShadow && shape.hasShadow()) {
this._applyShadow(shape); this._applyShadow(shape);

9
test/unit/Layer-test.js
View File

@@ -21,14 +21,7 @@ suite('Layer', function() {
var style = layer.getCanvas()._canvas.style; var style = layer.getCanvas()._canvas.style;
assert.equal(style.position, 'absolute', 'canvas position style should be absolute'); assert.equal(style.position, 'absolute', 'canvas position style should be absolute');
assert.equal(style.border.indexOf('0px'), 0, 'canvas border style should be 0px');
if (Kinetic.UA.browser === 'mozilla') {
assert.equal(style.border, '0px none', 'canvas border style should be 0px');
}
else {
assert.equal(style.border, '0px', 'canvas border style should be 0px');
}
assert.equal(style.margin, '0px', 'canvas margin style should be 0px'); assert.equal(style.margin, '0px', 'canvas margin style should be 0px');
assert.equal(style.padding, '0px', 'canvas padding style should be 0px'); assert.equal(style.padding, '0px', 'canvas padding style should be 0px');
assert.equal(style.backgroundColor, 'transparent', 'canvas backgroundColor style should be transparent'); assert.equal(style.backgroundColor, 'transparent', 'canvas backgroundColor style should be transparent');

4
test/unit/Shape-test.js
View File

@@ -407,6 +407,10 @@ suite('Shape-test', function() {
assert.equal(circle.getShadowEnabled(), true, 'shadowEnabled should be true'); assert.equal(circle.getShadowEnabled(), true, 'shadowEnabled should be true');
assert.equal(circle.getDashArrayEnabled(), true, 'dashArrayEnabled should be true'); assert.equal(circle.getDashArrayEnabled(), true, 'dashArrayEnabled should be true');
var trace = layer.getContext().getTrace();
//console.log(trace);
assert.equal(trace, 'clearRect(0,0,578,200);save();transform(1,0,0,1,289,100);beginPath();arc(0,0,70,0,6.283,false);closePath();save();shadowColor=black;shadowBlur=10;shadowOffsetX=10;shadowOffsetY=10;fillStyle=green;fill();restore();fillStyle=green;fill();setLineDash([10,10]);lineWidth=4;strokeStyle=black;stroke();restore()');
}); });