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

Remove message background color detection.

Browse source 
It is useless without text color and breaks dark mode
This commit is contained in:
djmaze 2021-03-12 11:56:44 +01:00
parent f9ded86221
commit 424167d43f
2 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
dev/View/User/MailBox/MessageView.js
View file

@ -41,10 +41,6 @@ import Remote from 'Remote/User/Fetch';
import { decorateKoCommands, createCommand } from 'Knoin/Knoin'; import { decorateKoCommands, createCommand } from 'Knoin/Knoin';
import { AbstractViewRight } from 'Knoin/AbstractViews'; import { AbstractViewRight } from 'Knoin/AbstractViews';
function isTransparent(color) {
return 'rgba(0, 0, 0, 0)' === color || 'transparent' === color;
}
class MessageViewMailBoxUserView extends AbstractViewRight { class MessageViewMailBoxUserView extends AbstractViewRight {
constructor() { constructor() {
super('User/MailBox/MessageView', 'MailMessageView'); super('User/MailBox/MessageView', 'MailMessageView');
@ -68,7 +64,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
this.oMessageScrollerDom = null; this.oMessageScrollerDom = null;
this.addObservables({ this.addObservables({
bodyBackgroundColor: '',
showAttachmnetControls: false, showAttachmnetControls: false,
downloadAsZipLoading: false, downloadAsZipLoading: false,
lastReplyAction_: '', lastReplyAction_: '',
@ -203,8 +198,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
lastReplyAction_: value => Local.set(ClientSideKeyName.LastReplyAction, value), lastReplyAction_: value => Local.set(ClientSideKeyName.LastReplyAction, value),
messageActiveDom: dom => this.bodyBackgroundColor(this.detectDomBackgroundColor(dom)),
message: message => { message: message => {
this.messageActiveDom(null); this.messageActiveDom(null);
@ -301,28 +294,21 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
{detail:SettingsUserStore.usePreviewPane() || !!this.message()} // bForceSelect {detail:SettingsUserStore.usePreviewPane() || !!this.message()} // bForceSelect
)); ));
} }
/*
detectDomBackgroundColor(dom) { detectDomBackgroundColor(dom) {
let color = ''; let color = '';
if (dom && !SettingsUserStore.removeColors()) { if (dom && !SettingsUserStore.removeColors()) {
let limit = 5, dom.querySelectorAll('div[data-x-div-type="html"], div[data-x-div-type="body"]').forEach(node => {
aC = dom; let clr = node.style.backgroundColor || '';
while (!color && aC && limit--) { // is transparent ?
let children = aC.children; if ('transparent' !== clr && !/(rgba|hsla)\(.+,\s*0\s*\)/.test(clr)) {
if (!children || 1 !== children.length || !children[0].matches('table,div,center')) break; color = clr;
aC = children[0];
color = aC.style.backgroundColor || '';
if (!aC.matches('table')) {
color = isTransparent(color) ? '' : color;
} }
} });
color = isTransparent(color) ? '' : color;
} }
return color; return color;
} }
*/
toggleFullScreen() { toggleFullScreen() {
try { try {
getSelection().removeAllRanges(); getSelection().removeAllRanges();

3
snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -231,8 +231,7 @@
</div> </div>
</div> </div>
<div class="messageItem fixIndex" data-bind="css: viewLineAsCss(), attr: {'style': 'top:' + viewBodyTopValue() + 'px' }"> <div class="messageItem fixIndex" data-bind="css: viewLineAsCss(), attr: {'style': 'top:' + viewBodyTopValue() + 'px' }">
<div class="content" tabindex="0" data-bind="hasfocus: messageDomFocused, css: { 'focused': messageDomFocused }, <div class="content" tabindex="0" data-bind="hasfocus: messageDomFocused, css: { 'focused': messageDomFocused }">
style: {'background-color': messageLoadingThrottle() ? '' : bodyBackgroundColor()}">
<div class="content-wrapper"> <div class="content-wrapper">