Merge branch 'fixes' into 'pregmod-master'

More fixes for the options macro

See merge request pregmodfan/fc-pregmod!4364

src/js/optionsMacro.js

@@ -157,7 +157,7 @@ Macro.add('options', {
 							onClickChange = onClickChange ? ', ' + onClickChange : '';
 							output += `<span class=${className}>[[${argText}${extraComment}|${passageName}][${variable}=${JSON.stringify(args[hasComparitor ? 1 : 0])}${onClickChange}]]</span>`;
 						} else if (showSelectedOption) {
-							output += `<span class=${optionMacroSelected}${className}>${argText}${extraComment}</span>`;
+							output += `<span class="optionMacroSelected ${className}">${argText}${extraComment}</span>`;
 						}
 					}
 				} else if (this.payload[i].name === 'comment') {
@@ -165,9 +165,10 @@ Macro.add('options', {
 				}
 			}
 			jQuery(this.output).wiki(
-				`<span class=optionMacro ${currentOptionIsNumber ? 'optionMacroNumber' : ``}>` +
-				`<span class=optionDescription> ${title} ${description} </span>` +
-				`<span class=optionValue> ${output} </span> ${comment ? `<span class=optionComment>// ${comment} //</span>` : ``}` +
+				`<span class="optionMacro ${currentOptionIsNumber ? 'optionMacroNumber' : ''}">` +
+					`<span class="optionDescription">${title} ${description} </span>` +
+					`<span class="optionValue">${output}</span>` +
+					`${comment ? '<span class="optionComment">//${comment}//</span>' : ''}` +
 				`</span>`);
 		} catch (ex) {
 			return this.error('bad options expression: ' + ex.message);