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

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2017-08-07 18:09:14 +03:00
parent 0f6b70f63e
commit 425f0ee3f6
11 changed files with 5608 additions and 5457 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/Common/Utils.js
View file

@ -1455,6 +1455,15 @@ export function mimeContentType(fileName)
return result;
}
/**
* @param {string} color
* @returns {boolean}
*/
export function isTransparent(color)
{
return 'rgba(0, 0, 0, 0)' === color || 'transparent' === color;
}
/**
* @param {Object} $el
* @returns {number}

6
dev/Screen/AbstractSettings.js
View file

@ -168,9 +168,9 @@ class AbstractSettingsScreen extends AbstractScreen
routes() {
const
DefaultViewModel = _.find(
VIEW_MODELS.settings,
(SettingsViewModel) => SettingsViewModel && SettingsViewModel.__rlSettingsData && SettingsViewModel.__rlSettingsData.IsDefault
),
VIEW_MODELS.settings,
(SettingsViewModel) => SettingsViewModel && SettingsViewModel.__rlSettingsData && SettingsViewModel.__rlSettingsData.IsDefault
),
defaultRoute = DefaultViewModel && DefaultViewModel.__rlSettingsData ? DefaultViewModel.__rlSettingsData.Route : 'general',
rules = {
subname: /^(.*)$/,

12
dev/View/Popup/FolderSystem.js
View file

@ -48,12 +48,12 @@ class FolderSystemPopupView extends AbstractViewNext
const
fSetSystemFolders = () => {
Settings.settingsSet('SentFolder', FolderStore.sentFolder());
Settings.settingsSet('DraftFolder', FolderStore.draftFolder());
Settings.settingsSet('SpamFolder', FolderStore.spamFolder());
Settings.settingsSet('TrashFolder', FolderStore.trashFolder());
Settings.settingsSet('ArchiveFolder', FolderStore.archiveFolder());
},
Settings.settingsSet('SentFolder', FolderStore.sentFolder());
Settings.settingsSet('DraftFolder', FolderStore.draftFolder());
Settings.settingsSet('SpamFolder', FolderStore.spamFolder());
Settings.settingsSet('TrashFolder', FolderStore.trashFolder());
Settings.settingsSet('ArchiveFolder', FolderStore.archiveFolder());
},
fSaveSystemFolders = _.debounce(
() => {
fSetSystemFolders();

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

@ -23,7 +23,7 @@ import {
import {
inArray, isArray, isNonEmptyArray, trim, noop,
windowResize, windowResizeCallback, inFocus,
removeSelection, removeInFocus, mailToHelper
removeSelection, removeInFocus, mailToHelper, isTransparent
} from 'Common/Utils';
import Audio from 'Common/Audio';
@ -438,9 +438,9 @@ class MessageViewMailBoxUserView extends AbstractViewNext
const
fFindDom = function(inputDom) {
const children = inputDom ? inputDom.children() : null;
return (children && 1 === children.length && children.is('table,div,center')) ? children : null;
},
const children = inputDom ? inputDom.children() : null;
return (children && 1 === children.length && children.is('table,div,center')) ? children : null;
},
fFindColor = function(inputDom) {
let color = '';
if (inputDom)
@ -448,7 +448,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext
color = inputDom.css('background-color') || '';
if (!inputDom.is('table'))
{
color = 'rgba(0, 0, 0, 0)' === color || 'transparent' === color ? '' : color;
color = isTransparent(color) ? '' : color;
}
}
@ -477,7 +477,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext
}
}
result = 'rgba(0, 0, 0, 0)' === result || 'transparent' === result ? '' : result;
result = isTransparent(result) ? '' : result;
}
return result;