Merge branch 'master' into update-js-yaml

svg-sprite · Mar 11, 2021 · ed1918f · ed1918f
2 parents 475069f + ba1ecfb
commit ed1918f
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 43 deletions.
diff --git a/LICENSE.txt → LICENSE b/LICENSE.txt → LICENSE
diff --git a/README.md b/README.md
@@ -378,7 +378,7 @@ Please refer to the [changelog](CHANGELOG.md) for a complete release history.
 
 ## Legal
 
-Copyright © 2018 Joschi Kuphal <joschi@kuphal.net> / [@jkphl](https://twitter.com/jkphl). *svg-sprite* is licensed under the terms of the [MIT license](LICENSE.txt). The contained example SVG icons are part of the [Tango Icon Library](http://tango.freedesktop.org/Tango_Icon_Library) and belong to the Public Domain.
+Copyright © 2018 Joschi Kuphal <joschi@kuphal.net> / [@jkphl](https://twitter.com/jkphl). *svg-sprite* is licensed under the terms of the [MIT license](LICENSE). The contained example SVG icons are part of the [Tango Icon Library](http://tango.freedesktop.org/Tango_Icon_Library) and belong to the Public Domain.
 
 
 [npm-url]: https://npmjs.org/package/svg-sprite

diff --git a/bin/svg-sprite.js b/bin/svg-sprite.js
@@ -1,17 +1,17 @@
 #!/usr/bin/env node
 
+'use strict';
+
 /**
  * svg-sprite is a Node.js module for creating SVG sprites
  *
  * @see https://github.com/svg-sprite/svg-sprite
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
-'use strict';
-
 /**
  * Module dependencies.
  */
@@ -106,14 +106,16 @@ function addConfigMap(store, path, value) {
  */
 function mergeConfig(from, to) {
 	for (var f in from) {
-		if (_.isObject(from[f])) {
-			if (!_.isObject(to[f])) {
-				to[f] = from[f];
+		if (Object.prototype.hasOwnProperty.call(from, f)) {
+			if (Object.prototype.hasOwnProperty.call(to, f) && _.isObject(from[f])) {
+				if (!_.isObject(to[f])) {
+					to[f] = from[f];
+				} else {
+					mergeConfig(from[f], to[f]);
+				}
 			} else {
-				mergeConfig(from[f], to[f]);
+				to[f] = from[f];
 			}
-		} else {
-			to[f] = from[f];
 		}
 	}
 }

diff --git a/lib/svg-sprite.js b/lib/svg-sprite.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 var CONFIG = require('./svg-sprite/config');

diff --git a/lib/svg-sprite/config.js b/lib/svg-sprite/config.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 var _ = require('lodash'),

diff --git a/lib/svg-sprite/layouter.js b/lib/svg-sprite/layouter.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 var _                               = require('lodash'),

diff --git a/lib/svg-sprite/mode/base.js b/lib/svg-sprite/mode/base.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 var path							= require('path'),

diff --git a/lib/svg-sprite/mode/css.js b/lib/svg-sprite/mode/css.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 var _								= require('lodash');
@@ -32,7 +32,7 @@ function SVGSpriteCss(spriter, config, data, key) {
  *
  * @type {Object}
  */
-SVGSpriteCss.prototype = _.create(SVGSpriteBase.prototype, {
+SVGSpriteCss.prototype = Object.assign(Object.create(SVGSpriteBase.prototype), {
 	constructor						: SVGSpriteCss,
 	mode							: SVGSpriteBase.prototype.MODE_CSS,
 	tmpl							: 'css',

diff --git a/lib/svg-sprite/mode/css/packer.js b/lib/svg-sprite/mode/css/packer.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 /**

diff --git a/lib/svg-sprite/mode/defs.js b/lib/svg-sprite/mode/defs.js
@@ -7,10 +7,9 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
-var _								= require('lodash');
 var SVGSpriteStandalone				= require('./standalone');
 var SVGSprite						= require('../sprite');
 
@@ -31,7 +30,7 @@ function SVGSpriteDefs(spriter, config, data, key) {
  *
  * @type {Object}
  */
-SVGSpriteDefs.prototype = _.create(SVGSpriteStandalone.prototype, {
+SVGSpriteDefs.prototype = Object.assign(Object.create(SVGSpriteStandalone.prototype), {
 	constructor						: SVGSpriteDefs,
 	mode							: SVGSpriteStandalone.prototype.MODE_DEFS
 });

diff --git a/lib/svg-sprite/mode/stack.js b/lib/svg-sprite/mode/stack.js
@@ -7,10 +7,9 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
-var _								= require('lodash');
 var SVGSpriteStandalone				= require('./standalone');
 var SVGSprite						= require('../sprite');
 
@@ -31,7 +30,7 @@ function SVGSpriteStack(spriter, config, data, key) {
  *
  * @type {Object}
  */
-SVGSpriteStack.prototype = _.create(SVGSpriteStandalone.prototype, {
+SVGSpriteStack.prototype = Object.assign(Object.create(SVGSpriteStandalone.prototype), {
 	constructor						: SVGSpriteStack,
 	mode							: SVGSpriteStandalone.prototype.MODE_STACK
 });

diff --git a/lib/svg-sprite/mode/standalone.js b/lib/svg-sprite/mode/standalone.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 var _								= require('lodash'),
@@ -30,7 +30,7 @@ function SVGSpriteStandalone(spriter, config, data) {
  *
  * @type {Object}
  */
-SVGSpriteStandalone.prototype = _.create(SVGSpriteBase.prototype, {
+SVGSpriteStandalone.prototype = Object.assign(Object.create(SVGSpriteBase.prototype), {
 	constructor						: SVGSpriteStandalone
 });
 

diff --git a/lib/svg-sprite/mode/symbol.js b/lib/svg-sprite/mode/symbol.js
@@ -7,10 +7,9 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
-var _								= require('lodash');
 var SVGSpriteStandalone				= require('./standalone');
 var SVGSprite						= require('../sprite');
 var symbolAttributes				= ['id', 'xml:base', 'xml:lang', 'xml:space', 'onfocusin', 'onfocusout', 'onactivate', 'onclick', 'onmousedown', 'onmouseup', 'onmouseover', 'onmousemove', 'onmouseout', 'onload', 'alignment-baseline', 'baseline-shift', 'clip', 'clip-path', 'clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cursor', 'direction', 'display', 'dominant-baseline', 'enable-background', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'flood-color', 'flood-opacity', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'glyph-orientation-horizontal', 'glyph-orientation-vertical', 'image-rendering', 'kerning', 'letter-spacing', 'lighting-color', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'overflow', 'pointer-events', 'shape-rendering', 'stop-color', 'stop-opacity', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'text-anchor', 'text-decoration', 'text-rendering', 'unicode-bidi', 'visibility', 'word-spacing', 'writing-mode', 'class', 'style', 'externalResourcesRequired', 'preserveAspectRatio', 'viewBox', 'aria-labelledby'];
@@ -32,7 +31,7 @@ function SVGSpriteSymbol(spriter, config, data, key) {
  *
  * @type {Object}
  */
-SVGSpriteSymbol.prototype = _.create(SVGSpriteStandalone.prototype, {
+SVGSpriteSymbol.prototype = Object.assign(Object.create(SVGSpriteStandalone.prototype), {
 	constructor						: SVGSpriteSymbol,
 	mode							: SVGSpriteStandalone.prototype.MODE_SYMBOL
 });

diff --git a/lib/svg-sprite/mode/view.js b/lib/svg-sprite/mode/view.js
@@ -7,11 +7,10 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
-var _								= require('lodash'),
-SVGSpriteStandalone					= require('./standalone'),
+var SVGSpriteStandalone					= require('./standalone'),
 SVGSpriteCss						= require('./css'),
 SVGSprite							= require('../sprite');
 
@@ -32,7 +31,7 @@ function SVGSpriteView(spriter, config, data, key) {
  *
  * @type {Object}
  */
-SVGSpriteView.prototype = _.create(SVGSpriteCss.prototype, {
+SVGSpriteView.prototype = Object.assign(Object.create(SVGSpriteCss.prototype), {
 	constructor						: SVGSpriteView,
 	mode							: SVGSpriteCss.prototype.MODE_VIEW,
 

diff --git a/lib/svg-sprite/queue.js b/lib/svg-sprite/queue.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 var path				= require('path'),

diff --git a/lib/svg-sprite/shape.js b/lib/svg-sprite/shape.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 var _						= require('lodash'),

diff --git a/lib/svg-sprite/shape/dimensions.phantom.js b/lib/svg-sprite/shape/dimensions.phantom.js
@@ -1,17 +1,17 @@
 'use strict';
 
-/* jshint -W117 */
-
 /**
  * svg-sprite is a Node.js module for creating SVG sprites
  *
  * @see https://github.com/svg-sprite/svg-sprite
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
+/* jshint -W117 */
+
 var system = require('system');
 
 if (system.args.length !== 3) {

diff --git a/lib/svg-sprite/sprite.js b/lib/svg-sprite/sprite.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 var _								= require('lodash'),

diff --git a/lib/svg-sprite/transform/svgo.js b/lib/svg-sprite/transform/svgo.js
@@ -7,7 +7,7 @@
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
 var SVGO = require('svgo'),

diff --git a/test/svg-sprite.js b/test/svg-sprite.js
@@ -1,18 +1,18 @@
 'use strict';
 
-/* jshint -W117 */
-/* jshint -W030 */
-
 /**
  * svg-sprite is a Node.js module for creating SVG sprites
  *
  * @see https://github.com/svg-sprite/svg-sprite
  *
  * @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
  * @copyright © 2018 Joschi Kuphal
- * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE.txt
+ * @license MIT https://github.com/svg-sprite/svg-sprite/blob/master/LICENSE
  */
 
+/* jshint -W117 */
+/* jshint -W030 */
+
 var fs = require('fs');
 var util = require('util');
 var svg2png = require('svg2png');