From 90b25b53737ff85f8136110acad4d3bd562f0806 Mon Sep 17 00:00:00 2001 From: Thomas Wang Date: Tue, 15 Feb 2022 13:20:18 -0500 Subject: [PATCH] prettier and version --- extension/content/main.js | 44 ++++++++++++++++++--------------- extension/manifest.firefox.json | 2 +- extension/manifest.v2.json | 2 +- extension/manifest.v3.json | 2 +- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/extension/content/main.js b/extension/content/main.js index 9da2d995..a9041271 100644 --- a/extension/content/main.js +++ b/extension/content/main.js @@ -73,7 +73,7 @@ const addTypefullyPlug = () => { typefullyLink.addEventListener("click", () => { let tweetTextAreaNumber = 0; let typefullyContent = ""; - + while (true) { if ( document.querySelector( @@ -83,7 +83,7 @@ const addTypefullyPlug = () => { if (tweetTextAreaNumber > 0) { typefullyContent = `${typefullyContent}\n\n\n\n\n`; } - + let tweetTextItems = Array.from( document.querySelectorAll( `[data-testid="tweetTextarea_${tweetTextAreaNumber}"] [data-text="true"]` @@ -91,30 +91,34 @@ const addTypefullyPlug = () => { ); // remove trailing newlines at end of tweets (there is always one last
on the first tweet DOM node) - tweetTextItems = tweetTextItems.filter((item, index) => !(item.tagName === "BR" && index === tweetTextItems.length-1)); - + tweetTextItems = tweetTextItems.filter( + (item, index) => + !(item.tagName === "BR" && index === tweetTextItems.length - 1) + ); + tweetTextItems.forEach((item, index) => { - const isLastItem = index === tweetTextItems.length - 1; - const isTagOrMention = item => !!item.parentElement.parentElement.attributes.style; - - // handle hard break (2 newlines) within single tweet - if (item.tagName === "BR" && !isLastItem) { - typefullyContent += "\n\n"; - } - // handle regular text ( elements) - else { - typefullyContent = `${typefullyContent}${item.innerText}`; - - // this handles non-hard breaks (just one newline) within a single tweet - if (!isLastItem && !isTagOrMention(tweetTextItems[index+1])) { - typefullyContent += "\n" - } + const isLastItem = index === tweetTextItems.length - 1; + const isTagOrMention = (item) => + !!item.parentElement.parentElement.attributes.style; + + // handle hard break (2 newlines) within single tweet + if (item.tagName === "BR" && !isLastItem) { + typefullyContent += "\n\n"; + } + // handle regular text ( elements) + else { + typefullyContent = `${typefullyContent}${item.innerText}`; + + // this handles non-hard breaks (just one newline) within a single tweet + if (!isLastItem && !isTagOrMention(tweetTextItems[index + 1])) { + typefullyContent += "\n"; } + } }); } else { break; } - + tweetTextAreaNumber = tweetTextAreaNumber + 1; } diff --git a/extension/manifest.firefox.json b/extension/manifest.firefox.json index 1323f6de..2abe662e 100644 --- a/extension/manifest.firefox.json +++ b/extension/manifest.firefox.json @@ -2,7 +2,7 @@ "name": "Minimal Theme for Twitter", "short_name": "Minimal Twitter", "description": "Declutter the Twitter web experience.", - "version": "4.1.4", + "version": "4.1.5", "manifest_version": 2, "browser_specific_settings": { "gecko": { diff --git a/extension/manifest.v2.json b/extension/manifest.v2.json index d13a61b1..7fe0a6e3 100644 --- a/extension/manifest.v2.json +++ b/extension/manifest.v2.json @@ -2,7 +2,7 @@ "name": "Minimal Theme for Twitter", "short_name": "Minimal Twitter", "description": "Declutter the Twitter web experience.", - "version": "4.1.4", + "version": "4.1.5", "manifest_version": 2, "icons": { "16": "images/MinimalTwitterIcon16.png", diff --git a/extension/manifest.v3.json b/extension/manifest.v3.json index 9dcd061d..e88525b3 100644 --- a/extension/manifest.v3.json +++ b/extension/manifest.v3.json @@ -2,7 +2,7 @@ "name": "Minimal Theme for Twitter", "short_name": "Minimal Twitter", "description": "Declutter the Twitter web experience.", - "version": "4.1.4", + "version": "4.1.5", "manifest_version": 3, "icons": { "16": "images/MinimalTwitterIcon16.png",