Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-16 09:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More JSCS fixes; down to 295 failures

Browse source
This commit is contained in:
kangax 2014-02-17 11:55:54 -05:00
parent 9a3f8da675
commit 631226d26b
12 changed files with 60 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.jscs.json
View file

@ -1,6 +1,9 @@
{
"requireCurlyBraces": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireCurlyBraces": [ "if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireSpaceBeforeBinaryOperators": ["+", "-", "*", "=", "==", "===", "!=", "!=="],
"requireSpaceAfterBinaryOperators": ["+", "-", "*", "=", "==", "===", "!=", "!=="],
"requireParenthesesAroundIIFE": true,
"requireSpacesInsideObjectBrackets": "all",
"requireCommaBeforeLineBreak": true,
@ -16,8 +19,10 @@
"disallowEmptyBlocks": true,
"disallowQuotedKeysInObjects": "allButReserved",
"disallowSpaceAfterObjectKeys": true,
"disallowLeftStickedOperators": ["?", "+", "-", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowRightStickedOperators": ["?", "+", ":", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--"],
"disallowKeywords": ["with"],
"disallowMultipleLineStrings": true,
"disallowMultipleLineBreaks": true,
@ -26,7 +31,7 @@
"validateLineBreaks": "LF",
"validateQuoteMarks": "'",
"validateIndentation": 2,
"safeContextKeyword": "_this"
}

33
dist/fabric.js vendored
View file

