Skip to content
This repository has been archived by the owner on Aug 3, 2022. It is now read-only.

DONT MIND THIS #720

Closed
wants to merge 164 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
2d54f62
Added BBaper and GachiPls
XGSleepWalker Sep 12, 2017
dbd3f5f
Ignores folders and config files in plugins/themes
rauenzi Oct 1, 2017
07c7b46
Merge pull request #1 from Jiiks/master
rauenzi Oct 27, 2017
1ea7677
test
rauenzi Oct 29, 2017
12f6d08
settings
rauenzi Oct 29, 2017
bfec7b5
no public
rauenzi Oct 29, 2017
84ddea5
defaults
rauenzi Oct 29, 2017
0e2a7f2
remove more jquery
rauenzi Oct 29, 2017
f9e4d68
textarea stuff
rauenzi Oct 29, 2017
1999bad
test
rauenzi Oct 29, 2017
7133d14
more tests
rauenzi Oct 29, 2017
15b03ef
textarea
rauenzi Oct 29, 2017
85fa175
link updates and such
rauenzi Oct 29, 2017
d8a2835
fix react errors
rauenzi Oct 29, 2017
939b733
fix hash
rauenzi Oct 29, 2017
6d862c8
error checking, escaping
rauenzi Oct 29, 2017
3ddae1e
friggin hell
rauenzi Oct 29, 2017
1417c62
more error checks
rauenzi Oct 29, 2017
8a2cda4
escape IDs
rauenzi Oct 29, 2017
7897b2c
let's see what breaks
rauenzi Oct 29, 2017
770b163
maybe less breaking
rauenzi Oct 29, 2017
0187581
start deleting useless spaghetti
rauenzi Oct 29, 2017
87ea70c
cleanup
rauenzi Oct 29, 2017
8ba8756
more useless code
rauenzi Oct 29, 2017
ac2b3f1
more unused code hopefully
rauenzi Oct 30, 2017
11edc76
expand dev mode
rauenzi Oct 30, 2017
921f058
missed the off
rauenzi Oct 30, 2017
9f4981a
I spelled context wrong...
rauenzi Oct 30, 2017
f8fea73
fix devmode
rauenzi Oct 30, 2017
9a39c15
hopefully finalize devmode
rauenzi Oct 30, 2017
37129c3
reenable emote menu
rauenzi Oct 30, 2017
e1ba41f
start emote modifiers
rauenzi Oct 30, 2017
a6fa031
update css
rauenzi Oct 30, 2017
1eed4bb
start fixing plugin api
rauenzi Oct 30, 2017
4309890
further test plugin api
rauenzi Oct 30, 2017
3ec3b47
fix onMessage
rauenzi Oct 30, 2017
1015e35
more devmode stuff
rauenzi Oct 30, 2017
e42e2e5
hopefully finalize devmode
rauenzi Oct 30, 2017
eeccf6b
changes for onMessage
rauenzi Oct 30, 2017
76f7a61
refactor main observer
rauenzi Oct 30, 2017
b53c9b0
some fixes for tooltips
rauenzi Oct 30, 2017
333c994
settings are disorganized apparently
rauenzi Oct 30, 2017
a9f2756
test removing some settings crap
rauenzi Oct 30, 2017
4735b69
not the way I thought
rauenzi Oct 30, 2017
68e40aa
hecking
rauenzi Oct 30, 2017
2a3d7e3
update some css for minimal mode
rauenzi Oct 30, 2017
8a34c78
css for minimal mode
rauenzi Oct 30, 2017
62fb184
remove more crap and fix emoji menu
rauenzi Oct 30, 2017
a9914b4
update error checking
rauenzi Oct 31, 2017
6dea1de
man I'm dumb
rauenzi Oct 31, 2017
d28f8fc
cleanup plugins/themes loading
rauenzi Oct 31, 2017
ad47b4e
pluginModule, themeModule and customcss
rauenzi Oct 31, 2017
bcd6705
refactor some pluginModule stuff
rauenzi Oct 31, 2017
5119095
add info to plugincards
rauenzi Oct 31, 2017
b0f96e0
.,
rauenzi Oct 31, 2017
33246a7
anotha one
rauenzi Oct 31, 2017
95fc520
adjust error log
rauenzi Oct 31, 2017
ca289d2
pluginCard data
rauenzi Oct 31, 2017
6ef12b4
continue instead of return
rauenzi Oct 31, 2017
088241b
switch back to cdn cause it's easier
rauenzi Nov 1, 2017
22d686c
cleanup and change settings inject
rauenzi Nov 1, 2017
e77c0ca
remove old settings panel
rauenzi Nov 1, 2017
64e04eb
start observer after bd loads
rauenzi Nov 1, 2017
a12773e
fucking lack of es6
rauenzi Nov 1, 2017
3db3482
start cleanup
rauenzi Nov 1, 2017
36ec503
test my understanding of react
rauenzi Nov 1, 2017
054a48f
finish restructure of plugin cards
rauenzi Nov 1, 2017
e8dff1d
finish cards hopefully
rauenzi Nov 1, 2017
85acf96
start switch to V2 switches
rauenzi Nov 1, 2017
d0a3762
switches
rauenzi Nov 1, 2017
c7fb4ad
switches and settings
rauenzi Nov 1, 2017
f92bab3
cleanup cards
rauenzi Nov 1, 2017
99bab11
theme module and card
rauenzi Nov 1, 2017
43a955d
fix a screwup
rauenzi Nov 1, 2017
c212c76
change toggle
rauenzi Nov 1, 2017
6bc4b75
scroll settings into view
rauenzi Nov 1, 2017
639dc5f
single settingspanel call
rauenzi Nov 1, 2017
484fd91
style links
rauenzi Nov 1, 2017
fef5272
code cleanup, check for errors
rauenzi Nov 3, 2017
2ca6a24
start on loadup errors
rauenzi Nov 3, 2017
eb9a873
fix settings for showing errors on load
rauenzi Nov 3, 2017
a7afbde
little bit more repo cleanup
rauenzi Nov 3, 2017
88b29e5
new modals
rauenzi Nov 3, 2017
147b67d
show modal on startup
rauenzi Nov 3, 2017
2571a05
pain in my ass self vs this
rauenzi Nov 3, 2017
14ba272
add toasts
rauenzi Nov 3, 2017
38bf9ac
add stop/start toasts with setting
rauenzi Nov 3, 2017
3c62d9e
forgot settings check, add backwards compatibility
rauenzi Nov 3, 2017
5b1e895
backwards compat.
rauenzi Nov 3, 2017
6359170
I fucked up
rauenzi Nov 3, 2017
bbe3caf
update toasts
rauenzi Nov 3, 2017
43f99ac
smooth scroll on settings panel
rauenzi Nov 3, 2017
28174e5
Fix 24 hour and add react instance stuff
rauenzi Nov 4, 2017
d906826
add error checking locally
rauenzi Nov 4, 2017
303a2d4
update 24hour and colored text
rauenzi Nov 4, 2017
23685f6
test minification
rauenzi Nov 4, 2017
2db5607
fixed a string
rauenzi Nov 4, 2017
988af4f
link back to minified versions
rauenzi Nov 4, 2017
cb733f5
Add fix for emote data and load custom css
rauenzi Nov 9, 2017
df2c803
forgot atob
rauenzi Nov 9, 2017
38f7997
Revert "forgot atob"
rauenzi Nov 9, 2017
0f2e8c9
atob
rauenzi Nov 9, 2017
542d794
readd old files and fix onSwitch
rauenzi Nov 17, 2017
6985c24
some cleanup
rauenzi Nov 17, 2017
b30eaea
update installer
rauenzi Dec 19, 2017
e920f40
update installer for canary changes
rauenzi Dec 20, 2017
8de7ae7
check for people with bad internet
rauenzi Dec 20, 2017
bf93547
grab react from webpack modules
rauenzi Dec 22, 2017
bdec1a3
Updates for emotes, devmode, plugin settings
rauenzi Dec 22, 2017
b628cbf
forgot to make settingspanel a member
rauenzi Dec 22, 2017
98fe8c2
Lots of updates, some features
rauenzi Dec 24, 2017
8a7b7b1
change emote system and custom css
rauenzi Jan 9, 2018
6e69876
Exclude short emotes
rauenzi Jan 9, 2018
1d89fb9
Few bug fixes
rauenzi Jan 9, 2018
1a6db9e
fix some more emote crap
rauenzi Jan 9, 2018
af3124b
new customcss editor and fix for canary
rauenzi Jan 10, 2018
089741a
update some files
rauenzi Jan 13, 2018
de3d0b9
minor emotes stuff
rauenzi Jan 20, 2018
80bedb0
forgot to minify
rauenzi Jan 23, 2018
d604610
rebrand as BandagedBD
rauenzi Feb 5, 2018
2250bf1
backwards support for emote plugins
rauenzi Feb 13, 2018
8533d76
toast setting affects emotes
rauenzi Feb 13, 2018
7fdd27e
public servers and emotes stuff
rauenzi Feb 28, 2018
964c5bf
emote stuff
rauenzi Mar 12, 2018
261c914
hopefully fix emotes and copy selector
rauenzi Mar 15, 2018
2f71d66
update for ffz emotes
rauenzi Mar 16, 2018
6abe7fc
more emote stuff
rauenzi Mar 16, 2018
b8df86c
update blacklist aka fuck FFZ
rauenzi Mar 17, 2018
50fe3a4
overhaul public servers
rauenzi Mar 29, 2018
bff16ce
fix close button
rauenzi Mar 30, 2018
ffa43c7
hotfix for plugins page
rauenzi Mar 30, 2018
9fceef4
minor performance boost
rauenzi Apr 6, 2018
401f14c
fix observer am dumb
rauenzi Apr 6, 2018
697db70
emotes for heathen compact mode
rauenzi Apr 7, 2018
b6e9ab4
revert ffz data
rauenzi Apr 15, 2018
209f5f7
move away from cookies
rauenzi Apr 15, 2018
88706de
fix emote download & speed up startup
rauenzi Apr 15, 2018
9ab8ac0
emotes are the bane of my existence
rauenzi Apr 16, 2018
90800c1
hotfix for emote menu
rauenzi Apr 25, 2018
f7747eb
go fuck yourself discord
rauenzi Apr 28, 2018
532b605
scrolling & fuck discord devs
rauenzi Apr 28, 2018
c776f7c
update blacklist
rauenzi May 3, 2018
1437ea0
fix css hopefully
rauenzi May 5, 2018
16219b5
Update main.js
intrnl May 5, 2018
2b07e8c
Merge pull request #4 from intrnl/patch-1
rauenzi May 5, 2018
1948e35
more classes and alerts
rauenzi May 5, 2018
be2085b
blame intrnl
rauenzi May 5, 2018
e328a7f
fix webpack for canary
rauenzi May 19, 2018
2cdaf11
add setting to stop downloading emotes
rauenzi May 22, 2018
10f3e2b
small fix for ratelimiting issues
rauenzi Jun 3, 2018
8961f58
async setting save
rauenzi Jun 16, 2018
5d5c4a1
nvm
rauenzi Jun 16, 2018
002984a
add class normalizer
rauenzi Jun 21, 2018
e4e2209
Merge pull request #9 from XGSleepWalker/master
rauenzi Jun 23, 2018
37de4b1
normalize normal classes too
rauenzi Jun 23, 2018
222c2c7
fix normalizer
rauenzi Jun 26, 2018
ba5fc86
return of public servers
rauenzi Jun 28, 2018
ca4a586
fix for canary + ptb
rauenzi Jun 28, 2018
33cb8c8
some css and a class
rauenzi Jun 28, 2018
6234234
you're welcome uri
rauenzi Jun 30, 2018
b46d6ec
fix emotes for canary
rauenzi Jul 17, 2018
1371a89
update for some crashing issues
rauenzi Jul 19, 2018
4884444
another attempt
rauenzi Jul 19, 2018
bf8b1d2
update fallback hash
rauenzi Jul 19, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add setting to stop downloading emotes
  • Loading branch information
rauenzi committed May 22, 2018
commit 2cdaf11a12a8ad91cb8617be20dfb0375b61783b
18 changes: 11 additions & 7 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,14 @@ var settings = {
"Developer Mode": { "id": "bda-gs-8", "info": "Developer Mode", "implemented": true, "hidden": false, "cat": "core"},


"Startup Error Modal": { "id": "fork-ps-1", "info": "Show a modal with plugin/theme errors on startup", "implemented": true, "hidden": false, "cat": "fork"},
"Startup Error Modal": { "id": "fork-ps-1", "info": "Show a modal with plugin/theme errors on startup", "implemented": true, "hidden": false, "cat": "fork"},
"Show Toasts": { "id": "fork-ps-2", "info": "Shows a small notification for starting and stopping plugins & themes", "implemented": true, "hidden": false, "cat": "fork"},
"Scroll To Settings": { "id": "fork-ps-3", "info": "Auto-scrolls to a plugin's settings when the button is clicked (only if out of view)", "implemented": true, "hidden": false, "cat": "fork"},
"Emote Modifier Tooltip": { "id": "fork-es-1", "info": "Shows the emote modifier in the tooltip.", "implemented": true, "hidden": false, "cat": "fork"},
"Animate On Hover": { "id": "fork-es-2", "info": "Only animate the emote modifiers on hover", "implemented": true, "hidden": false, "cat": "fork"},
"Copy Selector": { "id": "fork-dm-1", "info": "Adds a \"Copy Selector\" option to context menus when developer mode is active", "implemented": true, "hidden": false, "cat": "fork"},

"Download Emotes": { "id": "fork-es-3", "info": "Download emotes when the cache is expired", "implemented": true, "hidden": false, "cat": "fork"},


"Twitch Emotes": { "id": "bda-es-7", "info": "Show Twitch emotes", "implemented": true, "hidden": false, "cat": "emote"},
"FrankerFaceZ Emotes": { "id": "bda-es-1", "info": "Show FrankerFaceZ Emotes", "implemented": true, "hidden": false, "cat": "emote"},
Expand Down Expand Up @@ -199,7 +200,8 @@ var defaultCookie = {
"fork-ps-2": true,
"fork-ps-3": true,
"fork-es-1": true,
"fork-es-2": false
"fork-es-2": false,
"fork-es-3": true
};


Expand All @@ -223,6 +225,8 @@ function Core(config) {
window.bdConfig = config;
}

var emoteModulePromise;

Core.prototype.init = async function() {
var self = this;
bdConfig.deferLoaded = false;
Expand All @@ -236,17 +240,16 @@ Core.prototype.init = async function() {

utils = new Utils();
await utils.getHash();
utils.log("Initializing Settings");
this.initSettings();
emoteModule = new EmoteModule();
utils.log("Initializing EmoteModule");
emoteModule.init();
emoteModule.init().then(() => {emoteModule.initialized = true;});
publicServersModule = new V2_PublicServers();
quickEmoteMenu = new QuickEmoteMenu();
voiceMode = new VoiceMode();
dMode = new devMode();

utils.log("Initializing Settings");
this.initSettings();

//Incase were too fast
function gwDefer() {
//console.log(new Date().getTime() + " Defer");
Expand Down Expand Up @@ -859,6 +862,7 @@ EmoteModule.prototype.loadEmoteData = async function(emoteInfo) {
_fs.unlinkSync(file);
}

if (!settingsCookie["fork-es-3"]) return quickEmoteMenu.init();
if (settingsCookie["fork-ps-2"]) mainCore.showToast("Downloading emotes in the background do not reload.", {type: "info"});

for (let e in emoteInfo) {
Expand Down
Loading