Allow multiple selectors for ID / class namespacing (closes svg-sprit…

…e#109)

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Breaking change: Dropped support for Node.js < 4.0 and io.js
 * Set sprite size in example document ([#138](https://github.com/jkphl/svg-sprite/issues/138))
 * Added XML entity resolution ([#118](https://github.com/jkphl/svg-sprite/issues/118))
+* Allow multiple selectors for ID / class namespacing ([#109](https://github.com/jkphl/svg-sprite/issues/109))
 
 ## 1.2.19 Maintenance release (2016-01-11)
 * Updated dependencies

lib/svg-sprite/shape.js

@@ -786,8 +786,8 @@ SVGShape.prototype._replaceIdAndClassnameReferencesInCssSelectors = function(str
                     classnames.push(classname);
                 }
             };
-      var idOrClassSubstitution = function(sel){
-      	// If ID substitution should be applied: Search for an ID
+			var idOrClassSubstitution = function(sel){
+				// If ID substitution should be applied: Search for an ID
 				if (('id' in sel.rule) && (substIds !== null) && (('#' + sel.rule.id) in substIds)) {
 					ids.push(sel.rule.id);
 				}
@@ -796,17 +796,16 @@ SVGShape.prototype._replaceIdAndClassnameReferencesInCssSelectors = function(str
 				if (('classNames' in sel.rule) && (substClassnames !== null) && _.isArray(sel.rule.classNames)) {
 					sel.rule.classNames.forEach(classnameFilter);
 				}
-      };
+			};
 
+			// If there are multiple subselectors, substitute all of them
 			if ('selectors' in sel) {
-				sel.selectors.forEach(function(subsel){
-					idOrClassSubstitution(subsel);
-				}, this);
+				sel.selectors.forEach(idOrClassSubstitution);
 			}
 
+			// While there are nested rules: Substitute and recurse
 			while ((typeof(sel) === 'object') && ('rule' in sel)) {
 				idOrClassSubstitution(sel);
-				// Recurse
 				sel				= sel.rule;
 			}