@ -915,7 +915,7 @@ fabric.Collection = {
a10 = sinTh * rx,
a11 = cosTh * ry,
thHalf = 0.5 * (th1 - th0),
t = (8/3) * Math.sin(thHalf * 0.5) *
t = (8 / 3) * Math.sin(thHalf * 0.5) *
Math.sin(thHalf * 0.5) / Math.sin(thHalf),
x1 = cx + Math.cos(th0) - t * Math.sin(th0),
@ -1878,8 +1878,8 @@ fabric.Collection = {
top = 0;
}
else if (element === fabric.document) {
left = body.scrollLeft || docElement.scrollLeft || 0;
top = body.scrollTop || docElement.scrollTop || 0;
left += body.scrollLeft || docElement.scrollLeft || 0;
top += body.scrollTop || docElement.scrollTop || 0;
}
else {
left += element.scrollLeft || 0;
@ -2173,7 +2173,7 @@ if (typeof console !== 'undefined') {
finish = start + duration, time,
onChange = options.onChange || function() { },
abort = options.abort || function() { return false; },
easing = options.easing || function(t, b, c, d) {return -c * Math.cos(t/d * (Math.PI/2)) + c + b;},
easing = options.easing || function(t, b, c, d) {return -c * Math.cos(t / d * (Math.PI / 2)) + c + b;},
startValue = 'startValue' in options ? options.startValue : 0,
endValue = 'endValue' in options ? options.endValue : 100,
byValue = options.byValue || endValue - startValue;
@ -8601,8 +8601,8 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
*/
_finalizeCurrentTransform: function() {
var transform = this._currentTransform;
var target = transform.target;
var transform = this._currentTransform,
target = transform.target;
if (target._scaling) {
target._scaling = false;
@ -8912,7 +8912,7 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
* @private
*/
_fire: function(eventName, target, e) {
this.fire('object:' + eventName, { target: target, e: e});
this.fire('object:' + eventName, { target: target, e: e });
target.fire(eventName, { e: e });
},
@ -8969,9 +8969,9 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
return false;
}
else {
var activeGroup = this.getActiveGroup();
// only show proper corner when group selection is not active
var corner = target._findTargetCorner
var activeGroup = this.getActiveGroup(),
// only show proper corner when group selection is not active
corner = target._findTargetCorner
&& (!activeGroup || !activeGroup.contains(target))
&& target._findTargetCorner(e, this._offset);
@ -13604,8 +13604,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
* @param ctx {CanvasRenderingContext2D} context to render on
*/
_renderDashedStroke: function(ctx) {
var x = -this.width/2,
y = -this.height/2,
var x = -this.width / 2,
y = -this.height / 2,
w = this.width,
h = this.height;
@ -15790,8 +15790,9 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
if (!this.visible) return;
ctx.save();
var m = this.transformMatrix;
var isInPathGroup = this.group && this.group.type === 'path-group';
var m = this.transformMatrix,
isInPathGroup = this.group && this.group.type === 'path-group';
// this._resetWidthHeight();
if (isInPathGroup) {
@ -19901,7 +19902,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
* @param {Number} direction: 1 or -1
*/
searchWordBoundary: function(selectionStart, direction) {
var index = this._reSpace.test(this.text.charAt(selectionStart)) ? selectionStart-1 : selectionStart,
var index = this._reSpace.test(this.text.charAt(selectionStart)) ? selectionStart - 1 : selectionStart,
_char = this.text.charAt(index),
reNonWord = /[ \n\.,;!\?\-]/;
@ -21204,7 +21205,7 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot
this.selectionStart = leftWordBoundary;
}
else {
var isBeginningOfLine = this.text.slice(this.selectionStart-1, this.selectionStart) === '\n';
var isBeginningOfLine = this.text.slice(this.selectionStart - 1, this.selectionStart) === '\n';
this.removeStyleObject(isBeginningOfLine);
this.selectionStart--;

4
dist/fabric.min.js vendored
View file

File diff suppressed because one or more lines are too long

BIN
dist/fabric.min.js.gz vendored
View file

Binary file not shown.

33
dist/fabric.require.js vendored
View file

@ -915,7 +915,7 @@ fabric.Collection = {
a10 = sinTh * rx,
a11 = cosTh * ry,
thHalf = 0.5 * (th1 - th0),
t = (8/3) * Math.sin(thHalf * 0.5) *
t = (8 / 3) * Math.sin(thHalf * 0.5) *
Math.sin(thHalf * 0.5) / Math.sin(thHalf),
x1 = cx + Math.cos(th0) - t * Math.sin(th0),
@ -1878,8 +1878,8 @@ fabric.Collection = {
top = 0;
}
else if (element === fabric.document) {
left = body.scrollLeft || docElement.scrollLeft || 0;
top = body.scrollTop || docElement.scrollTop || 0;
left += body.scrollLeft || docElement.scrollLeft || 0;
top += body.scrollTop || docElement.scrollTop || 0;
}
else {
left += element.scrollLeft || 0;
@ -2173,7 +2173,7 @@ if (typeof console !== 'undefined') {
finish = start + duration, time,
onChange = options.onChange || function() { },
abort = options.abort || function() { return false; },
easing = options.easing || function(t, b, c, d) {return -c * Math.cos(t/d * (Math.PI/2)) + c + b;},
easing = options.easing || function(t, b, c, d) {return -c * Math.cos(t / d * (Math.PI / 2)) + c + b;},
startValue = 'startValue' in options ? options.startValue : 0,
endValue = 'endValue' in options ? options.endValue : 100,
byValue = options.byValue || endValue - startValue;
@ -8601,8 +8601,8 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
*/
_finalizeCurrentTransform: function() {
var transform = this._currentTransform;
var target = transform.target;
var transform = this._currentTransform,
target = transform.target;
if (target._scaling) {
target._scaling = false;
@ -8912,7 +8912,7 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
* @private
*/
_fire: function(eventName, target, e) {
this.fire('object:' + eventName, { target: target, e: e});
this.fire('object:' + eventName, { target: target, e: e });
target.fire(eventName, { e: e });
},
@ -8969,9 +8969,9 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
return false;
}
else {
var activeGroup = this.getActiveGroup();
// only show proper corner when group selection is not active
var corner = target._findTargetCorner
var activeGroup = this.getActiveGroup(),
// only show proper corner when group selection is not active
corner = target._findTargetCorner
&& (!activeGroup || !activeGroup.contains(target))
&& target._findTargetCorner(e, this._offset);
@ -13604,8 +13604,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
* @param ctx {CanvasRenderingContext2D} context to render on
*/
_renderDashedStroke: function(ctx) {
var x = -this.width/2,
y = -this.height/2,
var x = -this.width / 2,
y = -this.height / 2,
w = this.width,
h = this.height;
@ -15790,8 +15790,9 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
if (!this.visible) return;
ctx.save();
var m = this.transformMatrix;
var isInPathGroup = this.group && this.group.type === 'path-group';
var m = this.transformMatrix,
isInPathGroup = this.group && this.group.type === 'path-group';
// this._resetWidthHeight();
if (isInPathGroup) {
@ -19901,7 +19902,7 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
* @param {Number} direction: 1 or -1
*/
searchWordBoundary: function(selectionStart, direction) {
var index = this._reSpace.test(this.text.charAt(selectionStart)) ? selectionStart-1 : selectionStart,
var index = this._reSpace.test(this.text.charAt(selectionStart)) ? selectionStart - 1 : selectionStart,
_char = this.text.charAt(index),
reNonWord = /[ \n\.,;!\?\-]/;
@ -21204,7 +21205,7 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot
this.selectionStart = leftWordBoundary;
}
else {
var isBeginningOfLine = this.text.slice(this.selectionStart-1, this.selectionStart) === '\n';
var isBeginningOfLine = this.text.slice(this.selectionStart - 1, this.selectionStart) === '\n';
this.removeStyleObject(isBeginningOfLine);
this.selectionStart--;

12
src/mixins/canvas_events.mixin.js
View file

@ -264,8 +264,8 @@
*/
_finalizeCurrentTransform: function() {
var transform = this._currentTransform;
var target = transform.target;
var transform = this._currentTransform,
target = transform.target;
if (target._scaling) {
target._scaling = false;
@ -575,7 +575,7 @@
* @private
*/
_fire: function(eventName, target, e) {
this.fire('object:' + eventName, { target: target, e: e});
this.fire('object:' + eventName, { target: target, e: e });
target.fire(eventName, { e: e });
},
@ -632,9 +632,9 @@
return false;
}
else {
var activeGroup = this.getActiveGroup();
// only show proper corner when group selection is not active
var corner = target._findTargetCorner
var activeGroup = this.getActiveGroup(),
// only show proper corner when group selection is not active
corner = target._findTargetCorner
&& (!activeGroup || !activeGroup.contains(target))
&& target._findTargetCorner(e, this._offset);

2
src/mixins/itext_behavior.mixin.js
View file

@ -258,7 +258,7 @@
* @param {Number} direction: 1 or -1
*/
searchWordBoundary: function(selectionStart, direction) {
var index = this._reSpace.test(this.text.charAt(selectionStart)) ? selectionStart-1 : selectionStart,
var index = this._reSpace.test(this.text.charAt(selectionStart)) ? selectionStart - 1 : selectionStart,
_char = this.text.charAt(index),
reNonWord = /[ \n\.,;!\?\-]/;

2
src/mixins/itext_key_behavior.mixin.js
View file

@ -600,7 +600,7 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot
this.selectionStart = leftWordBoundary;
}
else {
var isBeginningOfLine = this.text.slice(this.selectionStart-1, this.selectionStart) === '\n';
var isBeginningOfLine = this.text.slice(this.selectionStart - 1, this.selectionStart) === '\n';
this.removeStyleObject(isBeginningOfLine);
this.selectionStart--;

5
src/shapes/image.class.js
View file

@ -122,8 +122,9 @@
if (!this.visible) return;
ctx.save();
var m = this.transformMatrix;
var isInPathGroup = this.group && this.group.type === 'path-group';
var m = this.transformMatrix,
isInPathGroup = this.group && this.group.type === 'path-group';
// this._resetWidthHeight();
if (isInPathGroup) {

4
src/shapes/rect.class.js
View file

@ -156,8 +156,8 @@
* @param ctx {CanvasRenderingContext2D} context to render on
*/
_renderDashedStroke: function(ctx) {
var x = -this.width/2,
y = -this.height/2,
var x = -this.width / 2,
y = -this.height / 2,
w = this.width,
h = this.height;

2
src/util/animate.js
View file

@ -22,7 +22,7 @@
finish = start + duration, time,
onChange = options.onChange || function() { },
abort = options.abort || function() { return false; },
easing = options.easing || function(t, b, c, d) {return -c * Math.cos(t/d * (Math.PI/2)) + c + b;},
easing = options.easing || function(t, b, c, d) {return -c * Math.cos(t / d * (Math.PI / 2)) + c + b;},
startValue = 'startValue' in options ? options.startValue : 0,
endValue = 'endValue' in options ? options.endValue : 100,
byValue = options.byValue || endValue - startValue;

2
src/util/arc.js
View file

@ -99,7 +99,7 @@
a10 = sinTh * rx,
a11 = cosTh * ry,
thHalf = 0.5 * (th1 - th0),
t = (8/3) * Math.sin(thHalf * 0.5) *
t = (8 / 3) * Math.sin(thHalf * 0.5) *
Math.sin(thHalf * 0.5) / Math.sin(thHalf),
x1 = cx + Math.cos(th0) - t * Math.sin(th0),