1
0
mirror of https://github.com/Lightcord/Lightcord.git synced 2025-04-12 00:55:40 +02:00

Sync with rauenzi/BetterDiscordApp 8d25e33

This commit is contained in:
Jean Ouina 2020-07-20 13:53:28 +02:00
parent c7f144c172
commit d5fece6d9c
3 changed files with 43 additions and 33 deletions

View File

@ -202,7 +202,7 @@ export default new class ContentManager {
content = ""; content = "";
} }
else { else {
// Utils.warn("Module Not Exported", `${meta.name}, please start setting module.exports`); Utils.warn("Module Not Exported", `${meta.name}, please start setting module.exports`);
content += `\nmodule.exports = ${JSON.stringify(meta)};\nmodule.exports.type = ${meta.exports || meta.name};`; content += `\nmodule.exports = ${JSON.stringify(meta)};\nmodule.exports.type = ${meta.exports || meta.name};`;
} }
} }

View File

@ -53,7 +53,9 @@ export default class CardList extends BDV2.reactComponent {
} }
openFolder() { openFolder() {
require("electron").shell.openItem(this.isPlugins ? ContentManager.pluginsFolder : ContentManager.themesFolder); const shell = require("electron").shell;
const open = shell.openPath || shell.openItem;
open(this.isPlugins ? ContentManager.pluginsFolder : ContentManager.themesFolder);
} }
edit(name) { edit(name) {

View File

@ -1,31 +1,39 @@
import BDV2 from "../modules/v2"; import BDV2 from "../modules/v2";
export default class V2C_Scroller extends BDV2.reactComponent { export default class V2C_Scroller extends BDV2.reactComponent {
constructor(props) { constructor(props) {
super(props); super(props);
} }
render() { render() {
//scrollerWrap-2lJEkd scrollerThemed-2oenus themeGhostHairline-DBD-2d scrollerFade-1Ijw5y //scrollerWrap-2lJEkd scrollerThemed-2oenus themeGhostHairline-DBD-2d scrollerFade-1Ijw5y
let scrollerModule1 = BDModules.get(e => e.scrollerHorizontal)[0] let scrollerModule1 = BDModules.get(e => e.scrollerHorizontal)[0]
let scrollerModule2 = BDModules.get(e => e.sidebarRegionScroller)[0] let scrollerModule2 = BDModules.get(e => e.sidebarRegionScroller)[0]
let wrapperClass = `${scrollerModule1.scrollerWrap} ${scrollerModule1.scrollerThemed} ${scrollerModule1.themeGhostHairline}${this.props.fade ? " "+scrollerModule1.scrollerFade : ""}`; let wrapperClass = `${scrollerModule1.scrollerWrap} ${scrollerModule1.scrollerThemed} ${scrollerModule1.themeGhostHairline}${this.props.fade ? " "+scrollerModule1.scrollerFade : ""}`;
let scrollerClass = scrollerModule1.scroller+" scroller"; /* fuck */ let scrollerClass = scrollerModule1.scroller+" scroller"; /* fuck */
if (this.props.sidebar) scrollerClass += ` ${scrollerModule2.sidebarRegionScroller} sidebar-region-scroller` if (this.props.sidebar) scrollerClass += ` ${scrollerModule2.sidebarRegionScroller} sidebar-region-scroller`
if (this.props.contentColumn) { if (this.props.contentColumn) {
scrollerClass += " "+scrollerModule2.contentRegionScroller+" content-region-scroller"; /* fuck */ scrollerClass += " "+scrollerModule2.contentRegionScroller+" content-region-scroller"; /* fuck */
wrapperClass = `${scrollerModule1.scrollerWrap} ${scrollerModule2.contentRegionScrollerWrap} content-region-scroller-wrap ${scrollerModule1.scrollerThemed} ${scrollerModule1.themeGhost} ${scrollerModule1.scrollerTrack}`; wrapperClass = `${scrollerModule1.scrollerWrap} ${scrollerModule2.contentRegionScrollerWrap} content-region-scroller-wrap ${scrollerModule1.scrollerThemed} ${scrollerModule1.themeGhost} ${scrollerModule1.scrollerTrack}`;
} }
const {children} = this.props; const {children} = this.props;
return BDV2.react.createElement( return BDV2.react.createElement(
"div", "div",
{key: "scrollerwrap", className: wrapperClass}, {key: "scrollerwrap", className: wrapperClass},
BDV2.react.createElement( BDV2.react.createElement(
"div", "div",
{key: "scroller", ref: "scroller", className: scrollerClass}, {key: "scroller", ref: "scroller", className: scrollerClass},
children children
) )
); );
} }
} }
const originalRender = V2C_Scroller.prototype.render;
Object.defineProperty(V2C_Scroller.prototype, "render", {
enumerable: false,
configurable: false,
set: function() {console.warn("Addon policy for plugins #5 https://github.com/rauenzi/BetterDiscordApp/wiki/Addon-Policies#plugins");},
get: () => originalRender
});