merge conflicts

Author: TensAndTwenties

CHANGELOG.md

@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Upgraded follow-redirects dependancy for security alert
+- Upgraded follow-redirects dependency for security alert
 - Bumped Node version for tests to 16.x
 - Bumped electron version
 - Fixed unit test errors

src/main/index.js

@@ -44,7 +44,7 @@ function createWindow() {
     webPreferences: {
       // Use pluginOptions.nodeIntegration, leave this alone
       // See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info
-      nodeIntegration: true,
+      nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION,
       webviewTag: true,
       webSecurity: false,
       contextIsolation: false,

src/renderer/class/CaptionManager.js

@@ -100,8 +100,7 @@ class CaptionManager {
       this.emitOpenedJSON();
       return;
     }
-    //this.currentCaptionIndex.edited = true;
-    // -- the above line didnt make sense, edited it out, and set the current caption edited to be true
+
     this.emitCurrent($origin);
     this.emitData($origin);
   }

src/renderer/components/caption-studio/TextEditor.vue

@@ -154,7 +154,6 @@ export default {
     EventBus.$on('caption_reset', this.reset);
     EventBus.$on('json_errors', this.onJsonErrors);
     this.$refs.Quill?.quill?.on('text-change', this.onEdit);
-    //this.$refs.Quill?.$el.addEventListener('paste', catchPasteEvent);
   },
   /**
    *