Skip to content

Commit

Permalink
3.7.1
Browse files Browse the repository at this point in the history
🥳 UNICODE 13 (Twemoji) now is supported
- Updated Twemoji and OpenMoji fonts
- Alert when yo choose a non-Twemoji font
  • Loading branch information
Sav22999 authored Oct 9, 2020
2 parents 08c34e3 + fbc5189 commit d5e979c
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 68 deletions.
5 changes: 5 additions & 0 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,11 @@ div {
background-position: 120px center;
}

.select-extra-big {
width: 250px;
background-position: 220px center;
}

/*Dark and light themes*/

.light-settings {
Expand Down
Binary file modified font/openmojicolor.ttf
Binary file not shown.
Binary file modified font/twemoji.ttf
Binary file not shown.
126 changes: 63 additions & 63 deletions js/emojis.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ emojis[2] = {
"😡": ["Pouting Face", "Angry Face", "Grumpy Face", "Mad Face", "Red Face"],
"😠": ["Angry Face", "Angry", "Grumpy Face"],
"🤬": ["@#$%&!", "Face with Symbols on Mouth", "Cursing", "Cussing", "Grawlix", "Swearing", "Face With Symbols Over Mouth", "Serious Face with Symbols Covering Mouth"],
//"🥲": ["Smiling Face with Tear"],
//"🥸": ["Disguised Face"],
"🥲": ["Smiling Face with Tear"],
"🥸": ["Disguised Face"],
"😈": ["Smiling Face with Horns", "Devil", "Devil Horns", "Happy Devil", "Purple Devil", "Red Devil"],
"👿": ["Angry Face with Horns", "Devil", "Devil Horns", "Purple Devil", "Purple Goblin", "Sad Devil", "Imp"],
"🤡": ["Clown Face", "Creepy Clown", "Evil Clown", "Scary Clown"],
Expand All @@ -107,7 +107,7 @@ emojis[2] = {
"👻": ["Ghost", "Halloween"],
"🗣️": ["Speaking Head", "Mansplaining", "Shout", "Shouting", "Speaking Head in Silhouette"],
"👤": ["Bust in Silhouette", "Shadow", "Silhouette", "User", "Silhouette of Person"],
//"🫂": ["People Hugging"],
"🫂": ["People Hugging"],
"👥": ["Busts in Silhouette", "Shadows", "Silhouettes", "Users", "Silhouette of Two People"]
};
/*people*/
Expand Down Expand Up @@ -144,11 +144,11 @@ emojis[3] = {
"🧕[[*skin_tone*]]‍": ["Woman with Headscarf", "Hijab", "Person with Headscarf"],
"🤵[[*skin_tone*]]‍": ["Person in Tuxedo", "Groom", "Man In Suit", "Man in Tuxedo"],
"👰[[*skin_tone*]]‍": ["Person With Veil", "Bride", "Bride with Veil"],
//"👰‍[[*skin_tone*]]‍♂️": ["Man with Veil"],
//"👰‍[[*skin_tone*]]‍♀️": ["Woman with Veil"],
//"👩‍[[*skin_tone*]]‍🍼": ["Woman Feeding Baby"],
//"👨‍[[*skin_tone*]]‍🍼": ["Man Feeding Baby"],
//"🥷": ["Ninja"],
"👰‍[[*skin_tone*]]‍♂️": ["Man with Veil"],
"👰‍[[*skin_tone*]]‍♀️": ["Woman with Veil"],
"👩‍[[*skin_tone*]]‍🍼": ["Woman Feeding Baby"],
"👨‍[[*skin_tone*]]‍🍼": ["Man Feeding Baby"],
"🥷": ["Ninja"],
"🤰[[*skin_tone*]]‍": ["Pregnant Woman", "Pregnancy", "Pregnant Lady"],
"🤱[[*skin_tone*]]‍": ["Breast-Feeding", "Breastfeeding"],
"🦸‍[[*skin_tone*]]‍♂️": ["Man Superhero"],
Expand Down Expand Up @@ -310,7 +310,7 @@ emojis[4] = {
"🦝": ["Raccoon"],
"🐱": [":3", "Cat Face", "Kitten", "Kitty"],
"🐈": ["Cat", "Domestic Cat", "Feline", "Housecat"],
//"🐈‍⬛": ["Black Cat"],
"🐈‍⬛": ["Black Cat"],
"🦁": ["Lion", "Lion Face"],
"🐯": ["Tiger Face", "Cute Tiger"],
"🐅": ["Tiger", "Bengal Tiger"],
Expand Down Expand Up @@ -403,16 +403,16 @@ emojis[4] = {
"🦥": ["Sloth"],
"🦦": ["Otter"],
"🦨": ["Skunk"],
//"🦬": ["Bison"],
//"🦣": ["Mammoth"],
//"🦫": ["Beaver"],
//"🐻‍❄️": ["Polar Bear"],
//"🦤": ["Dodo"],
//"🦭": ["Seal"],
//"🪲": ["Beetle"],
//"🪳": ["Cockroach"],
//"🪰": ["Fly"],
//"🪱": ["Worm"],
"🦬": ["Bison"],
"🦣": ["Mammoth"],
"🦫": ["Beaver"],
"🐻‍❄️": ["Polar Bear"],
"🦤": ["Dodo"],
"🦭": ["Seal"],
"🪲": ["Beetle"],
"🪳": ["Cockroach"],
"🪰": ["Fly"],
"🪱": ["Worm"],
"🦩": ["Flamingo"]
};
/*symbols*/
Expand Down Expand Up @@ -694,8 +694,8 @@ emojis[5] = {
"🔘": ["Radio Button"],
"🛑": ["Stop Sign", "Octagonal Sign"],
"⚕️": ["Medical Symbol", "Aesculapius", "Asklepios", "Rod of Asclepius", "Staff of Aesculapius"],
//"🛗": ["Elevator", "Lift"],
//"⚧️": ["Transgender Symbol"],
"🛗": ["Elevator", "Lift"],
"⚧️": ["Transgender Symbol"],
"♂️": ["Male Sign", "Man Symbol", "Mars Symbol"],
"♀️": ["Female Sign", "Woman Symbol", "Venus Symbol"]
};
Expand Down Expand Up @@ -814,13 +814,13 @@ emojis[6] = {
"🦪": ["Oyster"],
"🧃": ["Beverage Box", "Juice Box"],
"🧉": ["Mate Drink", "Chimarrão", "Cimarrón", "Yerba Mate"],
//"🫒": ["Olive"],
//"🫐": ["Blueberries"],
//"🫑": ["Bell Pepper"],
//"🫓": ["Flatbread"],
//"🫔": ["Tamale", "Tamal"],
//"🫕": ["Fondue"],
//"🧋": ["Bubble Tea", "Boba"],
"🫒": ["Olive"],
"🫐": ["Blueberries"],
"🫑": ["Bell Pepper"],
"🫓": ["Flatbread"],
"🫔": ["Tamale", "Tamal"],
"🫕": ["Fondue"],
"🧋": ["Bubble Tea", "Boba"],
"🧊": ["Ice Cube"]
};
/*flags*/
Expand All @@ -831,7 +831,7 @@ emojis[7] = {
"🏴": ["Black Flag", "Waving Black Flag"],
"🏳️": ["White Flag", "Waving White Flag"],
"🏳️‍🌈": ["Rainbow Flag", "Pride Flag"],
//"🏳️‍⚧️": ["Transgender Flag", "Blue, Pink, and White Flag", "Trans Flag"],
"🏳️‍⚧️": ["Transgender Flag", "Blue, Pink, and White Flag", "Trans Flag"],
"🏴‍☠️": ["Pirate Flag", "Jolly Roger"],
"🇺🇳": ["UN", "Flag: United Nations", "United Nations Flag"],
"🇪🇺": ["EU", "Flag: European Union", "EU Flag", "Flag of European Union"],
Expand Down Expand Up @@ -1202,7 +1202,7 @@ emojis[9] = {
"🚚": ["Delivery Truck", "Lorry"],
"🚛": ["Articulated Lorry", "Green Truck"],
"🚜": ["Tractor", "Farm"],
//"🛻": ["Pickup Truck"],
"🛻": ["Pickup Truck"],
"🏎️": ["Racing Car", "F1", "Formula One", "Race Car"],
"🏍️": ["Motorbike", "Motorcycle"],
"🛵": ["Motor Scooter", "Vespa", "Motor Bike", "Motor Bike"],
Expand Down Expand Up @@ -1280,7 +1280,7 @@ emojis[9] = {
"🌠": ["Shooting Star", "When You Wish Upon A Star", "Meteoroid"],
"🌌": ["Milky Way", "Galaxy", "Night Sky", "Space", "Stars", "Universe"],
"🎑": ["Moon Viewing Ceremony", "Grass, Dumplings and Moon", "Harvest Moon", "Mid-Autumn Festival", "Tsukimi"],
//"🛖": ["Hut"],
"🛖": ["Hut"],
"🎢": ["Roller Coaster", "Rollercoaster", "Theme Park"]
};
/*technologies (smartphones, laptops, ect.) and office*/
Expand Down Expand Up @@ -1423,9 +1423,9 @@ emojis[11] = {
"🥻": ["Sari", "Saree", "Shari"],
"🩲": ["Briefs"],
"🩳": ["Shorts"],
//"🛼": ["Roller Skate", "Inline Skate", "Roller Derby"],
//"🩴": ["Flip Flop", "Thong Sandal"],
//"🪖": ["Military Helmet"],
"🛼": ["Roller Skate", "Inline Skate", "Roller Derby"],
"🩴": ["Flip Flop", "Thong Sandal"],
"🪖": ["Military Helmet"],
"🩰": ["Ballet Shoes", "Pointe Shoe"]
};
/*hands and parts of body*/
Expand Down Expand Up @@ -1454,7 +1454,7 @@ emojis[12] = {
"👊‍[[*skin_tone*]]‍": ["Oncoming Fist", "Bro Fist", "Brofist", "Fist Bump", "Punch", "Closed Fist", "Fisted Hand Sign"],
"🤛‍[[*skin_tone*]]‍": ["Left Fist Bump"],
"🤜‍[[*skin_tone*]]‍": ["Right Fist Bump"],
//"🤌‍[[*skin_tone*]]‍": ["Pinched Fingers", "Ma Che Vuoi", "Finger Purse"],
"🤌‍[[*skin_tone*]]‍": ["Pinched Fingers", "Ma Che Vuoi", "Finger Purse"],
"👏‍[[*skin_tone*]]‍": ["Clapping Hands Sign", "Applause", "Clap", "Clapping", "Golf Clap", "Round Of Applause"],
"🙌‍[[*skin_tone*]]‍": ["Person Raising Both Hands in Celebration", "Raising Hands", "Arms In The Air", "Banzai", "Festivus Miracle", "Hallelujah", "Praise Hands", "Two Hands"],
"👐‍[[*skin_tone*]]‍": ["Open Hands Sign", "Hug", "Jazz Hands"],
Expand All @@ -1473,8 +1473,8 @@ emojis[12] = {
"👁️": ["Eye", "Single Eye"],
"👅": ["Tongue Out"],
"👄": ["Mouth", "Kissing Lips", "Lips"],
//"🫀": ["Anatomical Heart"],
//"🫁": ["Lungs"],
"🫀": ["Anatomical Heart"],
"🫁": ["Lungs"],
"🦾": ["Mechanical Arm"],
"🦿": ["Mechanical Leg"]
};
Expand Down Expand Up @@ -1568,17 +1568,17 @@ emojis[13] = {
"🍁": ["Maple Leaf", "Canada", "Canadian", "Maple"],
"🍂": ["Fallen Leaf", "Autumn Leaf", "Autumn Leaves", "Brown Leaves", "Fall Leaves", "Fallen Leaves"],
"🍃": ["Leaf Fluttering in Wind", "Green Leaves", "Spring"],
//"🪴": ["Potted Plant"],
"🪴": ["Potted Plant"],
"🔑": ["Key", "Gold Key"],
"🗝️": ["Old Key"],
"🔨": ["Hammer", "Claw Hammer", "Handyman", "Tool"],
"⛏️": ["Pick", "Pickaxe"],
"🪓": ["Axe"],
//"🪚": ["Carpentry Saw"],
//"🪛": ["Screwdriver"],
//"🪝": ["Hook"],
//"🪠": ["Plunger"],
//"🪣": ["Bucket"],
"🪚": ["Carpentry Saw"],
"🪛": ["Screwdriver"],
"🪝": ["Hook"],
"🪠": ["Plunger"],
"🪣": ["Bucket"],
"🔩": ["Nut and Bolt", "Bolt", "Screw"],
"🗜️": ["Clamp", "Table Vice", "WinZip", "Compression"],
"🔒": ["Locked", "Closed Lock", "Padlock"],
Expand All @@ -1598,9 +1598,9 @@ emojis[13] = {
"🛋️": ["Couch and Lamp", "Lounge", "Settee", "Sofa"],
"🪑": ["Chair"],
"🚪": ["Door", "Doorway", "Front Door"],
//"🪟": ["Window"],
//"🪜": ["Ladder"],
//"🪞": ["Mirror"],
"🪟": ["Window"],
"🪜": ["Ladder"],
"🪞": ["Mirror"],
"🚽": ["Toilet", "Bathroom", "Loo", "Restroom", "WC"],
"🚿": ["Shower", "Shower Head"],
"🛁": ["Bathtub", "Bubble Bath"],
Expand Down Expand Up @@ -1664,8 +1664,8 @@ emojis[13] = {
"🥁": ["Drum", "Drum with Drumsticks"],
"🎹": ["Piano", "Musical Keyboard"],
"🪕": ["Banjo"],
//"🪗": ["Accordion"],
//"🪘": ["Long Drum"],
"🪗": ["Accordion"],
"🪘": ["Long Drum"],
"🎨": ["Artist Palette", "Art", "Painting"],
"🧩": ["Puzzle Piece", "Jigsaw Puzzle Piece"],
"🎲": ["Game Die", "Dice"],
Expand Down Expand Up @@ -1737,20 +1737,20 @@ emojis[13] = {
"🩸": ["Drop of Blood"],
"🩹": ["Adhesive Bandage"],
"🩺": ["Stethoscope"],
//"🪶": ["Feather"],
//"🪤": ["Mouse Trap"],
//"🫖": ["Teapot"],
//"🪨": ["Rock"],
//"🪵": ["Wood"],
//"🪄": ["Magic Wand"],
//"🪅": ["Piñata"],
//"🪆": ["Nesting Dolls", "Matryoshka"],
//"🪡": ["Sewing Needle"],
//"🪢": ["Knot"],
//"🪙": ["Coin"],
//"🪃": "Boomerang",
//"🪥": ["Toothbrush"],
//"🪦": ["Headstone"],
//"🪧": ["Placard"],
"🪶": ["Feather"],
"🪤": ["Mouse Trap"],
"🫖": ["Teapot"],
"🪨": ["Rock"],
"🪵": ["Wood"],
"🪄": ["Magic Wand"],
"🪅": ["Piñata"],
"🪆": ["Nesting Dolls", "Matryoshka"],
"🪡": ["Sewing Needle"],
"🪢": ["Knot"],
"🪙": ["Coin"],
"🪃": "Boomerang",
"🪥": ["Toothbrush"],
"🪦": ["Headstone"],
"🪧": ["Placard"],
"🪒": ["Razor"]
};
14 changes: 14 additions & 0 deletions js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,22 @@ function setPopUpUI() {
}
}

document.getElementById("font-family-selected").onchange = function () {
checkFontFamily();
}
checkFontFamily();

setSkinToneEmojis();
}

function checkFontFamily() {
if (document.getElementById("font-family-selected").selectedIndex != 0) {
document.getElementById("alert-font-pop-up").style.display = "inline-block";
} else {
document.getElementById("alert-font-pop-up").style.display = "none";
}
}

function showReviewAddonMessage() {
let message_element = document.createElement("div");
message_element.id = "review-message";
Expand Down Expand Up @@ -541,6 +554,7 @@ function setVariablesFromSettings(resize_popup_ui = false) {
max_columns = columnsElement.value;
max_rows = rowsElement.value;
font_family = fontFamily.value;

auto_close = autoClosePopup.value.toLowerCase();
/*
if (skin_tone_selected !== undefined) skin_tone_previous = skin_tone_selected;
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "Emoji",
"version": "3.7",
"version": "3.7.1",
"description": "It permits just with a single click to copy an emoji.",
"icons": {
"16": "./img/icon-dark-16.png",
Expand Down
11 changes: 7 additions & 4 deletions popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
<label id="text-click-on-emoji-to-remove">Click on the emoji(s) you want to remove</label>
</div>
<input type="button" value="️Finish" class="button dark-finish-edit-button" id="finish-edit-button">
<input type="button" value="" class="button dark-delete-button" id="delete-button" title="Delete one or more emojis from the 'Most used emojis' section">
<input type="button" value="" class="button dark-settings-button" id="settings-button" title="Open Settings pane">
<input type="button" value="" class="button dark-delete-button" id="delete-button"
title="Delete one or more emojis from the 'Most used emojis' section">
<input type="button" value="" class="button dark-settings-button" id="settings-button"
title="Open Settings pane">
</div>
<div id="titles">
<!-- Titles: generated by JS script -->
Expand Down Expand Up @@ -76,12 +78,13 @@ <h1 id="settings-title">Settings</h1>
</div>
<div class="subsection-settings">
<span class="title-subsection-settings">Font family</span>
<select class="select select-big" id="font-family-selected">
<option value="twemoji">Twitter</option>
<select class="select select-extra-big" id="font-family-selected">
<option value="twemoji">Twitter (Recommended)</option>
<!--<option value="notocoloremoji">Google</option>-->
<option value="openmojicolor">OpenMoji</option>
<option value="default">OS emoji font</option>
</select>
<span class="description-subsection-settings" id="alert-font-pop-up">This font family could be shown not well. Use "Twitter" instead!</span>
</div>
<div class="margin-top-20"></div>
<div id="subsection-settings-bottom">
Expand Down

0 comments on commit d5e979c

Please sign in to comment.