diff options
author | Saivan <savian@me.com> | 2018-11-26 00:17:41 +1300 |
---|---|---|
committer | Saivan <savian@me.com> | 2018-11-26 00:17:41 +1300 |
commit | 617aa12304541cf1d80b2bf5567ac633958c38de (patch) | |
tree | c1082b4573625f93d18e82e6d5a0c4a40782993f /src/modules/optional/sugar.js | |
parent | 599fda2f11c88b2c18d0cd0b57d4adeca20db2eb (diff) | |
download | svg.js-617aa12304541cf1d80b2bf5567ac633958c38de.tar.gz svg.js-617aa12304541cf1d80b2bf5567ac633958c38de.zip |
Reverted some of the lint rules after chatting with fuzzy
This commit reverts some of the rules we added on the linter, it changed a lot of
code again... but these won't happen too often.
Changes
=======
- Modified the linter again
Diffstat (limited to 'src/modules/optional/sugar.js')
-rw-r--r-- | src/modules/optional/sugar.js | 232 |
1 files changed, 83 insertions, 149 deletions
diff --git a/src/modules/optional/sugar.js b/src/modules/optional/sugar.js index 4b6e6f3..3bd61fb 100644 --- a/src/modules/optional/sugar.js +++ b/src/modules/optional/sugar.js @@ -10,225 +10,167 @@ import SVGNumber from '../../types/SVGNumber.js' var sugar = { stroke: [ 'color', 'width', 'opacity', 'linecap', 'linejoin', 'miterlimit', 'dasharray', 'dashoffset' ], fill: [ 'color', 'opacity', 'rule' ], - prefix: function ( t, a ) { - + prefix: function (t, a) { return a === 'color' ? t : t + '-' + a - } } // Add sugar for fill and stroke -;[ 'fill', 'stroke' ].forEach( function ( m ) { - +;[ 'fill', 'stroke' ].forEach(function (m) { var extension = {} var i - extension[m] = function ( o ) { - - if ( typeof o === 'undefined' ) { - - return this.attr( m ) - + extension[m] = function (o) { + if (typeof o === 'undefined') { + return this.attr(m) } - if ( typeof o === 'string' || Color.isRgb( o ) || ( o instanceof Element ) ) { - - this.attr( m, o ) - + if (typeof o === 'string' || Color.isRgb(o) || (o instanceof Element)) { + this.attr(m, o) } else { - // set all attributes from sugar.fill and sugar.stroke list - for ( i = sugar[m].length - 1; i >= 0; i-- ) { - - if ( o[sugar[m][i]] != null ) { - - this.attr( sugar.prefix( m, sugar[m][i] ), o[sugar[m][i]] ) - + for (i = sugar[m].length - 1; i >= 0; i--) { + if (o[sugar[m][i]] != null) { + this.attr(sugar.prefix(m, sugar[m][i]), o[sugar[m][i]]) } - } - } return this - } - registerMethods( [ 'Shape', 'Runner' ], extension ) + registerMethods([ 'Shape', 'Runner' ], extension) +}) -} ) - -registerMethods( [ 'Element', 'Runner' ], { +registerMethods([ 'Element', 'Runner' ], { // Let the user set the matrix directly - matrix: function ( mat, b, c, d, e, f ) { - + matrix: function (mat, b, c, d, e, f) { // Act as a getter - if ( mat == null ) { - - return new Matrix( this ) - + if (mat == null) { + return new Matrix(this) } // Act as a setter, the user can pass a matrix or a set of numbers - return this.attr( 'transform', new Matrix( mat, b, c, d, e, f ) ) - + return this.attr('transform', new Matrix(mat, b, c, d, e, f)) }, // Map rotation to transform - rotate: function ( angle, cx, cy ) { - - return this.transform( { rotate: angle, ox: cx, oy: cy }, true ) - + rotate: function (angle, cx, cy) { + return this.transform({ rotate: angle, ox: cx, oy: cy }, true) }, // Map skew to transform - skew: function ( x, y, cx, cy ) { - + skew: function (x, y, cx, cy) { return arguments.length === 1 || arguments.length === 3 - ? this.transform( { skew: x, ox: y, oy: cx }, true ) - : this.transform( { skew: [ x, y ], ox: cx, oy: cy }, true ) - + ? this.transform({ skew: x, ox: y, oy: cx }, true) + : this.transform({ skew: [ x, y ], ox: cx, oy: cy }, true) }, - shear: function ( lam, cx, cy ) { - - return this.transform( { shear: lam, ox: cx, oy: cy }, true ) - + shear: function (lam, cx, cy) { + return this.transform({ shear: lam, ox: cx, oy: cy }, true) }, // Map scale to transform - scale: function ( x, y, cx, cy ) { - + scale: function (x, y, cx, cy) { return arguments.length === 1 || arguments.length === 3 - ? this.transform( { scale: x, ox: y, oy: cx }, true ) - : this.transform( { scale: [ x, y ], ox: cx, oy: cy }, true ) - + ? this.transform({ scale: x, ox: y, oy: cx }, true) + : this.transform({ scale: [ x, y ], ox: cx, oy: cy }, true) }, // Map translate to transform - translate: function ( x, y ) { - - return this.transform( { translate: [ x, y ] }, true ) - + translate: function (x, y) { + return this.transform({ translate: [ x, y ] }, true) }, // Map relative translations to transform - relative: function ( x, y ) { - - return this.transform( { relative: [ x, y ] }, true ) - + relative: function (x, y) { + return this.transform({ relative: [ x, y ] }, true) }, // Map flip to transform - flip: function ( direction, around ) { - + flip: function (direction, around) { var directionString = typeof direction === 'string' ? direction - : isFinite( direction ) ? 'both' + : isFinite(direction) ? 'both' : 'both' - var origin = ( direction === 'both' && isFinite( around ) ) ? [ around, around ] - : ( direction === 'x' ) ? [ around, 0 ] - : ( direction === 'y' ) ? [ 0, around ] - : isFinite( direction ) ? [ direction, direction ] + var origin = (direction === 'both' && isFinite(around)) ? [ around, around ] + : (direction === 'x') ? [ around, 0 ] + : (direction === 'y') ? [ 0, around ] + : isFinite(direction) ? [ direction, direction ] : [ 0, 0 ] - this.transform( { flip: directionString, origin: origin }, true ) - + this.transform({ flip: directionString, origin: origin }, true) }, // Opacity - opacity: function ( value ) { - - return this.attr( 'opacity', value ) - + opacity: function (value) { + return this.attr('opacity', value) }, // Relative move over x and y axes - dmove: function ( x, y ) { - - return this.dx( x ).dy( y ) - + dmove: function (x, y) { + return this.dx(x).dy(y) } -} ) +}) -registerMethods( 'Element', { +registerMethods('Element', { // Relative move over x axis - dx: function ( x ) { - - return this.x( new SVGNumber( x ).plus( this.x() ) ) - + dx: function (x) { + return this.x(new SVGNumber(x).plus(this.x())) }, // Relative move over y axis - dy: function ( y ) { - - return this.y( new SVGNumber( y ).plus( this.y() ) ) - + dy: function (y) { + return this.y(new SVGNumber(y).plus(this.y())) } -} ) +}) -registerMethods( 'radius', { +registerMethods('radius', { // Add x and y radius - radius: function ( x, y ) { - - var type = ( this._element || this ).type + radius: function (x, y) { + var type = (this._element || this).type return type === 'radialGradient' || type === 'radialGradient' - ? this.attr( 'r', new SVGNumber( x ) ) - : this.rx( x ).ry( y == null ? x : y ) - + ? this.attr('r', new SVGNumber(x)) + : this.rx(x).ry(y == null ? x : y) } -} ) +}) -registerMethods( 'Path', { +registerMethods('Path', { // Get path length length: function () { - return this.node.getTotalLength() - }, // Get point at length - pointAt: function ( length ) { - - return new Point( this.node.getPointAtLength( length ) ) - + pointAt: function (length) { + return new Point(this.node.getPointAtLength(length)) } -} ) +}) -registerMethods( [ 'Element', 'Runner' ], { +registerMethods([ 'Element', 'Runner' ], { // Set font - font: function ( a, v ) { - - if ( typeof a === 'object' ) { - - for ( v in a ) this.font( v, a[v] ) - + font: function (a, v) { + if (typeof a === 'object') { + for (v in a) this.font(v, a[v]) } return a === 'leading' - ? this.leading( v ) + ? this.leading(v) : a === 'anchor' - ? this.attr( 'text-anchor', v ) + ? this.attr('text-anchor', v) : a === 'size' || a === 'family' || a === 'weight' || a === 'stretch' || a === 'variant' || a === 'style' - ? this.attr( 'font-' + a, v ) - : this.attr( a, v ) - + ? this.attr('font-' + a, v) + : this.attr(a, v) } -} ) - -registerMethods( 'Text', { - ax ( x ) { - - return this.attr( 'x', x ) +}) +registerMethods('Text', { + ax (x) { + return this.attr('x', x) }, - ay ( y ) { - - return this.attr( 'y', y ) - + ay (y) { + return this.attr('y', y) }, - amove ( x, y ) { - - return this.ax( x ).ay( y ) - + amove (x, y) { + return this.ax(x).ay(y) } -} ) +}) // Add events to elements const methods = [ 'click', @@ -244,27 +186,19 @@ const methods = [ 'click', 'touchmove', 'touchleave', 'touchend', - 'touchcancel' ].reduce( function ( last, event ) { - + 'touchcancel' ].reduce(function (last, event) { // add event to Element - const fn = function ( f ) { - - if ( f === null ) { - - off( this, event ) - + const fn = function (f) { + if (f === null) { + off(this, event) } else { - - on( this, event, f ) - + on(this, event, f) } return this - } last[event] = fn return last +}, {}) -}, {} ) - -registerMethods( 'Element', methods ) +registerMethods('Element', methods) |