Font icon class replacement tweaks.

See #222
remkus · May 28, 2014 · 5566acb · 5566acb
1 parent 1049f4c
commit 5566acb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -120,11 +120,13 @@ module.exports = function(grunt) {
 					patterns: [{
 						match: /\'@@fonticonclasses\'/,
 						replacement: function() {
-							grunt.log.ok( 'Replacing font icon classes in .js file' );
+							grunt.log.write( 'Replacing font icon classes placeholder in .js file' );
 							var icons = grunt.file.read( 'assets/bower/less/font-awesome/icons.less' );
+							// Get rid of stuff before class name
 							icons = icons.replace( /\.@\{fa-css-prefix\}/gm, '\t\t\t\'ft-ico' );
+							// Get rid of stuff after class name
 							icons = icons.replace( /:before.*$/gm, '\',' );
-							icons = icons.replace( /\/\*.*\*\//gm, '' );
+							// Get rid of leading comment and trailing comma
 							icons = icons.substring( icons.indexOf( '\'' ), icons.lastIndexOf( ',' ) );
 							return icons;
 						}

diff --git a/assets/forsitethemes/js/fontawesome-icon-selector-app.js b/assets/forsitethemes/js/fontawesome-icon-selector-app.js
@@ -176,8 +176,8 @@
 		$( iconSelectorElement ).data( 'FontAwesomeIconSelectorApp', true );
 	};
 
-	// The placeholder is replaced with the full list via the grunt replace:fonticons task
 	AdminApp.getFontAwesomeIcons = function() {
+		// The placeholder is replaced with the full list via the grunt replace:fonticons task
 		var iconModels, iconClasses = [
 			'@@fonticonclasses'
 		];

diff --git a/theme/js/fontawesome-icon-selector-app.js b/theme/js/fontawesome-icon-selector-app.js
@@ -176,8 +176,8 @@
 		$( iconSelectorElement ).data( 'FontAwesomeIconSelectorApp', true );
 	};
 
-	// The placeholder is replaced with the full list via the grunt replace:fonticons task
 	AdminApp.getFontAwesomeIcons = function() {
+		// The placeholder is replaced with the full list via the grunt replace:fonticons task
 		var iconModels, iconClasses = [
 			'ft-ico-glass',
 			'ft-ico-music',