Merge pull request #119 from Sav22999/beta

3.21.1
Sav22999 · Apr 20, 2024 · 6fa7edd · 6fa7edd
2 parents 242a8a4 + 49b0874
commit 6fa7edd
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 *.zip
 .idea/*
-img/.DS_Store
+*/.DS_Store
diff --git a/img/.DS_Store b/img/.DS_Store
diff --git a/js/emojis.js b/js/emojis.js
@@ -1559,7 +1559,7 @@ emojis_language[lang][11] = {
     "🤿": ["Diving Mask", ":diving_mask:"],
     "🦺": ["Safety Vest", ":safety_vest:"],
     "🥻": ["Sari", ":sari:", "Saree", "Shari"],
-    "🩲": ["Briefs", ":briefs:"],
+    "🩲": ["Briefs", ":briefs:", "Undies", "Underwear", "Underpants", "Jocks", "Panties"],
     "🩳": ["Shorts", ":shorts:"],
     "🛼": ["Roller Skate", ":roller_skate:", "Inline Skate", "Roller Derby"],
     "🩴": ["Flip Flop", ":flip_flop:", "Thong Sandal"],

diff --git a/js/script.js b/js/script.js
@@ -1941,6 +1941,48 @@ function setSkinToneEmojis() {
     all_emojis[3] = JSON.parse(string[3]);
     all_emojis[8] = JSON.parse(string[8]);
     all_emojis[12] = JSON.parse(string[12]);
+
+    addDescriptionTitleToButtons();
+}
+
+function addDescriptionTitleToButtons() {
+    for (let emoji in all_emojis[2]) {
+        all_emojis[2][emoji].push(titles["😀"]);
+    }
+    for (let emoji in all_emojis[3]) {
+        all_emojis[3][emoji].push(titles["🙋"]);
+    }
+    for (let emoji in all_emojis[4]) {
+        all_emojis[4][emoji].push(titles["🦊"]);
+    }
+    for (let emoji in all_emojis[5]) {
+        all_emojis[5][emoji].push(titles["🅰️"]);
+    }
+    for (let emoji in all_emojis[6]) {
+        all_emojis[6][emoji].push(titles["🍎"]);
+    }
+    for (let emoji in all_emojis[7]) {
+        all_emojis[7][emoji].push(titles["🏳️‍🌈"]);
+    }
+    for (let emoji in all_emojis[8]) {
+
+        all_emojis[8][emoji].push(titles["🏊"]);
+    }
+    for (let emoji in all_emojis[9]) {
+        all_emojis[9][emoji].push(titles["✈️"]);
+    }
+    for (let emoji in all_emojis[10]) {
+        all_emojis[10][emoji].push(titles["🖱️"]);
+    }
+    for (let emoji in all_emojis[11]) {
+        all_emojis[11][emoji].push(titles["👗"]);
+    }
+    for (let emoji in all_emojis[12]) {
+        all_emojis[12][emoji].push(titles["🖐️"]);
+    }
+    for (let emoji in all_emojis[13]) {
+        all_emojis[13][emoji].push(titles["🛎️"]);
+    }
 }
 
 function editMode() {
@@ -2120,7 +2162,7 @@ function setLanguageFile() {
     all_emojis = emojis.slice();
     setSkinToneEmojis();
 
-    checkEmojis(); //TODO!for-test-only
+    //checkEmojis(); //TODO!for-test-only
 }
 
 function setLanguageUI() {

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Emoji",
-  "version": "3.21",
+  "version": "3.21.1",
   "author": "Saverio Morelli (Sav22999)",
   "description": "Insert emojis using a web browser, and customise the experience and the add-on in Settings.",
   "icons": {

diff --git a/screenshots/.DS_Store b/screenshots/.DS_Store