Skip to content

Commit 40b8d82

Browse files
DeKleineKobiniDeKleineKobini
committed
Load global filter stuff earlier.
1 parent 049432d commit 40b8d82

File tree

2 files changed

+9
-33
lines changed

2 files changed

+9
-33
lines changed

‎extension/changelog.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{ "message": "Sidebar timer for OC 2.", "contributor": "DeKleineKobini" },
99
{ "message": "Fill Max for Item Market 2.0.", "contributor": "TheFoxMan" }
1010
],
11-
"fixes": [],
11+
"fixes": [{ "message": "Load global filter stuff earlier, in the hopes of it working better.", "contributor": "DeKleineKobini" }],
1212
"changes": [
1313
{ "message": "Disable OC1 timer when detecting OC 2 data.", "contributor": "DeKleineKobini" },
1414
{ "message": "Disable Faction OC timer when detecting OC 2 data.", "contributor": "DeKleineKobini" },

‎extension/manifest.json

+8-32
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"scripts/global/globalStyle.css",
7474
"scripts/global/functions/containers.css",
7575
"scripts/global/functions/dom.css",
76+
"scripts/global/functions/filters.css",
7677
"scripts/global/elements/checkbox/ttCheckbox.css",
7778
"scripts/global/elements/checkbox-list/ttCheckboxList.css",
7879
"scripts/global/elements/slider/ttSlider.css",
@@ -99,6 +100,7 @@
99100
"scripts/global/functions/torn.js",
100101
"scripts/global/functions/api.js",
101102
"scripts/global/functions/api-external.js",
103+
"scripts/global/functions/filters.js",
102104
"scripts/global/featureManager.js",
103105
"scripts/global/elements/checkbox/ttCheckbox.js",
104106
"scripts/global/elements/checkbox-list/ttCheckboxList.js",
@@ -274,7 +276,6 @@
274276
"matches": ["https://www.torn.com/bounties.php*"],
275277
"css": ["scripts/features/bounty-filter/ttBountyFilter.css", "scripts/features/stats-estimate/ttStatsEstimate.css"],
276278
"js": [
277-
"scripts/global/functions/filters.js",
278279
"scripts/content/bounties/ttBounties.js",
279280
"scripts/features/bounty-filter/ttBountyFilter.js",
280281
"scripts/features/stats-estimate/statsEstimate.js",
@@ -337,7 +338,6 @@
337338
{
338339
"matches": ["https://www.torn.com/factions.php*"],
339340
"css": [
340-
"scripts/global/functions/filters.css",
341341
"scripts/features/drug-details/ttDrugDetails.css",
342342
"scripts/features/item-values/ttItemValues.css",
343343
"scripts/features/highlight-blood-bags/ttHighlightBloodBags.css",
@@ -367,7 +367,6 @@
367367
"scripts/features/show-faction-spy/ttShowFactionSpy.css"
368368
],
369369
"js": [
370-
"scripts/global/functions/filters.js",
371370
"scripts/global/functions/csv.js",
372371
"scripts/global/functions/torn-items.js",
373372
"scripts/content/factions/ttFactions.js",
@@ -413,9 +412,7 @@
413412
},
414413
{
415414
"matches": ["https://www.torn.com/hospitalview.php*"],
416-
"css": ["scripts/global/functions/filters.css"],
417415
"js": [
418-
"scripts/global/functions/filters.js",
419416
"scripts/content/hospital/ttHospital.js",
420417
"scripts/features/hospital-filter/ttHospitalFilter.js",
421418
"scripts/features/user-alias/ttUserAliasUserlist.js"
@@ -446,7 +443,6 @@
446443
{
447444
"matches": ["https://www.torn.com/index.php*"],
448445
"css": [
449-
"scripts/global/functions/filters.css",
450446
"scripts/global/elements/table/ttTable.css",
451447
"scripts/features/effective-stats/ttEffectiveStats.css",
452448
"scripts/features/live-networth/ttLiveNetworth.css",
@@ -459,7 +455,6 @@
459455
"scripts/features/abroad-energy-warning/ttAbroadEnergyWarning.css"
460456
],
461457
"js": [
462-
"scripts/global/functions/filters.js",
463458
"scripts/global/elements/table/ttTable.js",
464459
"scripts/features/effective-stats/ttEffectiveStats.js",
465460
"scripts/features/live-networth/ttLiveNetworth.js",
@@ -536,13 +531,8 @@
536531
},
537532
{
538533
"matches": ["https://www.torn.com/jailview.php*"],
539-
"css": ["scripts/global/functions/filters.css", "scripts/features/jail-filter/ttJailFilter.css"],
540-
"js": [
541-
"scripts/global/functions/filters.js",
542-
"scripts/content/jail/ttJail.js",
543-
"scripts/features/jail-filter/ttJailFilter.js",
544-
"scripts/features/user-alias/ttUserAliasUserlist.js"
545-
],
534+
"css": ["scripts/features/jail-filter/ttJailFilter.css"],
535+
"js": ["scripts/content/jail/ttJail.js", "scripts/features/jail-filter/ttJailFilter.js", "scripts/features/user-alias/ttUserAliasUserlist.js"],
546536
"run_at": "document_end"
547537
},
548538
{
@@ -642,14 +632,12 @@
642632
{
643633
"matches": ["https://www.torn.com/page.php?sid=stocks*"],
644634
"css": [
645-
"scripts/global/functions/filters.css",
646635
"scripts/features/stocks-filter/ttStocksFilter.css",
647636
"scripts/features/stock-acronyms/ttStockAcronyms.css",
648637
"scripts/features/total-portfolio-value/ttTotalPortfolioValue.css",
649638
"scripts/features/hide-stocks/ttHideStocks.css"
650639
],
651640
"js": [
652-
"scripts/global/functions/filters.js",
653641
"scripts/features/stocks-filter/ttStocksFilter.js",
654642
"scripts/features/stock-acronyms/ttStockAcronyms.js",
655643
"scripts/features/total-portfolio-value/ttTotalPortfolioValue.js",
@@ -659,9 +647,8 @@
659647
},
660648
{
661649
"matches": ["https://www.torn.com/page.php?sid=UserList*"],
662-
"css": ["scripts/global/functions/filters.css", "scripts/features/stats-estimate/ttStatsEstimate.css"],
650+
"css": ["scripts/features/stats-estimate/ttStatsEstimate.css"],
663651
"js": [
664-
"scripts/global/functions/filters.js",
665652
"scripts/content/userlist/ttUserlist.js",
666653
"scripts/features/userlist-filter/ttUserlistFilter.js",
667654
"scripts/features/stats-estimate/statsEstimate.js",
@@ -834,9 +821,8 @@
834821
{ "matches": ["https://www.torn.com/museum.php*"], "js": ["scripts/features/museum-auto-fill/ttMuseumAutoFill.js"], "run_at": "document_end" },
835822
{
836823
"matches": ["https://www.torn.com/blacklist.php*"],
837-
"css": ["scripts/global/functions/filters.css", "scripts/features/stats-estimate/ttStatsEstimate.css"],
824+
"css": ["scripts/features/stats-estimate/ttStatsEstimate.css"],
838825
"js": [
839-
"scripts/global/functions/filters.js",
840826
"scripts/features/stats-estimate/statsEstimate.js",
841827
"scripts/features/stats-estimate/ttStatsEstimateEnemies.js",
842828
"scripts/features/enemy-filter/ttEnemyFilter.js"
@@ -851,13 +837,8 @@
851837
},
852838
{
853839
"matches": ["https://www.torn.com/competition.php*"],
854-
"css": [
855-
"scripts/global/functions/filters.css",
856-
"scripts/features/competition-filter/ttCompetitionFilter.css",
857-
"scripts/features/stats-estimate/ttStatsEstimate.css"
858-
],
840+
"css": ["scripts/features/competition-filter/ttCompetitionFilter.css", "scripts/features/stats-estimate/ttStatsEstimate.css"],
859841
"js": [
860-
"scripts/global/functions/filters.js",
861842
"scripts/content/competition/ttCompetition.js",
862843
"scripts/features/competition-filter/ttCompetitionFilter.js",
863844
"scripts/features/stats-estimate/statsEstimate.js",
@@ -868,12 +849,7 @@
868849
{ "matches": ["https://www.torn.com/pmarket.php*"], "js": ["scripts/features/no-confirm/ttPointsMarketNoConfirm.js"], "run_at": "document_end" },
869850
{
870851
"matches": ["https://www.torn.com/amarket.php*"],
871-
"css": ["scripts/global/functions/filters.css"],
872-
"js": [
873-
"scripts/global/functions/filters.js",
874-
"scripts/content/auction-house/ttAuctionHouse.js",
875-
"scripts/features/auction-house-filter/ttAuctionHouseFilter.js"
876-
],
852+
"js": ["scripts/content/auction-house/ttAuctionHouse.js", "scripts/features/auction-house-filter/ttAuctionHouseFilter.js"],
877853
"run_at": "document_end"
878854
}
879855
]

0 commit comments

Comments
 (0)