Merge branch 'develop' of LInE/Ifractions-web into master

js/menus/menu_custom.js

@@ -260,6 +260,7 @@ const customMenuState = {
     infoIcon.anchor(0.5, 0.5);
     infoIcon.iconType = 'infoIcon';
     infoIcon.id = 'gameMode';
+    infoIcon.description = 'info_description';
     self.menuIcons.push(infoIcon);
 
     // Label 'Operations'
@@ -269,6 +270,7 @@ const customMenuState = {
     infoIcon.anchor(0.5, 0.5);
     infoIcon.iconType = 'infoIcon';
     infoIcon.id = 'gameOperation';
+    infoIcon.description = 'info_description';
     self.menuIcons.push(infoIcon);
 
     // Label 'Difficulties'
@@ -278,6 +280,7 @@ const customMenuState = {
     infoIcon.anchor(0.5, 0.5);
     infoIcon.iconType = 'infoIcon';
     infoIcon.id = 'gameDifficulty';
+    infoIcon.description = 'info_description';
     self.menuIcons.push(infoIcon);
 
     // Label 'Show Fractions'
@@ -483,7 +486,7 @@ const customMenuState = {
    * @param {object} icon icon for the game mode
    */
   showTitle: function (icon) {
-    if (icon.iconType !== 'infoIcon' && icon.iconType !== 'enter')
+    if (icon.iconType !== 'enter')
       self.lbl_description.name = game.lang[icon.description];
   },
 

js/menus/menu_main.js

@@ -92,6 +92,7 @@ const menuState = {
         infoIcon.anchor(0.5, 0.5);
         infoIcon.iconType = 'infoIcon';
         infoIcon.id = i;
+        infoIcon.description = 'info_description';
         this.menuIcons.push(infoIcon);
       }
 
@@ -192,10 +193,13 @@ const menuState = {
    * @param {object} icon icon for the game
    */
   showTitle: function (icon) {
-    const number =
+    if (icon.iconType === 'game') {
-      gameList[icon.gameId].gameName.slice(-3) == 'One' ? 'I' : 'II';
+      const number =
-    const shape = gameList[icon.gameId].gameName.slice(0, -3);
+        gameList[icon.gameId].gameName.slice(-3) == 'One' ? 'I' : 'II';
-    self.lbl_game.name = game.lang[shape] + ' ' + number;
+      const shape = gameList[icon.gameId].gameName.slice(0, -3);
+      self.lbl_game.name = game.lang[shape] + ' ' + number;
+    } else if (icon.iconType === 'infoIcon')
+      self.lbl_game.name = game.lang.info_description;
   },
 
   /**
@@ -252,7 +256,10 @@ const menuState = {
     if (overIcon) {
       // If pointer is over icon
       document.body.style.cursor = 'pointer';
-      if (self.menuIcons[overIcon].iconType == 'game')
+      if (
+        self.menuIcons[overIcon].iconType == 'game' ||
+        self.menuIcons[overIcon].iconType == 'infoIcon'
+      )
         self.showTitle(self.menuIcons[overIcon]);
       self.menuIcons.forEach((cur) => {
         if (cur.iconType == self.menuIcons[overIcon].iconType) {