Merge branch 'main' into renovate/webpack-cli-6.x

Author: MrBurrBurr

src/views/ASFConfig.vue

@@ -100,12 +100,18 @@
           // if we got routed to asf-config with params, we propably
           // came from PasswordHash.vue and want to set ipc data from params
           if (Object.keys(this.$route.params).length !== 0) {
-            this.model.IPCPassword = this.$route.params?.ipcPassword;
-            this.model.IPCPasswordFormat = this.$route.params?.ipcPasswordFormat;
+            // only set the values if they exist in the params
+            if (typeof this.$route.params.ipcPassword !== 'undefined') {
+              this.model.IPCPassword = this.$route.params.ipcPassword;
+            }
+            if (typeof this.$route.params.ipcPasswordFormat !== 'undefined') {
+              this.model.IPCPasswordFormat = this.$route.params.ipcPasswordFormat;
+            }
           }
 
           const extendedFields = {
             IPCPassword: { placeholder: this.$t('keep-unchanged') },
+            LicenseID: { placeholder: this.$t('keep-unchanged') },
           };
 
           this.fields = Object.keys(fields).map(key => {

src/views/Commands.vue

@@ -19,6 +19,7 @@
             @keydown.ctrl.65.prevent="jumpToStart"
             @keydown.ctrl.75.prevent="removeAfterCursor"
             @keydown.ctrl.76.prevent="clearTerminal"
+            @keydown.ctrl.85.prevent="deleteBeforeCursorAndJumpToStart"
           >
           <input v-model="autocompleteSuggestion" type="text" spellcheck="false" class="terminal__input terminal__input--autocomplete">
         </div>
@@ -341,18 +342,29 @@
         this.log = [];
       },
       jumpToStart() {
-        this.$refs['terminal-input'].setSelectionRange(0, 0);
+        const el = this.$refs['terminal-input'];
+
+        if (el.setSelectionRange) setTimeout(() => el.setSelectionRange(0, 0), 0);
       },
       removeAfterCursor() {
         const pos = this.$refs['terminal-input'].selectionStart;
         this.command = this.command.substr(0, pos);
       },
+      removeBeforeCursor() {
+        const pos = this.$refs['terminal-input'].selectionStart;
+        const inputLength = this.$refs['terminal-input'].value.length;
+        this.command = this.command.substr(pos, inputLength);
+      },
       moveCursorToEnd() {
         const el = this.$refs['terminal-input'];
         const len = this.command.length;
 
         if (el.setSelectionRange) setTimeout(() => el.setSelectionRange(len, len), 0);
       },
+      deleteBeforeCursorAndJumpToStart() {
+        this.removeBeforeCursor();
+        this.jumpToStart();
+      },
       parseCommandsHTML(commandsWikiRaw) {
         const virtualDOM = createVirtualDOM(commandsWikiRaw);
         const commandsTableHTML = virtualDOM.querySelector('.markdown-heading > h2').parentElement.nextElementSibling;

src/views/modals/BotConfig.vue

@@ -102,8 +102,13 @@
           // if we got routed to bot-config with params, we propably
           // came from PasswordEncrypt.vue and want to set password data from params
           if (Object.keys(this.$route.params).length !== 0) {
-            this.model.SteamPassword = this.$route.params?.steamPassword;
-            this.model.PasswordFormat = this.$route.params?.passwordFormat;
+            // only set the values if they exist in the params
+            if (typeof this.$route.params.steamPassword !== 'undefined') {
+              this.model.SteamPassword = this.$route.params.steamPassword;
+            }
+            if (typeof this.$route.params.passwordFormat !== 'undefined') {
+              this.model.PasswordFormat = this.$route.params.passwordFormat;
+            }
           }
 
           const extendedFields = {