Show current font in font selector

Author: twiss

index.html

@@ -347,11 +347,11 @@ <h1 id="fileName" class="no-zen"><span id="currentFileLocation" style="display:n
 					<li>
 						<select data-change="font" id="font-select" data-l10n-title="font">
 							<option value="" disabled selected data-l10n-id="font"></option>
-							<option value="Verdana,Geneva,sans-serif" style="font-family: Verdana,Geneva,sans-serif;">Verdana/Geneva</option>
-							<option value="Helvetica,Arial,sans-serif" style="font-family: Helvetica,Arial,sans-serif;">Helvetica/Arial</option>
-							<option value="Georgia,Utopia,Charter,serif" style="font-family: Georgia,Utopia,Charter,serif;">Georgia/Utopia/Charter</option>
-							<option value="'Times New Roman',Times,serif" style="font-family: 'Times New Roman',Times,serif;">Times New Roman/Times</option>
-							<option value="'Courier New',Courier,monospace" style="font-family: 'Courier New',Courier,monospace;">Courier New/Courier</option>
+							<option value='Verdana, Geneva, sans-serif' style='font-family: Verdana, Geneva, sans-serif;'>Verdana/Geneva</option>
+							<option value='Helvetica, Arial, sans-serif' style='font-family: Helvetica, Arial, sans-serif;'>Helvetica/Arial</option>
+							<option value='Georgia, Utopia, Charter, serif' style='font-family: Georgia, Utopia, Charter, serif;'>Georgia/Utopia/Charter</option>
+							<option value='"Times New Roman", Times, serif' style='font-family: "Times New Roman", Times, serif;'>Times New Roman/Times</option>
+							<option value='"Courier New", Courier, monospace' style='font-family: "Courier New", Courier, monospace;'>Courier New/Courier</option>
 						</select>
 					</li>
 					<li>

scripts/firetext.js

@@ -1103,8 +1103,8 @@ function updateToolbar() {
 				bold.classList.remove('active');
 			}
 
-			// Font (TBD: show actual font)
-			fontSelect.value = '';
+			// Font
+			fontSelect.value = commandStates.fontName.value.replace(/'/g, '"').replace(/,\s*/g, ', ');
 
 			// Font size
 			fontSizeSelect.value = commandStates.fontSize.value;