Merge pull request #207 from mladenplavsic/fix/remove-titles

Fix: Remove <title> tags from SVGs

Gruntfile.js

@@ -56,7 +56,7 @@ module.exports = function( grunt ) {
 		svgstore: {
 			withCustomTemplate:{
 				options: {
-					prefix : '', // Unused by us, but svgstore demands this variable
+					includeTitleElement: false,
 					svg: { // will add and overide the the default xmlns="http://www.w3.org/2000/svg" attribute to the resulting SVG
 						viewBox : '0 0 24 24',
 						xmlns: 'http://www.w3.org/2000/svg'
@@ -176,16 +176,16 @@ module.exports = function( grunt ) {
 
 				},
 				files: {
-					'svg-sprite/gridicons.svg': ['svg/*.svg']
+					'svg-sprite/gridicons.svg': ['svg-min/*.svg']
 				}
-			},
+			}
 		},
 
 		rename: {
 			moveThis: {
 					src: 'svg-sprite/gridicons-demo.html',
 					dest: 'svg-sprite/index.html'
-			},
+			}
 		},
 
 		copy: {
@@ -418,41 +418,10 @@ module.exports = function( grunt ) {
 			var fileContent = grunt.file.read( 'svg-min/' + svgFile );
 
 			// Add transparent rectangle to each file
-			fileContent = fileContent.slice( 0, fileContent.indexOf( '</title>' ) + 8 ) +
+			var insertAt = fileContent.indexOf( '>' ) + 1;
+			fileContent = fileContent.slice( 0, insertAt ) +
 						'<rect x="0" fill="none" width="24" height="24"/>' +
-						fileContent.slice( fileContent.indexOf( '</title>' ) + 8, -6 ) +
-						fileContent.slice( -6 );
-
-			// Save and overwrite the files in svg-min
-			grunt.file.write( 'svg-min/' + svgFile, fileContent );
-
-		} );
-
-	});
-
-	// Update all files in svg-min to add a title element for accessibility
-	grunt.registerTask( 'addtitle', 'Add title element to SVGs', function() {
-		var svgFiles = grunt.file.expand( { filter: 'isFile', cwd: 'svg-min/' }, [ '**/*.svg' ] );
-
-		// Add stuff
-		svgFiles.forEach( function( svgFile ) {
-
-			// Grab the relevant bits from the file contents
-			var fileContent = grunt.file.read( 'svg-min/' + svgFile );
-
-			// Grab the filename without 'gridicons-' and the .svg extension
-			var name = svgFile.substring( 10, svgFile.lastIndexOf( '.' ) );
-
-			// Remove hyphens and convert to Title Case
-			var title = name.split( '-' ).map( function( item ) {
-				return item.charAt( 0 ).toUpperCase() + item.slice( 1 );
-			 } ).join( ' ' );
-
-			// Add transparent rectangle to each file
-			fileContent = fileContent.slice( 0, fileContent.indexOf( 'viewBox="0 0 24 24">' ) + 20 ) +
-						'<title>' + title + '</title>' +
-						fileContent.slice( fileContent.indexOf( 'viewBox="0 0 24 24">' ) + 20, -6 ) +
-						fileContent.slice( -6 );
+						fileContent.slice( insertAt );
 
 			// Save and overwrite the files in svg-min
 			grunt.file.write( 'svg-min/' + svgFile, fileContent );
@@ -462,6 +431,6 @@ module.exports = function( grunt ) {
 	});
 
 	// Default task(s).
-	grunt.registerTask('default', ['svgmin', 'group', 'svgstore', 'rename', 'copy', 'addtitle', 'svgphp', 'kebabToCamelCase', 'svgreact', 'babel', 'addsquare', 'clean' ]);
+	grunt.registerTask('default', ['svgmin', 'group', 'svgstore', 'rename', 'copy', 'svgphp', 'kebabToCamelCase', 'svgreact', 'babel', 'addsquare', 'clean' ]);
 
 };

package.json

@@ -36,7 +36,7 @@
     "grunt-contrib-copy": "^0.6.0",
     "grunt-rename": "^0.1.4",
     "grunt-svgmin": "^2.0.1",
-    "grunt-svgstore": "^0.3.6",
+    "grunt-svgstore": "^1.0.0",
     "handlebars": "^2.0.0",
     "jit-grunt": "^0.10.0",
     "load-grunt-tasks": "^3.5.2",