Skip to content

Guard copy actions when no report is generated #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Myst1C13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Guard copy actions when no report is generated #576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions src/scripts/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,14 @@ function getYesterday() {
return yesterday.toISOString().split('T')[0];
}

function hasScrumReportContent(scrumReportEl = document.getElementById('scrumReport')) {
if (!scrumReportEl) {
return false;
}

return Boolean(scrumReportEl.textContent?.trim() || scrumReportEl.innerHTML?.trim());
}

function applyI18n() {
document.querySelectorAll('[data-i18n]').forEach((el) => {
const key = el.getAttribute('data-i18n');
Expand Down Expand Up @@ -679,7 +687,7 @@ document.addEventListener('DOMContentLoaded', () => {
const content = scrumReport ? scrumReport.innerHTML : '';
const subject = buildScrumSubjectFromPopup();

if (!content) {
if (!hasScrumReportContent(scrumReport)) {
insertBtn._triggeredByShortcut = false;
return;
}
Expand Down Expand Up @@ -741,6 +749,11 @@ document.addEventListener('DOMContentLoaded', () => {

copyBtn.addEventListener('click', function () {
const scrumReport = document.getElementById('scrumReport');
if (!hasScrumReportContent(scrumReport)) {
this._triggeredByShortcut = false;
return;
}

const tempDiv = document.createElement('div');
tempDiv.innerHTML = scrumReport.innerHTML;
document.body.appendChild(tempDiv);
Expand Down Expand Up @@ -2081,14 +2094,32 @@ document.addEventListener('keydown', (e) => {
generateBtn.click();
}

if (modifier && e.shiftKey && !e.altKey && key === 'y' && !e.repeat && copyBtn && !copyBtn.disabled) {
if (
modifier &&
e.shiftKey &&
!e.altKey &&
key === 'y' &&
!e.repeat &&
copyBtn &&
!copyBtn.disabled &&
hasScrumReportContent()
) {
e.preventDefault();
showShortcutNotification('copyingReportNotification');
copyBtn._triggeredByShortcut = true;
copyBtn.click();
}

if (modifier && e.shiftKey && !e.altKey && key === 'm' && !e.repeat && insertEmailBtn && !insertEmailBtn.disabled) {
if (
modifier &&
e.shiftKey &&
!e.altKey &&
key === 'm' &&
!e.repeat &&
insertEmailBtn &&
!insertEmailBtn.disabled &&
hasScrumReportContent()
) {
e.preventDefault();
showShortcutNotification('insertingInEmailNotification');
insertEmailBtn._triggeredByShortcut = true;
Expand Down
Loading