Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog of PrivacyWire

## 1.2.1
- feat: add capability to set messageTimout to zero

## 1.2.0
- add configuration option to define max retention of stored consent

Expand Down
3 changes: 2 additions & 1 deletion PrivacyWire.module
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,12 @@ class PrivacyWire extends WireData implements Module, ConfigurableModule
public function ___getPrivacyWireConfigObject(): string
{
$privacyWireSettings = new \StdClass;
$messageTimeout = is_numeric($this->messageTimeout) ? intval($this->messageTimeout) : null;
$privacyWireSettings->version = $this->version;
$privacyWireSettings->dnt = ($this->respectDNT) ? "1" : "0";
$privacyWireSettings->bots = ($this->checkForBots) ? "1" : "0";
$privacyWireSettings->customFunction = ($this->wire('sanitizer')->text($this->trigger_custom_js_function)) ?? "";
$privacyWireSettings->messageTimeout = ($this->messageTimeout && intval($this->messageTimeout) > 1) ? intval($this->messageTimeout) : 1500;
$privacyWireSettings->messageTimeout = ($messageTimeout !== null && $messageTimeout >= 0) ? $messageTimeout : 1500;
$privacyWireSettings->consentStorageDurationMonths = intval($this->consent_storage_duration_months ?? 0);
$privacyWireSettings->consentByClass = ($this->detect_consents_by_class) ? "1" : "0";
$privacyWireSettings->cookieGroups = [
Expand Down
2 changes: 1 addition & 1 deletion PrivacyWireConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function __construct()
'name' => 'messageTimeout',
'type' => 'integer',
'label' => $this->_('Consent Saving Confirmation Duration'),
'description' => $this->_("How many milliseconds should the consent saving confirmation be visible after the user makes a choice."),
'description' => $this->_("How many milliseconds should the consent saving confirmation be visible after the user makes a choice? Set to 0 to disable the confirmation message."),
'columnWidth' => 25,
],
[ // consent storage duration
Expand Down
2 changes: 1 addition & 1 deletion js/PrivacyWire.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/PrivacyWire_legacy.js

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion src/js/PrivacyWire.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ class PrivacyWire {
*/
sanitizeSettings(PrivacyWireSettings) {
const settings = {};
const messageTimeout = Number.parseInt(PrivacyWireSettings.messageTimeout);
settings.version = Number.parseInt(PrivacyWireSettings.version);
settings.dnt = Boolean(Number.parseInt(PrivacyWireSettings.dnt));
settings.bots = Boolean(Number.parseInt(PrivacyWireSettings.bots));
settings.customFunction = `${PrivacyWireSettings.customFunction}`;
settings.messageTimeout = Number.parseInt(PrivacyWireSettings.messageTimeout);
settings.messageTimeout = Number.isFinite(messageTimeout) && messageTimeout >= 0 ? messageTimeout : 1500;
settings.consentStorageDurationMonths =
Number.parseInt(PrivacyWireSettings.consentStorageDurationMonths) || 0;
settings.consentByClass = Boolean(Number.parseInt(PrivacyWireSettings.consentByClass));
Expand Down Expand Up @@ -408,6 +409,10 @@ class PrivacyWire {
}

showMessage() {
if (this.settings.messageTimeout === 0) {
return;
}

this.elements.banner.wrapper.classList.add("show-message");
setTimeout(() => {
this.elements.banner.wrapper.classList.remove("show-message");
Expand Down
Loading