Skip to content

Commit 5d015ce

Browse files
authored
Merge pull request #155 from FriendsOfREDAXO/multi_copy
Multi copy fix for multiuser
2 parents c9b495d + 71cea7a commit 5d015ce

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

assets/js/bloecks.js

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -561,14 +561,14 @@ var BLOECKS = (function($) {
561561

562562
var $this = $(this);
563563

564-
// Always show dropdown if we have any clipboard items
565-
if (multiClipboard.length > 0) {
566-
showClipboardDropdown($this);
564+
// Check if we have any clipboard items
565+
if (multiClipboard.length === 0) {
566+
showToast('Zwischenablage ist leer', 'warning');
567567
return;
568568
}
569569

570-
// No clipboard items - show error
571-
showToast('Zwischenablage ist leer', 'warning');
570+
// Always show dropdown if we have clipboard items (user can also clear clipboard)
571+
showClipboardDropdown($this);
572572
});
573573
}
574574

@@ -887,6 +887,20 @@ var BLOECKS = (function($) {
887887
return;
888888
}
889889

890+
// If multi-clipboard is NOT enabled AND we have only one item, use simple paste
891+
if (!isMultiClipboardEnabled && indexes.length === 1) {
892+
var params = {
893+
'bloecks_target': targetSlice,
894+
'article_id': articleId,
895+
'clang': clangId,
896+
'ctype': ctypeId
897+
};
898+
899+
performCopyPasteAction('paste', params);
900+
return;
901+
}
902+
903+
// Use multi-paste for multiple items or when multi-clipboard is enabled
890904
// Show loading toast
891905
var loadingToastId = 'bloecks-multi-paste-' + Date.now();
892906
var loadingToast = showToastWithId('Füge ' + indexes.length + ' Elemente ein...', 'info', 30000, loadingToastId);

0 commit comments

Comments
 (0)