mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-28 19:49:20 +03:00
$.proxy is deprecated
$.trim is deprecated
This commit is contained in:
parent
ae1b7610fd
commit
bbd9f49dcd
39 changed files with 153 additions and 173 deletions
|
|
@ -6,7 +6,6 @@ import AccountStore from 'Stores/User/Account';
|
|||
import MessageStore from 'Stores/User/Message';
|
||||
|
||||
import { Capa, Magics, KeyState } from 'Common/Enums';
|
||||
import { trim } from 'Common/Utils';
|
||||
import { settings } from 'Common/Links';
|
||||
|
||||
import * as Events from 'Common/Events';
|
||||
|
|
@ -21,8 +20,8 @@ class AbstractSystemDropDownUserView extends AbstractViewNext {
|
|||
constructor() {
|
||||
super();
|
||||
|
||||
this.logoImg = trim(Settings.settingsGet('UserLogo'));
|
||||
this.logoTitle = trim(Settings.settingsGet('UserLogoTitle'));
|
||||
this.logoImg = (Settings.settingsGet('UserLogo')||'').trim();
|
||||
this.logoTitle = (Settings.settingsGet('UserLogoTitle')||'').trim();
|
||||
|
||||
this.mobile = !!Settings.appSettingsGet('mobile');
|
||||
this.mobileDevice = !!Settings.appSettingsGet('mobileDevice');
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import {
|
|||
Notification
|
||||
} from 'Common/Enums';
|
||||
|
||||
import { trim, convertLangName, triggerAutocompleteInputChange } from 'Common/Utils';
|
||||
import { convertLangName, triggerAutocompleteInputChange } from 'Common/Utils';
|
||||
|
||||
import { $win } from 'Common/Globals';
|
||||
import { getNotification, getNotificationFromResponse, reload as translatorReload } from 'Common/Translator';
|
||||
|
|
@ -53,8 +53,8 @@ class LoginUserView extends AbstractViewNext {
|
|||
this.additionalCode.visibility = ko.observable(false);
|
||||
this.additionalCodeSignMe = ko.observable(false);
|
||||
|
||||
this.logoImg = trim(Settings.settingsGet('LoginLogo'));
|
||||
this.loginDescription = trim(Settings.settingsGet('LoginDescription'));
|
||||
this.logoImg = (Settings.settingsGet('LoginLogo')||'').trim();
|
||||
this.loginDescription = (Settings.settingsGet('LoginDescription')||'').trim();
|
||||
|
||||
this.mobile = !!Settings.appSettingsGet('mobile');
|
||||
this.mobileDevice = !!Settings.appSettingsGet('mobileDevice');
|
||||
|
|
@ -154,12 +154,12 @@ class LoginUserView extends AbstractViewNext {
|
|||
this.emailError(false);
|
||||
this.passwordError(false);
|
||||
|
||||
this.emailError(!trim(this.email()));
|
||||
this.passwordError(!trim(this.password()));
|
||||
this.emailError(!this.email().trim());
|
||||
this.passwordError(!this.password().trim());
|
||||
|
||||
if (this.additionalCode.visibility()) {
|
||||
this.additionalCode.error(false);
|
||||
this.additionalCode.error(!trim(this.additionalCode()));
|
||||
this.additionalCode.error(!this.additionalCode().trim());
|
||||
}
|
||||
|
||||
if (
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import $ from '$';
|
|||
import ko from 'ko';
|
||||
import key from 'key';
|
||||
|
||||
import { trim, isNormal, windowResize } from 'Common/Utils';
|
||||
import { isNormal, windowResize } from 'Common/Utils';
|
||||
import { Capa, Focused, Layout, KeyState, EventKeyCode, Magics } from 'Common/Enums';
|
||||
import { $htmlCL, leftPanelDisabled, moveAction } from 'Common/Globals';
|
||||
import { mailBox, settings } from 'Common/Links';
|
||||
|
|
@ -58,7 +58,7 @@ class FolderListMailBoxUserView extends AbstractViewNext {
|
|||
() =>
|
||||
FolderStore.currentFolder() &&
|
||||
FolderStore.currentFolder().isInbox() &&
|
||||
trim(MessageStore.messageListSearch()).includes('is:flagged')
|
||||
MessageStore.messageListSearch().trim().includes('is:flagged')
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import { $htmlCL, leftPanelDisabled, keyScopeReal, useKeyboardShortcuts, moveAct
|
|||
|
||||
import {
|
||||
isNonEmptyArray,
|
||||
trim,
|
||||
windowResize,
|
||||
windowResizeCallback,
|
||||
inFocus,
|
||||
|
|
@ -95,8 +94,8 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
|
|||
this.allowMessageActions = !!Settings.capa(Capa.MessageActions);
|
||||
this.allowMessageListActions = !!Settings.capa(Capa.MessageListActions);
|
||||
|
||||
this.logoImg = trim(Settings.settingsGet('UserLogoMessage'));
|
||||
this.logoIframe = trim(Settings.settingsGet('UserIframeMessage'));
|
||||
this.logoImg = (Settings.settingsGet('UserLogoMessage')||'').trim();
|
||||
this.logoIframe = (Settings.settingsGet('UserIframeMessage')||'').trim();
|
||||
|
||||
this.mobile = !!Settings.appSettingsGet('mobile');
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue