Merge remote-tracking branch 'remotes/upstream/master'

client/components/ui/VueTrix.vue

@@ -318,10 +318,8 @@ export default {
       }
     },
     handleAttachmentAdd(event) {
-      // Prevent pasting in images from the browser
-      if (!event.attachment.file) {
-        event.attachment.remove()
-      }
+      // Prevent pasting in images/any files from the browser
+      event.attachment.remove()
     }
   },
   mounted() {

client/components/widgets/EncoderOptionsCard.vue

@@ -143,10 +143,18 @@ export default {
       localStorage.setItem('embedMetadataCodec', val)
     },
     getEncodingOptions() {
-      return {
-        codec: this.selectedCodec || 'aac',
-        bitrate: this.selectedBitrate || '128k',
-        channels: this.selectedChannels || 2
+      if (this.showAdvancedView) {
+        return {
+          codec: this.customCodec || this.selectedCodec || 'aac',
+          bitrate: this.customBitrate || this.selectedBitrate || '128k',
+          channels: this.customChannels || this.selectedChannels || 2
+        }
+      } else {
+        return {
+          codec: this.selectedCodec || 'aac',
+          bitrate: this.selectedBitrate || '128k',
+          channels: this.selectedChannels || 2
+        }
       }
     },
     setPreset() {

client/components/widgets/LoadingSpinner.vue

@@ -248,4 +248,4 @@ export default {
     transform: scale(0);
   }
 }
-</style>
+</style>

client/components/widgets/SeriesInputWidget.vue

@@ -109,4 +109,4 @@ export default {
     }
   }
 }
-</script>
+</script>