Compare commits

..

No commits in common. "3603caed217e163a59441fe98782524f225795d3" and "85cc4957d8474dcb6f16e0d5eb2a8fe462c2f31f" have entirely different histories.

6 changed files with 8 additions and 26 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "twitch-vod-manager", "name": "twitch-vod-manager",
"version": "4.6.116", "version": "4.6.115",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "twitch-vod-manager", "name": "twitch-vod-manager",
"version": "4.6.116", "version": "4.6.115",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"axios": "^1.6.0", "axios": "^1.6.0",

View File

@ -1,6 +1,6 @@
{ {
"name": "twitch-vod-manager", "name": "twitch-vod-manager",
"version": "4.6.116", "version": "4.6.115",
"description": "Twitch VOD Manager - Download Twitch VODs easily", "description": "Twitch VOD Manager - Download Twitch VODs easily",
"main": "dist/main.js", "main": "dist/main.js",
"author": "xRangerDE", "author": "xRangerDE",

View File

@ -457,10 +457,7 @@ const UI_TEXT_DE = {
merging: 'Zusammenfugen...', merging: 'Zusammenfugen...',
merge: 'Zusammenfugen', merge: 'Zusammenfugen',
success: 'Videos erfolgreich zusammengefugt!', success: 'Videos erfolgreich zusammengefugt!',
failed: 'Fehler beim Zusammenfugen der Videos.', failed: 'Fehler beim Zusammenfugen der Videos.'
moveUpAria: 'Nach oben verschieben',
moveDownAria: 'Nach unten verschieben',
removeAria: 'Aus Liste entfernen'
}, },
mergeGroup: { mergeGroup: {
btn: 'Zusammenfugen & Splitten', btn: 'Zusammenfugen & Splitten',

View File

@ -457,10 +457,7 @@ const UI_TEXT_EN = {
merging: 'Merging...', merging: 'Merging...',
merge: 'Merge', merge: 'Merge',
success: 'Videos merged successfully!', success: 'Videos merged successfully!',
failed: 'Failed to merge videos.', failed: 'Failed to merge videos.'
moveUpAria: 'Move up',
moveDownAria: 'Move down',
removeAria: 'Remove from list'
}, },
mergeGroup: { mergeGroup: {
btn: 'Merge & Split', btn: 'Merge & Split',

View File

@ -1639,9 +1639,9 @@ function renderMergeFiles(): void {
<div class="file-order">${index + 1}</div> <div class="file-order">${index + 1}</div>
<div class="file-name" title="${file}">${name}</div> <div class="file-name" title="${file}">${name}</div>
<div class="file-actions"> <div class="file-actions">
<button type="button" class="file-btn" aria-label="${escapeHtml(UI_TEXT.merge.moveUpAria)}" title="${escapeHtml(UI_TEXT.merge.moveUpAria)}" onclick="moveMergeFile(${index}, -1)" ${index === 0 ? 'disabled' : ''}>&#9650;</button> <button type="button" class="file-btn" onclick="moveMergeFile(${index}, -1)" ${index === 0 ? 'disabled' : ''}>&#9650;</button>
<button type="button" class="file-btn" aria-label="${escapeHtml(UI_TEXT.merge.moveDownAria)}" title="${escapeHtml(UI_TEXT.merge.moveDownAria)}" onclick="moveMergeFile(${index}, 1)" ${index === mergeFiles.length - 1 ? 'disabled' : ''}>&#9660;</button> <button type="button" class="file-btn" onclick="moveMergeFile(${index}, 1)" ${index === mergeFiles.length - 1 ? 'disabled' : ''}>&#9660;</button>
<button type="button" class="file-btn remove" aria-label="${escapeHtml(UI_TEXT.merge.removeAria)}" title="${escapeHtml(UI_TEXT.merge.removeAria)}" onclick="removeMergeFile(${index})">x</button> <button type="button" class="file-btn remove" onclick="removeMergeFile(${index})">x</button>
</div> </div>
</div> </div>
`; `;

View File

@ -3083,22 +3083,10 @@ select option {
color: var(--text); color: var(--text);
} }
.file-item .file-btn:focus-visible {
outline: none;
border-radius: 4px;
box-shadow: 0 0 0 2px rgba(145, 70, 255, 0.65);
color: var(--text);
}
.file-item .file-btn.remove:hover { .file-item .file-btn.remove:hover {
color: var(--error); color: var(--error);
} }
.file-item .file-btn.remove:focus-visible {
box-shadow: 0 0 0 2px rgba(255, 107, 107, 0.65);
color: var(--error);
}
.merge-actions { .merge-actions {
display: flex; display: flex;
gap: 10px; gap: 10px;