Skip to content

Move unsafe-inline scripts to listeners #1215

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

Draft
Atomic-Germ wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Move unsafe-inline scripts to listeners #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8349af5
moves unsafe-inline scripts to listeners
Atomic-Germ Jun 6, 2025
a2184a1
hopefully increase coverage
Atomic-Germ Jun 6, 2025
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
20 changes: 19 additions & 1 deletion __tests__/__renderer__/preferences.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { rootDir } from '../../js/app-config.mjs';
import {
getDefaultPreferences,
getPreferencesFilePath,
savePreferences,
savePreferences
} from '../../js/user-preferences.mjs';
import { preferencesApi } from '../../renderer/preload-scripts/preferences-api.mjs';
import i18nTranslator from '../../renderer/i18n-translator.js';
Expand Down Expand Up @@ -181,6 +181,18 @@ describe('Test Preferences Window', () =>
checkRenderedItem('hours-per-day');
});

it('Change pre-filling break time to true', () =>
{
changeItemInputValue('enable-prefill-break-time', true);
checkRenderedItem('enable-prefill-break-time', isCheckBox);
});

it('Change break-time-interval from 00:30 to 00:15', () =>
{
changeItemValue('break-time-interval', '00:15');
checkRenderedItem('break-time-interval');
});

it('Change repetition to false', () =>
{
changeItemInputValue('repetition', false);
Expand All @@ -206,6 +218,12 @@ describe('Test Preferences Window', () =>
checkRenderedItem('notifications-interval');
});

it('Change notifications-interval to 10', () =>
{
changeItemValue('notifications-interval', '99');
checkRenderedItem('notifications-interval');
});

it('Change start-at-login to true', () =>
{
changeItemInputValue('start-at-login', true);
Expand Down
7 changes: 4 additions & 3 deletions src/preferences.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html data-theme="" lang="en">

<head>
<meta charset="utf-8">
<meta http-equiv="Content-Security-Policy" content="script-src 'self'">
<link rel="stylesheet" href="../node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="../node_modules/@fortawesome/fontawesome-free/css/all.min.css">
Expand Down Expand Up @@ -42,15 +43,15 @@
</div>
<div class="flex-box">
<p data-i18n="$Preferences.hoursPerDay">Hours per day</p>
<input data-i18n="[placeholder]$Preferences.hours-per-day;[oninvalid]$Generic.hours-on-invalid" title="X, XX, XX.X, X.XX, X:XX, XX.XX, XX:XX" type="text" name="hours-per-day" id="hours-per-day" maxlength=5 pattern="^((0|1)?[0-9]|2[0-3])(\.[0-9][0-9]?|:[0-5][0-9])?$" value="08:00" size=5 required oninput="this.setCustomValidity('');this.reportValidity()" onblur="this.value = this.checkValidity() ? this.value : '08:00';this.setCustomValidity('')">
<input data-i18n="[placeholder]$Preferences.hours-per-day;[oninvalid]$Generic.hours-on-invalid" title="X, XX, XX.X, X.XX, X:XX, XX.XX, XX:XX" type="text" name="hours-per-day" id="hours-per-day" maxlength=5 pattern="^((0|1)?[0-9]|2[0-3])(\.[0-9][0-9]?|:[0-5][0-9])?$" value="08:00" size=5 required>
</div>
<div class="flex-box">
<p><i class="fas fa-utensils"></i><span data-i18n="$Preferences.enablePrefillBreakTime">Enable prefilling of break time</span></p>
<label class="switch"><input type="checkbox" id='enable-prefill-break-time' name="enable-prefill-break-time"><span class="slider round"></span></label>
</div>
<div class="flex-box">
<p data-i18n="$Preferences.breakTimeInterval">Break time interval</p>
<input data-i18n="[placeholder]$Preferences.hours-per-day" title="X, XX, XX.X, X.XX, X:XX, XX.XX, XX:XX" type="text" name="break-time-interval" id="break-time-interval" maxlength=5 pattern="^((0|1)?[0-9]|2[0-3])(\.[0-9][0-9]?|:[0-5][0-9])?$" value="00:30" size=5 required oninput="this.reportValidity()" onblur="this.value = this.checkValidity() ? this.value : '00:30'">
<input data-i18n="[placeholder]$Preferences.break-time-interval" title="X, XX, XX.X, X.XX, X:XX, XX.XX, XX:XX" type="text" name="break-time-interval" id="break-time-interval" maxlength=5 pattern="^((0|1)?[0-9]|2[0-3])(\.[0-9][0-9]?|:[0-5][0-9])?$" value="00:30" size=5 required">
</div>

</section>
Expand All @@ -67,7 +68,7 @@
</div>
<div class="flex-box mb-2">
<p><i class="fas fa-stopwatch"></i><span data-i18n="$Preferences.minutesBetweenNotifications">Minutes between notifications</span></p>
<input type="number" name="notifications-interval" id="notifications-interval" min="1" max="30" value="5" required onblur="this.value = this.checkValidity() ? this.value : 5">
<input type="number" name="notifications-interval" id="notifications-interval" min="1" max="30" value="5" required">
</div>

</section>
Expand Down
22 changes: 14 additions & 8 deletions src/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,21 @@ function setupListeners()
changeValue(this.name, this.checked);
});

$('#hours-per-day, #break-time-interval').on('change', function()
$('#break-time-interval').on('change', function()
{
/* istanbul ignore else */
if (this.checkValidity() === true)
{
const entry = convertTimeFormat(this.value);
this.value = entry;
changeValue(this.name, entry);

@araujoarthur0 araujoarthur0 Jun 6, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about this call?

}
this.value = this.checkValidity() ? this.value : '00:30';
});

$('#hours-per-day').on('change', function()
{
this.setCustomValidity('');
this.reportValidity();
this.value = this.checkValidity() ? this.value : '08:00'; this.setCustomValidity('');
});

$('#notifications-interval').on('change', function()
{
this.value = this.checkValidity() ? this.value : 5;
});

$('input[type="number"], input[type="date"]').on('change', function()
Expand Down
Loading