Skip to content

Commit

Permalink
Add the ability to click on icons (#840)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Houssem-Guemer
Houssem-Guemer authored Feb 23, 2025
1 parent dc59709 commit 5965e69
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 22 deletions.
3 changes: 2 additions & 1 deletion extension/changelog.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
{ "message": "Prevent error on the faction page when member list is modified", "contributor": "MOBermejo" },
{ "message": "Migrate attacks over to API V2.", "contributor": "DeKleineKobini" },
{ "message": "Migrate faction stakeouts over to API V2.", "contributor": "DeKleineKobini" },
{ "message": "Migrate faction last action over to API V2.", "contributor": "DeKleineKobini" }
{ "message": "Migrate faction last action over to API V2.", "contributor": "DeKleineKobini" },
{ "message": "Make icons in the popup clickable to open their corresponding pages.", "contributor": "Hashibee" }
],
"removed": []
}
Expand Down
11 changes: 10 additions & 1 deletion extension/pages/popup/popup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ async function setupDashboard() {
const dashboard = document.find("#dashboard");

const iconsWrap = dashboard.find(".icons-wrap");
for (const { icon, id, description } of ALL_ICONS) {
for (const { icon, id, description, url } of ALL_ICONS) {
const iconWrap = document.newElement({
type: "div",
class: "icon tt-hidden",
Expand All @@ -144,6 +144,15 @@ async function setupDashboard() {
iconWrap.classList.add("hover_tooltip");
iconWrap.appendChild(document.newElement({ type: "span", class: "hover_tooltip_text", text: description }));

// Add a click event if the icon has a URL
if (url) {
iconWrap.addEventListener("click", () => {
window.open(url, "_blank", "noopener,noreferrer");
});

iconWrap.style.cursor = "pointer";
}

iconsWrap.appendChild(iconWrap);
}

Expand Down
40 changes: 20 additions & 20 deletions extension/scripts/global/functions/torn.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ const ALL_ICONS = [
{ id: 7, icon: "icon7", description: "Female" },
{ id: 87, icon: "icon87", description: "Enby" },
{ id: 72, icon: "icon72", description: "New player" },
{ id: 3, icon: "icon3", description: "Donator" },
{ id: 4, icon: "icon4", description: "Subscriber" },
{ id: 3, icon: "icon3", description: "Donator", url: "https://www.torn.com/donator.php" },
{ id: 4, icon: "icon4", description: "Subscriber", url: "https://www.torn.com/donator.php" },
{ id: 11, icon: "icon11", description: "Staff" },
{ id: 10, icon: "icon10", description: "Committee" },
{ id: 8, icon: "icon8", description: "Marriage" },
Expand All @@ -21,43 +21,43 @@ const ALL_ICONS = [
{ id: 24, icon: "icon24", description: "Grocer job" },
{ id: 25, icon: "icon25", description: "Lawyer job" },
{ id: 26, icon: "icon26", description: "Education job" },
{ id: 73, icon: "icon73", description: "Company director" },
{ id: 27, icon: "icon27", description: "Company employee" },
{ id: 83, icon: "icon83", description: "Company recruit" },
{ id: 74, icon: "icon74", description: "Faction leader / co-leader" },
{ id: 9, icon: "icon9", description: "Faction member" },
{ id: 81, icon: "icon81", description: "Faction recruit" },
{ id: 73, icon: "icon73", description: "Company director", url: "https://www.torn.com/companies.php" },
{ id: 27, icon: "icon27", description: "Company employee", url: "https://www.torn.com/companies.php" },
{ id: 83, icon: "icon83", description: "Company recruit", url: "https://www.torn.com/companies.php" },
{ id: 74, icon: "icon74", description: "Faction leader / co-leader", url: "https://www.torn.com/factions.php" },
{ id: 9, icon: "icon9", description: "Faction member", url: "https://www.torn.com/factions.php" },
{ id: 81, icon: "icon81", description: "Faction recruit", url: "https://www.torn.com/factions.php" },
{ id: 75, icon: "icon75", description: "Territory war (defending)" },
{ id: 76, icon: "icon76", description: "Territory war (assaulting)" },
{ id: 19, icon: "icon19", description: "Education in progress" },
{ id: 20, icon: "icon20", description: "Education completed" },
{ id: 29, icon: "icon29", description: "Investment in progress" },
{ id: 30, icon: "icon30", description: "Investment completed" },
{ id: 29, icon: "icon29", description: "Investment in progress", url: "https://www.torn.com/bank.php" },
{ id: 30, icon: "icon30", description: "Investment completed", url: "https://www.torn.com/bank.php" },
{ id: 31, icon: "icon31", description: "Cayman islands bank" },
{ id: 32, icon: "icon32", description: "Property vault" },
{ id: 32, icon: "icon32", description: "Property vault", url: "https://www.torn.com/properties.php#/p=options&tab=vault" },
{ id: 33, icon: "icon33", description: "Loan" },
{ id: 34, icon: "icon34", description: "Items in auction" },
{ id: 35, icon: "icon35", description: "Items in bazaar" },
{ id: 35, icon: "icon35", description: "Items in bazaar", url: "https://www.torn.com/bazaar.php" },
{ id: 36, icon: "icon36", description: "Items in item market" },
{ id: 54, icon: "icon54", description: "Points market" },
{ id: 38, icon: "icon38", description: "Stocks owned" },
{ id: 84, icon: "icon84", description: "Dividend collection ready" },
{ id: 38, icon: "icon38", description: "Stocks owned", url: "https://www.torn.com/page.php?sid=stocks" },
{ id: 84, icon: "icon84", description: "Dividend collection ready", url: "https://www.torn.com/page.php?sid=stocks" },
{ id: 37, icon: "icon37", description: "Trade in progress" },
{ id: 68, icon: "icon68", description: "Reading book" },
{ id: 71, icon: "icon71", description: "Traveling" },
{ id: 17, icon: "icon17", description: "Racing in progress" },
{ id: 18, icon: "icon18", description: "Racing completed" },
{ id: 85, icon: "icon85", description: "Organized crime being planned" },
{ id: 86, icon: "icon86", description: "Organized crime ready" },
{ id: 17, icon: "icon17", description: "Racing in progress", url: "https://www.torn.com/loader.php?sid=racing" },
{ id: 18, icon: "icon18", description: "Racing completed", url: "https://www.torn.com/loader.php?sid=racing" },
{ id: 85, icon: "icon85", description: "Organized crime being planned", url: "https://www.torn.com/factions.php?step=your#/tab=crimes" },
{ id: 86, icon: "icon86", description: "Organized crime ready", url: "https://www.torn.com/factions.php?step=your#/tab=crimes" },
{ id: 13, icon: "icon13", description: "Bounty" },
{ id: 28, icon: "icon28", description: "Cashier's checks" },
{ id: 55, icon: "icon55", description: "Auction high bidder" },
{ id: 56, icon: "icon56", description: "Auction outbid" },
{ id: 15, icon: "icon15", description: "Hospital" },
{ id: 15, icon: "icon15", description: "Hospital", url: "https://www.torn.com/hospitalview.php" },
{ id: 82, icon: "icon82", description: "Hospital early discharge" },
{ id: 16, icon: "icon16", description: "Jail" },
{ id: 70, icon: "icon70", description: "Federal jail" },
{ id: 12, icon: "icon12", description: "Low life" },
{ id: 12, icon: "icon12", description: "Low life", url: "https://www.torn.com/hospitalview.php" },
{ id: 39, icon: "icon39", description: "Booster cooldown (0-6hr)" },
{ id: 40, icon: "icon40", description: "Booster cooldown (6-12hr)" },
{ id: 41, icon: "icon41", description: "Booster cooldown (12-18hr)" },
Expand Down
7 changes: 7 additions & 0 deletions extension/scripts/global/team.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,13 @@ const TEAM = [
torn: 3385879,
color: "#DAA520",
},
{
name: "Hashibee",
title: "Developer",
core: false,
torn: 2303184,
color: "#6ACF65",
},
];

const CONTRIBUTORS = TEAM.filter(({ title, color }) => title.includes("Developer") || color).reduce(
Expand Down

0 comments on commit 5965e69

Please sign in to comment.