Localize add-on & add features for menu display

src/background/modules/ContextMenu.js

@@ -84,10 +84,36 @@ async function handleMenuShown(info) {
  * @returns {void}
  */
 function buildMenu(unicodeFontSettings, exampleText = null, refreshMenu = false) {
-    let addedEntries = false;
-    for (const transformationId of menuStructure) {
+    if (unicodeFontSettings.changeFont) {
+        addMenuItems(menuStructure[TRANSFORMATION_TYPE.FONT], unicodeFontSettings, exampleText, refreshMenu);
+    }
+    if (unicodeFontSettings.changeFont &&
+        unicodeFontSettings.changeCase &&
+        !refreshMenu) {
+        menus.create({
+            id: "seperator-case-font",
+            type: "separator",
+            contexts: ["editable"]
+        });
+    }
+    if (unicodeFontSettings.changeCase) {
+        addMenuItems(menuStructure[TRANSFORMATION_TYPE.CASING], unicodeFontSettings, exampleText, refreshMenu);
+    }
+}
+
+/**
+ * Add Unicode menu items.
+ *
+ * @param {string[]} menuItems
+ * @param {Object} [unicodeFontSettings]
+ * @param {string?} [exampleText=null]
+ * @param {bool?} [refreshMenu=false]
+ * @returns {void}
+ */
+function addMenuItems(menuItems, unicodeFontSettings = lastCachedUnicodeFontSettings, exampleText = null, refreshMenu = false) {
+    for (const transformationId of menuItems) {
         if (transformationId === SEPARATOR_ID) {
-            if (!addedEntries || refreshMenu) {
+            if (refreshMenu) {
                 continue;
             }
 
@@ -99,16 +125,6 @@ function buildMenu(unicodeFontSettings, exampleText = null, refreshMenu = false)
             continue;
         }
 
-        const transformationType = UnicodeTransformationHandler.getTransformationType(transformationId);
-        if (transformationType === TRANSFORMATION_TYPE.CASING &&
-            !unicodeFontSettings.changeCase) {
-            continue;
-        }
-        if (transformationType === TRANSFORMATION_TYPE.FONT &&
-            !unicodeFontSettings.changeFont) {
-            continue;
-        }
-
         const translatedMenuText = browser.i18n.getMessage(transformationId);
         let textToBeTransformed = translatedMenuText;
         if (unicodeFontSettings.livePreview && exampleText) {
@@ -132,9 +148,7 @@ function buildMenu(unicodeFontSettings, exampleText = null, refreshMenu = false)
                 "title": menuText,
                 "contexts": ["editable"],
             });
-
         }
-        addedEntries = true;
     }
 }
 

src/common/modules/data/Fonts.js

@@ -47,39 +47,41 @@ export const FONT_ID_PREFIX = "menuFont";
  *
  * @public
  * @const
- * @type {Object.<string>}
+ * @type {Object.<Symbol, string[]>}
  */
-export const menuStructure = Object.freeze([
-    `${FONT_ID_PREFIX}Superscript`,
-    `${FONT_ID_PREFIX}SmallCaps`,
-    `${FONT_ID_PREFIX}AllSmallCaps`,
-    `${FONT_ID_PREFIX}Unicase`,
-    SEPARATOR_ID,
-    `${FONT_ID_PREFIX}SerifBold`,
-    `${FONT_ID_PREFIX}SerifItalic`,
-    `${FONT_ID_PREFIX}SerifBoldItalic`,
-    `${FONT_ID_PREFIX}SansSerif`,
-    `${FONT_ID_PREFIX}SansSerifBold`,
-    `${FONT_ID_PREFIX}SansSerifItalic`,
-    `${FONT_ID_PREFIX}SansSerifBoldItalic`,
-    `${FONT_ID_PREFIX}Script`,
-    `${FONT_ID_PREFIX}ScriptBold`,
-    `${FONT_ID_PREFIX}ScriptFraktur`,
-    `${FONT_ID_PREFIX}FrakturBold`,
-    `${FONT_ID_PREFIX}Monospace`,
-    `${FONT_ID_PREFIX}DoubleStruck`,
-    SEPARATOR_ID,
-    `${FONT_ID_PREFIX}Circled`,
-    `${FONT_ID_PREFIX}CircledBlack`,
-    `${FONT_ID_PREFIX}Squared`,
-    `${FONT_ID_PREFIX}SquaredBlack`,
-    `${FONT_ID_PREFIX}Fullwidth`,
-    SEPARATOR_ID,
-    `${CASE_ID_PREFIX}Lowercase`,
-    `${CASE_ID_PREFIX}Uppercase`,
-    `${CASE_ID_PREFIX}CapitalizeEachWord`,
-    `${CASE_ID_PREFIX}ToggleCase`
-]);
+export const menuStructure = Object.freeze({
+    [TRANSFORMATION_TYPE.FONT]: [
+        `${FONT_ID_PREFIX}Superscript`,
+        `${FONT_ID_PREFIX}SmallCaps`,
+        `${FONT_ID_PREFIX}AllSmallCaps`,
+        `${FONT_ID_PREFIX}Unicase`,
+        SEPARATOR_ID,
+        `${FONT_ID_PREFIX}SerifBold`,
+        `${FONT_ID_PREFIX}SerifItalic`,
+        `${FONT_ID_PREFIX}SerifBoldItalic`,
+        `${FONT_ID_PREFIX}SansSerif`,
+        `${FONT_ID_PREFIX}SansSerifBold`,
+        `${FONT_ID_PREFIX}SansSerifItalic`,
+        `${FONT_ID_PREFIX}SansSerifBoldItalic`,
+        `${FONT_ID_PREFIX}Script`,
+        `${FONT_ID_PREFIX}ScriptBold`,
+        `${FONT_ID_PREFIX}ScriptFraktur`,
+        `${FONT_ID_PREFIX}FrakturBold`,
+        `${FONT_ID_PREFIX}Monospace`,
+        `${FONT_ID_PREFIX}DoubleStruck`,
+        `${FONT_ID_PREFIX}Circled`,
+        `${FONT_ID_PREFIX}CircledBlack`,
+        `${FONT_ID_PREFIX}Squared`,
+        `${FONT_ID_PREFIX}SquaredBlack`,
+        `${FONT_ID_PREFIX}Fullwidth`,
+    ],
+    [TRANSFORMATION_TYPE.CASING]: [
+        `${CASE_ID_PREFIX}Lowercase`,
+        `${CASE_ID_PREFIX}Uppercase`,
+        `${CASE_ID_PREFIX}CapitalizeEachWord`,
+        `${CASE_ID_PREFIX}ToggleCase`
+    ]
+});
 
 /**
  * Unicode fonts