diff --git a/src/canvas/BlendMode.js b/src/canvas/BlendMode.js index bd519bbc..f04f6cdf 100644 --- a/src/canvas/BlendMode.js +++ b/src/canvas/BlendMode.js @@ -273,8 +273,8 @@ var BlendMode = new function() { return; var dstData = dstContext.getImageData(offset.x, offset.y, srcCanvas.width, srcCanvas.height), - dst = dstData.data, - src = srcContext.getImageData(0, 0, + dst = dstData.data, + src = srcContext.getImageData(0, 0, srcCanvas.width, srcCanvas.height).data; for (var i = 0, l = dst.length; i < l; i += 4) { sr = src[i]; diff --git a/src/dom/DomElement.js b/src/dom/DomElement.js index c120aefa..317f04a4 100644 --- a/src/dom/DomElement.js +++ b/src/dom/DomElement.js @@ -173,7 +173,7 @@ var DomElement = new function() { rect = { left: 0, top: 0, width: 0, height: 0 }; } var x = rect.left - (html.clientLeft || body.clientLeft || 0), - y = rect.top - (html.clientTop || body.clientTop || 0); + y = rect.top - (html.clientTop || body.clientTop || 0); if (!viewport) { var view = doc.defaultView; x += view.pageXOffset || html.scrollLeft || body.scrollLeft; diff --git a/src/path/Curve.js b/src/path/Curve.js index 71e774e2..b23ae438 100644 --- a/src/path/Curve.js +++ b/src/path/Curve.js @@ -1264,7 +1264,7 @@ new function() { // Scope for methods that require numerical integration } else if (qy <= dMax) { px = hullBottom[i][0]; qx = hullBottom[i + 1][0]; - tProxy = px + (dMax - py) * (qx - px) / (qy - py); + tProxy = px + (dMax - py) * (qx - px) / (qy - py); } else { // Try the next chain continue; diff --git a/src/path/Path.js b/src/path/Path.js index 1448fc96..8508ef8d 100644 --- a/src/path/Path.js +++ b/src/path/Path.js @@ -2481,7 +2481,7 @@ var Path = PathItem.extend(/** @lends Path# */{ } } var ext = Math.abs(extent), - count = ext >= 360 ? 4 : Math.ceil(ext / 90), + count = ext >= 360 ? 4 : Math.ceil(ext / 90), inc = extent / count, half = inc * Math.PI / 360, z = 4 / 3 * Math.sin(half) / (1 + Math.cos(half)), diff --git a/src/path/PathFlattener.js b/src/path/PathFlattener.js index cfb7b59e..b36bcddc 100644 --- a/src/path/PathFlattener.js +++ b/src/path/PathFlattener.js @@ -102,7 +102,7 @@ var PathFlattener = Base.extend({ return { // Interpolate value: prevVal + (part.value - prevVal) - * (offset - prevLen) / (part.offset - prevLen), + * (offset - prevLen) / (part.offset - prevLen), index: part.index }; } diff --git a/src/path/PathItem.Boolean.js b/src/path/PathItem.Boolean.js index 62a76504..903ec1aa 100644 --- a/src/path/PathItem.Boolean.js +++ b/src/path/PathItem.Boolean.js @@ -676,7 +676,7 @@ CompoundPath.inject(/** @lends CompoundPath# */{ * Used by getWinding(). */ _getMonoCurves: function() { - var children = this._children, + var children = this._children, monoCurves = []; for (var i = 0, l = children.length; i < l; i++) monoCurves.push.apply(monoCurves, children[i]._getMonoCurves()); diff --git a/src/path/Segment.js b/src/path/Segment.js index 5cd05f6a..cd76ccd4 100644 --- a/src/path/Segment.js +++ b/src/path/Segment.js @@ -503,7 +503,7 @@ var Segment = Base.extend(/** @lends Segment# */{ // This saves some computation time. If change is false, always // use the real handles, as we just want to receive a filled // coords array for getBounds(). - handleIn = !change || !this._handleIn.isZero() + handleIn = !change || !this._handleIn.isZero() ? this._handleIn : null, handleOut = !change || !this._handleOut.isZero() ? this._handleOut : null, diff --git a/src/style/Gradient.js b/src/style/Gradient.js index 1d1990f9..1f244f08 100644 --- a/src/style/Gradient.js +++ b/src/style/Gradient.js @@ -182,7 +182,7 @@ var Gradient = Base.extend(/** @lends Gradient# */{ equals: function(gradient) { if (gradient === this) return true; - if (gradient && this._class === gradient._class + if (gradient && this._class === gradient._class && this._stops.length === gradient._stops.length) { for (var i = 0, l = this._stops.length; i < l; i++) { if (!this._stops[i].equals(gradient._stops[i])) diff --git a/src/ui/Key.js b/src/ui/Key.js index 0da1a1ce..4d922619 100644 --- a/src/ui/Key.js +++ b/src/ui/Key.js @@ -37,7 +37,7 @@ var Key = new function() { 46: 'delete', 91: 'command', 93: 'command', // WebKit right command button - 224: 'command' // Gecko command button + 224: 'command' // Gecko command button }, // Mark the special keys that still can be interpreted as chars too