lightcordwarez
/
BetterDiscordApp-rauenzi
mirror of https://github.com/rauenzi/BetterDiscordApp.git
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Moves tooltip classes to a function

This commit is contained in:
Zack Rauen 2020-07-26 18:16:21 -04:00
parent 3413eee2ce
commit 8ec5b5742f
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/core.js
View File

@ -19,15 +19,13 @@ const dependencies = [
name: "jquery",
type: "script",
url: "//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js",
backup: "//cdn.jsdelivr.net/gh/jquery/jquery@2.0.0/jquery.min.js",
local: null
backup: "//cdn.jsdelivr.net/gh/jquery/jquery@2.0.0/jquery.min.js"
},
{
name: "bd-stylesheet",
type: "style",
url: "//betterdiscord.zerebos.com/dist/style.css",
backup: "//rauenzi.github.io/BetterDiscordApp/dist/style.css",
local: "{{localServer}}/BetterDiscordApp/dist/style.css"
backup: "//rauenzi.github.io/BetterDiscordApp/dist/style.css"
}
];
@ -165,7 +163,7 @@ Core.prototype.injectExternals = async function() {
await DOM.addScript("ace-script", "https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js");
if (window.require.original) window.require = window.require.original;
if (window.$ && window.jQuery) return; // Dependencies already loaded
const jqueryUrl = Utils.formatString((bdConfig.local && dependencies[0].local != null) ? dependencies[0].local : dependencies[0].url, {repo: bdConfig.repo, hash: bdConfig.hash, minified: bdConfig.minified ? ".min" : "", localServer: bdConfig.localServer});
const jqueryUrl = Utils.formatString(dependencies[0].url, {repo: bdConfig.repo, hash: bdConfig.hash, minified: bdConfig.minified ? ".min" : "", localServer: bdConfig.localServer});
try {await DOM.addScript("jquery", jqueryUrl);}
catch (_) {
try {
@ -176,7 +174,7 @@ Core.prototype.injectExternals = async function() {
Utils.alert("jQuery Not Loaded", "Unable to load jQuery, some plugins may fail to work. Proceed at your own risk.");
}
}
document.head.append(DOM.createElement(`<link rel="stylesheet" href=${Utils.formatString((bdConfig.local && dependencies[1].local != null) ? dependencies[1].local : dependencies[1].url, {repo: bdConfig.repo, hash: bdConfig.hash, minified: bdConfig.minified ? ".min" : "", localServer: bdConfig.localServer})}>`));
document.head.append(DOM.createElement(`<link rel="stylesheet" href=${Utils.formatString(dependencies[1].url, {repo: bdConfig.repo, hash: bdConfig.hash, minified: bdConfig.minified ? ".min" : "", localServer: bdConfig.localServer})}>`));
};
Core.prototype.initSettings = function () {

12
src/ui/tooltip.js
View File

@ -25,12 +25,12 @@ import WebpackModules from "../modules/webpackModules";
// Changelog
// </div>
//</div>
const TooltipClasses = WebpackModules.findByProps("tooltip", "tooltipBlack");
const TooltipClasses = () => WebpackModules.findByProps("tooltip", "tooltipBlack");
const TooltipLayers = WebpackModules.findByProps("layer", "layerContainer");
const getClass = function(sideOrColor) {
const upperCase = sideOrColor[0].toUpperCase() + sideOrColor.slice(1);
const tooltipClass = TooltipClasses[`tooltip${upperCase}`];
const tooltipClass = TooltipClasses()[`tooltip${upperCase}`];
if (tooltipClass) return tooltipClass;
return null;
};
@ -78,12 +78,12 @@ export default class EmulatedTooltip {
this.element.className = TooltipLayers.layer;
this.tooltipElement = document.createElement("div");
this.tooltipElement.className = `${TooltipClasses.tooltip} ${getClass(this.style)}`;
this.tooltipElement.className = `${TooltipClasses().tooltip} ${getClass(this.style)}`;
this.labelElement = document.createElement("div");
this.labelElement.className = TooltipClasses.tooltipContent;
this.labelElement.className = TooltipClasses().tooltipContent;
const pointerElement = document.createElement("div");
pointerElement.className = TooltipClasses.tooltipPointer;
pointerElement.className = TooltipClasses().tooltipPointer;
this.tooltipElement.append(pointerElement);
this.tooltipElement.append(this.labelElement);
@ -132,7 +132,7 @@ export default class EmulatedTooltip {
/** Shows the tooltip. Automatically called on mouseenter. Will attempt to flip if position was wrong. */
show() {
this.tooltipElement.className = `${TooltipClasses.tooltip} ${getClass(this.style)}`;
this.tooltipElement.className = `${TooltipClasses().tooltip} ${getClass(this.style)}`;
this.labelElement.textContent = this.label;
this.container.append(this.element);