diff --git a/.gitignore b/.gitignore index 394395b..b9ddf28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,7 @@ dev-build node_modules build -<<<<<<< Updated upstream *.psd *.ai cdn/ artwork/ -======= -.jshintrc ->>>>>>> Stashed changes diff --git a/src/background/Setup.js b/src/background/Setup.js index 7540b8b..bd964d2 100644 --- a/src/background/Setup.js +++ b/src/background/Setup.js @@ -29,11 +29,7 @@ const ensure = () => { return true; }; -<<<<<<< Updated upstream chrome.tabs.create({ url: 'html/welcome.html' }); -======= - chrome.tabs.create({ url: 'https://wompmacho.com/wompchat' }); ->>>>>>> Stashed changes chrome.runtime.onMessage.addListener(onSetupComplete); console.log('Storage Setup Complete, Linking User To Welcome Page.'); }); diff --git a/src/config.js b/src/config.js index 447782d..8274f6b 100644 --- a/src/config.js +++ b/src/config.js @@ -18,11 +18,7 @@ const CONFIG = { setLiveChat: true, allowTextSlider: false, -<<<<<<< Updated upstream // Var -======= - // Variables ->>>>>>> Stashed changes textSizeSlider: 'inherit', } }; diff --git a/src/html/welcome.html b/src/html/welcome.html index 3d36324..7571609 100644 --- a/src/html/welcome.html +++ b/src/html/welcome.html @@ -7,111 +7,7 @@ Welcome Page -<<<<<<< Updated upstream -======= - - - - -
- -
- done -
- -
- -
- - -

Welcome to the Chat

- -

Were changing our name!

-

Aparently LIVE CHAT was a bad idea. Now We Are WOMP -

- -
- - discord shield.io - - - BTC shield.io - - - GitHub Release Date - -
- -
- -
- Join our Discord Community - Donations - Youtube - Contact Me -
- -
- -

- Soon to come: -

- - - -
- -

How To:

- -

- There is still a lot of stuff I am working on. This is very Beta at the moment so -

-

Use At Your Own Risk

-

- This is a Chrome Extension for Youtube Live Streams, adding some Quality of Life improvements for the Chat. - Adds Top, Trending and Global (500ish) Emotes from popular sites. These Update with what is Trending. -

-

- Don't forget to pin this extension for easy access. -

- pinYourExtension.gif -

- Youtube Live is slow to load its pages currently. - Give the extension a moment while the page's iframes are loading. - Once you see the Emote Panel Icon you can open the Emote Selection Panel. -

- emotesMenu.gif -

- Enhanced Theater Mode Is Now Available. Just click the check in the option panel and refresh your page. -

- theaterMode.gif -

- Over around 500 Top and Trending Emotes are loaded from popular sites. - You can Enable/Disable them in the Options Menu. -

- optionsMenu.gif -

- Can Also Click on UserNames To Autofill an @ Notification -

- clickUserNamesToAtThem.gif - -

Use At Your Own Risk

- -

Enjoy!

-
- ->>>>>>> Stashed changes \ No newline at end of file diff --git a/src/options.js b/src/options.js index 3064afd..aed49f4 100644 --- a/src/options.js +++ b/src/options.js @@ -118,24 +118,11 @@ PersistentSyncStorage.on('ready', () => { input.removeAttribute('disabled'); break; -<<<<<<< Updated upstream if(PersistentSyncStorage.data.options.allowTextSlider == true){ textSizeSlider.disabled = false; }else{ textSizeSlider.disabled = true; } -======= - case 'enableFrankerEmotes': - input.removeAttribute('disabled'); - break; - - case 'enableTwitchEmotes': - input.removeAttribute('disabled'); - break; - - case 'kappaFix': - input.removeAttribute('disabled'); ->>>>>>> Stashed changes break; case 'theaterModeFix': diff --git a/src/welcomePage.js b/src/welcomePage.js index 21b63f4..6973b32 100644 --- a/src/welcomePage.js +++ b/src/welcomePage.js @@ -1,21 +1,7 @@ -<<<<<<< Updated upstream import PersistentSyncStorage from './helpers/PersistentSyncStorage'; const setupComplete = () => { -======= -import './stylus/setupPage.styl'; -import PersistentSyncStorage from './helpers/PersistentSyncStorage'; - -// --- Definitions --- -const completeButton = document.querySelector('.complete-setup-button'); -const successOverlay = document.querySelector('.success-overlay'); -const successIcon = successOverlay.querySelector('.material-icons'); -const successCloseMessageCountdown = successOverlay.querySelector('.countdown'); - -const setupComplete = () => { - // do nuffin ->>>>>>> Stashed changes }; // --- Main --- @@ -35,10 +21,6 @@ const main = () => { console.log('Competed setup, sent message'); }); -<<<<<<< Updated upstream -======= - ->>>>>>> Stashed changes }; // --- Executed ---