lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-06-28 15:23:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

linting fixes

Browse Source
This commit is contained in:
lavrton 2015-10-22 07:32:07 +02:00
parent ba674dbbb4
commit bd910a8bc7
44 changed files with 567 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
.eslintrc
View File

@ -1,23 +1,173 @@
{ {
"ecmaFeatures": {
"blockBindings": true,
"forOf": true,
"jsx": true
},
"env": { "env": {
"browser": true, "browser": true,
"node": true "node": true
}, },
"rules": { "rules": {
"semi": 2, "no-alert": 0,
"quotes": [2, "single"], "no-array-constructor": 2,
"no-bitwise": 0,
"no-caller": 2,
"no-catch-shadow": 2,
"comma-dangle": 2,
"no-underscore-dangle": 0, "no-underscore-dangle": 0,
"no-cond-assign": 2,
"no-console": 0,
"no-constant-condition": 0,
"no-continue": 0,
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-div-regex": 0,
"no-dupe-keys": 2,
"no-dupe-args": 2,
"no-duplicate-case": 2,
"no-else-return": 1,
"no-empty": 2,
"no-empty-class": 0,
"no-empty-character-class": 2,
"no-empty-label": 2,
"no-eq-null": 2,
"no-eval": 2,
"no-ex-assign": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": 0,
"no-extra-semi": 2,
"no-fallthrough": 2,
"no-floating-decimal": 0,
"no-func-assign": 2,
"no-implied-eval": 2,
"no-inline-comments": 0,
"no-inner-declarations": [2, "functions"],
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-lonely-if": 0,
"no-loop-func": 2,
"no-mixed-requires": [1, false],
"no-mixed-spaces-and-tabs": [2, false],
"linebreak-style": [1, "unix"],
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-multiple-empty-lines": [1, {"max": 3}],
"no-native-reassign": 2,
"no-negated-in-lhs": 2,
"no-nested-ternary": 0,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-require": 0,
"no-new-wrappers": 2,
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-param-reassign": 0,
"no-path-concat": 0,
"no-plusplus": 0,
"no-process-env": 0,
"no-process-exit": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-reserved-keys": 0,
"no-restricted-modules": 0,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 0,
"no-sequences": 2,
"no-shadow": 2,
"no-shadow-restricted-names": 2,
"no-spaced-func": 2,
"no-sparse-arrays": 2,
"no-sync": 0,
"no-ternary": 0,
"no-trailing-spaces": 2,
"no-throw-literal": 1,
"no-undef": 2,
"no-undef-init": 2,
"no-undefined": 0,
"no-unneeded-ternary": 2,
"no-unreachable": 2,
"no-unused-expressions": 2,
"no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
"no-use-before-define": 2,
"no-void": 0,
"no-var": 0,
"prefer-const": 0,
"no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
"no-with": 2,
"accessor-pairs": 0,
"block-scoped-var": 0,
"brace-style": [0, "1tbs"],
"camelcase": 1,
"comma-dangle": [2, "never"],
"comma-spacing": 2,
"comma-style": 0,
"complexity": [1, 11],
"computed-property-spacing": [0, "never"],
"consistent-return": 2,
"consistent-this": [0, "that"],
"curly": [2, "all"],
"default-case": 0,
"dot-location": 0,
"dot-notation": [2, { "allowKeywords": true }],
"eol-last": 0,
"eqeqeq": 2,
"func-names": 0,
"func-style": [1, "declaration"],
"generator-star": 0,
"generator-star-spacing": 0,
"guard-for-in": 1,
"handle-callback-err": 2,
"indent": 0,
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
"lines-around-comment": 0,
"max-depth": [2, 4],
"max-len": [2, 320, 4],
"max-nested-callbacks": [2, 2],
"max-params": [1, 8],
"max-statements": [1, 20],
"new-cap": 0,
"new-parens": 2,
"newline-after-var": 0,
"object-curly-spacing": [0, "never"],
"object-shorthand": 0,
"one-var": 0,
"operator-assignment": [0, "always"],
"operator-linebreak": 0,
"padded-blocks": 0,
"quote-props": 0,
"quotes": [2, "single"],
"radix": 0,
"semi": 2,
"semi-spacing": [2, {"before": false, "after": true}],
"sort-vars": 0,
"space-after-function-name": [0, "never"],
"space-after-keywords": [0, "always"],
"space-before-blocks": [0, "always"],
"space-before-function-paren": [0, "always"],
"space-before-function-parentheses": [0, "always"],
"space-in-brackets": [0, "never"],
"space-in-parens": [0, "never"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"spaced-comment": 0,
"spaced-line-comment": [0, "always"],
"strict": 2,
"use-isnan": 2,
"valid-jsdoc": 0, "valid-jsdoc": 0,
"no-constant-condition": 1, "valid-typeof": 2,
"strict": [0, "never"], "vars-on-top": 0,
"camelcase": 0, "wrap-iife": 0,
"space-infix-ops": 0, "wrap-regex": 0,
"new-cap": 0 "yoda": [2, "never"]
}, },
"globals": { "globals": {
"Konva" : false, "Konva" : false,

3
bower.json
View File

@ -23,7 +23,8 @@
"package.json", "package.json",
".travis.yml", ".travis.yml",
".gitignore", ".gitignore",
"Gruntfile.js" "Gruntfile.js",
"gulpfile.js"
], ],
"main": "konva.min.js" "main": "konva.min.js"
} }

332
konva.js
View File

@ -3,7 +3,7 @@
* Konva JavaScript Framework v0.9.9 * Konva JavaScript Framework v0.9.9
* http://konvajs.github.io/ * http://konvajs.github.io/
* Licensed under the MIT or GPL Version 2 licenses. * Licensed under the MIT or GPL Version 2 licenses.
* Date: Mon Oct 12 2015 * Date: Thu Oct 22 2015
* *
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS) * Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
* Modified work Copyright (C) 2014 - 2015 by Anton Lavrenov (Konva) * Modified work Copyright (C) 2014 - 2015 by Anton Lavrenov (Konva)
@ -30,7 +30,6 @@
/** /**
* @namespace Konva * @namespace Konva
*/ */
/*jshint -W079, -W020*/
var Konva = {}; var Konva = {};
(function(root) { (function(root) {
'use strict'; 'use strict';
@ -114,9 +113,8 @@ var Konva = {};
// drag and drop is not even possible // drag and drop is not even possible
if (dd) { if (dd) {
return dd.isDragging; return dd.isDragging;
} else {
return false;
} }
return false;
}, },
/** /**
* returns whether or not a drag and drop operation is ready, but may * returns whether or not a drag and drop operation is ready, but may
@ -131,9 +129,8 @@ var Konva = {};
// drag and drop is not even possible // drag and drop is not even possible
if (dd) { if (dd) {
return !!dd.node; return !!dd.node;
} else {
return false;
} }
return false;
}, },
_addId: function(node, id) { _addId: function(node, id) {
if(id !== undefined) { if(id !== undefined) {
@ -2138,6 +2135,9 @@ var Konva = {};
} }
for (key in val) { for (key in val) {
if (!val.hasOwnProperty(key)) {
continue;
}
this._setAttr(attr + capitalize(key), val[key]); this._setAttr(attr + capitalize(key), val[key]);
} }
@ -2164,9 +2164,7 @@ var Konva = {};
return this; return this;
} }
// getting // getting
else {
return this[getter](); return this[getter]();
}
}; };
}, },
addDeprecatedGetterSetter: function(constructor, attr, def, validator) { addDeprecatedGetterSetter: function(constructor, attr, def, validator) {
@ -2205,9 +2203,8 @@ var Konva = {};
return 255; return 255;
} else if (val < 0) { } else if (val < 0) {
return 0; return 0;
} else {
return Math.round(val);
} }
return Math.round(val);
}, },
alphaComponent: function(val) { alphaComponent: function(val) {
if (val > 1) { if (val > 1) {
@ -2217,10 +2214,9 @@ var Konva = {};
else if (val < 0.0001) { else if (val < 0.0001) {
return 0.0001; return 0.0001;
} }
else {
return val; return val;
} }
}
}; };
})(); })();
@ -2515,7 +2511,7 @@ var Konva = {};
getClientRect: function() { getClientRect: function() {
// abstract method // abstract method
// redefine in Container and Shape // redefine in Container and Shape
throw 'abstract "getClientRect" method call'; throw new Error('abstract "getClientRect" method call');
}, },
_transformedRect: function(rect) { _transformedRect: function(rect) {
var points = [ var points = [
@ -2605,9 +2601,7 @@ var Konva = {};
return filterCanvas; return filterCanvas;
} }
else {
return sceneCanvas; return sceneCanvas;
}
}, },
/** /**
* bind events to the node. KonvaJS supports mouseover, mousemove, * bind events to the node. KonvaJS supports mouseover, mousemove,
@ -2819,9 +2813,7 @@ var Konva = {};
return this[method](); return this[method]();
} }
// otherwise get directly // otherwise get directly
else {
return this.attrs[attr]; return this.attrs[attr];
}
}, },
/** /**
* get ancestors * get ancestors
@ -4464,6 +4456,7 @@ var Konva = {};
})(Konva); })(Konva);
(function() { (function() {
'use strict';
/** /**
* Grayscale Filter * Grayscale Filter
* @function * @function
@ -4491,6 +4484,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
/** /**
* Brighten Filter. * Brighten Filter.
* @function * @function
@ -4531,6 +4525,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
/** /**
* Invert Filter * Invert Filter
* @function * @function
@ -4561,6 +4556,7 @@ var Konva = {};
master repo: https://github.com/pavelpower/kineticjsGaussFilter master repo: https://github.com/pavelpower/kineticjsGaussFilter
*/ */
(function() { (function() {
'use strict';
/* /*
StackBlur - a fast almost Gaussian Blur For Canvas StackBlur - a fast almost Gaussian Blur For Canvas
@ -4916,8 +4912,9 @@ var Konva = {};
*/ */
})(); })();
/*eslint-disable max-depth */
(function() { (function() {
'use strict';
function pixelAt(idata, x, y) { function pixelAt(idata, x, y) {
var idx = (y * idata.width + x) * 4; var idx = (y * idata.width + x) * 4;
var d = []; var d = [];
@ -5115,6 +5112,7 @@ var Konva = {};
})(); })();
(function () { (function () {
'use strict';
/** /**
* RGB Filter * RGB Filter
* @function * @function
@ -5137,10 +5135,10 @@ var Konva = {};
i, brightness; i, brightness;
for (i = 0; i < nPixels; i += 4) { for (i = 0; i < nPixels; i += 4) {
brightness = (0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2])/255; brightness = (0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2]) / 255;
data[i] = brightness*red; // r data[i] = brightness * red; // r
data[i + 1] = brightness*green; // g data[i + 1] = brightness * green; // g
data[i + 2] = brightness*blue; // b data[i + 2] = brightness * blue; // b
data[i + 3] = data[i + 3]; // alpha data[i + 3] = data[i + 3]; // alpha
} }
}; };
@ -5199,6 +5197,7 @@ var Konva = {};
})(); })();
(function () { (function () {
'use strict';
/** /**
* RGBA Filter * RGBA Filter
* @function * @function
@ -5306,7 +5305,7 @@ var Konva = {};
})(); })();
(function () { (function () {
'use strict';
/** /**
* HSV Filter. Adjusts the hue, saturation and value * HSV Filter. Adjusts the hue, saturation and value
* @function * @function
@ -5401,6 +5400,7 @@ var Konva = {};
})(); })();
(function () { (function () {
'use strict';
Konva.Factory.addGetterSetter(Konva.Node, 'hue', 0, null, Konva.Factory.afterSetFilter); Konva.Factory.addGetterSetter(Konva.Node, 'hue', 0, null, Konva.Factory.afterSetFilter);
/** /**
@ -5494,6 +5494,7 @@ var Konva = {};
})(); })();
(function () { (function () {
'use strict';
/** /**
* Emboss Filter. * Emboss Filter.
* Pixastic Lib - Emboss filter - v0.1.0 * Pixastic Lib - Emboss filter - v0.1.0
@ -5675,6 +5676,7 @@ var Konva = {};
})(); })();
(function () { (function () {
'use strict';
function remap(fromValue, fromMin, fromMax, toMin, toMax) { function remap(fromValue, fromMin, fromMax, toMin, toMax) {
// Compute the range of the data // Compute the range of the data
var fromRange = fromMax - fromMin, var fromRange = fromMax - fromMin,
@ -5791,7 +5793,7 @@ var Konva = {};
})(); })();
(function () { (function () {
'use strict';
/** /**
* Posterize Filter. Adjusts the channels so that there are no more * Posterize Filter. Adjusts the channels so that there are no more
* than n different values for that channel. This is also applied * than n different values for that channel. This is also applied
@ -5833,6 +5835,7 @@ var Konva = {};
})(); })();
(function () { (function () {
'use strict';
/** /**
* Noise Filter. Randomly adds or substracts to the color channels * Noise Filter. Randomly adds or substracts to the color channels
@ -5872,8 +5875,9 @@ var Konva = {};
*/ */
})(); })();
/*eslint-disable max-depth */
(function () { (function () {
'use strict';
/** /**
* Pixelate Filter. Averages groups of pixels and redraws * Pixelate Filter. Averages groups of pixels and redraws
* them as larger pixels * them as larger pixels
@ -5967,7 +5971,7 @@ var Konva = {};
})(); })();
(function () { (function () {
'use strict';
/** /**
* Threshold Filter. Pushes any value above the mid point to * Threshold Filter. Pushes any value above the mid point to
* the max and any value below the mid point to the min. * the max and any value below the mid point to the min.
@ -6007,6 +6011,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
/** /**
* Sepia Filter * Sepia Filter
* Based on: Pixastic Lib - Sepia filter - v0.1.0 * Based on: Pixastic Lib - Sepia filter - v0.1.0
@ -6025,33 +6030,34 @@ var Konva = {};
var data = imageData.data, var data = imageData.data,
w = imageData.width, w = imageData.width,
y = imageData.height, y = imageData.height,
w4 = w*4, w4 = w * 4,
offsetY, x, offset, or, og, ob, r, g, b; offsetY, x, offset, or, og, ob, r, g, b;
do { do {
offsetY = (y-1)*w4; offsetY = (y - 1) * w4;
x = w; x = w;
do { do {
offset = offsetY + (x-1)*4; offset = offsetY + (x - 1) * 4;
or = data[offset]; or = data[offset];
og = data[offset+1]; og = data[offset + 1];
ob = data[offset+2]; ob = data[offset + 2];
r = or * 0.393 + og * 0.769 + ob * 0.189; r = or * 0.393 + og * 0.769 + ob * 0.189;
g = or * 0.349 + og * 0.686 + ob * 0.168; g = or * 0.349 + og * 0.686 + ob * 0.168;
b = or * 0.272 + og * 0.534 + ob * 0.131; b = or * 0.272 + og * 0.534 + ob * 0.131;
data[offset] = r > 255 ? 255 : r; data[offset] = r > 255 ? 255 : r;
data[offset+1] = g > 255 ? 255 : g; data[offset + 1] = g > 255 ? 255 : g;
data[offset+2] = b > 255 ? 255 : b; data[offset + 2] = b > 255 ? 255 : b;
data[offset+3] = data[offset+3]; data[offset + 3] = data[offset + 3];
} while (--x); } while (--x);
} while (--y); } while (--y);
}; };
})(); })();
(function () { (function () {
'use strict';
/** /**
* Solarize Filter * Solarize Filter
* Pixastic Lib - Solarize filter - v0.1.0 * Pixastic Lib - Solarize filter - v0.1.0
@ -6069,17 +6075,17 @@ var Konva = {};
var data = imageData.data, var data = imageData.data,
w = imageData.width, w = imageData.width,
h = imageData.height, h = imageData.height,
w4 = w*4, w4 = w * 4,
y = h; y = h;
do { do {
var offsetY = (y-1)*w4; var offsetY = (y - 1) * w4;
var x = w; var x = w;
do { do {
var offset = offsetY + (x-1)*4; var offset = offsetY + (x - 1) * 4;
var r = data[offset]; var r = data[offset];
var g = data[offset+1]; var g = data[offset + 1];
var b = data[offset+2]; var b = data[offset + 2];
if (r > 127) { if (r > 127) {
r = 255 - r; r = 255 - r;
@ -6092,8 +6098,8 @@ var Konva = {};
} }
data[offset] = r; data[offset] = r;
data[offset+1] = g; data[offset + 1] = g;
data[offset+2] = b; data[offset + 2] = b;
} while (--x); } while (--x);
} while (--y); } while (--y);
}; };
@ -6102,6 +6108,7 @@ var Konva = {};
(function () { (function () {
'use strict';
/* /*
* ToPolar Filter. Converts image data to polar coordinates. Performs * ToPolar Filter. Converts image data to polar coordinates. Performs
@ -6125,16 +6132,16 @@ var Konva = {};
dstPixels = dst.data, dstPixels = dst.data,
xSize = src.width, xSize = src.width,
ySize = src.height, ySize = src.height,
xMid = opt.polarCenterX || xSize/2, xMid = opt.polarCenterX || xSize / 2,
yMid = opt.polarCenterY || ySize/2, yMid = opt.polarCenterY || ySize / 2,
i, x, y, r=0, g=0, b=0, a=0; i, x, y, r = 0, g = 0, b = 0, a = 0;
// Find the largest radius // Find the largest radius
var rad, rMax = Math.sqrt( xMid*xMid + yMid*yMid ); var rad, rMax = Math.sqrt( xMid * xMid + yMid * yMid );
x = xSize - xMid; x = xSize - xMid;
y = ySize - yMid; y = ySize - yMid;
rad = Math.sqrt( x*x + y*y ); rad = Math.sqrt( x * x + y * y );
rMax = (rad > rMax)?rad:rMax; rMax = (rad > rMax) ? rad : rMax;
// We'll be uisng y as the radius, and x as the angle (theta=t) // We'll be uisng y as the radius, and x as the angle (theta=t)
var rSize = ySize, var rSize = ySize,
@ -6143,29 +6150,29 @@ var Konva = {};
// We want to cover all angles (0-360) and we need to convert to // We want to cover all angles (0-360) and we need to convert to
// radians (*PI/180) // radians (*PI/180)
var conversion = 360/tSize*Math.PI/180, sin, cos; var conversion = 360 / tSize * Math.PI / 180, sin, cos;
// var x1, x2, x1i, x2i, y1, y2, y1i, y2i, scale; // var x1, x2, x1i, x2i, y1, y2, y1i, y2i, scale;
for( theta=0; theta<tSize; theta+=1 ){ for( theta = 0; theta < tSize; theta += 1 ){
sin = Math.sin(theta*conversion); sin = Math.sin(theta * conversion);
cos = Math.cos(theta*conversion); cos = Math.cos(theta * conversion);
for( radius=0; radius<rSize; radius+=1 ){ for( radius = 0; radius < rSize; radius += 1 ){
x = Math.floor(xMid+rMax*radius/rSize*cos); x = Math.floor(xMid + rMax * radius / rSize * cos);
y = Math.floor(yMid+rMax*radius/rSize*sin); y = Math.floor(yMid + rMax * radius / rSize * sin);
i = (y*xSize + x)*4; i = (y * xSize + x) * 4;
r = srcPixels[i+0]; r = srcPixels[i + 0];
g = srcPixels[i+1]; g = srcPixels[i + 1];
b = srcPixels[i+2]; b = srcPixels[i + 2];
a = srcPixels[i+3]; a = srcPixels[i + 3];
// Store it // Store it
//i = (theta * xSize + radius) * 4; //i = (theta * xSize + radius) * 4;
i = (theta + radius*xSize) * 4; i = (theta + radius * xSize) * 4;
dstPixels[i+0] = r; dstPixels[i + 0] = r;
dstPixels[i+1] = g; dstPixels[i + 1] = g;
dstPixels[i+2] = b; dstPixels[i + 2] = b;
dstPixels[i+3] = a; dstPixels[i + 3] = a;
} }
} }
@ -6194,17 +6201,17 @@ var Konva = {};
dstPixels = dst.data, dstPixels = dst.data,
xSize = src.width, xSize = src.width,
ySize = src.height, ySize = src.height,
xMid = opt.polarCenterX || xSize/2, xMid = opt.polarCenterX || xSize / 2,
yMid = opt.polarCenterY || ySize/2, yMid = opt.polarCenterY || ySize / 2,
i, x, y, dx, dy, r=0, g=0, b=0, a=0; i, x, y, dx, dy, r = 0, g = 0, b = 0, a = 0;
// Find the largest radius // Find the largest radius
var rad, rMax = Math.sqrt( xMid*xMid + yMid*yMid ); var rad, rMax = Math.sqrt( xMid * xMid + yMid * yMid );
x = xSize - xMid; x = xSize - xMid;
y = ySize - yMid; y = ySize - yMid;
rad = Math.sqrt( x*x + y*y ); rad = Math.sqrt( x * x + y * y );
rMax = (rad > rMax)?rad:rMax; rMax = (rad > rMax) ? rad : rMax;
// We'll be uisng x as the radius, and y as the angle (theta=t) // We'll be uisng x as the radius, and y as the angle (theta=t)
var rSize = ySize, var rSize = ySize,
@ -6219,27 +6226,27 @@ var Konva = {};
var x1, y1; var x1, y1;
for( x=0; x<xSize; x+=1 ){ for( x = 0; x < xSize; x += 1 ){
for( y=0; y<ySize; y+=1 ){ for( y = 0; y < ySize; y += 1 ){
dx = x - xMid; dx = x - xMid;
dy = y - yMid; dy = y - yMid;
radius = Math.sqrt(dx*dx + dy*dy)*rSize/rMax; radius = Math.sqrt(dx * dx + dy * dy) * rSize / rMax;
theta = (Math.atan2(dy, dx)*180/Math.PI + 360 + phaseShift)%360; theta = (Math.atan2(dy, dx) * 180 / Math.PI + 360 + phaseShift) % 360;
theta = theta*tSize/360; theta = theta * tSize / 360;
x1 = Math.floor(theta); x1 = Math.floor(theta);
y1 = Math.floor(radius); y1 = Math.floor(radius);
i = (y1*xSize + x1)*4; i = (y1 * xSize + x1) * 4;
r = srcPixels[i+0]; r = srcPixels[i + 0];
g = srcPixels[i+1]; g = srcPixels[i + 1];
b = srcPixels[i+2]; b = srcPixels[i + 2];
a = srcPixels[i+3]; a = srcPixels[i + 3];
// Store it // Store it
i = (y*xSize + x)*4; i = (y * xSize + x) * 4;
dstPixels[i+0] = r; dstPixels[i + 0] = r;
dstPixels[i+1] = g; dstPixels[i + 1] = g;
dstPixels[i+2] = b; dstPixels[i + 2] = b;
dstPixels[i+3] = a; dstPixels[i + 3] = a;
} }
} }
@ -6270,7 +6277,7 @@ var Konva = {};
var x, y, xoff, i, r, g, b, a, srcPos, dstPos; var x, y, xoff, i, r, g, b, a, srcPos, dstPos;
var power = Math.round( this.kaleidoscopePower() ); var power = Math.round( this.kaleidoscopePower() );
var angle = Math.round( this.kaleidoscopeAngle() ); var angle = Math.round( this.kaleidoscopeAngle() );
var offset = Math.floor(xSize*(angle%360)/360); var offset = Math.floor(xSize * (angle % 360) / 360);
if( power < 1 ){return; } if( power < 1 ){return; }
@ -6281,15 +6288,15 @@ var Konva = {};
// Convert thhe original to polar coordinates // Convert thhe original to polar coordinates
ToPolar( imageData, scratchData, { ToPolar( imageData, scratchData, {
polarCenterX: xSize/2, polarCenterX: xSize / 2,
polarCenterY: ySize/2 polarCenterY: ySize / 2
}); });
// Determine how big each section will be, if it's too small // Determine how big each section will be, if it's too small
// make it bigger // make it bigger
var minSectionSize = xSize / Math.pow(2, power); var minSectionSize = xSize / Math.pow(2, power);
while( minSectionSize <= 8){ while( minSectionSize <= 8){
minSectionSize = minSectionSize*2; minSectionSize = minSectionSize * 2;
power -= 1; power -= 1;
} }
minSectionSize = Math.ceil(minSectionSize); minSectionSize = Math.ceil(minSectionSize);
@ -6301,42 +6308,42 @@ var Konva = {};
var xStart = 0, var xStart = 0,
xEnd = sectionSize, xEnd = sectionSize,
xDelta = 1; xDelta = 1;
if( offset+minSectionSize > xSize ){ if( offset + minSectionSize > xSize ){
xStart = sectionSize; xStart = sectionSize;
xEnd = 0; xEnd = 0;
xDelta = -1; xDelta = -1;
} }
for( y=0; y<ySize; y+=1 ){ for( y = 0; y < ySize; y += 1 ){
for( x=xStart; x !== xEnd; x+=xDelta ){ for( x = xStart; x !== xEnd; x += xDelta ){
xoff = Math.round(x+offset)%xSize; xoff = Math.round(x + offset) % xSize;
srcPos = (xSize*y+xoff)*4; srcPos = (xSize * y + xoff) * 4;
r = scratchData.data[srcPos+0]; r = scratchData.data[srcPos + 0];
g = scratchData.data[srcPos+1]; g = scratchData.data[srcPos + 1];
b = scratchData.data[srcPos+2]; b = scratchData.data[srcPos + 2];
a = scratchData.data[srcPos+3]; a = scratchData.data[srcPos + 3];
dstPos = (xSize*y+x)*4; dstPos = (xSize * y + x) * 4;
scratchData.data[dstPos+0] = r; scratchData.data[dstPos + 0] = r;
scratchData.data[dstPos+1] = g; scratchData.data[dstPos + 1] = g;
scratchData.data[dstPos+2] = b; scratchData.data[dstPos + 2] = b;
scratchData.data[dstPos+3] = a; scratchData.data[dstPos + 3] = a;
} }
} }
// Perform the actual effect // Perform the actual effect
for( y=0; y<ySize; y+=1 ){ for( y = 0; y < ySize; y += 1 ){
sectionSize = Math.floor( minSectionSize ); sectionSize = Math.floor( minSectionSize );
for( i=0; i<power; i+=1 ){ for( i = 0; i < power; i += 1 ){
for( x=0; x<sectionSize+1; x+=1 ){ for( x = 0; x < sectionSize + 1; x += 1 ){
srcPos = (xSize*y+x)*4; srcPos = (xSize * y + x) * 4;
r = scratchData.data[srcPos+0]; r = scratchData.data[srcPos + 0];
g = scratchData.data[srcPos+1]; g = scratchData.data[srcPos + 1];
b = scratchData.data[srcPos+2]; b = scratchData.data[srcPos + 2];
a = scratchData.data[srcPos+3]; a = scratchData.data[srcPos + 3];
dstPos = (xSize*y+sectionSize*2-x-1)*4; dstPos = (xSize * y + sectionSize * 2 - x - 1) * 4;
scratchData.data[dstPos+0] = r; scratchData.data[dstPos + 0] = r;
scratchData.data[dstPos+1] = g; scratchData.data[dstPos + 1] = g;
scratchData.data[dstPos+2] = b; scratchData.data[dstPos + 2] = b;
scratchData.data[dstPos+3] = a; scratchData.data[dstPos + 3] = a;
} }
sectionSize *= 2; sectionSize *= 2;
} }
@ -6439,7 +6446,8 @@ var Konva = {};
getChildren: function(filterFunc) { getChildren: function(filterFunc) {
if (!filterFunc) { if (!filterFunc) {
return this.children; return this.children;
} else { }
var results = new Konva.Collection(); var results = new Konva.Collection();
this.children.each(function(child){ this.children.each(function(child){
if (filterFunc(child)) { if (filterFunc(child)) {
@ -6447,7 +6455,6 @@ var Konva = {};
} }
}); });
return results; return results;
}
}, },
/** /**
* determine if node has children * determine if node has children
@ -9623,13 +9630,11 @@ var Konva = {};
return { return {
shape: shape shape: shape
}; };
} else { }
return { return {
antialiased: true antialiased: true
}; };
} }
}
// antialiased pixel // antialiased pixel
else if(p3 > 0) { else if(p3 > 0) {
return { return {
@ -9637,9 +9642,7 @@ var Konva = {};
}; };
} }
// empty pixel // empty pixel
else {
return {}; return {};
}
}, },
drawScene: function(can, top) { drawScene: function(can, top) {
var layer = this.getLayer(), var layer = this.getLayer(),
@ -9898,11 +9901,10 @@ var Konva = {};
return Konva.root.performance.now(); return Konva.root.performance.now();
}; };
} }
else {
return function() { return function() {
return new Date().getTime(); return new Date().getTime();
}; };
}
})(); })();
function FRAF(callback) { function FRAF(callback) {
@ -9967,6 +9969,7 @@ var Konva = {};
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @param {Konva.Layer|Array} [layers] layer(s) to be redrawn.&nbsp; Can be a layer, an array of layers, or null. Not specifying a node will result in no redraw. * @param {Konva.Layer|Array} [layers] layer(s) to be redrawn.&nbsp; Can be a layer, an array of layers, or null. Not specifying a node will result in no redraw.
* @return {Konva.Animation} this
*/ */
setLayers: function(layers) { setLayers: function(layers) {
var lays = []; var lays = [];
@ -9986,11 +9989,13 @@ var Konva = {};
} }
this.layers = lays; this.layers = lays;
return this;
}, },
/** /**
* get layers * get layers
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @return {Array} Array of Konva.Layer
*/ */
getLayers: function() { getLayers: function() {
return this.layers; return this.layers;
@ -9999,7 +10004,8 @@ var Konva = {};
* add layer. Returns true if the layer was added, and false if it was not * add layer. Returns true if the layer was added, and false if it was not
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @param {Konva.Layer} layer * @param {Konva.Layer} layer to add
* @return {Bool} true if layer is added to animation, otherwise false
*/ */
addLayer: function(layer) { addLayer: function(layer) {
var layers = this.layers, var layers = this.layers,
@ -10019,6 +10025,7 @@ var Konva = {};
* determine if animation is running or not. returns true or false * determine if animation is running or not. returns true or false
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @return {Bool} is animation running?
*/ */
isRunning: function() { isRunning: function() {
var a = Konva.Animation, var a = Konva.Animation,
@ -10037,6 +10044,7 @@ var Konva = {};
* start animation * start animation
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @return {Konva.Animation} this
*/ */
start: function() { start: function() {
var Anim = Konva.Animation; var Anim = Konva.Animation;
@ -10044,14 +10052,17 @@ var Konva = {};
this.frame.timeDiff = 0; this.frame.timeDiff = 0;
this.frame.lastTime = now(); this.frame.lastTime = now();
Anim._addAnimation(this); Anim._addAnimation(this);
return this;
}, },
/** /**
* stop animation * stop animation
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @return {Konva.Animation} this
*/ */
stop: function() { stop: function() {
Konva.Animation._removeAnimation(this); Konva.Animation._removeAnimation(this);
return this;
}, },
_updateFrameObject: function(time) { _updateFrameObject: function(time) {
this.frame.timeDiff = time - this.frame.lastTime; this.frame.timeDiff = time - this.frame.lastTime;
@ -10127,12 +10138,14 @@ var Konva = {};
} }
for (key in layerHash) { for (key in layerHash) {
if (!layerHash.hasOwnProperty(key)) {
continue;
}
layerHash[key].draw(); layerHash[key].draw();
} }
}; };
Konva.Animation._animationLoop = function() { Konva.Animation._animationLoop = function() {
var Anim = Konva.Animation; var Anim = Konva.Animation;
if(Anim.animations.length) { if(Anim.animations.length) {
requestAnimFrame(Anim._animationLoop); requestAnimFrame(Anim._animationLoop);
Anim._runFrames(); Anim._runFrames();
@ -10142,10 +10155,9 @@ var Konva = {};
} }
}; };
Konva.Animation._handleAnimation = function() { Konva.Animation._handleAnimation = function() {
var that = this;
if(!this.animRunning) { if(!this.animRunning) {
this.animRunning = true; this.animRunning = true;
that._animationLoop(); this._animationLoop();
} }
}; };
@ -10157,6 +10169,7 @@ var Konva = {};
/** /**
* batch draw * batch draw
* @method * @method
* @return {Konva.Layer} this
* @memberof Konva.Base.prototype * @memberof Konva.Base.prototype
*/ */
Konva.BaseLayer.prototype.batchDraw = function() { Konva.BaseLayer.prototype.batchDraw = function() {
@ -10177,17 +10190,20 @@ var Konva = {};
this.draw(); this.draw();
this.batchAnim.start(); this.batchAnim.start();
} }
return this;
}; };
/** /**
* batch draw * batch draw
* @method * @method
* @return {Konva.Stage} this
* @memberof Konva.Stage.prototype * @memberof Konva.Stage.prototype
*/ */
Konva.Stage.prototype.batchDraw = function() { Konva.Stage.prototype.batchDraw = function() {
this.getChildren().each(function(layer) { this.getChildren().each(function(layer) {
layer.batchDraw(); layer.batchDraw();
}); });
return this;
}; };
})(Konva); })(Konva);
@ -11181,6 +11197,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
/** /**
* Rect constructor * Rect constructor
* @constructor * @constructor
@ -11328,6 +11345,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
// the 0.0001 offset fixes a bug in Chrome 27 // the 0.0001 offset fixes a bug in Chrome 27
var PIx2 = (Math.PI * 2) - 0.0001, var PIx2 = (Math.PI * 2) - 0.0001,
CIRCLE = 'Circle'; CIRCLE = 'Circle';
@ -11485,6 +11503,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
// the 0.0001 offset fixes a bug in Chrome 27 // the 0.0001 offset fixes a bug in Chrome 27
var PIx2 = (Math.PI * 2) - 0.0001, var PIx2 = (Math.PI * 2) - 0.0001,
ELLIPSE = 'Ellipse'; ELLIPSE = 'Ellipse';
@ -11686,6 +11705,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
// the 0.0001 offset fixes a bug in Chrome 27 // the 0.0001 offset fixes a bug in Chrome 27
var PIx2 = (Math.PI * 2) - 0.0001; var PIx2 = (Math.PI * 2) - 0.0001;
/** /**
@ -11865,6 +11885,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
/** /**
* Wedge constructor * Wedge constructor
* @constructor * @constructor
@ -12064,6 +12085,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
/** /**
* Arc constructor * Arc constructor
* @constructor * @constructor
@ -12279,7 +12301,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
// CONSTANTS // CONSTANTS
var IMAGE = 'Image'; var IMAGE = 'Image';
@ -12572,7 +12594,9 @@ var Konva = {};
}; };
})(); })();
/*eslint-disable max-depth */
(function() { (function() {
'use strict';
// constants // constants
var AUTO = 'auto', var AUTO = 'auto',
//CANVAS = 'canvas', //CANVAS = 'canvas',
@ -13130,6 +13154,7 @@ var Konva = {};
})(); })();
(function () { (function () {
'use strict';
/** /**
* Line constructor.&nbsp; Lines are defined by an array of points and * Line constructor.&nbsp; Lines are defined by an array of points and
* a tension * a tension
@ -13439,6 +13464,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
/** /**
* Sprite constructor * Sprite constructor
* @constructor * @constructor
@ -13847,8 +13873,9 @@ var Konva = {};
Konva.Collection.mapMethods(Konva.Sprite); Konva.Collection.mapMethods(Konva.Sprite);
})(); })();
/*eslint-disable no-shadow*/ /*eslint-disable no-shadow, max-len, max-depth */
(function () { (function () {
'use strict';
/** /**
* Path constructor. * Path constructor.
* @author Jason Follas * @author Jason Follas
@ -14019,7 +14046,7 @@ var Konva = {};
var minY = points[0]; var minY = points[0];
var maxY = points[0]; var maxY = points[0];
var x, y; var x, y;
for (var i = 0; i<points.length / 2; i++) { for (var i = 0; i < points.length / 2; i++) {
x = points[i * 2]; y = points[i * 2 + 1]; x = points[i * 2]; y = points[i * 2 + 1];
minX = Math.min(minX, x); minX = Math.min(minX, x);
maxX = Math.max(maxX, x); maxX = Math.max(maxX, x);
@ -14250,11 +14277,11 @@ var Konva = {};
cmd = 'M'; cmd = 'M';
// After closing the path move the current position // After closing the path move the current position
// to the the first point of the path (if any). // to the the first point of the path (if any).
if(ca.length>2 && ca[ca.length-1].command==='z'){ if(ca.length > 2 && ca[ca.length - 1].command === 'z'){
for(var idx=ca.length-2; idx>=0; idx--){ for(var idx = ca.length - 2; idx >= 0; idx--){
if(ca[idx].command==='M'){ if(ca[idx].command === 'M'){
cpx=ca[idx].points[0]+dx; cpx = ca[idx].points[0] + dx;
cpy=ca[idx].points[1]+dy; cpy = ca[idx].points[1] + dy;
break; break;
} }
} }
@ -14567,6 +14594,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
var EMPTY_STRING = '', var EMPTY_STRING = '',
//CALIBRI = 'Calibri', //CALIBRI = 'Calibri',
NORMAL = 'normal'; NORMAL = 'normal';
@ -14974,7 +15002,7 @@ var Konva = {};
var minY = points[0]; var minY = points[0];
var maxY = points[0]; var maxY = points[0];
var x, y; var x, y;
for (var i = 0; i<points.length / 2; i++) { for (var i = 0; i < points.length / 2; i++) {
x = points[i * 2]; y = points[i * 2 + 1]; x = points[i * 2]; y = points[i * 2 + 1];
minX = Math.min(minX, x); minX = Math.min(minX, x);
maxX = Math.max(maxX, x); maxX = Math.max(maxX, x);
@ -15077,6 +15105,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
/** /**
* RegularPolygon constructor.&nbsp; Examples include triangles, squares, pentagons, hexagons, etc. * RegularPolygon constructor.&nbsp; Examples include triangles, squares, pentagons, hexagons, etc.
* @constructor * @constructor
@ -15258,6 +15287,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
/** /**
* Star constructor * Star constructor
* @constructor * @constructor
@ -15461,6 +15491,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
// constants // constants
var ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'lineHeight', 'text'], var ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'lineHeight', 'text'],
CHANGE_KONVA = 'Change.konva', CHANGE_KONVA = 'Change.konva',
@ -15671,9 +15702,9 @@ var Konva = {};
context.moveTo(0, 0); context.moveTo(0, 0);
if (pointerDirection === UP) { if (pointerDirection === UP) {
context.lineTo((width - pointerWidth)/2, 0); context.lineTo((width - pointerWidth) / 2, 0);
context.lineTo(width/2, -1 * pointerHeight); context.lineTo(width / 2, -1 * pointerHeight);
context.lineTo((width + pointerWidth)/2, 0); context.lineTo((width + pointerWidth) / 2, 0);
} }
if(!cornerRadius) { if(!cornerRadius) {
@ -15684,9 +15715,9 @@ var Konva = {};
} }
if (pointerDirection === RIGHT) { if (pointerDirection === RIGHT) {
context.lineTo(width, (height - pointerHeight)/2); context.lineTo(width, (height - pointerHeight) / 2);
context.lineTo(width + pointerWidth, height/2); context.lineTo(width + pointerWidth, height / 2);
context.lineTo(width, (height + pointerHeight)/2); context.lineTo(width, (height + pointerHeight) / 2);
} }
if(!cornerRadius) { if(!cornerRadius) {
@ -15697,9 +15728,9 @@ var Konva = {};
} }
if (pointerDirection === DOWN) { if (pointerDirection === DOWN) {
context.lineTo((width + pointerWidth)/2, height); context.lineTo((width + pointerWidth) / 2, height);
context.lineTo(width/2, height + pointerHeight); context.lineTo(width / 2, height + pointerHeight);
context.lineTo((width - pointerWidth)/2, height); context.lineTo((width - pointerWidth) / 2, height);
} }
if(!cornerRadius) { if(!cornerRadius) {
@ -15710,9 +15741,9 @@ var Konva = {};
} }
if (pointerDirection === LEFT) { if (pointerDirection === LEFT) {
context.lineTo(0, (height + pointerHeight)/2); context.lineTo(0, (height + pointerHeight) / 2);
context.lineTo(-1 * pointerWidth, height/2); context.lineTo(-1 * pointerWidth, height / 2);
context.lineTo(0, (height - pointerHeight)/2); context.lineTo(0, (height - pointerHeight) / 2);
} }
if(cornerRadius) { if(cornerRadius) {
@ -15827,6 +15858,7 @@ var Konva = {};
})(); })();
(function() { (function() {
'use strict';
/** /**
* Arrow constructor * Arrow constructor
* @constructor * @constructor

12
konva.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
src/Animation.js
View File

@ -8,11 +8,10 @@
return Konva.root.performance.now(); return Konva.root.performance.now();
}; };
} }
else {
return function() { return function() {
return new Date().getTime(); return new Date().getTime();
}; };
}
})(); })();
function FRAF(callback) { function FRAF(callback) {
@ -77,6 +76,7 @@
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @param {Konva.Layer|Array} [layers] layer(s) to be redrawn.&nbsp; Can be a layer, an array of layers, or null. Not specifying a node will result in no redraw. * @param {Konva.Layer|Array} [layers] layer(s) to be redrawn.&nbsp; Can be a layer, an array of layers, or null. Not specifying a node will result in no redraw.
* @return {Konva.Animation} this
*/ */
setLayers: function(layers) { setLayers: function(layers) {
var lays = []; var lays = [];
@ -96,11 +96,13 @@
} }
this.layers = lays; this.layers = lays;
return this;
}, },
/** /**
* get layers * get layers
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @return {Array} Array of Konva.Layer
*/ */
getLayers: function() { getLayers: function() {
return this.layers; return this.layers;
@ -109,7 +111,8 @@
* add layer. Returns true if the layer was added, and false if it was not * add layer. Returns true if the layer was added, and false if it was not
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @param {Konva.Layer} layer * @param {Konva.Layer} layer to add
* @return {Bool} true if layer is added to animation, otherwise false
*/ */
addLayer: function(layer) { addLayer: function(layer) {
var layers = this.layers, var layers = this.layers,
@ -129,6 +132,7 @@
* determine if animation is running or not. returns true or false * determine if animation is running or not. returns true or false
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @return {Bool} is animation running?
*/ */
isRunning: function() { isRunning: function() {
var a = Konva.Animation, var a = Konva.Animation,
@ -147,6 +151,7 @@
* start animation * start animation
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @return {Konva.Animation} this
*/ */
start: function() { start: function() {
var Anim = Konva.Animation; var Anim = Konva.Animation;
@ -154,14 +159,17 @@
this.frame.timeDiff = 0; this.frame.timeDiff = 0;
this.frame.lastTime = now(); this.frame.lastTime = now();
Anim._addAnimation(this); Anim._addAnimation(this);
return this;
}, },
/** /**
* stop animation * stop animation
* @method * @method
* @memberof Konva.Animation.prototype * @memberof Konva.Animation.prototype
* @return {Konva.Animation} this
*/ */
stop: function() { stop: function() {
Konva.Animation._removeAnimation(this); Konva.Animation._removeAnimation(this);
return this;
}, },
_updateFrameObject: function(time) { _updateFrameObject: function(time) {
this.frame.timeDiff = time - this.frame.lastTime; this.frame.timeDiff = time - this.frame.lastTime;
@ -237,12 +245,14 @@
} }
for (key in layerHash) { for (key in layerHash) {
if (!layerHash.hasOwnProperty(key)) {
continue;
}
layerHash[key].draw(); layerHash[key].draw();
} }
}; };
Konva.Animation._animationLoop = function() { Konva.Animation._animationLoop = function() {
var Anim = Konva.Animation; var Anim = Konva.Animation;
if(Anim.animations.length) { if(Anim.animations.length) {
requestAnimFrame(Anim._animationLoop); requestAnimFrame(Anim._animationLoop);
Anim._runFrames(); Anim._runFrames();
@ -252,10 +262,9 @@
} }
}; };
Konva.Animation._handleAnimation = function() { Konva.Animation._handleAnimation = function() {
var that = this;
if(!this.animRunning) { if(!this.animRunning) {
this.animRunning = true; this.animRunning = true;
that._animationLoop(); this._animationLoop();
} }
}; };
@ -267,6 +276,7 @@
/** /**
* batch draw * batch draw
* @method * @method
* @return {Konva.Layer} this
* @memberof Konva.Base.prototype * @memberof Konva.Base.prototype
*/ */
Konva.BaseLayer.prototype.batchDraw = function() { Konva.BaseLayer.prototype.batchDraw = function() {
@ -287,16 +297,19 @@
this.draw(); this.draw();
this.batchAnim.start(); this.batchAnim.start();
} }
return this;
}; };
/** /**
* batch draw * batch draw
* @method * @method
* @return {Konva.Stage} this
* @memberof Konva.Stage.prototype * @memberof Konva.Stage.prototype
*/ */
Konva.Stage.prototype.batchDraw = function() { Konva.Stage.prototype.batchDraw = function() {
this.getChildren().each(function(layer) { this.getChildren().each(function(layer) {
layer.batchDraw(); layer.batchDraw();
}); });
return this;
}; };
})(Konva); })(Konva);

4
src/Container.js
View File

@ -45,7 +45,8 @@
getChildren: function(filterFunc) { getChildren: function(filterFunc) {
if (!filterFunc) { if (!filterFunc) {
return this.children; return this.children;
} else { }
var results = new Konva.Collection(); var results = new Konva.Collection();
this.children.each(function(child){ this.children.each(function(child){
if (filterFunc(child)) { if (filterFunc(child)) {
@ -53,7 +54,6 @@
} }
}); });
return results; return results;
}
}, },
/** /**
* determine if node has children * determine if node has children

11
src/Factory.js
View File

@ -64,6 +64,9 @@
} }
for (key in val) { for (key in val) {
if (!val.hasOwnProperty(key)) {
continue;
}
this._setAttr(attr + capitalize(key), val[key]); this._setAttr(attr + capitalize(key), val[key]);
} }
@ -90,9 +93,7 @@
return this; return this;
} }
// getting // getting
else {
return this[getter](); return this[getter]();
}
}; };
}, },
addDeprecatedGetterSetter: function(constructor, attr, def, validator) { addDeprecatedGetterSetter: function(constructor, attr, def, validator) {
@ -131,9 +132,8 @@
return 255; return 255;
} else if (val < 0) { } else if (val < 0) {
return 0; return 0;
} else {
return Math.round(val);
} }
return Math.round(val);
}, },
alphaComponent: function(val) { alphaComponent: function(val) {
if (val > 1) { if (val > 1) {
@ -143,9 +143,8 @@
else if (val < 0.0001) { else if (val < 0.0001) {
return 0.0001; return 0.0001;
} }
else {
return val; return val;
} }
}
}; };
})(); })();

7
src/Global.js
View File

@ -30,7 +30,6 @@
/** /**
* @namespace Konva * @namespace Konva
*/ */
/*jshint -W079, -W020*/
var Konva = {}; var Konva = {};
(function(root) { (function(root) {
'use strict'; 'use strict';
@ -114,9 +113,8 @@ var Konva = {};
// drag and drop is not even possible // drag and drop is not even possible
if (dd) { if (dd) {
return dd.isDragging; return dd.isDragging;
} else {
return false;
} }
return false;
}, },
/** /**
* returns whether or not a drag and drop operation is ready, but may * returns whether or not a drag and drop operation is ready, but may
@ -131,9 +129,8 @@ var Konva = {};
// drag and drop is not even possible // drag and drop is not even possible
if (dd) { if (dd) {
return !!dd.node; return !!dd.node;
} else {
return false;
} }
return false;
}, },
_addId: function(node, id) { _addId: function(node, id) {
if(id !== undefined) { if(id !== undefined) {

6
src/Layer.js
View File

@ -140,13 +140,11 @@
return { return {
shape: shape shape: shape
}; };
} else { }
return { return {
antialiased: true antialiased: true
}; };
} }
}
// antialiased pixel // antialiased pixel
else if(p3 > 0) { else if(p3 > 0) {
return { return {
@ -154,9 +152,7 @@
}; };
} }
// empty pixel // empty pixel
else {
return {}; return {};
}
}, },
drawScene: function(can, top) { drawScene: function(can, top) {
var layer = this.getLayer(), var layer = this.getLayer(),

6
src/Node.js
View File

@ -270,7 +270,7 @@
getClientRect: function() { getClientRect: function() {
// abstract method // abstract method
// redefine in Container and Shape // redefine in Container and Shape
throw 'abstract "getClientRect" method call'; throw new Error('abstract "getClientRect" method call');
}, },
_transformedRect: function(rect) { _transformedRect: function(rect) {
var points = [ var points = [
@ -360,9 +360,7 @@
return filterCanvas; return filterCanvas;
} }
else {
return sceneCanvas; return sceneCanvas;
}
}, },
/** /**
* bind events to the node. KonvaJS supports mouseover, mousemove, * bind events to the node. KonvaJS supports mouseover, mousemove,
@ -574,9 +572,7 @@
return this[method](); return this[method]();
} }
// otherwise get directly // otherwise get directly
else {
return this.attrs[attr]; return this.attrs[attr];
}
}, },
/** /**
* get ancestors * get ancestors

1
src/filters/Blur.js
View File

@ -3,6 +3,7 @@
master repo: https://github.com/pavelpower/kineticjsGaussFilter master repo: https://github.com/pavelpower/kineticjsGaussFilter
*/ */
(function() { (function() {
'use strict';
/* /*
StackBlur - a fast almost Gaussian Blur For Canvas StackBlur - a fast almost Gaussian Blur For Canvas

1
src/filters/Brighten.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* Brighten Filter. * Brighten Filter.
* @function * @function

1
src/filters/Emboss.js
View File

@ -1,4 +1,5 @@
(function () { (function () {
'use strict';
/** /**
* Emboss Filter. * Emboss Filter.
* Pixastic Lib - Emboss filter - v0.1.0 * Pixastic Lib - Emboss filter - v0.1.0

1
src/filters/Enhance.js
View File

@ -1,4 +1,5 @@
(function () { (function () {
'use strict';
function remap(fromValue, fromMin, fromMax, toMin, toMax) { function remap(fromValue, fromMin, fromMax, toMin, toMax) {
// Compute the range of the data // Compute the range of the data
var fromRange = fromMax - fromMin, var fromRange = fromMax - fromMin,

1
src/filters/Grayscale.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* Grayscale Filter * Grayscale Filter
* @function * @function

1
src/filters/HSL.js
View File

@ -1,4 +1,5 @@
(function () { (function () {
'use strict';
Konva.Factory.addGetterSetter(Konva.Node, 'hue', 0, null, Konva.Factory.afterSetFilter); Konva.Factory.addGetterSetter(Konva.Node, 'hue', 0, null, Konva.Factory.afterSetFilter);
/** /**

2
src/filters/HSV.js
View File

@ -1,5 +1,5 @@
(function () { (function () {
'use strict';
/** /**
* HSV Filter. Adjusts the hue, saturation and value * HSV Filter. Adjusts the hue, saturation and value
* @function * @function

1
src/filters/Invert.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* Invert Filter * Invert Filter
* @function * @function

151
src/filters/Kaleidoscope.js
View File

@ -1,4 +1,5 @@
(function () { (function () {
'use strict';
/* /*
* ToPolar Filter. Converts image data to polar coordinates. Performs * ToPolar Filter. Converts image data to polar coordinates. Performs
@ -22,16 +23,16 @@
dstPixels = dst.data, dstPixels = dst.data,
xSize = src.width, xSize = src.width,
ySize = src.height, ySize = src.height,
xMid = opt.polarCenterX || xSize/2, xMid = opt.polarCenterX || xSize / 2,
yMid = opt.polarCenterY || ySize/2, yMid = opt.polarCenterY || ySize / 2,
i, x, y, r=0, g=0, b=0, a=0; i, x, y, r = 0, g = 0, b = 0, a = 0;
// Find the largest radius // Find the largest radius
var rad, rMax = Math.sqrt( xMid*xMid + yMid*yMid ); var rad, rMax = Math.sqrt( xMid * xMid + yMid * yMid );
x = xSize - xMid; x = xSize - xMid;
y = ySize - yMid; y = ySize - yMid;
rad = Math.sqrt( x*x + y*y ); rad = Math.sqrt( x * x + y * y );
rMax = (rad > rMax)?rad:rMax; rMax = (rad > rMax) ? rad : rMax;
// We'll be uisng y as the radius, and x as the angle (theta=t) // We'll be uisng y as the radius, and x as the angle (theta=t)
var rSize = ySize, var rSize = ySize,
@ -40,29 +41,29 @@
// We want to cover all angles (0-360) and we need to convert to // We want to cover all angles (0-360) and we need to convert to
// radians (*PI/180) // radians (*PI/180)
var conversion = 360/tSize*Math.PI/180, sin, cos; var conversion = 360 / tSize * Math.PI / 180, sin, cos;
// var x1, x2, x1i, x2i, y1, y2, y1i, y2i, scale; // var x1, x2, x1i, x2i, y1, y2, y1i, y2i, scale;
for( theta=0; theta<tSize; theta+=1 ){ for( theta = 0; theta < tSize; theta += 1 ){
sin = Math.sin(theta*conversion); sin = Math.sin(theta * conversion);
cos = Math.cos(theta*conversion); cos = Math.cos(theta * conversion);
for( radius=0; radius<rSize; radius+=1 ){ for( radius = 0; radius < rSize; radius += 1 ){
x = Math.floor(xMid+rMax*radius/rSize*cos); x = Math.floor(xMid + rMax * radius / rSize * cos);
y = Math.floor(yMid+rMax*radius/rSize*sin); y = Math.floor(yMid + rMax * radius / rSize * sin);
i = (y*xSize + x)*4; i = (y * xSize + x) * 4;
r = srcPixels[i+0]; r = srcPixels[i + 0];
g = srcPixels[i+1]; g = srcPixels[i + 1];
b = srcPixels[i+2]; b = srcPixels[i + 2];
a = srcPixels[i+3]; a = srcPixels[i + 3];
// Store it // Store it
//i = (theta * xSize + radius) * 4; //i = (theta * xSize + radius) * 4;
i = (theta + radius*xSize) * 4; i = (theta + radius * xSize) * 4;
dstPixels[i+0] = r; dstPixels[i + 0] = r;
dstPixels[i+1] = g; dstPixels[i + 1] = g;
dstPixels[i+2] = b; dstPixels[i + 2] = b;
dstPixels[i+3] = a; dstPixels[i + 3] = a;
} }
} }
@ -91,17 +92,17 @@
dstPixels = dst.data, dstPixels = dst.data,
xSize = src.width, xSize = src.width,
ySize = src.height, ySize = src.height,
xMid = opt.polarCenterX || xSize/2, xMid = opt.polarCenterX || xSize / 2,
yMid = opt.polarCenterY || ySize/2, yMid = opt.polarCenterY || ySize / 2,
i, x, y, dx, dy, r=0, g=0, b=0, a=0; i, x, y, dx, dy, r = 0, g = 0, b = 0, a = 0;
// Find the largest radius // Find the largest radius
var rad, rMax = Math.sqrt( xMid*xMid + yMid*yMid ); var rad, rMax = Math.sqrt( xMid * xMid + yMid * yMid );
x = xSize - xMid; x = xSize - xMid;
y = ySize - yMid; y = ySize - yMid;
rad = Math.sqrt( x*x + y*y ); rad = Math.sqrt( x * x + y * y );
rMax = (rad > rMax)?rad:rMax; rMax = (rad > rMax) ? rad : rMax;
// We'll be uisng x as the radius, and y as the angle (theta=t) // We'll be uisng x as the radius, and y as the angle (theta=t)
var rSize = ySize, var rSize = ySize,
@ -116,27 +117,27 @@
var x1, y1; var x1, y1;
for( x=0; x<xSize; x+=1 ){ for( x = 0; x < xSize; x += 1 ){
for( y=0; y<ySize; y+=1 ){ for( y = 0; y < ySize; y += 1 ){
dx = x - xMid; dx = x - xMid;
dy = y - yMid; dy = y - yMid;
radius = Math.sqrt(dx*dx + dy*dy)*rSize/rMax; radius = Math.sqrt(dx * dx + dy * dy) * rSize / rMax;
theta = (Math.atan2(dy, dx)*180/Math.PI + 360 + phaseShift)%360; theta = (Math.atan2(dy, dx) * 180 / Math.PI + 360 + phaseShift) % 360;
theta = theta*tSize/360; theta = theta * tSize / 360;
x1 = Math.floor(theta); x1 = Math.floor(theta);
y1 = Math.floor(radius); y1 = Math.floor(radius);
i = (y1*xSize + x1)*4; i = (y1 * xSize + x1) * 4;
r = srcPixels[i+0]; r = srcPixels[i + 0];
g = srcPixels[i+1]; g = srcPixels[i + 1];
b = srcPixels[i+2]; b = srcPixels[i + 2];
a = srcPixels[i+3]; a = srcPixels[i + 3];
// Store it // Store it
i = (y*xSize + x)*4; i = (y * xSize + x) * 4;
dstPixels[i+0] = r; dstPixels[i + 0] = r;
dstPixels[i+1] = g; dstPixels[i + 1] = g;
dstPixels[i+2] = b; dstPixels[i + 2] = b;
dstPixels[i+3] = a; dstPixels[i + 3] = a;
} }
} }
@ -167,7 +168,7 @@
var x, y, xoff, i, r, g, b, a, srcPos, dstPos; var x, y, xoff, i, r, g, b, a, srcPos, dstPos;
var power = Math.round( this.kaleidoscopePower() ); var power = Math.round( this.kaleidoscopePower() );
var angle = Math.round( this.kaleidoscopeAngle() ); var angle = Math.round( this.kaleidoscopeAngle() );
var offset = Math.floor(xSize*(angle%360)/360); var offset = Math.floor(xSize * (angle % 360) / 360);
if( power < 1 ){return; } if( power < 1 ){return; }
@ -178,15 +179,15 @@
// Convert thhe original to polar coordinates // Convert thhe original to polar coordinates
ToPolar( imageData, scratchData, { ToPolar( imageData, scratchData, {
polarCenterX: xSize/2, polarCenterX: xSize / 2,
polarCenterY: ySize/2 polarCenterY: ySize / 2
}); });
// Determine how big each section will be, if it's too small // Determine how big each section will be, if it's too small
// make it bigger // make it bigger
var minSectionSize = xSize / Math.pow(2, power); var minSectionSize = xSize / Math.pow(2, power);
while( minSectionSize <= 8){ while( minSectionSize <= 8){
minSectionSize = minSectionSize*2; minSectionSize = minSectionSize * 2;
power -= 1; power -= 1;
} }
minSectionSize = Math.ceil(minSectionSize); minSectionSize = Math.ceil(minSectionSize);
@ -198,42 +199,42 @@
var xStart = 0, var xStart = 0,
xEnd = sectionSize, xEnd = sectionSize,
xDelta = 1; xDelta = 1;
if( offset+minSectionSize > xSize ){ if( offset + minSectionSize > xSize ){
xStart = sectionSize; xStart = sectionSize;
xEnd = 0; xEnd = 0;
xDelta = -1; xDelta = -1;
} }
for( y=0; y<ySize; y+=1 ){ for( y = 0; y < ySize; y += 1 ){
for( x=xStart; x !== xEnd; x+=xDelta ){ for( x = xStart; x !== xEnd; x += xDelta ){
xoff = Math.round(x+offset)%xSize; xoff = Math.round(x + offset) % xSize;
srcPos = (xSize*y+xoff)*4; srcPos = (xSize * y + xoff) * 4;
r = scratchData.data[srcPos+0]; r = scratchData.data[srcPos + 0];
g = scratchData.data[srcPos+1]; g = scratchData.data[srcPos + 1];
b = scratchData.data[srcPos+2]; b = scratchData.data[srcPos + 2];
a = scratchData.data[srcPos+3]; a = scratchData.data[srcPos + 3];
dstPos = (xSize*y+x)*4; dstPos = (xSize * y + x) * 4;
scratchData.data[dstPos+0] = r; scratchData.data[dstPos + 0] = r;
scratchData.data[dstPos+1] = g; scratchData.data[dstPos + 1] = g;
scratchData.data[dstPos+2] = b; scratchData.data[dstPos + 2] = b;
scratchData.data[dstPos+3] = a; scratchData.data[dstPos + 3] = a;
} }
} }
// Perform the actual effect // Perform the actual effect
for( y=0; y<ySize; y+=1 ){ for( y = 0; y < ySize; y += 1 ){
sectionSize = Math.floor( minSectionSize ); sectionSize = Math.floor( minSectionSize );
for( i=0; i<power; i+=1 ){ for( i = 0; i < power; i += 1 ){
for( x=0; x<sectionSize+1; x+=1 ){ for( x = 0; x < sectionSize + 1; x += 1 ){
srcPos = (xSize*y+x)*4; srcPos = (xSize * y + x) * 4;
r = scratchData.data[srcPos+0]; r = scratchData.data[srcPos + 0];
g = scratchData.data[srcPos+1]; g = scratchData.data[srcPos + 1];
b = scratchData.data[srcPos+2]; b = scratchData.data[srcPos + 2];
a = scratchData.data[srcPos+3]; a = scratchData.data[srcPos + 3];
dstPos = (xSize*y+sectionSize*2-x-1)*4; dstPos = (xSize * y + sectionSize * 2 - x - 1) * 4;
scratchData.data[dstPos+0] = r; scratchData.data[dstPos + 0] = r;
scratchData.data[dstPos+1] = g; scratchData.data[dstPos + 1] = g;
scratchData.data[dstPos+2] = b; scratchData.data[dstPos + 2] = b;
scratchData.data[dstPos+3] = a; scratchData.data[dstPos + 3] = a;
} }
sectionSize *= 2; sectionSize *= 2;
} }

3
src/filters/Mask.js
View File

@ -1,5 +1,6 @@
/*eslint-disable max-depth */
(function() { (function() {
'use strict';
function pixelAt(idata, x, y) { function pixelAt(idata, x, y) {
var idx = (y * idata.width + x) * 4; var idx = (y * idata.width + x) * 4;
var d = []; var d = [];

1
src/filters/Noise.js
View File

@ -1,4 +1,5 @@
(function () { (function () {
'use strict';
/** /**
* Noise Filter. Randomly adds or substracts to the color channels * Noise Filter. Randomly adds or substracts to the color channels

3
src/filters/Pixelate.js
View File

@ -1,5 +1,6 @@
/*eslint-disable max-depth */
(function () { (function () {
'use strict';
/** /**
* Pixelate Filter. Averages groups of pixels and redraws * Pixelate Filter. Averages groups of pixels and redraws
* them as larger pixels * them as larger pixels

2
src/filters/Posterize.js
View File

@ -1,5 +1,5 @@
(function () { (function () {
'use strict';
/** /**
* Posterize Filter. Adjusts the channels so that there are no more * Posterize Filter. Adjusts the channels so that there are no more
* than n different values for that channel. This is also applied * than n different values for that channel. This is also applied

9
src/filters/RGB.js
View File

@ -1,4 +1,5 @@
(function () { (function () {
'use strict';
/** /**
* RGB Filter * RGB Filter
* @function * @function
@ -21,10 +22,10 @@
i, brightness; i, brightness;
for (i = 0; i < nPixels; i += 4) { for (i = 0; i < nPixels; i += 4) {
brightness = (0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2])/255; brightness = (0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2]) / 255;
data[i] = brightness*red; // r data[i] = brightness * red; // r
data[i + 1] = brightness*green; // g data[i + 1] = brightness * green; // g
data[i + 2] = brightness*blue; // b data[i + 2] = brightness * blue; // b
data[i + 3] = data[i + 3]; // alpha data[i + 3] = data[i + 3]; // alpha
} }
}; };

1
src/filters/RGBA.js
View File

@ -1,4 +1,5 @@
(function () { (function () {
'use strict';
/** /**
* RGBA Filter * RGBA Filter
* @function * @function

17
src/filters/Sepia.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* Sepia Filter * Sepia Filter
* Based on: Pixastic Lib - Sepia filter - v0.1.0 * Based on: Pixastic Lib - Sepia filter - v0.1.0
@ -17,27 +18,27 @@
var data = imageData.data, var data = imageData.data,
w = imageData.width, w = imageData.width,
y = imageData.height, y = imageData.height,
w4 = w*4, w4 = w * 4,
offsetY, x, offset, or, og, ob, r, g, b; offsetY, x, offset, or, og, ob, r, g, b;
do { do {
offsetY = (y-1)*w4; offsetY = (y - 1) * w4;
x = w; x = w;
do { do {
offset = offsetY + (x-1)*4; offset = offsetY + (x - 1) * 4;
or = data[offset]; or = data[offset];
og = data[offset+1]; og = data[offset + 1];
ob = data[offset+2]; ob = data[offset + 2];
r = or * 0.393 + og * 0.769 + ob * 0.189; r = or * 0.393 + og * 0.769 + ob * 0.189;
g = or * 0.349 + og * 0.686 + ob * 0.168; g = or * 0.349 + og * 0.686 + ob * 0.168;
b = or * 0.272 + og * 0.534 + ob * 0.131; b = or * 0.272 + og * 0.534 + ob * 0.131;
data[offset] = r > 255 ? 255 : r; data[offset] = r > 255 ? 255 : r;
data[offset+1] = g > 255 ? 255 : g; data[offset + 1] = g > 255 ? 255 : g;
data[offset+2] = b > 255 ? 255 : b; data[offset + 2] = b > 255 ? 255 : b;
data[offset+3] = data[offset+3]; data[offset + 3] = data[offset + 3];
} while (--x); } while (--x);
} while (--y); } while (--y);
}; };

15
src/filters/Solarize.js
View File

@ -1,4 +1,5 @@
(function () { (function () {
'use strict';
/** /**
* Solarize Filter * Solarize Filter
* Pixastic Lib - Solarize filter - v0.1.0 * Pixastic Lib - Solarize filter - v0.1.0
@ -16,17 +17,17 @@
var data = imageData.data, var data = imageData.data,
w = imageData.width, w = imageData.width,
h = imageData.height, h = imageData.height,
w4 = w*4, w4 = w * 4,
y = h; y = h;
do { do {
var offsetY = (y-1)*w4; var offsetY = (y - 1) * w4;
var x = w; var x = w;
do { do {
var offset = offsetY + (x-1)*4; var offset = offsetY + (x - 1) * 4;
var r = data[offset]; var r = data[offset];
var g = data[offset+1]; var g = data[offset + 1];
var b = data[offset+2]; var b = data[offset + 2];
if (r > 127) { if (r > 127) {
r = 255 - r; r = 255 - r;
@ -39,8 +40,8 @@
} }
data[offset] = r; data[offset] = r;
data[offset+1] = g; data[offset + 1] = g;
data[offset+2] = b; data[offset + 2] = b;
} while (--x); } while (--x);
} while (--y); } while (--y);
}; };

2
src/filters/Threshold.js
View File

@ -1,5 +1,5 @@
(function () { (function () {
'use strict';
/** /**
* Threshold Filter. Pushes any value above the mid point to * Threshold Filter. Pushes any value above the mid point to
* the max and any value below the mid point to the min. * the max and any value below the mid point to the min.

1
src/plugins/Arrow.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* Arrow constructor * Arrow constructor
* @constructor * @constructor

25
src/plugins/Label.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
// constants // constants
var ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'lineHeight', 'text'], var ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'lineHeight', 'text'],
CHANGE_KONVA = 'Change.konva', CHANGE_KONVA = 'Change.konva',
@ -190,9 +191,9 @@
context.moveTo(0, 0); context.moveTo(0, 0);
if (pointerDirection === UP) { if (pointerDirection === UP) {
context.lineTo((width - pointerWidth)/2, 0); context.lineTo((width - pointerWidth) / 2, 0);
context.lineTo(width/2, -1 * pointerHeight); context.lineTo(width / 2, -1 * pointerHeight);
context.lineTo((width + pointerWidth)/2, 0); context.lineTo((width + pointerWidth) / 2, 0);
} }
if(!cornerRadius) { if(!cornerRadius) {
@ -203,9 +204,9 @@
} }
if (pointerDirection === RIGHT) { if (pointerDirection === RIGHT) {
context.lineTo(width, (height - pointerHeight)/2); context.lineTo(width, (height - pointerHeight) / 2);
context.lineTo(width + pointerWidth, height/2); context.lineTo(width + pointerWidth, height / 2);
context.lineTo(width, (height + pointerHeight)/2); context.lineTo(width, (height + pointerHeight) / 2);
} }
if(!cornerRadius) { if(!cornerRadius) {
@ -216,9 +217,9 @@
} }
if (pointerDirection === DOWN) { if (pointerDirection === DOWN) {
context.lineTo((width + pointerWidth)/2, height); context.lineTo((width + pointerWidth) / 2, height);
context.lineTo(width/2, height + pointerHeight); context.lineTo(width / 2, height + pointerHeight);
context.lineTo((width - pointerWidth)/2, height); context.lineTo((width - pointerWidth) / 2, height);
} }
if(!cornerRadius) { if(!cornerRadius) {
@ -229,9 +230,9 @@
} }
if (pointerDirection === LEFT) { if (pointerDirection === LEFT) {
context.lineTo(0, (height + pointerHeight)/2); context.lineTo(0, (height + pointerHeight) / 2);
context.lineTo(-1 * pointerWidth, height/2); context.lineTo(-1 * pointerWidth, height / 2);
context.lineTo(0, (height - pointerHeight)/2); context.lineTo(0, (height - pointerHeight) / 2);
} }
if(cornerRadius) { if(cornerRadius) {

15
src/plugins/Path.js
View File

@ -1,5 +1,6 @@
/*eslint-disable no-shadow*/ /*eslint-disable no-shadow, max-len, max-depth */
(function () { (function () {
'use strict';
/** /**
* Path constructor. * Path constructor.
* @author Jason Follas * @author Jason Follas
@ -101,7 +102,7 @@
var minY = points[0]; var minY = points[0];
var maxY = points[0]; var maxY = points[0];
var x, y; var x, y;
for (var i = 0; i<points.length / 2; i++) { for (var i = 0; i < points.length / 2; i++) {
x = points[i * 2]; y = points[i * 2 + 1]; x = points[i * 2]; y = points[i * 2 + 1];
minX = Math.min(minX, x); minX = Math.min(minX, x);
maxX = Math.max(maxX, x); maxX = Math.max(maxX, x);
@ -332,11 +333,11 @@
cmd = 'M'; cmd = 'M';
// After closing the path move the current position // After closing the path move the current position
// to the the first point of the path (if any). // to the the first point of the path (if any).
if(ca.length>2 && ca[ca.length-1].command==='z'){ if(ca.length > 2 && ca[ca.length - 1].command === 'z'){
for(var idx=ca.length-2; idx>=0; idx--){ for(var idx = ca.length - 2; idx >= 0; idx--){
if(ca[idx].command==='M'){ if(ca[idx].command === 'M'){
cpx=ca[idx].points[0]+dx; cpx = ca[idx].points[0] + dx;
cpy=ca[idx].points[1]+dy; cpy = ca[idx].points[1] + dy;
break; break;
} }
} }

1
src/plugins/RegularPolygon.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* RegularPolygon constructor.&nbsp; Examples include triangles, squares, pentagons, hexagons, etc. * RegularPolygon constructor.&nbsp; Examples include triangles, squares, pentagons, hexagons, etc.
* @constructor * @constructor

1
src/plugins/Star.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* Star constructor * Star constructor
* @constructor * @constructor

3
src/plugins/TextPath.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
var EMPTY_STRING = '', var EMPTY_STRING = '',
//CALIBRI = 'Calibri', //CALIBRI = 'Calibri',
NORMAL = 'normal'; NORMAL = 'normal';
@ -337,7 +338,7 @@
var minY = points[0]; var minY = points[0];
var maxY = points[0]; var maxY = points[0];
var x, y; var x, y;
for (var i = 0; i<points.length / 2; i++) { for (var i = 0; i < points.length / 2; i++) {
x = points[i * 2]; y = points[i * 2 + 1]; x = points[i * 2]; y = points[i * 2 + 1];
minX = Math.min(minX, x); minX = Math.min(minX, x);
maxX = Math.max(maxX, x); maxX = Math.max(maxX, x);

1
src/shapes/Arc.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* Arc constructor * Arc constructor
* @constructor * @constructor

1
src/shapes/Circle.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
// the 0.0001 offset fixes a bug in Chrome 27 // the 0.0001 offset fixes a bug in Chrome 27
var PIx2 = (Math.PI * 2) - 0.0001, var PIx2 = (Math.PI * 2) - 0.0001,
CIRCLE = 'Circle'; CIRCLE = 'Circle';

1
src/shapes/Ellipse.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
// the 0.0001 offset fixes a bug in Chrome 27 // the 0.0001 offset fixes a bug in Chrome 27
var PIx2 = (Math.PI * 2) - 0.0001, var PIx2 = (Math.PI * 2) - 0.0001,
ELLIPSE = 'Ellipse'; ELLIPSE = 'Ellipse';

2
src/shapes/Image.js
View File

@ -1,5 +1,5 @@
(function() { (function() {
'use strict';
// CONSTANTS // CONSTANTS
var IMAGE = 'Image'; var IMAGE = 'Image';

1
src/shapes/Line.js
View File

@ -1,4 +1,5 @@
(function () { (function () {
'use strict';
/** /**
* Line constructor.&nbsp; Lines are defined by an array of points and * Line constructor.&nbsp; Lines are defined by an array of points and
* a tension * a tension

1
src/shapes/Rect.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* Rect constructor * Rect constructor
* @constructor * @constructor

1
src/shapes/Ring.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
// the 0.0001 offset fixes a bug in Chrome 27 // the 0.0001 offset fixes a bug in Chrome 27
var PIx2 = (Math.PI * 2) - 0.0001; var PIx2 = (Math.PI * 2) - 0.0001;
/** /**

1
src/shapes/Sprite.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* Sprite constructor * Sprite constructor
* @constructor * @constructor

2
src/shapes/Text.js
View File

@ -1,4 +1,6 @@
/*eslint-disable max-depth */
(function() { (function() {
'use strict';
// constants // constants
var AUTO = 'auto', var AUTO = 'auto',
//CANVAS = 'canvas', //CANVAS = 'canvas',

1
src/shapes/Wedge.js
View File

@ -1,4 +1,5 @@
(function() { (function() {
'use strict';
/** /**
* Wedge constructor * Wedge constructor
* @constructor * @constructor