aboutsummaryrefslogtreecommitdiffstats
path: root/src/utils/adopter.js
diff options
context:
space:
mode:
authorSaivan <savian@me.com>2018-11-26 00:17:41 +1300
committerSaivan <savian@me.com>2018-11-26 00:17:41 +1300
commit617aa12304541cf1d80b2bf5567ac633958c38de (patch)
treec1082b4573625f93d18e82e6d5a0c4a40782993f /src/utils/adopter.js
parent599fda2f11c88b2c18d0cd0b57d4adeca20db2eb (diff)
downloadsvg.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/utils/adopter.js')
-rw-r--r--src/utils/adopter.js156
1 files changed, 51 insertions, 105 deletions
diff --git a/src/utils/adopter.js b/src/utils/adopter.js
index 6e526e3..ec6b2e5 100644
--- a/src/utils/adopter.js
+++ b/src/utils/adopter.js
@@ -5,190 +5,136 @@ import { globals } from '../utils/window.js'
import Base from '../types/Base.js'
const elements = {}
-export const root = Symbol( 'root' )
+export const root = Symbol('root')
// Method for element creation
-export function makeNode ( name ) {
-
+export function makeNode (name) {
// create element
- return globals.document.createElementNS( ns, name )
-
+ return globals.document.createElementNS(ns, name)
}
-export function makeInstance ( element ) {
-
- if ( element instanceof Base ) return element
-
- if ( typeof element === 'object' ) {
-
- return adopt( element )
+export function makeInstance (element) {
+ if (element instanceof Base) return element
+ if (typeof element === 'object') {
+ return adopt(element)
}
- if ( element == null ) {
-
+ if (element == null) {
return new elements[root]()
-
}
- if ( typeof element === 'string' && element.charAt( 0 ) !== '<' ) {
-
- return adopt( globals.document.querySelector( element ) )
-
+ if (typeof element === 'string' && element.charAt(0) !== '<') {
+ return adopt(globals.document.querySelector(element))
}
- var node = makeNode( 'svg' )
+ var node = makeNode('svg')
node.innerHTML = element
// We can use firstChild here because we know,
// that the first char is < and thus an element
- element = adopt( node.firstChild )
+ element = adopt(node.firstChild)
return element
-
}
-export function nodeOrNew ( name, node ) {
-
- return node instanceof globals.window.Node ? node : makeNode( name )
-
+export function nodeOrNew (name, node) {
+ return node instanceof globals.window.Node ? node : makeNode(name)
}
// Adopt existing svg elements
-export function adopt ( node ) {
-
+export function adopt (node) {
// check for presence of node
- if ( !node ) return null
+ if (!node) return null
// make sure a node isn't already adopted
- if ( node.instance instanceof Base ) return node.instance
-
- if ( !( node instanceof globals.window.SVGElement ) ) {
-
- return new elements.HtmlNode( node )
+ if (node.instance instanceof Base) return node.instance
+ if (!(node instanceof globals.window.SVGElement)) {
+ return new elements.HtmlNode(node)
}
// initialize variables
var element
// adopt with element-specific settings
- if ( node.nodeName === 'svg' ) {
-
- element = new elements[root]( node )
-
- } else if ( node.nodeName === 'linearGradient' || node.nodeName === 'radialGradient' ) {
-
- element = new elements.Gradient( node )
-
- } else if ( elements[capitalize( node.nodeName )] ) {
-
- element = new elements[capitalize( node.nodeName )]( node )
-
+ if (node.nodeName === 'svg') {
+ element = new elements[root](node)
+ } else if (node.nodeName === 'linearGradient' || node.nodeName === 'radialGradient') {
+ element = new elements.Gradient(node)
+ } else if (elements[capitalize(node.nodeName)]) {
+ element = new elements[capitalize(node.nodeName)](node)
} else {
-
- element = new elements.Bare( node )
-
+ element = new elements.Bare(node)
}
return element
-
}
-export function register ( element, name = element.name, asRoot = false ) {
-
+export function register (element, name = element.name, asRoot = false) {
elements[name] = element
- if ( asRoot ) elements[root] = element
+ if (asRoot) elements[root] = element
- addMethodNames( Object.keys( element.prototype ) )
+ addMethodNames(Object.keys(element.prototype))
return element
-
}
-export function getClass ( name ) {
-
+export function getClass (name) {
return elements[name]
-
}
// Element id sequence
let did = 1000
// Get next named element id
-export function eid ( name ) {
-
- return 'Svgjs' + capitalize( name ) + ( did++ )
-
+export function eid (name) {
+ return 'Svgjs' + capitalize(name) + (did++)
}
// Deep new id assignment
-export function assignNewId ( node ) {
-
+export function assignNewId (node) {
// do the same for SVG child nodes as well
- for ( var i = node.children.length - 1; i >= 0; i-- ) {
-
- assignNewId( node.children[i] )
-
+ for (var i = node.children.length - 1; i >= 0; i--) {
+ assignNewId(node.children[i])
}
- if ( node.id ) {
-
- return adopt( node ).id( eid( node.nodeName ) )
-
+ if (node.id) {
+ return adopt(node).id(eid(node.nodeName))
}
- return adopt( node )
-
+ return adopt(node)
}
// Method for extending objects
-export function extend ( modules, methods, attrCheck ) {
-
+export function extend (modules, methods, attrCheck) {
var key, i
- modules = Array.isArray( modules ) ? modules : [ modules ]
-
- for ( i = modules.length - 1; i >= 0; i-- ) {
-
- for ( key in methods ) {
+ modules = Array.isArray(modules) ? modules : [ modules ]
+ for (i = modules.length - 1; i >= 0; i--) {
+ for (key in methods) {
let method = methods[key]
- if ( attrCheck ) {
-
- method = wrapWithAttrCheck( methods[key] )
-
+ if (attrCheck) {
+ method = wrapWithAttrCheck(methods[key])
}
modules[i].prototype[key] = method
-
}
-
}
-
}
-export function extendWithAttrCheck ( ...args ) {
-
- extend( ...args, true )
-
+export function extendWithAttrCheck (...args) {
+ extend(...args, true)
}
-export function wrapWithAttrCheck ( fn ) {
-
- return function ( ...args ) {
-
+export function wrapWithAttrCheck (fn) {
+ return function (...args) {
let o = args[args.length - 1]
- if ( o && o.constructor === Object && !( o instanceof Array ) ) {
-
- return fn.apply( this, args.slice( 0, -1 ) ).attr( o )
-
+ if (o && o.constructor === Object && !(o instanceof Array)) {
+ return fn.apply(this, args.slice(0, -1)).attr(o)
} else {
-
- return fn.apply( this, args )
-
+ return fn.apply(this, args)
}
-
}
-
}