From 0bd75d558f8a92d4027d53caa33918681c83a02e Mon Sep 17 00:00:00 2001 From: Svallinn <41585298+Svallinn@users.noreply.github.com> Date: Sun, 6 Jun 2021 18:13:36 +0100 Subject: [PATCH] App: Remove unnecessary logic related to the `usingElectron` setting --- src/renderer/App.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/renderer/App.js b/src/renderer/App.js index f2a934b5..65b36272 100644 --- a/src/renderer/App.js +++ b/src/renderer/App.js @@ -13,16 +13,10 @@ import $ from 'jquery' import { markdown } from 'markdown' import Parser from 'rss-parser' -let useElectron = false let ipcRenderer = null Vue.directive('observe-visibility', ObserveVisibility) -if (window && window.process && window.process.type === 'renderer') { - useElectron = true - ipcRenderer = require('electron').ipcRenderer -} - export default Vue.extend({ name: 'App', components: { @@ -56,6 +50,9 @@ export default Vue.extend({ isOpen: function () { return this.$store.getters.getIsSideNavOpen }, + usingElectron: function() { + return this.$store.getters.getUsingElectron + }, showProgressBar: function () { return this.$store.getters.getShowProgressBar }, @@ -86,14 +83,14 @@ export default Vue.extend({ this.grabAllProfiles(this.$t('Profile.All Channels')).then(async () => { this.grabHistory() this.grabAllPlaylists() - this.setUsingElectron(useElectron) this.checkThemeSettings() await this.checkLocale() this.dataReady = true - if (useElectron) { + if (this.usingElectron) { console.log('User is using Electron') + ipcRenderer = require('electron').ipcRenderer this.activateKeyboardShortcuts() this.openAllLinksExternally() this.enableOpenUrl() @@ -283,7 +280,7 @@ export default Vue.extend({ openAllLinksExternally: function () { $(document).on('click', 'a[href^="http"]', (event) => { const el = event.currentTarget - console.log(useElectron) + console.log(this.usingElectron) console.log(el) event.preventDefault()