From 492253e5cac12fce41ad667f393b7f7443b124e0 Mon Sep 17 00:00:00 2001 From: kangax Date: Tue, 24 Jun 2014 14:12:17 +0200 Subject: [PATCH] JSCS tweaks. Down to 114 failures. --- .jscs.json | 2 - src/brushes/pencil_brush.class.js | 2 +- src/canvas.class.js | 5 +- src/filters/multiply_filter.class.js | 7 ++- src/mixins/canvas_events.mixin.js | 2 +- src/mixins/itext.svg_export.js | 2 +- src/mixins/itext_click_behavior.mixin.js | 8 +-- src/mixins/itext_key_behavior.mixin.js | 9 ++-- src/mixins/object_interactivity.mixin.js | 4 +- src/parser.js | 62 ++++++++++++------------ src/shapes/circle.class.js | 14 +++--- src/shapes/image.class.js | 23 ++++----- src/static_canvas.class.js | 1 - src/util/arc.js | 15 +++--- src/util/dom_event.js | 4 +- src/util/lang_class.js | 4 +- 16 files changed, 85 insertions(+), 79 deletions(-) diff --git a/.jscs.json b/.jscs.json index e33dbf0f..3068bf42 100644 --- a/.jscs.json +++ b/.jscs.json @@ -7,8 +7,6 @@ "requireParenthesesAroundIIFE": true, "requireSpacesInsideObjectBrackets": "all", "requireCommaBeforeLineBreak": true, - "requireRightStickedOperators": ["!"], - "requireLeftStickedOperators": [","], "requireCamelCaseOrUpperCaseIdentifiers": true, "requireKeywordsOnNewLine": ["else"], "requireLineFeedAtFileEnd": true, diff --git a/src/brushes/pencil_brush.class.js b/src/brushes/pencil_brush.class.js index 7da68bdb..7f31179a 100644 --- a/src/brushes/pencil_brush.class.js +++ b/src/brushes/pencil_brush.class.js @@ -144,7 +144,7 @@ this.box = this.getPathBoundingBox(this._points); return this.convertPointsToSVGPath( this._points, this.box.minx, this.box.maxx, this.box.miny, this.box.maxy); - }, + }, /** * Returns bounding box of a path based on given points diff --git a/src/canvas.class.js b/src/canvas.class.js index b216085a..66ac3a61 100644 --- a/src/canvas.class.js +++ b/src/canvas.class.js @@ -783,9 +783,8 @@ // Cache all targets where their bounding box contains point. var target, - pointer = this.getPointer(e); - - var i = this._objects.length; + pointer = this.getPointer(e), + i = this._objects.length; while (i--) { if (this._checkTarget(e, this._objects[i], pointer)){ diff --git a/src/filters/multiply_filter.class.js b/src/filters/multiply_filter.class.js index 3361ff29..8a9bcf95 100644 --- a/src/filters/multiply_filter.class.js +++ b/src/filters/multiply_filter.class.js @@ -59,10 +59,9 @@ source = new fabric.Color(this.color).getSource(); for (i = 0; i < iLen; i+=4) { - data[i] *= source[0]/255; - data[i + 1] *= source[1]/255; - data[i + 2] *= source[2]/255; - + data[i] *= source[0] / 255; + data[i + 1] *= source[1] / 255; + data[i + 2] *= source[2] / 255; } context.putImageData(imageData, 0, 0); diff --git a/src/mixins/canvas_events.mixin.js b/src/mixins/canvas_events.mixin.js index 063536bd..55987271 100644 --- a/src/mixins/canvas_events.mixin.js +++ b/src/mixins/canvas_events.mixin.js @@ -153,7 +153,7 @@ if (e.type === 'touchstart') { // Unbind mousedown to prevent double triggers from touch devices - removeListener(this.upperCanvasEl, 'mousedown', this._onMouseDown); + removeListener(this.upperCanvasEl, 'mousedown', this._onMouseDown); } else { addListener(fabric.document, 'mouseup', this._onMouseUp); diff --git a/src/mixins/itext.svg_export.js b/src/mixins/itext.svg_export.js index 41299b4f..bf75214f 100644 --- a/src/mixins/itext.svg_export.js +++ b/src/mixins/itext.svg_export.js @@ -108,7 +108,7 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot fabric.util.string.escapeXml(_char), '' - ].join(''); + ].join(''); } }); /* _TO_SVG_END_ */ diff --git a/src/mixins/itext_click_behavior.mixin.js b/src/mixins/itext_click_behavior.mixin.js index 2f1f1ad8..9c2c6c24 100644 --- a/src/mixins/itext_click_behavior.mixin.js +++ b/src/mixins/itext_click_behavior.mixin.js @@ -238,10 +238,10 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot mouseOffset, prevWidth, width, charIndex + i, jlen); } - if (mouseOffset.y < height) { - return this._getNewSelectionStartFromOffset( - mouseOffset, prevWidth, width, charIndex + i, jlen, j); - } + if (mouseOffset.y < height) { + return this._getNewSelectionStartFromOffset( + mouseOffset, prevWidth, width, charIndex + i, jlen, j); + } } // clicked somewhere after all chars, so set at the end diff --git a/src/mixins/itext_key_behavior.mixin.js b/src/mixins/itext_key_behavior.mixin.js index 5b8fce3f..72bbaa7e 100644 --- a/src/mixins/itext_key_behavior.mixin.js +++ b/src/mixins/itext_key_behavior.mixin.js @@ -16,7 +16,6 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot fabric.util.addListener(this.hiddenTextarea, 'copy', this.copy.bind(this)); fabric.util.addListener(this.hiddenTextarea, 'paste', this.paste.bind(this)); - if (!this._clickHandlerInitialized && this.canvas) { fabric.util.addListener(this.canvas.upperCanvasEl, 'click', this.onClick.bind(this)); this._clickHandlerInitialized = true; @@ -88,7 +87,7 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot copy: function(e) { var selectedText = this.getSelectedText(), clipboardData = this._getClipboardData(e); - + // Check for backward compatibility with old browsers if (clipboardData) { clipboardData.setData('text', selectedText); @@ -107,14 +106,14 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot paste: function(e) { var copiedText = null, clipboardData = this._getClipboardData(e); - + // Check for backward compatibility with old browsers if (clipboardData) { copiedText = clipboardData.getData('text'); } else { copiedText = this.copiedText; } - + if (copiedText) { this.insertChars(copiedText); } @@ -639,4 +638,4 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot } } } -}); \ No newline at end of file +}); diff --git a/src/mixins/object_interactivity.mixin.js b/src/mixins/object_interactivity.mixin.js index 6e6e1390..ecd51aa0 100644 --- a/src/mixins/object_interactivity.mixin.js +++ b/src/mixins/object_interactivity.mixin.js @@ -18,7 +18,9 @@ * @return {String|Boolean} corner code (tl, tr, bl, br, etc.), or false if nothing is found */ _findTargetCorner: function(pointer) { - if (!this.hasControls || !this.active) return false; + if (!this.hasControls || !this.active) { + return false; + } var ex = pointer.x, ey = pointer.y, diff --git a/src/parser.js b/src/parser.js index 3645cf8f..9761bc2f 100644 --- a/src/parser.js +++ b/src/parser.js @@ -354,8 +354,8 @@ if (ruleMatchesElement) { for (var property in fabric.cssRules[rule]) { - var attr = normalizeAttr(property); - var value = normalizeValue(attr, fabric.cssRules[rule][property]); + var attr = normalizeAttr(property), + value = normalizeValue(attr, fabric.cssRules[rule][property]); styles[attr] = value; } } @@ -480,46 +480,46 @@ * Used for caching SVG documents (loaded via `fabric.Canvas#loadSVGFromURL`) * @namespace */ - var svgCache = { + var svgCache = { - /** - * @param {String} name - * @param {Function} callback - */ - has: function (name, callback) { - callback(false); - }, + /** + * @param {String} name + * @param {Function} callback + */ + has: function (name, callback) { + callback(false); + }, - /** - * @param {String} url - * @param {Function} callback - */ - get: function () { - /* NOOP */ - }, + /** + * @param {String} url + * @param {Function} callback + */ + get: function () { + /* NOOP */ + }, - /** - * @param {String} url - * @param {Object} object - */ - set: function () { - /* NOOP */ - } - }; + /** + * @param {String} url + * @param {Object} object + */ + set: function () { + /* NOOP */ + } + }; /** * @private */ function _enlivenCachedObject(cachedObject) { - var objects = cachedObject.objects, - options = cachedObject.options; + var objects = cachedObject.objects, + options = cachedObject.options; - objects = objects.map(function (o) { - return fabric[capitalize(o.type)].fromObject(o); - }); + objects = objects.map(function (o) { + return fabric[capitalize(o.type)].fromObject(o); + }); - return ({ objects: objects, options: options }); + return ({ objects: objects, options: options }); } /** diff --git a/src/shapes/circle.class.js b/src/shapes/circle.class.js index e41de3e9..bdf1a6c6 100644 --- a/src/shapes/circle.class.js +++ b/src/shapes/circle.class.js @@ -161,22 +161,24 @@ */ fabric.Circle.fromElement = function(element, options) { options || (options = { }); + var parsedAttributes = fabric.parseAttributes(element, fabric.Circle.ATTRIBUTE_NAMES); + if (!isValidRadius(parsedAttributes)) { throw new Error('value of `r` attribute is required and can not be negative'); } - - + if (!('left' in parsedAttributes)) { - parsedAttributes.left = 0; + parsedAttributes.left = 0; } if (!('top' in parsedAttributes)) { - parsedAttributes.top = 0 + parsedAttributes.top = 0 } if (!('transformMatrix' in parsedAttributes)) { parsedAttributes.left -= (options.width / 2); - parsedAttributes.top -= (options.height / 2); - } + parsedAttributes.top -= (options.height / 2); + } + var obj = new fabric.Circle(extend(parsedAttributes, options)); obj.cx = parseFloat(element.getAttribute('cx')) || 0; diff --git a/src/shapes/image.class.js b/src/shapes/image.class.js index 73887969..bc411655 100644 --- a/src/shapes/image.class.js +++ b/src/shapes/image.class.js @@ -176,10 +176,10 @@ * @param {CanvasRenderingContext2D} ctx Context to render on */ _renderDashedStroke: function(ctx) { - var x = -this.width/2, - y = -this.height/2, - w = this.width, - h = this.height; + var x = -this.width / 2, + y = -this.height / 2, + w = this.width, + h = this.height; ctx.save(); this._setStrokeStyles(ctx); @@ -339,13 +339,14 @@ * @param {CanvasRenderingContext2D} ctx Context to render on */ _render: function(ctx) { - this._element && ctx.drawImage( - this._element, - -this.width / 2, - -this.height / 2, - this.width, - this.height - ); + this._element && + ctx.drawImage( + this._element, + -this.width / 2, + -this.height / 2, + this.width, + this.height + ); }, /** diff --git a/src/static_canvas.class.js b/src/static_canvas.class.js index 15c3b344..07f5c44c 100644 --- a/src/static_canvas.class.js +++ b/src/static_canvas.class.js @@ -923,7 +923,6 @@ } } - return data; }, diff --git a/src/util/arc.js b/src/util/arc.js index bbf78dc2..5c5dfde9 100644 --- a/src/util/arc.js +++ b/src/util/arc.js @@ -42,7 +42,7 @@ else if (thArc > 0 && sweep === 0) { thArc -= 2 * Math.PI; } - + var segments = Math.ceil(Math.abs(thArc / (Math.PI * 0.5 + 0.001))), result = []; @@ -69,7 +69,9 @@ var px = cosTh * (ox - x) + sinTh * (oy - y), py = cosTh * (oy - y) - sinTh * (ox - x), pl = (px * px) / (rx * rx) + (py * py) / (ry * ry); - pl *= 0.25; + + pl *= 0.25; + if (pl > 1) { pl = Math.sqrt(pl); rx *= pl; @@ -100,14 +102,15 @@ var sinTh0 = Math.sin(th0), cosTh0 = Math.cos(th0), - sinTh1 = Math.sin(th1), - cosTh1 = Math.cos(th1); - - var a00 = cosTh * rx, + sinTh1 = Math.sin(th1), + cosTh1 = Math.cos(th1), + + a00 = cosTh * rx, a01 = -sinTh * ry, a10 = sinTh * rx, a11 = cosTh * ry, thHalf = 0.25 * (th1 - th0), + t = (8 / 3) * Math.sin(thHalf) * Math.sin(thHalf) / Math.sin(thHalf * 2), diff --git a/src/util/dom_event.js b/src/util/dom_event.js index 5ec9c097..3941cf31 100644 --- a/src/util/dom_event.js +++ b/src/util/dom_event.js @@ -9,7 +9,9 @@ t, i, len = methodNames.length; for (i = 0; i < len; i++) { t = typeof object[methodNames[i]]; - if (!(/^(?:function|object|unknown)$/).test(t)) return false; + if (!(/^(?:function|object|unknown)$/).test(t)) { + return false; + } } return true; } diff --git a/src/util/lang_class.js b/src/util/lang_class.js index 6b3bf813..67995921 100644 --- a/src/util/lang_class.js +++ b/src/util/lang_class.js @@ -4,7 +4,9 @@ IS_DONTENUM_BUGGY = (function(){ for (var p in { toString: 1 }) { - if (p === 'toString') return false; + if (p === 'toString') { + return false; + } } return true; })(),