Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup checkbox component

Browse source
This commit is contained in:
djmaze 2021-09-07 23:09:56 +02:00
parent 081761b593
commit 01d96153c6
6 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dev/Component/AbstractCheckbox.js
View file

@ -8,20 +8,11 @@ class AbstractCheckbox extends AbstractComponent {
constructor(params = {}) { constructor(params = {}) {
super(); super();
this.value = params.value; this.value = ko.isObservable(params.value) ? params.value
if (undefined === this.value || !this.value.subscribe) { : ko.observable(!!params.value);
this.value = ko.observable(!!this.value);
}
this.enable = params.enable; this.enable = ko.isObservable(params.enable) ? params.enable
if (undefined === this.enable || !this.enable.subscribe) { : ko.observable(undefined === params.enable || !!params.enable);
this.enable = ko.observable(undefined === this.enable || !!this.enable);
}
this.disable = params.disable;
if (undefined === this.disable || !this.disable.subscribe) {
this.disable = ko.observable(!!this.disable);
}
this.label = params.label || ''; this.label = params.label || '';
this.inline = !!params.inline; this.inline = !!params.inline;

2
dev/Settings/User/General.js
View file

@ -35,7 +35,7 @@ export class GeneralUserSettings {
this.notificationSounds = ko.observableArray(SettingsGet('NewMailSounds')); this.notificationSounds = ko.observableArray(SettingsGet('NewMailSounds'));
this.enableDesktopNotification = NotificationUserStore.enableDesktopNotification; this.enableDesktopNotification = NotificationUserStore.enableDesktopNotification;
this.isDesktopNotificationDenied = NotificationUserStore.isDesktopNotificationDenied; this.isDesktopNotificationAllowed = NotificationUserStore.isDesktopNotificationAllowed;
this.showImages = SettingsUserStore.showImages; this.showImages = SettingsUserStore.showImages;
this.removeColors = SettingsUserStore.removeColors; this.removeColors = SettingsUserStore.removeColors;

4
dev/Stores/User/Notification.js
View file

@ -41,13 +41,13 @@ export const NotificationUserStore = new class {
this.enableDesktopNotification = ko.observable(false)/*.extend({ notify: 'always' })*/; this.enableDesktopNotification = ko.observable(false)/*.extend({ notify: 'always' })*/;
this.isDesktopNotificationDenied = ko.observable(NotificationsDenied()); this.isDesktopNotificationAllowed = ko.observable(!NotificationsDenied());
this.enableDesktopNotification.subscribe(value => { this.enableDesktopNotification.subscribe(value => {
DesktopNotifications = !!value; DesktopNotifications = !!value;
if (value && HTML5Notification && !NotificationsGranted()) { if (value && HTML5Notification && !NotificationsGranted()) {
HTML5Notification.requestPermission(() => HTML5Notification.requestPermission(() =>
this.isDesktopNotificationDenied(NotificationsDenied()) this.isDesktopNotificationAllowed(!NotificationsDenied())
); );
} }
}); });

2
snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
View file

@ -1,4 +1,4 @@
<span class="e-component e-checkbox inline" tabindex="0" data-bind="click: click, onSpace: click, css: { 'disabled': disable() || !enable() }"> <span class="e-component e-checkbox inline" tabindex="0" data-bind="click: click, onSpace: click, css: { 'disabled': !enable() }">
<i role="checkbox" class="e-checkbox-icon fontastic" data-bind="text: value() ? '☑' : '☐'"></i> <i role="checkbox" class="e-checkbox-icon fontastic" data-bind="text: value() ? '☑' : '☐'"></i>
<!-- ko if: labeled --> <!-- ko if: labeled -->
<span class="sub-label" data-bind="attr: {'data-i18n': label}"></span> <span class="sub-label" data-bind="attr: {'data-i18n': label}"></span>

2
snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
View file

@ -1,4 +1,4 @@
<span class="e-component e-checkbox material-design inline" tabindex="0" data-bind="click: click, onSpace: click, css: { 'disabled': disable() || !enable() }"> <span class="e-component e-checkbox material-design inline" tabindex="0" data-bind="click: click, onSpace: click, css: { 'disabled': !enable() }">
<div class="sub-checkbox-container" role="checkbox"> <div class="sub-checkbox-container" role="checkbox">
<div class="sub-checkbox" data-bind="css: {'checked': value(), <div class="sub-checkbox" data-bind="css: {'checked': value(),
'unchecked': !value(), 'unchecked': !value(),

4
snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
View file

@ -114,12 +114,12 @@
params: { params: {
label: 'SETTINGS_GENERAL/LABEL_CHROME_NOTIFICATION_DESC', label: 'SETTINGS_GENERAL/LABEL_CHROME_NOTIFICATION_DESC',
value: enableDesktopNotification, value: enableDesktopNotification,
disable: isDesktopNotificationDenied, enable: isDesktopNotificationAllowed,
inline: true inline: true
} }
}"></div> }"></div>
&nbsp; &nbsp;
<span data-bind="visible: isDesktopNotificationDenied" style="color: #999" data-i18n="SETTINGS_GENERAL/LABEL_CHROME_NOTIFICATION_DESC_DENIED"></span> <span data-bind="visible: !isDesktopNotificationAllowed()" style="color: #999" data-i18n="SETTINGS_GENERAL/LABEL_CHROME_NOTIFICATION_DESC_DENIED"></span>
<span class="fontastic" data-bind="click: testSystemNotification" style="color:green;cursor:pointer">▶️</span> <span class="fontastic" data-bind="click: testSystemNotification" style="color:green;cursor:pointer">▶️</span>
</div> </div>
<div> <div>