lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-05-02 20:05:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleaned up undefined, null, 0, and '' comparison operators. To unset a attribute, you can now set it to null, 0, or ''. Setting an attribute to undefined will have no effect

Browse Source
This commit is contained in:
Eric Rowell 2012-06-22 13:15:29 -07:00
parent 40a92a9988
commit 422791a99a
9 changed files with 56 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dist/kinetic-core.js vendored
View File

@ -3,7 +3,7 @@
* http://www.kineticjs.com/
* Copyright 2012, Eric Rowell
* Licensed under the MIT or GPL Version 2 licenses.
* Date: Jun 21 2012
* Date: Jun 22 2012
*
* Copyright (C) 2011 - 2012 by Eric Rowell
*
@ -172,11 +172,14 @@ Kinetic.GlobalObject = {
},
_isObject: function(obj) {
//return obj === Object(obj);
return (obj !== undefined && obj.constructor == Object);
return (!!obj && obj.constructor == Object);
},
_isNumber: function(obj) {
return Object.prototype.toString.call(obj) == '[object Number]';
},
/*
* other utils
*/
_hasMethods: function(obj) {
var names = [];
for(var key in obj) {
@ -563,7 +566,6 @@ Kinetic.Node.prototype = {
// set properties from config
if(config !== undefined) {
function setAttrs(obj, c, level) {
for(var key in c) {
var val = c[key];
@ -2792,10 +2794,6 @@ Kinetic.GlobalObject.extend(Kinetic.Group, Kinetic.Node);
*/
Kinetic.Shape = function(config) {
this.setDefaultAttrs({
fill: undefined,
stroke: undefined,
strokeWidth: undefined,
lineJoin: undefined,
detectionType: 'path',
shadow: {
blur: 10,
@ -2844,6 +2842,7 @@ Kinetic.Shape.prototype = {
* shadows if needed
*/
stroke: function() {
var go = Kinetic.GlobalObject;
var appliedShadow = false;
var context = this.getContext();
context.save();
@ -2894,16 +2893,16 @@ Kinetic.Shape.prototype = {
context.fill();
}
// pattern
else if(fill.image !== undefined) {
var repeat = fill.repeat === undefined ? 'repeat' : fill.repeat;
else if(!!fill.image) {
var repeat = !fill.repeat ? 'repeat' : fill.repeat;
f = context.createPattern(fill.image, repeat);
context.save();
if(fill.scale !== undefined) {
if(!!fill.scale) {
context.scale(fill.scale.x, fill.scale.y);
}
if(fill.offset !== undefined) {
if(!!fill.offset) {
context.translate(fill.offset.x, fill.offset.y);
}
@ -2912,7 +2911,7 @@ Kinetic.Shape.prototype = {
context.restore();
}
// linear gradient
else if(s.radius === undefined && e.radius === undefined) {
else if(!s.radius && !e.radius) {
var context = this.getContext();
var grd = context.createLinearGradient(s.x, s.y, e.x, e.y);
var colorStops = fill.colorStops;
@ -2926,7 +2925,7 @@ Kinetic.Shape.prototype = {
context.fill();
}
// radial gradient
else if(s.radius !== undefined && e.radius !== undefined) {
else if(!!s.radius && !!e.radius) {
var context = this.getContext();
var grd = context.createRadialGradient(s.x, s.y, s.radius, e.x, e.y, e.radius);
var colorStops = fill.colorStops;
@ -2961,7 +2960,7 @@ Kinetic.Shape.prototype = {
var appliedShadow = false;
var context = this.getContext();
context.save();
if(this.attrs.textFill !== undefined) {
if(!!this.attrs.textFill) {
if(!this.appliedShadow) {
appliedShadow = this._applyShadow();
}
@ -2985,16 +2984,16 @@ Kinetic.Shape.prototype = {
var appliedShadow = false;
var context = this.getContext();
context.save();
if(this.attrs.textStroke !== undefined || this.attrs.textStrokeWidth !== undefined) {
if(!!this.attrs.textStroke || !!this.attrs.textStrokeWidth) {
if(!this.appliedShadow) {
appliedShadow = this._applyShadow();
}
// defaults
if(this.attrs.textStroke === undefined) {
if(!!this.attrs.textStroke) {
this.attrs.textStroke = 'black';
}
else if(this.attrs.textStrokeWidth === undefined) {
else if(!!this.attrs.textStrokeWidth && this.attrs.textStrokeWidth !== 0) {
this.attrs.textStrokeWidth = 2;
}
context.lineWidth = this.attrs.textStrokeWidth;
@ -3043,7 +3042,7 @@ Kinetic.Shape.prototype = {
*/
applyLineJoin: function() {
var context = this.getContext();
if(this.attrs.lineJoin !== undefined) {
if(!!this.attrs.lineJoin) {
context.lineJoin = this.attrs.lineJoin;
}
},
@ -3055,11 +3054,11 @@ Kinetic.Shape.prototype = {
var context = this.getContext();
var s = this.attrs.shadow;
if(s !== undefined) {
if(!!s) {
var aa = this.getAbsoluteAlpha();
var sa = this.attrs.shadow.alpha;
if(sa !== undefined && s.color !== undefined) {
if(!!sa && !!s.color) {
context.globalAlpha = sa * aa;
context.shadowColor = s.color;
context.shadowBlur = s.blur;
@ -3117,11 +3116,11 @@ Kinetic.Shape.prototype = {
else {
var w = stage.attrs.width;
var alpha = this.data[((w * pos.y) + pos.x) * 4 + 3];
return (alpha !== undefined && alpha !== 0);
return (!!alpha);
}
},
_draw: function(layer) {
if(layer !== undefined && this.attrs.drawFunc !== undefined) {
if(!!layer && !!this.attrs.drawFunc) {
var stage = layer.getStage();
var context = layer.getContext();
var family = [];
@ -3473,9 +3472,9 @@ Kinetic.Image = function(config) {
this.shapeType = "Image";
config.drawFunc = function() {
if(this.attrs.image !== undefined) {
var width = this.attrs.width !== undefined ? this.attrs.width : this.attrs.image.width;
var height = this.attrs.height !== undefined ? this.attrs.height : this.attrs.image.height;
if(!!this.attrs.image) {
var width = !!this.attrs.width ? this.attrs.width : this.attrs.image.width;
var height = !!this.attrs.height ? this.attrs.height : this.attrs.image.height;
var cropX = this.attrs.crop.x;
var cropY = this.attrs.crop.y;
var cropWidth = this.attrs.crop.width;
@ -3490,7 +3489,7 @@ Kinetic.Image = function(config) {
this.stroke();
// if cropping
if(cropWidth !== undefined && cropHeight !== undefined) {
if(!!cropWidth && !!cropHeight) {
this.drawImage(this.attrs.image, cropX, cropY, cropWidth, cropHeight, 0, 0, width, height);
}
// no cropping
@ -3597,7 +3596,7 @@ Kinetic.Sprite = function(config) {
});
config.drawFunc = function() {
if(this.attrs.image !== undefined) {
if(!!this.attrs.image) {
var context = this.getContext();
var anim = this.attrs.animation;
var index = this.attrs.index;

6
dist/kinetic-core.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
src/GlobalObject.js
View File

@ -144,11 +144,14 @@ Kinetic.GlobalObject = {
},
_isObject: function(obj) {
//return obj === Object(obj);
return (obj !== undefined && obj.constructor == Object);
return (!!obj && obj.constructor == Object);
},
_isNumber: function(obj) {
return Object.prototype.toString.call(obj) == '[object Number]';
},
/*
* other utils
*/
_hasMethods: function(obj) {
var names = [];
for(var key in obj) {

1
src/Node.js
View File

@ -180,7 +180,6 @@ Kinetic.Node.prototype = {
// set properties from config
if(config !== undefined) {
function setAttrs(obj, c, level) {
for(var key in c) {
var val = c[key];

35
src/Shape.js
View File

@ -19,10 +19,6 @@
*/
Kinetic.Shape = function(config) {
this.setDefaultAttrs({
fill: undefined,
stroke: undefined,
strokeWidth: undefined,
lineJoin: undefined,
detectionType: 'path',
shadow: {
blur: 10,
@ -71,6 +67,7 @@ Kinetic.Shape.prototype = {
* shadows if needed
*/
stroke: function() {
var go = Kinetic.GlobalObject;
var appliedShadow = false;
var context = this.getContext();
context.save();
@ -121,16 +118,16 @@ Kinetic.Shape.prototype = {
context.fill();
}
// pattern
else if(fill.image !== undefined) {
var repeat = fill.repeat === undefined ? 'repeat' : fill.repeat;
else if(!!fill.image) {
var repeat = !fill.repeat ? 'repeat' : fill.repeat;
f = context.createPattern(fill.image, repeat);
context.save();
if(fill.scale !== undefined) {
if(!!fill.scale) {
context.scale(fill.scale.x, fill.scale.y);
}
if(fill.offset !== undefined) {
if(!!fill.offset) {
context.translate(fill.offset.x, fill.offset.y);
}
@ -139,7 +136,7 @@ Kinetic.Shape.prototype = {
context.restore();
}
// linear gradient
else if(s.radius === undefined && e.radius === undefined) {
else if(!s.radius && !e.radius) {
var context = this.getContext();
var grd = context.createLinearGradient(s.x, s.y, e.x, e.y);
var colorStops = fill.colorStops;
@ -153,7 +150,7 @@ Kinetic.Shape.prototype = {
context.fill();
}
// radial gradient
else if(s.radius !== undefined && e.radius !== undefined) {
else if(!!s.radius && !!e.radius) {
var context = this.getContext();
var grd = context.createRadialGradient(s.x, s.y, s.radius, e.x, e.y, e.radius);
var colorStops = fill.colorStops;
@ -188,7 +185,7 @@ Kinetic.Shape.prototype = {
var appliedShadow = false;
var context = this.getContext();
context.save();
if(this.attrs.textFill !== undefined) {
if(!!this.attrs.textFill) {
if(!this.appliedShadow) {
appliedShadow = this._applyShadow();
}
@ -212,16 +209,16 @@ Kinetic.Shape.prototype = {
var appliedShadow = false;
var context = this.getContext();
context.save();
if(this.attrs.textStroke !== undefined || this.attrs.textStrokeWidth !== undefined) {
if(!!this.attrs.textStroke || !!this.attrs.textStrokeWidth) {
if(!this.appliedShadow) {
appliedShadow = this._applyShadow();
}
// defaults
if(this.attrs.textStroke === undefined) {
if(!!this.attrs.textStroke) {
this.attrs.textStroke = 'black';
}
else if(this.attrs.textStrokeWidth === undefined) {
else if(!!this.attrs.textStrokeWidth && this.attrs.textStrokeWidth !== 0) {
this.attrs.textStrokeWidth = 2;
}
context.lineWidth = this.attrs.textStrokeWidth;
@ -270,7 +267,7 @@ Kinetic.Shape.prototype = {
*/
applyLineJoin: function() {
var context = this.getContext();
if(this.attrs.lineJoin !== undefined) {
if(!!this.attrs.lineJoin) {
context.lineJoin = this.attrs.lineJoin;
}
},
@ -282,11 +279,11 @@ Kinetic.Shape.prototype = {
var context = this.getContext();
var s = this.attrs.shadow;
if(s !== undefined) {
if(!!s) {
var aa = this.getAbsoluteAlpha();
var sa = this.attrs.shadow.alpha;
if(sa !== undefined && s.color !== undefined) {
if(!!sa && !!s.color) {
context.globalAlpha = sa * aa;
context.shadowColor = s.color;
context.shadowBlur = s.blur;
@ -344,11 +341,11 @@ Kinetic.Shape.prototype = {
else {
var w = stage.attrs.width;
var alpha = this.data[((w * pos.y) + pos.x) * 4 + 3];
return (alpha !== undefined && alpha !== 0);
return (!!alpha);
}
},
_draw: function(layer) {
if(layer !== undefined && this.attrs.drawFunc !== undefined) {
if(!!layer && !!this.attrs.drawFunc) {
var stage = layer.getStage();
var context = layer.getContext();
var family = [];

8
src/shapes/Image.js
View File

@ -19,9 +19,9 @@ Kinetic.Image = function(config) {
this.shapeType = "Image";
config.drawFunc = function() {
if(this.attrs.image !== undefined) {
var width = this.attrs.width !== undefined ? this.attrs.width : this.attrs.image.width;
var height = this.attrs.height !== undefined ? this.attrs.height : this.attrs.image.height;
if(!!this.attrs.image) {
var width = !!this.attrs.width ? this.attrs.width : this.attrs.image.width;
var height = !!this.attrs.height ? this.attrs.height : this.attrs.image.height;
var cropX = this.attrs.crop.x;
var cropY = this.attrs.crop.y;
var cropWidth = this.attrs.crop.width;
@ -36,7 +36,7 @@ Kinetic.Image = function(config) {
this.stroke();
// if cropping
if(cropWidth !== undefined && cropHeight !== undefined) {
if(!!cropWidth && !!cropHeight) {
this.drawImage(this.attrs.image, cropX, cropY, cropWidth, cropHeight, 0, 0, width, height);
}
// no cropping

2
src/shapes/Sprite.js
View File

@ -14,7 +14,7 @@ Kinetic.Sprite = function(config) {
});
config.drawFunc = function() {
if(this.attrs.image !== undefined) {
if(!!this.attrs.image) {
var context = this.getContext();
var anim = this.attrs.animation;
var index = this.attrs.index;

2
tests/js/manualTests.js
View File

@ -304,7 +304,7 @@ Test.prototype.tests = {
});
darth.on('mouseout', function() {
this.setStroke(undefined);
this.setStroke(null);
this.setStrokeWidth(0);
layer.draw();
});

2
tests/js/unitTests.js
View File

@ -368,7 +368,7 @@ Test.prototype.tests = {
//console.log(stage.toJSON())
var expectedJson = '{"attrs":{"width":578,"height":200,"throttle":80,"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false},"nodeType":"Stage","children":[{"attrs":{"throttle":80,"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false},"nodeType":"Layer","children":[{"attrs":{"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false},"nodeType":"Group","children":[{"attrs":{"fill":"#00D2FF","stroke":"black","strokeWidth":4,"detectionType":"path","shadow":{"blur":10,"alpha":1,"offset":{"x":0,"y":0}},"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"id":"myTriangle"},"nodeType":"Shape"}]}]}]}';
var expectedJson = '{"attrs":{"width":578,"height":200,"throttle":80,"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false},"nodeType":"Stage","children":[{"attrs":{"throttle":80,"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false},"nodeType":"Layer","children":[{"attrs":{"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false},"nodeType":"Group","children":[{"attrs":{"detectionType":"path","shadow":{"blur":10,"alpha":1,"offset":{"x":0,"y":0}},"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"fill":"#00D2FF","stroke":"black","strokeWidth":4,"id":"myTriangle"},"nodeType":"Shape"}]}]}]}';
test(stage.toJSON() === expectedJson, "problem serializing stage with custom shape");
/*