diff --git a/src/main/base/plugins.ts b/src/main/base/plugins.ts index f4f1d2ec..3dc77b0f 100644 --- a/src/main/base/plugins.ts +++ b/src/main/base/plugins.ts @@ -33,13 +33,24 @@ export class Plugins { if (fs.existsSync(this.userPluginsPath)) { fs.readdirSync(this.userPluginsPath).forEach(file => { if (file.endsWith('.ts') || file.endsWith('.js')) { - const plugin = require(path.join(this.userPluginsPath, file)); - file = file.replace('.ts', '').replace('.js', ''); - if (plugins[file] || plugin in plugins) { - console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`); + if (!electron.app.isPackaged) { + const plugin = require(path.join(this.userPluginsPath, file)).default; + file = file.replace('.ts', '').replace('.js', ''); + if (plugins[file] || plugin in plugins) { + console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`); + } else { + plugins[file] = new plugin(electron.app, utils.getStore()); + } } else { - plugins[file] = new plugin(electron.app, utils.getStore()); + const plugin = require(path.join(this.userPluginsPath, file)); + file = file.replace('.ts', '').replace('.js', ''); + if (plugins[file] || plugin in plugins) { + console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`); + } else { + plugins[file] = new plugin(electron.app, utils.getStore()); + } } + } }); } diff --git a/src/renderer/index.js b/src/renderer/index.js index 72e5e535..931bf60f 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -293,7 +293,10 @@ const app = new Vue({ }, mainMenuVisibility(val) { if (val) { - (this.chrome.userinfo.id) ? this.chrome.menuOpened = !this.chrome.menuOpened : false + (this.mk.isAuthorized) ? this.chrome.menuOpened = !this.chrome.menuOpened : false; + if (!this.mk.isAuthorized){ + this.mk.authorize() + } } else { setTimeout(() => { this.chrome.menuOpened = false diff --git a/src/web-remote/views/index.ejs b/src/web-remote/views/index.ejs index de38dc44..9a6ec9a6 100644 --- a/src/web-remote/views/index.ejs +++ b/src/web-remote/views/index.ejs @@ -172,7 +172,7 @@