prettier --write

This commit is contained in:
RainLoop Team 2019-07-04 22:19:24 +03:00
parent 450528ff00
commit 8a0be3212d
164 changed files with 7053 additions and 9008 deletions

View file

@ -1,4 +1,3 @@
import window from 'window';
import $ from '$';
import _ from '_';
@ -7,19 +6,31 @@ import key from 'key';
import ssm from 'ssm';
import {
$win, $html, $doc,
startMicrotime, leftPanelDisabled, leftPanelType,
sUserAgent, bMobileDevice, bAnimationSupported
$win,
$html,
$doc,
startMicrotime,
leftPanelDisabled,
leftPanelType,
sUserAgent,
bMobileDevice,
bAnimationSupported
} from 'Common/Globals';
import {
noop, isNormal, pString, inArray, microtime, timestamp,
detectDropdownVisibility, windowResizeCallback
noop,
isNormal,
pString,
inArray,
microtime,
timestamp,
detectDropdownVisibility,
windowResizeCallback
} from 'Common/Utils';
import {KeyState, Magics} from 'Common/Enums';
import {root, rootAdmin, rootUser, populateAuthSuffix} from 'Common/Links';
import {initOnStartOrLangChange, initNotificationLanguage} from 'Common/Translator';
import { KeyState, Magics } from 'Common/Enums';
import { root, rootAdmin, rootUser, populateAuthSuffix } from 'Common/Links';
import { initOnStartOrLangChange, initNotificationLanguage } from 'Common/Translator';
import * as Events from 'Common/Events';
import * as Settings from 'Storage/Settings';
@ -27,16 +38,14 @@ import LanguageStore from 'Stores/Language';
import ThemeStore from 'Stores/Theme';
import SocialStore from 'Stores/Social';
import {routeOff, setHash} from 'Knoin/Knoin';
import {AbstractBoot} from 'Knoin/AbstractBoot';
import { routeOff, setHash } from 'Knoin/Knoin';
import { AbstractBoot } from 'Knoin/AbstractBoot';
class AbstractApp extends AbstractBoot
{
class AbstractApp extends AbstractBoot {
/**
* @param {RemoteStorage|AdminRemoteStorage} Remote
*/
constructor(Remote)
{
constructor(Remote) {
super();
this.googlePreviewSupportedCache = null;
@ -47,14 +56,15 @@ class AbstractApp extends AbstractBoot
this.iframe = $('<iframe class="internal-hiddden" />').appendTo('body');
$win.on('error', (event) => {
if (event && event.originalEvent && event.originalEvent.message &&
-1 === inArray(event.originalEvent.message, [
'Script error.', 'Uncaught Error: Error calling method on NPObject.'
]))
{
if (
event &&
event.originalEvent &&
event.originalEvent.message &&
-1 ===
inArray(event.originalEvent.message, ['Script error.', 'Uncaught Error: Error calling method on NPObject.'])
) {
const time = timestamp();
if (this.lastErrorTime >= time)
{
if (this.lastErrorTime >= time) {
return;
}
@ -76,19 +86,20 @@ class AbstractApp extends AbstractBoot
Events.pub('window.resize');
});
Events.sub('window.resize', _.throttle(() => {
const
iH = $win.height(),
iW = $win.height();
Events.sub(
'window.resize',
_.throttle(() => {
const iH = $win.height(),
iW = $win.height();
if ($win.__sizes[0] !== iH || $win.__sizes[1] !== iW)
{
$win.__sizes[0] = iH;
$win.__sizes[1] = iW;
if ($win.__sizes[0] !== iH || $win.__sizes[1] !== iW) {
$win.__sizes[0] = iH;
$win.__sizes[1] = iW;
Events.pub('window.resize.real');
}
}, Magics.Time50ms));
Events.pub('window.resize.real');
}
}, Magics.Time50ms)
);
// DEBUG
// Events.sub({
@ -100,21 +111,24 @@ class AbstractApp extends AbstractBoot
// }
// });
$doc.on('keydown', (event) => {
if (event && event.ctrlKey)
{
$html.addClass('rl-ctrl-key-pressed');
}
}).on('keyup', (event) => {
if (event && !event.ctrlKey)
{
$html.removeClass('rl-ctrl-key-pressed');
}
});
$doc
.on('keydown', (event) => {
if (event && event.ctrlKey) {
$html.addClass('rl-ctrl-key-pressed');
}
})
.on('keyup', (event) => {
if (event && !event.ctrlKey) {
$html.removeClass('rl-ctrl-key-pressed');
}
});
$doc.on('mousemove keypress click', _.debounce(() => {
Events.pub('rl.auto-logout-refresh');
}, Magics.Time5s));
$doc.on(
'mousemove keypress click',
_.debounce(() => {
Events.pub('rl.auto-logout-refresh');
}, Magics.Time5s)
);
key('esc, enter', KeyState.All, () => {
detectDropdownVisibility();
@ -138,17 +152,13 @@ class AbstractApp extends AbstractBoot
* @returns {boolean}
*/
download(link) {
if (sUserAgent && (-1 < sUserAgent.indexOf('chrome') || -1 < sUserAgent.indexOf('chrome')))
{
if (sUserAgent && (-1 < sUserAgent.indexOf('chrome') || -1 < sUserAgent.indexOf('chrome'))) {
const oLink = window.document.createElement('a');
oLink.href = link;
if (window.document && window.document.createEvent)
{
if (window.document && window.document.createEvent) {
const oE = window.document.createEvent.MouseEvents;
if (oE && oE.initEvent && oLink.dispatchEvent)
{
if (oE && oE.initEvent && oLink.dispatchEvent) {
oE.initEvent('click', true, true);
oLink.dispatchEvent(oE);
return true;
@ -156,13 +166,10 @@ class AbstractApp extends AbstractBoot
}
}
if (bMobileDevice)
{
if (bMobileDevice) {
window.open(link, '_self');
window.focus();
}
else
{
} else {
this.iframe.attr('src', link);
// window.document.location.href = link;
}
@ -174,10 +181,9 @@ class AbstractApp extends AbstractBoot
* @returns {boolean}
*/
googlePreviewSupported() {
if (null === this.googlePreviewSupportedCache)
{
this.googlePreviewSupportedCache = !!Settings.settingsGet('AllowGoogleSocial') &&
!!Settings.settingsGet('AllowGoogleSocialPreview');
if (null === this.googlePreviewSupportedCache) {
this.googlePreviewSupportedCache =
!!Settings.settingsGet('AllowGoogleSocial') && !!Settings.settingsGet('AllowGoogleSocialPreview');
}
return this.googlePreviewSupportedCache;
@ -187,9 +193,8 @@ class AbstractApp extends AbstractBoot
* @param {string} title
*/
setWindowTitle(title) {
title = ((isNormal(title) && 0 < title.length) ? '' + title : '');
if (Settings.settingsGet('Title'))
{
title = isNormal(title) && 0 < title.length ? '' + title : '';
if (Settings.settingsGet('Title')) {
title += (title ? ' - ' : '') + Settings.settingsGet('Title');
}
@ -204,8 +209,7 @@ class AbstractApp extends AbstractBoot
}
clearClientSideToken() {
if (window.__rlah_clear)
{
if (window.__rlah_clear) {
window.__rlah_clear();
}
}
@ -214,8 +218,7 @@ class AbstractApp extends AbstractBoot
* @param {string} token
*/
setClientSideToken(token) {
if (window.__rlah_set)
{
if (window.__rlah_set) {
window.__rlah_set(token);
Settings.settingsSet('AuthAccountHash', token);
@ -229,58 +232,42 @@ class AbstractApp extends AbstractBoot
* @param {boolean=} close = false
*/
loginAndLogoutReload(admin = false, logout = false, close = false) {
const inIframe = !!Settings.appSettingsGet('inIframe');
let customLogoutLink = pString(Settings.appSettingsGet('customLogoutLink'));
if (logout)
{
if (logout) {
this.clearClientSideToken();
}
if (logout && close && window.close)
{
if (logout && close && window.close) {
window.close();
}
customLogoutLink = customLogoutLink || (admin ? rootAdmin() : rootUser());
if (logout && window.location.href !== customLogoutLink)
{
if (logout && window.location.href !== customLogoutLink) {
_.delay(() => {
if (inIframe && window.parent)
{
if (inIframe && window.parent) {
window.parent.location.href = customLogoutLink;
}
else
{
} else {
window.location.href = customLogoutLink;
}
$win.trigger('rl.tooltips.diactivate');
}, Magics.Time100ms);
}
else
{
} else {
routeOff();
setHash(root(), true);
routeOff();
_.delay(() => {
if (inIframe && window.parent)
{
if (inIframe && window.parent) {
window.parent.location.reload();
}
else
{
} else {
window.location.reload();
}
$win.trigger('rl.tooltips.diactivate');
}, Magics.Time100ms);
}
}
@ -290,7 +277,6 @@ class AbstractApp extends AbstractBoot
}
bootstart() {
// log('Ps' + 'ss, hac' + 'kers! The' + 're\'s not' + 'hing inte' + 'resting :' + ')');
Events.pub('rl.bootstart');
@ -307,13 +293,10 @@ class AbstractApp extends AbstractBoot
ko.components.register('x-script', require('Component/Script').default);
// ko.components.register('svg-icon', require('Component/SvgIcon').default);
if (Settings.appSettingsGet('materialDesign') && bAnimationSupported)
{
if (Settings.appSettingsGet('materialDesign') && bAnimationSupported) {
ko.components.register('Checkbox', require('Component/MaterialDesign/Checkbox').default);
ko.components.register('CheckboxSimple', require('Component/Checkbox').default);
}
else
{
} else {
// ko.components.register('Checkbox', require('Component/Classic/Checkbox').default);
// ko.components.register('CheckboxSimple', require('Component/Classic/Checkbox').default);
ko.components.register('Checkbox', require('Component/Checkbox').default);
@ -332,8 +315,7 @@ class AbstractApp extends AbstractBoot
leftPanelDisabled(false);
});
if (!mobile)
{
if (!mobile) {
$html.addClass('rl-desktop');
ssm.addState({
@ -381,9 +363,7 @@ class AbstractApp extends AbstractBoot
$html.removeClass('ssm-state-desktop-large');
}
});
}
else
{
} else {
$html.addClass('ssm-state-mobile').addClass('rl-mobile');
Events.pub('ssm.mobile-enter');
}
@ -406,4 +386,4 @@ class AbstractApp extends AbstractBoot
}
}
export {AbstractApp, AbstractApp as default};
export { AbstractApp, AbstractApp as default };

View file

@ -1,13 +1,12 @@
import window from 'window';
import _ from '_';
import ko from 'ko';
import progressJs from 'progressJs';
import {root} from 'Common/Links';
import {getNotification} from 'Common/Translator';
import {StorageResultType, Notification} from 'Common/Enums';
import {pInt, isNormal, isArray, inArray, isUnd} from 'Common/Utils';
import { root } from 'Common/Links';
import { getNotification } from 'Common/Translator';
import { StorageResultType, Notification } from 'Common/Enums';
import { pInt, isNormal, isArray, inArray, isUnd } from 'Common/Utils';
import * as Settings from 'Storage/Settings';
@ -20,14 +19,13 @@ import PackageStore from 'Stores/Admin/Package';
import CoreStore from 'Stores/Admin/Core';
import Remote from 'Remote/Admin/Ajax';
import {SettingsAdminScreen} from 'Screen/Admin/Settings';
import {LoginAdminScreen} from 'Screen/Admin/Login';
import { SettingsAdminScreen } from 'Screen/Admin/Settings';
import { LoginAdminScreen } from 'Screen/Admin/Login';
import {hideLoading, routeOff, setHash, startScreens} from 'Knoin/Knoin';
import {AbstractApp} from 'App/Abstract';
import { hideLoading, routeOff, setHash, startScreens } from 'Knoin/Knoin';
import { AbstractApp } from 'App/Abstract';
class AdminApp extends AbstractApp
{
class AdminApp extends AbstractApp {
constructor() {
super(Remote);
}
@ -40,14 +38,15 @@ class AdminApp extends AbstractApp
DomainStore.domains.loading(true);
Remote.domainList((result, data) => {
DomainStore.domains.loading(false);
if (StorageResultType.Success === result && data && data.Result)
{
DomainStore.domains(_.map(data.Result, ([enabled, alias], name) => ({
name: name,
disabled: ko.observable(!enabled),
alias: alias,
deleteAccess: ko.observable(false)
})));
if (StorageResultType.Success === result && data && data.Result) {
DomainStore.domains(
_.map(data.Result, ([enabled, alias], name) => ({
name: name,
disabled: ko.observable(!enabled),
alias: alias,
deleteAccess: ko.observable(false)
}))
);
}
});
}
@ -56,13 +55,14 @@ class AdminApp extends AbstractApp
PluginStore.plugins.loading(true);
Remote.pluginList((result, data) => {
PluginStore.plugins.loading(false);
if (StorageResultType.Success === result && data && data.Result)
{
PluginStore.plugins(_.map(data.Result, (item) => ({
name: item.Name,
disabled: ko.observable(!item.Enabled),
configured: ko.observable(!!item.Configured)
})));
if (StorageResultType.Success === result && data && data.Result) {
PluginStore.plugins(
_.map(data.Result, (item) => ({
name: item.Name,
disabled: ko.observable(!item.Enabled),
configured: ko.observable(!!item.Configured)
}))
);
}
});
}
@ -72,8 +72,7 @@ class AdminApp extends AbstractApp
PackageStore.packagesReal(true);
Remote.packagesList((result, data) => {
PackageStore.packages.loading(false);
if (StorageResultType.Success === result && data && data.Result)
{
if (StorageResultType.Success === result && data && data.Result) {
PackageStore.packagesReal(!!data.Result.Real);
PackageStore.packagesMainUpdatable(!!data.Result.MainUpdatable);
@ -81,28 +80,25 @@ class AdminApp extends AbstractApp
const loading = {};
_.each(PackageStore.packages(), (item) => {
if (item && item.loading())
{
if (item && item.loading()) {
loading[item.file] = item;
}
});
if (isArray(data.Result.List))
{
list = _.compact(_.map(data.Result.List, (item) => {
if (item)
{
item.loading = ko.observable(!isUnd(loading[item.file]));
return 'core' === item.type && !item.canBeInstalled ? null : item;
}
return null;
}));
if (isArray(data.Result.List)) {
list = _.compact(
_.map(data.Result.List, (item) => {
if (item) {
item.loading = ko.observable(!isUnd(loading[item.file]));
return 'core' === item.type && !item.canBeInstalled ? null : item;
}
return null;
})
);
}
PackageStore.packages(list);
}
else
{
} else {
PackageStore.packagesReal(false);
}
});
@ -116,13 +112,10 @@ class AdminApp extends AbstractApp
CoreStore.coreRemoteVersion('');
CoreStore.coreRemoteRelease('');
CoreStore.coreVersionCompare(-2);
if (StorageResultType.Success === result && data && data.Result)
{
if (StorageResultType.Success === result && data && data.Result) {
CoreStore.coreReal(true);
window.location.reload();
}
else
{
} else {
CoreStore.coreReal(false);
}
});
@ -133,8 +126,7 @@ class AdminApp extends AbstractApp
CoreStore.coreReal(true);
Remote.coreData((result, data) => {
CoreStore.coreChecking(false);
if (StorageResultType.Success === result && data && data.Result)
{
if (StorageResultType.Success === result && data && data.Result) {
CoreStore.coreReal(!!data.Result.Real);
CoreStore.coreChannel(data.Result.Channel || 'stable');
CoreStore.coreType(data.Result.Type || 'stable');
@ -145,9 +137,7 @@ class AdminApp extends AbstractApp
CoreStore.coreRemoteVersion(data.Result.RemoteVersion || '');
CoreStore.coreRemoteRelease(data.Result.RemoteRelease || '');
CoreStore.coreVersionCompare(pInt(data.Result.VersionCompare));
}
else
{
} else {
CoreStore.coreReal(false);
CoreStore.coreChannel('stable');
CoreStore.coreType('stable');
@ -168,33 +158,25 @@ class AdminApp extends AbstractApp
LicenseStore.licenseError('');
Remote.licensing((result, data) => {
LicenseStore.licensingProcess(false);
if (StorageResultType.Success === result && data && data.Result && isNormal(data.Result.Expired))
{
if (StorageResultType.Success === result && data && data.Result && isNormal(data.Result.Expired)) {
LicenseStore.licenseValid(true);
LicenseStore.licenseExpired(pInt(data.Result.Expired));
LicenseStore.licenseError('');
LicenseStore.licensing(true);
AppStore.prem(true);
}
else
{
if (data && data.ErrorCode && -1 < inArray(pInt(data.ErrorCode), [
Notification.LicensingServerIsUnavailable,
Notification.LicensingExpired
]))
{
} else {
if (
data &&
data.ErrorCode &&
-1 < inArray(pInt(data.ErrorCode), [Notification.LicensingServerIsUnavailable, Notification.LicensingExpired])
) {
LicenseStore.licenseError(getNotification(pInt(data.ErrorCode)));
LicenseStore.licensing(true);
}
else
{
if (StorageResultType.Abort === result)
{
} else {
if (StorageResultType.Abort === result) {
LicenseStore.licenseError(getNotification(Notification.LicensingServerIsUnavailable));
LicenseStore.licensing(true);
}
else
{
} else {
LicenseStore.licensing(false);
}
}
@ -203,19 +185,16 @@ class AdminApp extends AbstractApp
}
bootend(bootendCallback = null) {
if (progressJs)
{
if (progressJs) {
progressJs.end();
}
if (bootendCallback)
{
if (bootendCallback) {
bootendCallback();
}
}
bootstart() {
super.bootstart();
AppStore.populate();
@ -223,8 +202,7 @@ class AdminApp extends AbstractApp
hideLoading();
if (!Settings.appSettingsGet('allowAdminPanel'))
{
if (!Settings.appSettingsGet('allowAdminPanel')) {
routeOff();
setHash(root(), true);
routeOff();
@ -232,20 +210,11 @@ class AdminApp extends AbstractApp
_.defer(() => {
window.location.href = '/';
});
}
else
{
if (Settings.settingsGet('Auth'))
{
startScreens([
SettingsAdminScreen
]);
}
else
{
startScreens([
LoginAdminScreen
]);
} else {
if (Settings.settingsGet('Auth')) {
startScreens([SettingsAdminScreen]);
} else {
startScreens([LoginAdminScreen]);
}
}

File diff suppressed because it is too large Load diff

View file

@ -1,12 +1,10 @@
import window from 'window';
import {bMobileDevice, bSafari} from 'Common/Globals';
import { bMobileDevice, bSafari } from 'Common/Globals';
import * as Links from 'Common/Links';
import * as Events from 'Common/Events';
import {trim} from 'Common/Utils';
import { trim } from 'Common/Utils';
class Audio
{
class Audio {
notificator = null;
player = null;
@ -20,16 +18,14 @@ class Audio
this.player = this.createNewObject();
this.supported = !bMobileDevice && !bSafari && !!this.player && !!this.player.play;
if (this.supported && this.player && this.player.canPlayType)
{
if (this.supported && this.player && this.player.canPlayType) {
this.supportedMp3 = '' !== this.player.canPlayType('audio/mpeg;').replace(/no/, '');
this.supportedWav = '' !== this.player.canPlayType('audio/wav; codecs="1"').replace(/no/, '');
this.supportedOgg = '' !== this.player.canPlayType('audio/ogg; codecs="vorbis"').replace(/no/, '');
this.supportedNotification = this.supported && this.supportedMp3;
}
if (!this.player || (!this.supportedMp3 && !this.supportedOgg && !this.supportedWav))
{
if (!this.player || (!this.supportedMp3 && !this.supportedOgg && !this.supportedWav)) {
this.supported = false;
this.supportedMp3 = false;
this.supportedOgg = false;
@ -37,8 +33,7 @@ class Audio
this.supportedNotification = false;
}
if (this.supported && this.player)
{
if (this.supported && this.player) {
const stopFn = () => this.stop();
this.player.addEventListener('ended', stopFn);
@ -50,8 +45,7 @@ class Audio
createNewObject() {
const player = window.Audio ? new window.Audio() : null;
if (player && player.canPlayType && player.pause && player.play)
{
if (player && player.canPlayType && player.pause && player.play) {
player.preload = 'none';
player.loop = false;
player.autoplay = false;
@ -66,8 +60,7 @@ class Audio
}
stop() {
if (this.supported && this.player.pause)
{
if (this.supported && this.player.pause) {
this.player.pause();
}
@ -79,10 +72,8 @@ class Audio
}
clearName(name = '', ext = '') {
name = trim(name);
if (ext && '.' + ext === name.toLowerCase().substr((ext.length + 1) * -1))
{
if (ext && '.' + ext === name.toLowerCase().substr((ext.length + 1) * -1)) {
name = trim(name.substr(0, name.length - 4));
}
@ -90,8 +81,7 @@ class Audio
}
playMp3(url, name) {
if (this.supported && this.supportedMp3)
{
if (this.supported && this.supportedMp3) {
this.player.src = url;
this.player.play();
@ -100,8 +90,7 @@ class Audio
}
playOgg(url, name) {
if (this.supported && this.supportedOgg)
{
if (this.supported && this.supportedOgg) {
this.player.src = url;
this.player.play();
@ -113,8 +102,7 @@ class Audio
}
playWav(url, name) {
if (this.supported && this.supportedWav)
{
if (this.supported && this.supportedWav) {
this.player.src = url;
this.player.play();
@ -123,16 +111,13 @@ class Audio
}
playNotification() {
if (this.supported && this.supportedMp3)
{
if (!this.notificator)
{
if (this.supported && this.supportedMp3) {
if (!this.notificator) {
this.notificator = this.createNewObject();
this.notificator.src = Links.sound('new-mail.mp3');
}
if (this.notificator && this.notificator.play)
{
if (this.notificator && this.notificator.play) {
this.notificator.play();
}
}

View file

@ -1,4 +1,3 @@
// Base64 encode / decode
// http://www.webtoolkit.info/
@ -6,23 +5,28 @@ const BASE_64_CHR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456
/* eslint-disable */
const Base64 = {
// public method for urlsafe encoding
urlsafe_encode: (input) => Base64.encode(input)
.replace(/[+]/g, '-').replace(/[\/]/g, '_').replace(/[=]/g, ''),
urlsafe_encode: (input) =>
Base64.encode(input)
.replace(/[+]/g, '-')
.replace(/[\/]/g, '_')
.replace(/[=]/g, ''),
// public method for encoding
encode: (input) => {
let
output = '',
chr1, chr2, chr3, enc1, enc2, enc3, enc4,
let output = '',
chr1,
chr2,
chr3,
enc1,
enc2,
enc3,
enc4,
i = 0;
input = Base64._utf8_encode(input);
while (i < input.length)
{
while (i < input.length) {
chr1 = input.charCodeAt(i++);
chr2 = input.charCodeAt(i++);
chr3 = input.charCodeAt(i++);
@ -32,18 +36,18 @@ const Base64 = {
enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
enc4 = chr3 & 63;
if (isNaN(chr2))
{
if (isNaN(chr2)) {
enc3 = enc4 = 64;
}
else if (isNaN(chr3))
{
} else if (isNaN(chr3)) {
enc4 = 64;
}
output = output +
BASE_64_CHR.charAt(enc1) + BASE_64_CHR.charAt(enc2) +
BASE_64_CHR.charAt(enc3) + BASE_64_CHR.charAt(enc4);
output =
output +
BASE_64_CHR.charAt(enc1) +
BASE_64_CHR.charAt(enc2) +
BASE_64_CHR.charAt(enc3) +
BASE_64_CHR.charAt(enc4);
}
return output;
@ -51,16 +55,19 @@ const Base64 = {
// public method for decoding
decode: (input) => {
let
output = '',
chr1, chr2, chr3, enc1, enc2, enc3, enc4,
let output = '',
chr1,
chr2,
chr3,
enc1,
enc2,
enc3,
enc4,
i = 0;
input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
while (i < input.length)
{
while (i < input.length) {
enc1 = BASE_64_CHR.indexOf(input.charAt(i++));
enc2 = BASE_64_CHR.indexOf(input.charAt(i++));
enc3 = BASE_64_CHR.indexOf(input.charAt(i++));
@ -72,13 +79,11 @@ const Base64 = {
output = output + String.fromCharCode(chr1);
if (enc3 !== 64)
{
if (enc3 !== 64) {
output = output + String.fromCharCode(chr2);
}
if (enc4 !== 64)
{
if (enc4 !== 64) {
output = output + String.fromCharCode(chr3);
}
}
@ -88,30 +93,22 @@ const Base64 = {
// private method for UTF-8 encoding
_utf8_encode: (string) => {
string = string.replace(/\r\n/g, '\n');
string = string.replace(/\r\n/g, "\n");
let
utftext = '',
let utftext = '',
n = 0,
l = string.length,
c = 0;
for (; n < l; n++) {
c = string.charCodeAt(n);
if (c < 128)
{
if (c < 128) {
utftext += String.fromCharCode(c);
}
else if ((c > 127) && (c < 2048))
{
} else if (c > 127 && c < 2048) {
utftext += String.fromCharCode((c >> 6) | 192);
utftext += String.fromCharCode((c & 63) | 128);
}
else
{
} else {
utftext += String.fromCharCode((c >> 12) | 224);
utftext += String.fromCharCode(((c >> 6) & 63) | 128);
utftext += String.fromCharCode((c & 63) | 128);
@ -123,33 +120,25 @@ const Base64 = {
// private method for UTF-8 decoding
_utf8_decode: (utftext) => {
let
string = '',
let string = '',
i = 0,
c = 0,
c2 = 0,
c3 = 0;
while ( i < utftext.length )
{
while (i < utftext.length) {
c = utftext.charCodeAt(i);
if (c < 128)
{
if (c < 128) {
string += String.fromCharCode(c);
i++;
}
else if((c > 191) && (c < 224))
{
c2 = utftext.charCodeAt(i+1);
} else if (c > 191 && c < 224) {
c2 = utftext.charCodeAt(i + 1);
string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
i += 2;
}
else
{
c2 = utftext.charCodeAt(i+1);
c3 = utftext.charCodeAt(i+2);
} else {
c2 = utftext.charCodeAt(i + 1);
c3 = utftext.charCodeAt(i + 2);
string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
i += 3;
}

View file

@ -1,9 +1,8 @@
import window from 'window';
import progressJs from 'progressJs';
import {jassl} from 'Common/Jassl';
import {getHash, setHash, clearHash} from 'Storage/RainLoop';
import { jassl } from 'Common/Jassl';
import { getHash, setHash, clearHash } from 'Storage/RainLoop';
let RL_APP_DATA_STORAGE = null;
@ -14,38 +13,38 @@ window.__rlah_clear = () => clearHash();
window.__rlah_data = () => RL_APP_DATA_STORAGE;
const useJsNextBundle = (function() {
// try {
//
// (function() {
// eval(`
// // let + const
//const x = 5; let y = 4; var z = 4;
//
// // Arrow Function
//const f = () => 'rainloop';
//
// // Default + Rest + Spread
//const d = (test = 1, ...t) => 'rainloop';
//d(...[1, 2, 3]);
//
//// Destructuring
//let [a, b] = [1, 2];
//({a, b} = {a: 1, b: 2});
//
//// Class
//class Q1 { constructor() {} }
//
//// Class extends + super
//class Q2 extends Q1 { constructor() { super() } }
//
//`);
// }());
//
// return true;
// }
// catch (e) {}
// try {
//
// (function() {
// eval(`
// // let + const
//const x = 5; let y = 4; var z = 4;
//
// // Arrow Function
//const f = () => 'rainloop';
//
// // Default + Rest + Spread
//const d = (test = 1, ...t) => 'rainloop';
//d(...[1, 2, 3]);
//
//// Destructuring
//let [a, b] = [1, 2];
//({a, b} = {a: 1, b: 2});
//
//// Class
//class Q1 { constructor() {} }
//
//// Class extends + super
//class Q2 extends Q1 { constructor() { super() } }
//
//`);
// }());
//
// return true;
// }
// catch (e) {}
return false;
}());
})();
/* eslint-enable */
/**
@ -53,19 +52,20 @@ const useJsNextBundle = (function() {
* @param {string} name
* @returns {string}
*/
function getComputedStyle(id, name)
{
function getComputedStyle(id, name) {
const element = window.document.getElementById(id);
return element && element.currentStyle ? element.currentStyle[name] :
(window.getComputedStyle ? window.getComputedStyle(element, null).getPropertyValue(name) : null);
return element && element.currentStyle
? element.currentStyle[name]
: window.getComputedStyle
? window.getComputedStyle(element, null).getPropertyValue(name)
: null;
}
/**
* @param {string} styles
* @returns {void}
*/
function includeStyle(styles)
{
function includeStyle(styles) {
window.document.write(unescape('%3Csty' + 'le%3E' + styles + '"%3E%3C/' + 'sty' + 'le%3E')); // eslint-disable-line no-useless-concat
}
@ -73,22 +73,31 @@ function includeStyle(styles)
* @param {string} src
* @returns {void}
*/
function includeScr(src)
{
window.document.write(unescape('%3Csc' + 'ript type="text/jav' + 'ascr' + 'ipt" data-cfasync="false" sr' + 'c="' + src + '"%3E%3C/' + 'scr' + 'ipt%3E')); // eslint-disable-line no-useless-concat
function includeScr(src) {
window.document.write(
unescape(
'%3Csc' +
'ript type="text/jav' +
'ascr' +
'ipt" data-cfasync="false" sr' +
'c="' +
src +
'"%3E%3C/' +
'scr' +
'ipt%3E'
)
); // eslint-disable-line no-useless-concat
}
/**
* @returns {boolean}
*/
function includeLayout()
{
function includeLayout() {
const app = window.document.getElementById('rl-app');
require('Styles/@Boot.css');
if (app)
{
if (app) {
const layout = require('Html/Layout.html');
app.innerHTML = ((layout && layout.default ? layout.default : layout) || '').replace(/[\r\n\t]+/g, '');
return true;
@ -103,8 +112,7 @@ function includeLayout()
* @param {boolean} mobileDevice = false
* @returns {void}
*/
function includeAppScr({admin = false, mobile = false, mobileDevice = false})
{
function includeAppScr({ admin = false, mobile = false, mobileDevice = false }) {
let src = './?/';
src += admin ? 'Admin' : '';
src += 'AppData@';
@ -112,19 +120,25 @@ function includeAppScr({admin = false, mobile = false, mobileDevice = false})
src += mobileDevice ? '-1' : '-0';
src += '/';
includeScr(src + (window.__rlah ? window.__rlah() || '0' : '0') + '/' + window.Math.random().toString().substr(2) + '/');
includeScr(
src +
(window.__rlah ? window.__rlah() || '0' : '0') +
'/' +
window.Math.random()
.toString()
.substr(2) +
'/'
);
}
/**
* @returns {object}
*/
function getRainloopBootData()
{
function getRainloopBootData() {
let result = {};
const meta = window.document.getElementById('app-boot-data');
if (meta && meta.getAttribute)
{
if (meta && meta.getAttribute) {
result = JSON.parse(meta.getAttribute('content')) || {};
}
@ -135,31 +149,25 @@ function getRainloopBootData()
* @param {string} additionalError
* @returns {void}
*/
function showError(additionalError)
{
const
oR = window.document.getElementById('rl-loading'),
function showError(additionalError) {
const oR = window.document.getElementById('rl-loading'),
oL = window.document.getElementById('rl-loading-error'),
oLA = window.document.getElementById('rl-loading-error-additional');
if (oR)
{
if (oR) {
oR.style.display = 'none';
}
if (oL)
{
if (oL) {
oL.style.display = 'block';
}
if (oLA && additionalError)
{
if (oLA && additionalError) {
oLA.style.display = 'block';
oLA.innerHTML = additionalError;
}
if (progressJs)
{
if (progressJs) {
progressJs.set(100).end();
}
}
@ -168,19 +176,15 @@ function showError(additionalError)
* @param {string} description
* @returns {void}
*/
function showDescriptionAndLoading(description)
{
const
oE = window.document.getElementById('rl-loading'),
function showDescriptionAndLoading(description) {
const oE = window.document.getElementById('rl-loading'),
oElDesc = window.document.getElementById('rl-loading-desc');
if (oElDesc && description)
{
if (oElDesc && description) {
oElDesc.innerHTML = description;
}
if (oE && oE.style)
{
if (oE && oE.style) {
oE.style.opacity = 0;
window.setTimeout(() => {
oE.style.opacity = 1;
@ -193,16 +197,12 @@ function showDescriptionAndLoading(description)
* @param {string} additionalError
* @returns {void}
*/
function runMainBoot(withError, additionalError)
{
if (window.__APP_BOOT && !withError)
{
function runMainBoot(withError, additionalError) {
if (window.__APP_BOOT && !withError) {
window.__APP_BOOT(() => {
showError(additionalError);
});
}
else
{
} else {
showError(additionalError);
}
}
@ -210,43 +210,47 @@ function runMainBoot(withError, additionalError)
/**
* @returns {void}
*/
function runApp()
{
function runApp() {
const appData = window.__rlah_data();
if (jassl && progressJs && appData && appData.TemplatesLink && appData.LangLink &&
appData.StaticLibJsLink && appData.StaticAppJsLink && appData.StaticAppJsNextLink && appData.StaticEditorJsLink)
{
if (
jassl &&
progressJs &&
appData &&
appData.TemplatesLink &&
appData.LangLink &&
appData.StaticLibJsLink &&
appData.StaticAppJsLink &&
appData.StaticAppJsNextLink &&
appData.StaticEditorJsLink
) {
const p = progressJs;
p.setOptions({theme: 'rainloop'});
p.setOptions({ theme: 'rainloop' });
p.start().set(5);
const libs = () => jassl(appData.StaticLibJsLink).then(() => {
if (window.$)
{
window.$('#rl-check').remove();
const libs = () =>
jassl(appData.StaticLibJsLink).then(() => {
if (window.$) {
window.$('#rl-check').remove();
if (appData.IncludeBackground)
{
window.$('#rl-bg')
.attr('style', 'background-image: none !important;')
.backstretch(
appData.IncludeBackground.replace('{{USER}}', (window.__rlah ? (window.__rlah() || '0') : '0')),
{fade: 100, centeredX: true, centeredY: true}
)
.removeAttr('style');
if (appData.IncludeBackground) {
window
.$('#rl-bg')
.attr('style', 'background-image: none !important;')
.backstretch(
appData.IncludeBackground.replace('{{USER}}', window.__rlah ? window.__rlah() || '0' : '0'),
{ fade: 100, centeredX: true, centeredY: true }
)
.removeAttr('style');
}
}
}
});
});
libs()
.then(() => {
p.set(20);
return window.Promise.all([
jassl(appData.TemplatesLink),
jassl(appData.LangLink)
]);
return window.Promise.all([jassl(appData.TemplatesLink), jassl(appData.LangLink)]);
})
.then(() => {
p.set(30);
@ -271,9 +275,7 @@ function runApp()
window.__initEditor = null;
}
});
}
else
{
} else {
runMainBoot(true);
}
}
@ -283,20 +285,16 @@ function runApp()
* @returns {void}
*/
window.__initAppData = function(data) {
RL_APP_DATA_STORAGE = data;
window.__rlah_set();
if (RL_APP_DATA_STORAGE)
{
if (RL_APP_DATA_STORAGE.NewThemeLink)
{
if (RL_APP_DATA_STORAGE) {
if (RL_APP_DATA_STORAGE.NewThemeLink) {
(window.document.getElementById('app-theme-link') || {}).href = RL_APP_DATA_STORAGE.NewThemeLink;
}
if (RL_APP_DATA_STORAGE.IncludeCss)
{
if (RL_APP_DATA_STORAGE.IncludeCss) {
includeStyle(RL_APP_DATA_STORAGE.IncludeCss);
}
@ -310,26 +308,20 @@ window.__initAppData = function(data) {
* @returns {void}
*/
window.__runBoot = function() {
if (!window.navigator || !window.navigator.cookieEnabled)
{
if (!window.navigator || !window.navigator.cookieEnabled) {
window.document.location.replace('./?/NoCookie');
}
const root = window.document.documentElement;
if ('none' !== getComputedStyle('rl-check', 'display'))
{
if ('none' !== getComputedStyle('rl-check', 'display')) {
root.className += ' no-css';
}
if (useJsNextBundle)
{
if (useJsNextBundle) {
root.className += ' js-next';
}
if (includeLayout())
{
if (includeLayout()) {
includeAppScr(getRainloopBootData());
}
};

View file

@ -1,7 +1,6 @@
import _ from '_';
import {Capa, MessageSetAction} from 'Common/Enums';
import {trim, pInt, isArray} from 'Common/Utils';
import { Capa, MessageSetAction } from 'Common/Enums';
import { trim, pInt, isArray } from 'Common/Utils';
import * as Links from 'Common/Links';
import * as Settings from 'Storage/Settings';
@ -19,8 +18,7 @@ const REQUESTED_MESSAGE_CACHE = {},
/**
* @returns {void}
*/
export function clear()
{
export function clear() {
FOLDERS_CACHE = {};
FOLDERS_NAME_CACHE = {};
FOLDERS_HASH_CACHE = {};
@ -33,8 +31,7 @@ export function clear()
* @param {Function} callback
* @returns {string}
*/
export function getUserPic(email, callback)
{
export function getUserPic(email, callback) {
email = trim(email);
callback(capaGravatar && '' !== email ? Links.avatarLink(email) : '', email);
}
@ -44,8 +41,7 @@ export function getUserPic(email, callback)
* @param {string} uid
* @returns {string}
*/
export function getMessageKey(folderFullNameRaw, uid)
{
export function getMessageKey(folderFullNameRaw, uid) {
return `${folderFullNameRaw}#${uid}`;
}
@ -53,8 +49,7 @@ export function getMessageKey(folderFullNameRaw, uid)
* @param {string} folder
* @param {string} uid
*/
export function addRequestedMessage(folder, uid)
{
export function addRequestedMessage(folder, uid) {
REQUESTED_MESSAGE_CACHE[getMessageKey(folder, uid)] = true;
}
@ -63,8 +58,7 @@ export function addRequestedMessage(folder, uid)
* @param {string} uid
* @returns {boolean}
*/
export function hasRequestedMessage(folder, uid)
{
export function hasRequestedMessage(folder, uid) {
return true === REQUESTED_MESSAGE_CACHE[getMessageKey(folder, uid)];
}
@ -72,8 +66,7 @@ export function hasRequestedMessage(folder, uid)
* @param {string} folderFullNameRaw
* @param {string} uid
*/
export function addNewMessageCache(folderFullNameRaw, uid)
{
export function addNewMessageCache(folderFullNameRaw, uid) {
NEW_MESSAGE_CACHE[getMessageKey(folderFullNameRaw, uid)] = true;
}
@ -81,10 +74,8 @@ export function addNewMessageCache(folderFullNameRaw, uid)
* @param {string} folderFullNameRaw
* @param {string} uid
*/
export function hasNewMessageAndRemoveFromCache(folderFullNameRaw, uid)
{
if (NEW_MESSAGE_CACHE[getMessageKey(folderFullNameRaw, uid)])
{
export function hasNewMessageAndRemoveFromCache(folderFullNameRaw, uid) {
if (NEW_MESSAGE_CACHE[getMessageKey(folderFullNameRaw, uid)]) {
NEW_MESSAGE_CACHE[getMessageKey(folderFullNameRaw, uid)] = null;
return true;
}
@ -94,16 +85,14 @@ export function hasNewMessageAndRemoveFromCache(folderFullNameRaw, uid)
/**
* @returns {void}
*/
export function clearNewMessageCache()
{
export function clearNewMessageCache() {
NEW_MESSAGE_CACHE = {};
}
/**
* @returns {string}
*/
export function getFolderInboxName()
{
export function getFolderInboxName() {
return '' === inboxFolderName ? 'INBOX' : inboxFolderName;
}
@ -111,8 +100,7 @@ export function getFolderInboxName()
* @param {string} folderHash
* @returns {string}
*/
export function getFolderFullNameRaw(folderHash)
{
export function getFolderFullNameRaw(folderHash) {
return '' !== folderHash && FOLDERS_NAME_CACHE[folderHash] ? FOLDERS_NAME_CACHE[folderHash] : '';
}
@ -120,11 +108,9 @@ export function getFolderFullNameRaw(folderHash)
* @param {string} folderHash
* @param {string} folderFullNameRaw
*/
export function setFolderFullNameRaw(folderHash, folderFullNameRaw)
{
export function setFolderFullNameRaw(folderHash, folderFullNameRaw) {
FOLDERS_NAME_CACHE[folderHash] = folderFullNameRaw;
if ('INBOX' === folderFullNameRaw || '' === inboxFolderName)
{
if ('INBOX' === folderFullNameRaw || '' === inboxFolderName) {
inboxFolderName = folderFullNameRaw;
}
}
@ -133,8 +119,7 @@ export function setFolderFullNameRaw(folderHash, folderFullNameRaw)
* @param {string} folderFullNameRaw
* @returns {string}
*/
export function getFolderHash(folderFullNameRaw)
{
export function getFolderHash(folderFullNameRaw) {
return '' !== folderFullNameRaw && FOLDERS_HASH_CACHE[folderFullNameRaw] ? FOLDERS_HASH_CACHE[folderFullNameRaw] : '';
}
@ -142,10 +127,8 @@ export function getFolderHash(folderFullNameRaw)
* @param {string} folderFullNameRaw
* @param {string} folderHash
*/
export function setFolderHash(folderFullNameRaw, folderHash)
{
if ('' !== folderFullNameRaw)
{
export function setFolderHash(folderFullNameRaw, folderHash) {
if ('' !== folderFullNameRaw) {
FOLDERS_HASH_CACHE[folderFullNameRaw] = folderHash;
}
}
@ -154,17 +137,17 @@ export function setFolderHash(folderFullNameRaw, folderHash)
* @param {string} folderFullNameRaw
* @returns {string}
*/
export function getFolderUidNext(folderFullNameRaw)
{
return '' !== folderFullNameRaw && FOLDERS_UID_NEXT_CACHE[folderFullNameRaw] ? FOLDERS_UID_NEXT_CACHE[folderFullNameRaw] : '';
export function getFolderUidNext(folderFullNameRaw) {
return '' !== folderFullNameRaw && FOLDERS_UID_NEXT_CACHE[folderFullNameRaw]
? FOLDERS_UID_NEXT_CACHE[folderFullNameRaw]
: '';
}
/**
* @param {string} folderFullNameRaw
* @param {string} uidNext
*/
export function setFolderUidNext(folderFullNameRaw, uidNext)
{
export function setFolderUidNext(folderFullNameRaw, uidNext) {
FOLDERS_UID_NEXT_CACHE[folderFullNameRaw] = uidNext;
}
@ -172,8 +155,7 @@ export function setFolderUidNext(folderFullNameRaw, uidNext)
* @param {string} folderFullNameRaw
* @returns {?FolderModel}
*/
export function getFolderFromCacheList(folderFullNameRaw)
{
export function getFolderFromCacheList(folderFullNameRaw) {
return '' !== folderFullNameRaw && FOLDERS_CACHE[folderFullNameRaw] ? FOLDERS_CACHE[folderFullNameRaw] : null;
}
@ -181,16 +163,14 @@ export function getFolderFromCacheList(folderFullNameRaw)
* @param {string} folderFullNameRaw
* @param {?FolderModel} folder
*/
export function setFolderToCacheList(folderFullNameRaw, folder)
{
export function setFolderToCacheList(folderFullNameRaw, folder) {
FOLDERS_CACHE[folderFullNameRaw] = folder;
}
/**
* @param {string} folderFullNameRaw
*/
export function removeFolderFromCacheList(folderFullNameRaw)
{
export function removeFolderFromCacheList(folderFullNameRaw) {
setFolderToCacheList(folderFullNameRaw, null);
}
@ -199,10 +179,10 @@ export function removeFolderFromCacheList(folderFullNameRaw)
* @param {string} uid
* @returns {?Array}
*/
export function getMessageFlagsFromCache(folderFullName, uid)
{
return MESSAGE_FLAGS_CACHE[folderFullName] && MESSAGE_FLAGS_CACHE[folderFullName][uid] ?
MESSAGE_FLAGS_CACHE[folderFullName][uid] : null;
export function getMessageFlagsFromCache(folderFullName, uid) {
return MESSAGE_FLAGS_CACHE[folderFullName] && MESSAGE_FLAGS_CACHE[folderFullName][uid]
? MESSAGE_FLAGS_CACHE[folderFullName][uid]
: null;
}
/**
@ -210,10 +190,8 @@ export function getMessageFlagsFromCache(folderFullName, uid)
* @param {string} uid
* @param {Array} flagsCache
*/
export function setMessageFlagsToCache(folderFullName, uid, flagsCache)
{
if (!MESSAGE_FLAGS_CACHE[folderFullName])
{
export function setMessageFlagsToCache(folderFullName, uid, flagsCache) {
if (!MESSAGE_FLAGS_CACHE[folderFullName]) {
MESSAGE_FLAGS_CACHE[folderFullName] = {};
}
@ -223,29 +201,22 @@ export function setMessageFlagsToCache(folderFullName, uid, flagsCache)
/**
* @param {string} folderFullName
*/
export function clearMessageFlagsFromCacheByFolder(folderFullName)
{
export function clearMessageFlagsFromCacheByFolder(folderFullName) {
MESSAGE_FLAGS_CACHE[folderFullName] = {};
}
/**
* @param {(MessageModel|null)} message
*/
export function initMessageFlagsFromCache(message)
{
if (message)
{
const
uid = message.uid,
export function initMessageFlagsFromCache(message) {
if (message) {
const uid = message.uid,
flags = getMessageFlagsFromCache(message.folderFullNameRaw, uid);
if (flags && 0 < flags.length)
{
if (flags && 0 < flags.length) {
message.flagged(!!flags[1]);
if (!message.isSimpleMessage)
{
if (!message.isSimpleMessage) {
message.unseen(!!flags[0]);
message.answered(!!flags[2]);
message.forwarded(!!flags[3]);
@ -254,8 +225,7 @@ export function initMessageFlagsFromCache(message)
}
}
if (0 < message.threads().length)
{
if (0 < message.threads().length) {
const unseenSubUid = _.find(message.threads(), (sSubUid) => {
if (uid !== sSubUid) {
const subFlags = getMessageFlagsFromCache(message.folderFullNameRaw, sSubUid);
@ -281,15 +251,16 @@ export function initMessageFlagsFromCache(message)
/**
* @param {(MessageModel|null)} message
*/
export function storeMessageFlagsToCache(message)
{
if (message)
{
setMessageFlagsToCache(
message.folderFullNameRaw, message.uid,
[message.unseen(), message.flagged(), message.answered(), message.forwarded(),
message.isReadReceipt(), message.deletedMark()]
);
export function storeMessageFlagsToCache(message) {
if (message) {
setMessageFlagsToCache(message.folderFullNameRaw, message.uid, [
message.unseen(),
message.flagged(),
message.answered(),
message.forwarded(),
message.isReadReceipt(),
message.deletedMark()
]);
}
}
@ -298,10 +269,8 @@ export function storeMessageFlagsToCache(message)
* @param {string} uid
* @param {Array} flags
*/
export function storeMessageFlagsToCacheByFolderAndUid(folder, uid, flags)
{
if (isArray(flags) && 0 < flags.length)
{
export function storeMessageFlagsToCacheByFolderAndUid(folder, uid, flags) {
if (isArray(flags) && 0 < flags.length) {
setMessageFlagsToCache(folder, uid, flags);
}
}
@ -311,21 +280,16 @@ export function storeMessageFlagsToCacheByFolderAndUid(folder, uid, flags)
* @param {string} uid
* @param {number} setAction
*/
export function storeMessageFlagsToCacheBySetAction(folder, uid, setAction)
{
export function storeMessageFlagsToCacheBySetAction(folder, uid, setAction) {
let unread = 0;
const flags = getMessageFlagsFromCache(folder, uid);
if (isArray(flags) && 0 < flags.length)
{
if (flags[0])
{
if (isArray(flags) && 0 < flags.length) {
if (flags[0]) {
unread = 1;
}
switch (setAction)
{
switch (setAction) {
case MessageSetAction.SetSeen:
flags[0] = false;
break;

View file

@ -1,39 +1,31 @@
import window from 'window';
import Cookies from 'js-cookie';
import {isUnd} from 'Common/Utils';
import {CLIENT_SIDE_STORAGE_INDEX_NAME} from 'Common/Consts';
import { isUnd } from 'Common/Utils';
import { CLIENT_SIDE_STORAGE_INDEX_NAME } from 'Common/Consts';
class CookieDriver
{
class CookieDriver {
/**
* @param {string} key
* @param {*} data
* @returns {boolean}
*/
set(key, data) {
let
result = false,
let result = false,
storageResult = null;
try
{
try {
storageResult = Cookies.getJSON(CLIENT_SIDE_STORAGE_INDEX_NAME);
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
(storageResult || (storageResult = {}))[key] = data;
try
{
try {
Cookies.set(CLIENT_SIDE_STORAGE_INDEX_NAME, storageResult, {
expires: 30
});
result = true;
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
return result;
}
@ -43,15 +35,12 @@ class CookieDriver
* @returns {*}
*/
get(key) {
let result = null;
try
{
try {
const storageResult = Cookies.getJSON(CLIENT_SIDE_STORAGE_INDEX_NAME);
result = (storageResult && !isUnd(storageResult[key])) ? storageResult[key] : null;
}
catch (e) {} // eslint-disable-line no-empty
result = storageResult && !isUnd(storageResult[key]) ? storageResult[key] : null;
} catch (e) {} // eslint-disable-line no-empty
return result;
}
@ -64,4 +53,4 @@ class CookieDriver
}
}
export {CookieDriver, CookieDriver as default};
export { CookieDriver, CookieDriver as default };

View file

@ -1,11 +1,9 @@
import window from 'window';
import {isUnd} from 'Common/Utils';
import {isStorageSupported} from 'Storage/RainLoop';
import {CLIENT_SIDE_STORAGE_INDEX_NAME} from 'Common/Consts';
import { isUnd } from 'Common/Utils';
import { isStorageSupported } from 'Storage/RainLoop';
import { CLIENT_SIDE_STORAGE_INDEX_NAME } from 'Common/Consts';
class LocalStorageDriver
{
class LocalStorageDriver {
s = null;
constructor() {
@ -18,27 +16,22 @@ class LocalStorageDriver
* @returns {boolean}
*/
set(key, data) {
if (!this.s)
{
if (!this.s) {
return false;
}
let storageResult = null;
try
{
try {
const storageValue = this.s.getItem(CLIENT_SIDE_STORAGE_INDEX_NAME) || null;
storageResult = null === storageValue ? null : window.JSON.parse(storageValue);
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
(storageResult || (storageResult = {}))[key] = data;
try
{
try {
this.s.setItem(CLIENT_SIDE_STORAGE_INDEX_NAME, window.JSON.stringify(storageResult));
return true;
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
return false;
}
@ -48,20 +41,16 @@ class LocalStorageDriver
* @returns {*}
*/
get(key) {
if (!this.s)
{
if (!this.s) {
return null;
}
try
{
const
storageValue = this.s.getItem(CLIENT_SIDE_STORAGE_INDEX_NAME) || null,
try {
const storageValue = this.s.getItem(CLIENT_SIDE_STORAGE_INDEX_NAME) || null,
storageResult = null === storageValue ? null : window.JSON.parse(storageValue);
return (storageResult && !isUnd(storageResult[key])) ? storageResult[key] : null;
}
catch (e) {} // eslint-disable-line no-empty
return storageResult && !isUnd(storageResult[key]) ? storageResult[key] : null;
} catch (e) {} // eslint-disable-line no-empty
return null;
}
@ -74,4 +63,4 @@ class LocalStorageDriver
}
}
export {LocalStorageDriver, LocalStorageDriver as default};
export { LocalStorageDriver, LocalStorageDriver as default };

View file

@ -1,4 +1,3 @@
export const MESSAGES_PER_PAGE = 20;
export const MESSAGES_PER_PAGE_VALUES = [10, 20, 30, 50, 100];
@ -38,8 +37,11 @@ export const TOKEN_ERROR_LIMIT = 10;
export const RAINLOOP_TRIAL_KEY = 'RAINLOOP-TRIAL-KEY';
/* eslint max-len: 0 */
export const DATA_IMAGE_USER_DOT_PIC = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAuCAYAAABXuSs3AAAHHklEQVRoQ7VZW08bVxCeXRuwIbTGXIwNtBBaqjwgVUiR8lDlbza9qe1DpVZ9aNQ/0KpPeaJK07SpcuEeCEmUAObm21bfrL9lONjexSYrWfbunj37zXdmvpkz9oIgCKTD0Wg0xPd94TDP83Q0zvWa50vzklSrdanVanqf4/D84GBGr+F+Op3S8fqoJxLOdnZgTvsO/nYhenHA+UC7CWF1uXwkb9++ldPTUwVerVbVqFQqpR8YPjQ0JCMjI5LNDijoRgP3PQVu5+5Eor2XGLg7IV4GkIdHJ/LmzRs5ODiIwNbrdR0O0GCcq4Xz4eFhmZyclP7+tDQaIik/BG5XKQn4SwG3zJTLZXn9+rUclI8UHD5YVoDDN8bSzXhONwL48fFxGR4eilzFZT1uFRIB5yT8BqCdnR3Z3d0VP9Un6XRawYJpggVrZBv38ME4XKtUKnLt2jUplUoy1PR/l3U7T6sVSAQcgMAkj8PDQ9ne3pajoyMRL7zeKsYZWHgWYDGmv78/mmdwcFA+mJlSgziHDWrERrsjEXDXegTi1tZW+DLxI2bxIrqFNYTXyDyCFweMAHCwb8e4RnTNuOsqe3t7sra21pTD0Kct666E8XlcZyzw9/RUUXK5nK5oUinUQI6TQ3cynO/v78vq6qrKXCNwlTiJJpyNGc3nZHp6uqV2dwrQWOCtZBDAV1ZWwsQk7f0wiQn5kffbAu/0/KWBYzIC1+XukfGx0RGZmppKlC2tIV0Bh4aDcZW7HhkfH8urLLZL7T2pihvlkMNnz56FiadHxicL41IsFpN41bkxsYxbRdFo9jwB8KdPn14J8KnSpBQKhQs63nPmbCVRcBUAR2Lq1VVmpksyMTFxAXjcEsQybiegESionjx5osCZOeNe1O4+EhCAX7bQSgQcxRHTMgAgcz5+/Dis/hL4uHU3/B4YGNASGHIKxuEql0k+l05AeIAF1vPnz5VxFFmdDlaJrMtZITJeSsXCOTlMunKxjLtMYOKNjQ158eJFuAuKkUOb5sEwgff19SkJUBVkThZUbnXZrtCKBQ6gbnWIkjZpyne3ejAWoGnA7Icz6irvBLgbOMicCM6TkxPx/LAkbXfgWcsazuE2kFRsKD5Z+CiqDumKncpZvieWcS6dDVD8xiYCNflpJdwcdwJOf9airLmVQ7DPzMxIYWLsXGXoVqLt5k0M3K3JUVPDZdbWNzsCp48TPFdvdnZWUz32nDha7bJ63kgAJPzSdRks9/Kf9xMJAQ1gq2NpaUmy2Yz4zar4nQC3xb99AQwCcGzLAAwuhG8YiWvcOKts+r4GOe5nMhm5efOm9lUA3E3vSZJRrKvE0fnPv//Jy5cvo5cTHIPQbSjhOoqq69evS19f6lxDKK4+sVhigZPtKJqbrQeqxd5+WR4+fKgqgT0k2XX3nhiPgETWXFhYkFzuPZ2yVq1GTSOXpE47/VjgNnD4m4GG7/LhsTx69EiwD4Vr2MwIIxgbAH18fKx1yfz8vEogNvGtWnCuhLZa9UTAreVWFsHy/b/+Vrbdl7E5REMQD2jDoUbByty+/ZnU64GkU2HzyJLhktU1cLv8nARgkYS2d3ajAgwG8qU2oLmDZ92CMaOjo7K4uCiZgbDWaRWgnZhPxLhrMUCvr69riwKZk1LHF7XqrWAO9hJxH6ozNzcnCx/PqztZg9mf6SQMscCtm2C5ke4BGMlHWTUp36036AJajDVrFMzBrhhWslQsSrFYiOqVpMriNYIgqFRq2j3FAb/zffT6zuxFXxsNzs3NTXn16lW4gYiW96w1FyedF+83xG/2FNGCRpU4NjamMsn+OZ9xE5RXqdaDdPpib6RWCzuwKF9RxqI2AVNQBwQYJoK0wdBejnqtEikP3pfP51XjUTESl12FqJEKxsEorARYDD44ONTeID7YpsEnrRvQfWAI2e8WfDaTUSIwJ0iBCmFOtOUAHvVMPp/TPwvYFVYFIuP8l+DBgwdaa2Miqwa0GgYwfeMltovbDfh6c1vIgMYcliSsKv4IWFr6VDHxvldvBAH+1sA+cnl5WYOPmmr9ir+1l9I0Cgz0yjhXjfJJ0JROnmezWbl165ayr/5fqwcBNr7IfhjMqKcvESSM4eRcCasQ3bDNObmKPLdGUGpZsN24cUNLBm9zazu4d++e6qpNBFaTuUS26U5dpuR1CxyA7J9ddrMRqlz4pwLLYawymPd++/2PADt2ugcGwq9gCCdhQ96C6xWwa6j1ceuq+I0EhW0i8MAIVJfeL3d/DVD8EKi12P6/2S2jV/EccVB54O/ejz/9HGCpoBBMta5rXMXLu53D1XAwjhXwvvv+h4BAXVe4bOu3O3ChxF08LiZFG3fel199G9CH3fLyqv24NcB44MRhpdK788U3CpyKwsCw590xmfSpzsBt0Fqc3ud3vtZigxWcVZCklVpSiN0w3q5E/h9TGMIUuA3+EQAAAABJRU5ErkJggg==';
export const DATA_IMAGE_USER_DOT_PIC =
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAuCAYAAABXuSs3AAAHHklEQVRoQ7VZW08bVxCeXRuwIbTGXIwNtBBaqjwgVUiR8lDlbza9qe1DpVZ9aNQ/0KpPeaJK07SpcuEeCEmUAObm21bfrL9lONjexSYrWfbunj37zXdmvpkz9oIgCKTD0Wg0xPd94TDP83Q0zvWa50vzklSrdanVanqf4/D84GBGr+F+Op3S8fqoJxLOdnZgTvsO/nYhenHA+UC7CWF1uXwkb9++ldPTUwVerVbVqFQqpR8YPjQ0JCMjI5LNDijoRgP3PQVu5+5Eor2XGLg7IV4GkIdHJ/LmzRs5ODiIwNbrdR0O0GCcq4Xz4eFhmZyclP7+tDQaIik/BG5XKQn4SwG3zJTLZXn9+rUclI8UHD5YVoDDN8bSzXhONwL48fFxGR4eilzFZT1uFRIB5yT8BqCdnR3Z3d0VP9Un6XRawYJpggVrZBv38ME4XKtUKnLt2jUplUoy1PR/l3U7T6sVSAQcgMAkj8PDQ9ne3pajoyMRL7zeKsYZWHgWYDGmv78/mmdwcFA+mJlSgziHDWrERrsjEXDXegTi1tZW+DLxI2bxIrqFNYTXyDyCFweMAHCwb8e4RnTNuOsqe3t7sra21pTD0Kct666E8XlcZyzw9/RUUXK5nK5oUinUQI6TQ3cynO/v78vq6qrKXCNwlTiJJpyNGc3nZHp6uqV2dwrQWOCtZBDAV1ZWwsQk7f0wiQn5kffbAu/0/KWBYzIC1+XukfGx0RGZmppKlC2tIV0Bh4aDcZW7HhkfH8urLLZL7T2pihvlkMNnz56FiadHxicL41IsFpN41bkxsYxbRdFo9jwB8KdPn14J8KnSpBQKhQs63nPmbCVRcBUAR2Lq1VVmpksyMTFxAXjcEsQybiegESionjx5osCZOeNe1O4+EhCAX7bQSgQcxRHTMgAgcz5+/Dis/hL4uHU3/B4YGNASGHIKxuEql0k+l05AeIAF1vPnz5VxFFmdDlaJrMtZITJeSsXCOTlMunKxjLtMYOKNjQ158eJFuAuKkUOb5sEwgff19SkJUBVkThZUbnXZrtCKBQ6gbnWIkjZpyne3ejAWoGnA7Icz6irvBLgbOMicCM6TkxPx/LAkbXfgWcsazuE2kFRsKD5Z+CiqDumKncpZvieWcS6dDVD8xiYCNflpJdwcdwJOf9airLmVQ7DPzMxIYWLsXGXoVqLt5k0M3K3JUVPDZdbWNzsCp48TPFdvdnZWUz32nDha7bJ63kgAJPzSdRks9/Kf9xMJAQ1gq2NpaUmy2Yz4zar4nQC3xb99AQwCcGzLAAwuhG8YiWvcOKts+r4GOe5nMhm5efOm9lUA3E3vSZJRrKvE0fnPv//Jy5cvo5cTHIPQbSjhOoqq69evS19f6lxDKK4+sVhigZPtKJqbrQeqxd5+WR4+fKgqgT0k2XX3nhiPgETWXFhYkFzuPZ2yVq1GTSOXpE47/VjgNnD4m4GG7/LhsTx69EiwD4Vr2MwIIxgbAH18fKx1yfz8vEogNvGtWnCuhLZa9UTAreVWFsHy/b/+Vrbdl7E5REMQD2jDoUbByty+/ZnU64GkU2HzyJLhktU1cLv8nARgkYS2d3ajAgwG8qU2oLmDZ92CMaOjo7K4uCiZgbDWaRWgnZhPxLhrMUCvr69riwKZk1LHF7XqrWAO9hJxH6ozNzcnCx/PqztZg9mf6SQMscCtm2C5ke4BGMlHWTUp36036AJajDVrFMzBrhhWslQsSrFYiOqVpMriNYIgqFRq2j3FAb/zffT6zuxFXxsNzs3NTXn16lW4gYiW96w1FyedF+83xG/2FNGCRpU4NjamMsn+OZ9xE5RXqdaDdPpib6RWCzuwKF9RxqI2AVNQBwQYJoK0wdBejnqtEikP3pfP51XjUTESl12FqJEKxsEorARYDD44ONTeID7YpsEnrRvQfWAI2e8WfDaTUSIwJ0iBCmFOtOUAHvVMPp/TPwvYFVYFIuP8l+DBgwdaa2Miqwa0GgYwfeMltovbDfh6c1vIgMYcliSsKv4IWFr6VDHxvldvBAH+1sA+cnl5WYOPmmr9ir+1l9I0Cgz0yjhXjfJJ0JROnmezWbl165ayr/5fqwcBNr7IfhjMqKcvESSM4eRcCasQ3bDNObmKPLdGUGpZsN24cUNLBm9zazu4d++e6qpNBFaTuUS26U5dpuR1CxyA7J9ddrMRqlz4pwLLYawymPd++/2PADt2ugcGwq9gCCdhQ96C6xWwa6j1ceuq+I0EhW0i8MAIVJfeL3d/DVD8EKi12P6/2S2jV/EccVB54O/ejz/9HGCpoBBMta5rXMXLu53D1XAwjhXwvvv+h4BAXVe4bOu3O3ChxF08LiZFG3fel199G9CH3fLyqv24NcB44MRhpdK788U3CpyKwsCw590xmfSpzsBt0Fqc3ud3vtZigxWcVZCklVpSiN0w3q5E/h9TGMIUuA3+EQAAAABJRU5ErkJggg==';
export const DATA_IMAGE_TRANSP_PIC = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII=';
export const DATA_IMAGE_TRANSP_PIC =
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII=';
export const DATA_IMAGE_LAZY_PLACEHOLDER_PIC = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB/AAffA0nNPuCLAAAAAElFTkSuQmCC';
export const DATA_IMAGE_LAZY_PLACEHOLDER_PIC =
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB/AAffA0nNPuCLAAAAAElFTkSuQmCC';

View file

@ -1,4 +1,3 @@
/* eslint quote-props: 0 */
/**
@ -387,7 +386,6 @@ export const SignedVerifyStatus = {
* @enum {number}
*/
export const ContactPropertyType = {
'Unknown': 0,
'FullName': 10,

View file

@ -1,6 +1,5 @@
import _ from '_';
import {isObject, isUnd} from 'Common/Utils';
import { isObject, isUnd } from 'Common/Utils';
import * as Plugins from 'Common/Plugins';
const SUBS = {};
@ -10,21 +9,16 @@ const SUBS = {};
* @param {Function} func
* @param {Object=} context
*/
export function sub(name, func, context)
{
if (isObject(name))
{
export function sub(name, func, context) {
if (isObject(name)) {
context = func || null;
func = null;
_.each(name, (subFunc, subName) => {
sub(subName, subFunc, context);
});
}
else
{
if (isUnd(SUBS[name]))
{
} else {
if (isUnd(SUBS[name])) {
SUBS[name] = [];
}
@ -36,15 +30,12 @@ export function sub(name, func, context)
* @param {string} name
* @param {Array=} args
*/
export function pub(name, args)
{
export function pub(name, args) {
Plugins.runHook('rl-pub', [name, args]);
if (!isUnd(SUBS[name]))
{
if (!isUnd(SUBS[name])) {
_.each(SUBS[name], (items) => {
if (items[0])
{
if (items[0]) {
items[0].apply(items[1] || null, args || []);
}
});

View file

@ -3,12 +3,12 @@ import _ from '_';
import $ from '$';
import key from 'key';
import ko from 'ko';
import {KeyState} from 'Common/Enums';
import { KeyState } from 'Common/Enums';
const $win = $(window);
$win.__sizes = [0, 0];
export {$win};
export { $win };
export const $doc = $(window.document);
@ -19,9 +19,12 @@ export const $body = $('body');
export const $div = $('<div></div>');
export const $hcont = $('<div></div>');
$hcont.attr('area', 'hidden').css({position: 'absolute', left: -5000}).appendTo($body);
$hcont
.attr('area', 'hidden')
.css({ position: 'absolute', left: -5000 })
.appendTo($body);
export const startMicrotime = (new window.Date()).getTime();
export const startMicrotime = new window.Date().getTime();
/**
* @type {boolean}
@ -31,7 +34,7 @@ export const community = RL_COMMUNITY;
/**
* @type {?}
*/
export const dropdownVisibility = ko.observable(false).extend({rateLimit: 0});
export const dropdownVisibility = ko.observable(false).extend({ rateLimit: 0 });
/**
* @type {boolean}
@ -41,8 +44,8 @@ export const useKeyboardShortcuts = ko.observable(true);
/**
* @type {string}
*/
export const sUserAgent = 'navigator' in window && 'userAgent' in window.navigator &&
window.navigator.userAgent.toLowerCase() || '';
export const sUserAgent =
('navigator' in window && 'userAgent' in window.navigator && window.navigator.userAgent.toLowerCase()) || '';
/**
* @type {boolean}
@ -77,7 +80,8 @@ export const bDisableNanoScroll = bMobileDevice;
/**
* @type {boolean}
*/
export const bAnimationSupported = !bMobileDevice && $html.hasClass('csstransitions') && $html.hasClass('cssanimations');
export const bAnimationSupported =
!bMobileDevice && $html.hasClass('csstransitions') && $html.hasClass('cssanimations');
/**
* @type {boolean}
@ -87,7 +91,8 @@ export const bXMLHttpRequestSupported = !!window.XMLHttpRequest;
/**
* @type {boolean}
*/
export const bIsHttps = window.document && window.document.location ? 'https:' === window.document.location.protocol : false;
export const bIsHttps =
window.document && window.document.location ? 'https:' === window.document.location.protocol : false;
/**
* @type {Object}
@ -98,15 +103,15 @@ export const htmlEditorDefaultConfig = {
'customConfig': '',
'contentsCss': '',
'toolbarGroups': [
{name: 'spec'},
{name: 'styles'},
{name: 'basicstyles', groups: ['basicstyles', 'cleanup', 'bidi']},
{name: 'colors'},
bMobileDevice ? {} : {name: 'paragraph', groups: ['list', 'indent', 'blocks', 'align']},
{name: 'links'},
{name: 'insert'},
{name: 'document', groups: ['mode', 'document', 'doctools']},
{name: 'others'}
{ name: 'spec' },
{ name: 'styles' },
{ name: 'basicstyles', groups: ['basicstyles', 'cleanup', 'bidi'] },
{ name: 'colors' },
bMobileDevice ? {} : { name: 'paragraph', groups: ['list', 'indent', 'blocks', 'align'] },
{ name: 'links' },
{ name: 'insert' },
{ name: 'document', groups: ['mode', 'document', 'doctools'] },
{ name: 'others' }
],
'removePlugins': 'liststyle',
@ -171,17 +176,15 @@ export const htmlEditorLangsMap = {
*/
let bAllowPdfPreview = !bMobileDevice;
if (bAllowPdfPreview && window.navigator && window.navigator.mimeTypes)
{
if (bAllowPdfPreview && window.navigator && window.navigator.mimeTypes) {
bAllowPdfPreview = !!_.find(window.navigator.mimeTypes, (type) => type && 'application/pdf' === type.type);
if (!bAllowPdfPreview)
{
if (!bAllowPdfPreview) {
bAllowPdfPreview = 'undefined' !== typeof window.navigator.mimeTypes['application/pdf'];
}
}
export {bAllowPdfPreview};
export { bAllowPdfPreview };
export const VIEW_MODELS = {
settings: [],
@ -222,26 +225,21 @@ export const keyScopeFake = ko.observable(KeyState.All);
export const keyScope = ko.computed({
read: () => keyScopeFake(),
write: (value) => {
if (KeyState.Menu !== value)
{
if (KeyState.Compose === value)
{
if (KeyState.Menu !== value) {
if (KeyState.Compose === value) {
// disableKeyFilter
key.filter = () => useKeyboardShortcuts();
}
else
{
} else {
// restoreKeyFilter
key.filter = (event) => {
if (useKeyboardShortcuts())
{
const
el = event.target || event.srcElement,
if (useKeyboardShortcuts()) {
const el = event.target || event.srcElement,
tagName = el ? el.tagName.toUpperCase() : '';
return !('INPUT' === tagName || 'SELECT' === tagName || 'TEXTAREA' === tagName ||
return !(
'INPUT' === tagName ||
'SELECT' === tagName ||
'TEXTAREA' === tagName ||
(el && 'DIV' === tagName && ('editorHtmlArea' === el.className || 'true' === '' + el.contentEditable))
);
}
@ -251,8 +249,7 @@ export const keyScope = ko.computed({
}
keyScopeFake(value);
if (dropdownVisibility())
{
if (dropdownVisibility()) {
value = KeyState.Menu;
}
}
@ -262,17 +259,14 @@ export const keyScope = ko.computed({
});
keyScopeReal.subscribe((value) => {
// window.console.log('keyScope=' + sValue); // DEBUG
// window.console.log('keyScope=' + sValue); // DEBUG
key.setScope(value);
});
dropdownVisibility.subscribe((value) => {
if (value)
{
if (value) {
keyScope(KeyState.Menu);
}
else if (KeyState.Menu === key.getScope())
{
} else if (KeyState.Menu === key.getScope()) {
keyScope(keyScopeFake());
}
});

View file

@ -1,13 +1,11 @@
import window from 'window';
import _ from '_';
import $ from '$';
import {htmlEditorDefaultConfig, htmlEditorLangsMap} from 'Common/Globals';
import {EventKeyCode, Magics} from 'Common/Enums';
import { htmlEditorDefaultConfig, htmlEditorLangsMap } from 'Common/Globals';
import { EventKeyCode, Magics } from 'Common/Enums';
import * as Settings from 'Storage/Settings';
class HtmlEditor
{
class HtmlEditor {
editor;
blurTimer = 0;
@ -29,8 +27,7 @@ class HtmlEditor
* @param {Function=} onReady
* @param {Function=} onModeChange
*/
constructor(element, onBlur = null, onReady = null, onModeChange = null)
{
constructor(element, onBlur = null, onReady = null, onModeChange = null) {
this.onBlur = onBlur;
this.onReady = onReady;
this.onModeChange = onModeChange;
@ -44,15 +41,13 @@ class HtmlEditor
}
runOnBlur() {
if (this.onBlur)
{
if (this.onBlur) {
this.onBlur();
}
}
blurTrigger() {
if (this.onBlur)
{
if (this.onBlur) {
window.clearTimeout(this.blurTimer);
this.blurTimer = window.setTimeout(() => {
this.runOnBlur();
@ -61,8 +56,7 @@ class HtmlEditor
}
focusTrigger() {
if (this.onBlur)
{
if (this.onBlur) {
window.clearTimeout(this.blurTimer);
}
}
@ -78,8 +72,7 @@ class HtmlEditor
* @returns {void}
*/
clearCachedSignature() {
if (this.editor)
{
if (this.editor) {
this.editor.execCommand('insertSignature', {
clearCache: true
});
@ -93,8 +86,7 @@ class HtmlEditor
* @returns {void}
*/
setSignature(signature, html, insertBefore = false) {
if (this.editor)
{
if (this.editor) {
this.editor.execCommand('insertSignature', {
isHtml: html,
insertBefore: insertBefore,
@ -111,8 +103,7 @@ class HtmlEditor
}
resetDirty() {
if (this.editor)
{
if (this.editor) {
this.editor.resetDirty();
}
}
@ -122,24 +113,19 @@ class HtmlEditor
* @returns {string}
*/
getData(wrapIsHtml = false) {
let result = '';
if (this.editor)
{
try
{
if ('plain' === this.editor.mode && this.editor.plugins.plain && this.editor.__plain)
{
if (this.editor) {
try {
if ('plain' === this.editor.mode && this.editor.plugins.plain && this.editor.__plain) {
result = this.editor.__plain.getRawData();
} else {
result = wrapIsHtml
? '<div data-html-editor-font-wrapper="true" style="font-family: arial, sans-serif; font-size: 13px;">' +
this.editor.getData() +
'</div>'
: this.editor.getData();
}
else
{
result = wrapIsHtml ?
'<div data-html-editor-font-wrapper="true" style="font-family: arial, sans-serif; font-size: 13px;">' +
this.editor.getData() + '</div>' : this.editor.getData();
}
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
}
return result;
@ -154,271 +140,217 @@ class HtmlEditor
}
modeToggle(plain, resize) {
if (this.editor)
{
if (this.editor) {
try {
if (plain)
{
if ('plain' === this.editor.mode)
{
if (plain) {
if ('plain' === this.editor.mode) {
this.editor.setMode('wysiwyg');
}
}
else if ('wysiwyg' === this.editor.mode)
{
} else if ('wysiwyg' === this.editor.mode) {
this.editor.setMode('plain');
}
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
if (resize)
{
if (resize) {
this.resize();
}
}
}
setHtmlOrPlain(text, focus) {
if (':HTML:' === text.substr(0, 6))
{
if (':HTML:' === text.substr(0, 6)) {
this.setHtml(text.substr(6), focus);
}
else
{
} else {
this.setPlain(text, focus);
}
}
setHtml(html, focus) {
if (this.editor && this.__inited)
{
if (this.editor && this.__inited) {
this.clearCachedSignature();
this.modeToggle(true);
html = html.replace(/<p[^>]*><\/p>/ig, '');
html = html.replace(/<p[^>]*><\/p>/gi, '');
try {
this.editor.setData(html);
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
if (focus)
{
if (focus) {
this.focus();
}
}
}
replaceHtml(find, replaceHtml) {
if (this.editor && this.__inited && 'wysiwyg' === this.editor.mode)
{
if (this.editor && this.__inited && 'wysiwyg' === this.editor.mode) {
try {
this.editor.setData(this.editor.getData().replace(find, replaceHtml));
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
}
}
setPlain(plain, focus) {
if (this.editor && this.__inited)
{
if (this.editor && this.__inited) {
this.clearCachedSignature();
this.modeToggle(false);
if ('plain' === this.editor.mode && this.editor.plugins.plain && this.editor.__plain)
{
if ('plain' === this.editor.mode && this.editor.plugins.plain && this.editor.__plain) {
this.editor.__plain.setRawData(plain);
}
else
{
} else {
try {
this.editor.setData(plain);
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
}
if (focus)
{
if (focus) {
this.focus();
}
}
}
init() {
if (this.element && !this.editor)
{
const
initFunc = () => {
if (this.element && !this.editor) {
const initFunc = () => {
const config = htmlEditorDefaultConfig,
language = Settings.settingsGet('Language'),
allowSource = !!Settings.appSettingsGet('allowHtmlEditorSourceButton'),
biti = !!Settings.appSettingsGet('allowHtmlEditorBitiButtons');
const
config = htmlEditorDefaultConfig,
language = Settings.settingsGet('Language'),
allowSource = !!Settings.appSettingsGet('allowHtmlEditorSourceButton'),
biti = !!Settings.appSettingsGet('allowHtmlEditorBitiButtons');
if ((allowSource || !biti) && !config.toolbarGroups.__cfgInited) {
config.toolbarGroups.__cfgInited = true;
if ((allowSource || !biti) && !config.toolbarGroups.__cfgInited)
{
config.toolbarGroups.__cfgInited = true;
if (allowSource)
{
config.removeButtons = config.removeButtons.replace(',Source', '');
}
if (!biti)
{
config.removePlugins += (config.removePlugins ? ',' : '') + 'bidi';
}
if (allowSource) {
config.removeButtons = config.removeButtons.replace(',Source', '');
}
config.enterMode = window.CKEDITOR.ENTER_BR;
config.shiftEnterMode = window.CKEDITOR.ENTER_P;
if (!biti) {
config.removePlugins += (config.removePlugins ? ',' : '') + 'bidi';
}
}
config.language = htmlEditorLangsMap[(language || 'en').toLowerCase()] || 'en';
if (window.CKEDITOR.env)
{
window.CKEDITOR.env.isCompatible = true;
config.enterMode = window.CKEDITOR.ENTER_BR;
config.shiftEnterMode = window.CKEDITOR.ENTER_P;
config.language = htmlEditorLangsMap[(language || 'en').toLowerCase()] || 'en';
if (window.CKEDITOR.env) {
window.CKEDITOR.env.isCompatible = true;
}
this.editor = window.CKEDITOR.appendTo(this.element, config);
this.editor.on('key', (event) => {
if (event && event.data && EventKeyCode.Tab === event.data.keyCode) {
return false;
}
this.editor = window.CKEDITOR.appendTo(this.element, config);
return true;
});
this.editor.on('key', (event) => {
if (event && event.data && EventKeyCode.Tab === event.data.keyCode)
{
return false;
}
this.editor.on('blur', () => {
this.blurTrigger();
});
return true;
});
this.editor.on('mode', () => {
this.blurTrigger();
if (this.onModeChange) {
this.onModeChange('plain' !== this.editor.mode);
}
});
this.editor.on('blur', () => {
this.blurTrigger();
});
this.editor.on('focus', () => {
this.focusTrigger();
});
this.editor.on('mode', () => {
this.blurTrigger();
if (this.onModeChange)
{
this.onModeChange('plain' !== this.editor.mode);
}
});
if (window.FileReader) {
this.editor.on('drop', (event) => {
if (0 < event.data.dataTransfer.getFilesCount()) {
const file = event.data.dataTransfer.getFile(0);
if (file && window.FileReader && event.data.dataTransfer.id && file.type && file.type.match(/^image/i)) {
const id = event.data.dataTransfer.id,
imageId = `[img=${id}]`,
reader = new window.FileReader();
this.editor.on('focus', () => {
this.focusTrigger();
});
reader.onloadend = () => {
if (reader.result) {
this.replaceHtml(imageId, `<img src="${reader.result}" />`);
}
};
if (window.FileReader)
{
this.editor.on('drop', (event) => {
if (0 < event.data.dataTransfer.getFilesCount())
{
const file = event.data.dataTransfer.getFile(0);
if (file && window.FileReader && event.data.dataTransfer.id &&
file.type && file.type.match(/^image/i))
{
const
id = event.data.dataTransfer.id,
imageId = `[img=${id}]`,
reader = new window.FileReader();
reader.readAsDataURL(file);
reader.onloadend = () => {
if (reader.result)
{
this.replaceHtml(imageId, `<img src="${reader.result}" />`);
}
};
reader.readAsDataURL(file);
event.data.dataTransfer.setData('text/html', imageId);
}
event.data.dataTransfer.setData('text/html', imageId);
}
});
}
});
}
this.editor.on('instanceReady', () => {
if (this.editor.removeMenuItem) {
this.editor.removeMenuItem('cut');
this.editor.removeMenuItem('copy');
this.editor.removeMenuItem('paste');
}
this.editor.on('instanceReady', () => {
this.__resizable = true;
this.__inited = true;
if (this.editor.removeMenuItem)
{
this.editor.removeMenuItem('cut');
this.editor.removeMenuItem('copy');
this.editor.removeMenuItem('paste');
}
this.resize();
this.__resizable = true;
this.__inited = true;
if (this.onReady) {
this.onReady();
}
});
};
this.resize();
if (this.onReady)
{
this.onReady();
}
});
};
if (window.CKEDITOR)
{
if (window.CKEDITOR) {
initFunc();
}
else
{
} else {
window.__initEditor = initFunc;
}
}
}
focus() {
if (this.editor)
{
if (this.editor) {
try {
this.editor.focus();
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
}
}
hasFocus() {
if (this.editor)
{
if (this.editor) {
try {
return !!this.editor.focusManager.hasFocus;
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
}
return false;
}
blur() {
if (this.editor)
{
if (this.editor) {
try {
this.editor.focusManager.blur(true);
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
}
}
resizeEditor() {
if (this.editor && this.__resizable)
{
if (this.editor && this.__resizable) {
try {
this.editor.resize(this.$element.width(), this.$element.innerHeight());
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
}
}
setReadOnly(value) {
if (this.editor)
{
if (this.editor) {
try {
this.editor.setReadOnly(!!value);
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
}
}
@ -427,4 +359,4 @@ class HtmlEditor
}
}
export {HtmlEditor, HtmlEditor as default};
export { HtmlEditor, HtmlEditor as default };

View file

@ -1,4 +1,3 @@
import window from 'window';
// let rainloopCaches = window.caches && window.caches.open ? window.caches : null;
@ -9,19 +8,15 @@ import window from 'window';
* @returns {Promise}
*/
export function jassl(src, async = false) {
if (!window.Promise || !window.Promise.all)
{
if (!window.Promise || !window.Promise.all) {
throw new Error('Promises are not available your environment.');
}
if (!src)
{
if (!src) {
throw new Error('src should not be empty.');
}
return new window.Promise((resolve, reject) => {
const element = window.document.createElement('script');
element.onload = () => {
@ -36,7 +31,7 @@ export function jassl(src, async = false) {
element.src = src;
window.document.body.appendChild(element);
})/* .then((s) => {
}) /* .then((s) => {
const found = s && rainloopCaches ? s.match(/rainloop\/v\/([^\/]+)\/static\//) : null;
if (found && found[1])

View file

@ -1,20 +1,15 @@
import window from 'window';
import {pString, pInt, isUnd, isNormal, trim, encodeURIComponent} from 'Common/Utils';
import { pString, pInt, isUnd, isNormal, trim, encodeURIComponent } from 'Common/Utils';
import * as Settings from 'Storage/Settings';
const
ROOT = './',
const ROOT = './',
HASH_PREFIX = '#/',
SERVER_PREFIX = './?',
SUB_QUERY_PREFIX = '&q[]=',
VERSION = Settings.appSettingsGet('version'),
WEB_PREFIX = Settings.appSettingsGet('webPath') || '',
VERSION_PREFIX = Settings.appSettingsGet('webVersionPath') || 'rainloop/v/' + VERSION + '/',
STATIC_PREFIX = VERSION_PREFIX + 'static/',
ADMIN_HOST_USE = !!Settings.appSettingsGet('adminHostUse'),
ADMIN_PATH = Settings.appSettingsGet('adminPath') || 'admin';
@ -23,16 +18,14 @@ let AUTH_PREFIX = Settings.settingsGet('AuthAccountHash') || '0';
/**
* @returns {void}
*/
export function populateAuthSuffix()
{
export function populateAuthSuffix() {
AUTH_PREFIX = Settings.settingsGet('AuthAccountHash') || '0';
}
/**
* @returns {string}
*/
export function subQueryPrefix()
{
export function subQueryPrefix() {
return SUB_QUERY_PREFIX;
}
@ -40,24 +33,21 @@ export function subQueryPrefix()
* @param {string=} startupUrl
* @returns {string}
*/
export function root(startupUrl = '')
{
export function root(startupUrl = '') {
return HASH_PREFIX + pString(startupUrl);
}
/**
* @returns {string}
*/
export function rootAdmin()
{
export function rootAdmin() {
return ADMIN_HOST_USE ? ROOT : SERVER_PREFIX + ADMIN_PATH;
}
/**
* @returns {string}
*/
export function rootUser()
{
export function rootUser() {
return ROOT;
}
@ -67,10 +57,21 @@ export function rootUser()
* @param {string=} customSpecSuffix
* @returns {string}
*/
export function attachmentRaw(type, download, customSpecSuffix)
{
export function attachmentRaw(type, download, customSpecSuffix) {
customSpecSuffix = isUnd(customSpecSuffix) ? AUTH_PREFIX : customSpecSuffix;
return SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/' + customSpecSuffix + '/' + type + '/' + SUB_QUERY_PREFIX + '/' + download;
return (
SERVER_PREFIX +
'/Raw/' +
SUB_QUERY_PREFIX +
'/' +
customSpecSuffix +
'/' +
type +
'/' +
SUB_QUERY_PREFIX +
'/' +
download
);
}
/**
@ -78,8 +79,7 @@ export function attachmentRaw(type, download, customSpecSuffix)
* @param {string=} customSpecSuffix
* @returns {string}
*/
export function attachmentDownload(download, customSpecSuffix)
{
export function attachmentDownload(download, customSpecSuffix) {
return attachmentRaw('Download', download, customSpecSuffix);
}
@ -88,8 +88,7 @@ export function attachmentDownload(download, customSpecSuffix)
* @param {string=} customSpecSuffix
* @returns {string}
*/
export function attachmentPreview(download, customSpecSuffix)
{
export function attachmentPreview(download, customSpecSuffix) {
return attachmentRaw('View', download, customSpecSuffix);
}
@ -98,8 +97,7 @@ export function attachmentPreview(download, customSpecSuffix)
* @param {string=} customSpecSuffix
* @returns {string}
*/
export function attachmentThumbnailPreview(download, customSpecSuffix)
{
export function attachmentThumbnailPreview(download, customSpecSuffix) {
return attachmentRaw('ViewThumbnail', download, customSpecSuffix);
}
@ -108,8 +106,7 @@ export function attachmentThumbnailPreview(download, customSpecSuffix)
* @param {string=} customSpecSuffix
* @returns {string}
*/
export function attachmentPreviewAsPlain(download, customSpecSuffix)
{
export function attachmentPreviewAsPlain(download, customSpecSuffix) {
return attachmentRaw('ViewAsPlain', download, customSpecSuffix);
}
@ -118,8 +115,7 @@ export function attachmentPreviewAsPlain(download, customSpecSuffix)
* @param {string=} customSpecSuffix
* @returns {string}
*/
export function attachmentFramed(download, customSpecSuffix)
{
export function attachmentFramed(download, customSpecSuffix) {
return attachmentRaw('FramedView', download, customSpecSuffix);
}
@ -127,40 +123,35 @@ export function attachmentFramed(download, customSpecSuffix)
* @param {string} type
* @returns {string}
*/
export function serverRequest(type)
{
export function serverRequest(type) {
return SERVER_PREFIX + '/' + type + '/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/';
}
/**
* @returns {string}
*/
export function upload()
{
export function upload() {
return serverRequest('Upload');
}
/**
* @returns {string}
*/
export function uploadContacts()
{
export function uploadContacts() {
return serverRequest('UploadContacts');
}
/**
* @returns {string}
*/
export function uploadBackground()
{
export function uploadBackground() {
return serverRequest('UploadBackground');
}
/**
* @returns {string}
*/
export function append()
{
export function append() {
return serverRequest('Append');
}
@ -168,8 +159,7 @@ export function append()
* @param {string} email
* @returns {string}
*/
export function change(email)
{
export function change(email) {
return serverRequest('Change') + encodeURIComponent(email) + '/';
}
@ -177,8 +167,7 @@ export function change(email)
* @param {string} add
* @returns {string}
*/
export function ajax(add)
{
export function ajax(add) {
return serverRequest('Ajax') + add;
}
@ -186,26 +175,35 @@ export function ajax(add)
* @param {string} requestHash
* @returns {string}
*/
export function messageViewLink(requestHash)
{
return SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/ViewAsPlain/' + SUB_QUERY_PREFIX + '/' + requestHash;
export function messageViewLink(requestHash) {
return (
SERVER_PREFIX +
'/Raw/' +
SUB_QUERY_PREFIX +
'/' +
AUTH_PREFIX +
'/ViewAsPlain/' +
SUB_QUERY_PREFIX +
'/' +
requestHash
);
}
/**
* @param {string} requestHash
* @returns {string}
*/
export function messageDownloadLink(requestHash)
{
return SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/Download/' + SUB_QUERY_PREFIX + '/' + requestHash;
export function messageDownloadLink(requestHash) {
return (
SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/Download/' + SUB_QUERY_PREFIX + '/' + requestHash
);
}
/**
* @param {string} email
* @returns {string}
*/
export function avatarLink(email)
{
export function avatarLink(email) {
return SERVER_PREFIX + '/Raw/0/Avatar/' + encodeURIComponent(email) + '/';
}
@ -213,8 +211,7 @@ export function avatarLink(email)
* @param {string} hash
* @returns {string}
*/
export function publicLink(hash)
{
export function publicLink(hash) {
return SERVER_PREFIX + '/Raw/0/Public/' + hash + '/';
}
@ -222,16 +219,16 @@ export function publicLink(hash)
* @param {string} hash
* @returns {string}
*/
export function userBackground(hash)
{
return SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/UserBackground/' + SUB_QUERY_PREFIX + '/' + hash;
export function userBackground(hash) {
return (
SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/UserBackground/' + SUB_QUERY_PREFIX + '/' + hash
);
}
/**
* @returns {string}
*/
export function phpInfo()
{
export function phpInfo() {
return SERVER_PREFIX + '/Info';
}
@ -240,24 +237,21 @@ export function phpInfo()
* @param {boolean} isAdmin
* @returns {string}
*/
export function langLink(lang, isAdmin)
{
export function langLink(lang, isAdmin) {
return SERVER_PREFIX + '/Lang/0/' + (isAdmin ? 'Admin' : 'App') + '/' + window.encodeURI(lang) + '/' + VERSION + '/';
}
/**
* @returns {string}
*/
export function exportContactsVcf()
{
export function exportContactsVcf() {
return SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/ContactsVcf/';
}
/**
* @returns {string}
*/
export function exportContactsCsv()
{
export function exportContactsCsv() {
return SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/ContactsCsv/';
}
@ -265,44 +259,43 @@ export function exportContactsCsv()
* @param {boolean} xauth = false
* @returns {string}
*/
export function socialGoogle(xauth = false)
{
return SERVER_PREFIX + 'SocialGoogle' +
('' !== AUTH_PREFIX ? '/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/' : '') + (xauth ? '&xauth=1' : '');
export function socialGoogle(xauth = false) {
return (
SERVER_PREFIX +
'SocialGoogle' +
('' !== AUTH_PREFIX ? '/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/' : '') +
(xauth ? '&xauth=1' : '')
);
}
/**
* @returns {string}
*/
export function socialTwitter()
{
return SERVER_PREFIX + 'SocialTwitter' +
('' !== AUTH_PREFIX ? '/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/' : '');
export function socialTwitter() {
return SERVER_PREFIX + 'SocialTwitter' + ('' !== AUTH_PREFIX ? '/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/' : '');
}
/**
* @returns {string}
*/
export function socialFacebook()
{
return SERVER_PREFIX + 'SocialFacebook' +
('' !== AUTH_PREFIX ? '/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/' : '');
export function socialFacebook() {
return (
SERVER_PREFIX + 'SocialFacebook' + ('' !== AUTH_PREFIX ? '/' + SUB_QUERY_PREFIX + '/' + AUTH_PREFIX + '/' : '')
);
}
/**
* @param {string} path
* @returns {string}
*/
export function staticPrefix(path)
{
export function staticPrefix(path) {
return STATIC_PREFIX + path;
}
/**
* @returns {string}
*/
export function emptyContactPic()
{
export function emptyContactPic() {
return staticPrefix('css/images/empty-contact.png');
}
@ -310,40 +303,35 @@ export function emptyContactPic()
* @param {string} fileName
* @returns {string}
*/
export function sound(fileName)
{
export function sound(fileName) {
return staticPrefix('sounds/' + fileName);
}
/**
* @returns {string}
*/
export function notificationMailIcon()
{
export function notificationMailIcon() {
return staticPrefix('css/images/icom-message-notification.png');
}
/**
* @returns {string}
*/
export function openPgpJs()
{
export function openPgpJs() {
return staticPrefix('js/min/openpgp.min.js');
}
/**
* @returns {string}
*/
export function openPgpWorkerJs()
{
export function openPgpWorkerJs() {
return staticPrefix('js/min/openpgp.worker.min.js');
}
/**
* @returns {string}
*/
export function openPgpWorkerPath()
{
export function openPgpWorkerPath() {
return staticPrefix('js/min/');
}
@ -351,11 +339,9 @@ export function openPgpWorkerPath()
* @param {string} theme
* @returns {string}
*/
export function themePreviewLink(theme)
{
export function themePreviewLink(theme) {
let prefix = VERSION_PREFIX;
if ('@custom' === theme.substr(-7))
{
if ('@custom' === theme.substr(-7)) {
theme = trim(theme.substring(0, theme.length - 7));
prefix = WEB_PREFIX;
}
@ -367,8 +353,7 @@ export function themePreviewLink(theme)
* @param {string} inboxFolderName = 'INBOX'
* @returns {string}
*/
export function inbox(inboxFolderName = 'INBOX')
{
export function inbox(inboxFolderName = 'INBOX') {
return HASH_PREFIX + 'mailbox/' + inboxFolderName;
}
@ -376,16 +361,14 @@ export function inbox(inboxFolderName = 'INBOX')
* @param {string=} screenName = ''
* @returns {string}
*/
export function settings(screenName = '')
{
export function settings(screenName = '') {
return HASH_PREFIX + 'settings' + (screenName ? '/' + screenName : '');
}
/**
* @returns {string}
*/
export function about()
{
export function about() {
return HASH_PREFIX + 'about';
}
@ -393,11 +376,9 @@ export function about()
* @param {string} screenName
* @returns {string}
*/
export function admin(screenName)
{
export function admin(screenName) {
let result = HASH_PREFIX;
switch (screenName)
{
switch (screenName) {
case 'AdminDomains':
result += 'domains';
break;
@ -420,28 +401,24 @@ export function admin(screenName)
* @param {string=} threadUid = ''
* @returns {string}
*/
export function mailBox(folder, page = 1, search = '', threadUid = '')
{
export function mailBox(folder, page = 1, search = '', threadUid = '') {
page = isNormal(page) ? pInt(page) : 1;
search = pString(search);
let result = HASH_PREFIX + 'mailbox/';
if ('' !== folder)
{
if ('' !== folder) {
const resultThreadUid = pInt(threadUid);
result += window.encodeURI(folder) + (0 < resultThreadUid ? '~' + resultThreadUid : '');
}
if (1 < page)
{
result = result.replace(/[\/]+$/, '');
if (1 < page) {
result = result.replace(/[/]+$/, '');
result += '/p' + page;
}
if ('' !== search)
{
result = result.replace(/[\/]+$/, '');
if ('' !== search) {
result = result.replace(/[/]+$/, '');
result += '/' + window.encodeURI(search);
}

View file

@ -1,166 +1,165 @@
/* eslint key-spacing: 0 */
/* eslint quote-props: 0 */
const Mime = {
'eml' : 'message/rfc822',
'mime' : 'message/rfc822',
'txt' : 'text/plain',
'text' : 'text/plain',
'def' : 'text/plain',
'list' : 'text/plain',
'in' : 'text/plain',
'ini' : 'text/plain',
'log' : 'text/plain',
'sql' : 'text/plain',
'cfg' : 'text/plain',
'conf' : 'text/plain',
'asc' : 'text/plain',
'rtx' : 'text/richtext',
'vcard' : 'text/vcard',
'vcf' : 'text/vcard',
'htm' : 'text/html',
'html' : 'text/html',
'csv' : 'text/csv',
'ics' : 'text/calendar',
'ifb' : 'text/calendar',
'xml' : 'text/xml',
'json' : 'application/json',
'swf' : 'application/x-shockwave-flash',
'hlp' : 'application/winhlp',
'wgt' : 'application/widget',
'chm' : 'application/vnd.ms-htmlhelp',
'p10' : 'application/pkcs10',
'p7c' : 'application/pkcs7-mime',
'p7m' : 'application/pkcs7-mime',
'p7s' : 'application/pkcs7-signature',
'torrent' : 'application/x-bittorrent',
'eml': 'message/rfc822',
'mime': 'message/rfc822',
'txt': 'text/plain',
'text': 'text/plain',
'def': 'text/plain',
'list': 'text/plain',
'in': 'text/plain',
'ini': 'text/plain',
'log': 'text/plain',
'sql': 'text/plain',
'cfg': 'text/plain',
'conf': 'text/plain',
'asc': 'text/plain',
'rtx': 'text/richtext',
'vcard': 'text/vcard',
'vcf': 'text/vcard',
'htm': 'text/html',
'html': 'text/html',
'csv': 'text/csv',
'ics': 'text/calendar',
'ifb': 'text/calendar',
'xml': 'text/xml',
'json': 'application/json',
'swf': 'application/x-shockwave-flash',
'hlp': 'application/winhlp',
'wgt': 'application/widget',
'chm': 'application/vnd.ms-htmlhelp',
'p10': 'application/pkcs10',
'p7c': 'application/pkcs7-mime',
'p7m': 'application/pkcs7-mime',
'p7s': 'application/pkcs7-signature',
'torrent': 'application/x-bittorrent',
// scripts
'js' : 'application/javascript',
'pl' : 'text/perl',
'css' : 'text/css',
'asp' : 'text/asp',
'php' : 'application/x-httpd-php',
'php3' : 'application/x-httpd-php',
'php4' : 'application/x-httpd-php',
'php5' : 'application/x-httpd-php',
'phtml' : 'application/x-httpd-php',
'js': 'application/javascript',
'pl': 'text/perl',
'css': 'text/css',
'asp': 'text/asp',
'php': 'application/x-httpd-php',
'php3': 'application/x-httpd-php',
'php4': 'application/x-httpd-php',
'php5': 'application/x-httpd-php',
'phtml': 'application/x-httpd-php',
// images
'png' : 'image/png',
'jpg' : 'image/jpeg',
'jpeg' : 'image/jpeg',
'jpe' : 'image/jpeg',
'jfif' : 'image/jpeg',
'gif' : 'image/gif',
'bmp' : 'image/bmp',
'cgm' : 'image/cgm',
'ief' : 'image/ief',
'ico' : 'image/x-icon',
'tif' : 'image/tiff',
'tiff' : 'image/tiff',
'svg' : 'image/svg+xml',
'svgz' : 'image/svg+xml',
'djv' : 'image/vnd.djvu',
'djvu' : 'image/vnd.djvu',
'webp' : 'image/webp',
'png': 'image/png',
'jpg': 'image/jpeg',
'jpeg': 'image/jpeg',
'jpe': 'image/jpeg',
'jfif': 'image/jpeg',
'gif': 'image/gif',
'bmp': 'image/bmp',
'cgm': 'image/cgm',
'ief': 'image/ief',
'ico': 'image/x-icon',
'tif': 'image/tiff',
'tiff': 'image/tiff',
'svg': 'image/svg+xml',
'svgz': 'image/svg+xml',
'djv': 'image/vnd.djvu',
'djvu': 'image/vnd.djvu',
'webp': 'image/webp',
// archives
'zip' : 'application/zip',
'7z' : 'application/x-7z-compressed',
'rar' : 'application/x-rar-compressed',
'exe' : 'application/x-msdownload',
'dll' : 'application/x-msdownload',
'scr' : 'application/x-msdownload',
'com' : 'application/x-msdownload',
'bat' : 'application/x-msdownload',
'msi' : 'application/x-msdownload',
'cab' : 'application/vnd.ms-cab-compressed',
'gz' : 'application/x-gzip',
'tgz' : 'application/x-gzip',
'bz' : 'application/x-bzip',
'bz2' : 'application/x-bzip2',
'deb' : 'application/x-debian-package',
'zip': 'application/zip',
'7z': 'application/x-7z-compressed',
'rar': 'application/x-rar-compressed',
'exe': 'application/x-msdownload',
'dll': 'application/x-msdownload',
'scr': 'application/x-msdownload',
'com': 'application/x-msdownload',
'bat': 'application/x-msdownload',
'msi': 'application/x-msdownload',
'cab': 'application/vnd.ms-cab-compressed',
'gz': 'application/x-gzip',
'tgz': 'application/x-gzip',
'bz': 'application/x-bzip',
'bz2': 'application/x-bzip2',
'deb': 'application/x-debian-package',
// fonts
'psf' : 'application/x-font-linux-psf',
'otf' : 'application/x-font-otf',
'pcf' : 'application/x-font-pcf',
'snf' : 'application/x-font-snf',
'ttf' : 'application/x-font-ttf',
'ttc' : 'application/x-font-ttf',
'psf': 'application/x-font-linux-psf',
'otf': 'application/x-font-otf',
'pcf': 'application/x-font-pcf',
'snf': 'application/x-font-snf',
'ttf': 'application/x-font-ttf',
'ttc': 'application/x-font-ttf',
// audio
'mp3' : 'audio/mpeg',
'amr' : 'audio/amr',
'aac' : 'audio/x-aac',
'aif' : 'audio/x-aiff',
'aifc' : 'audio/x-aiff',
'aiff' : 'audio/x-aiff',
'wav' : 'audio/x-wav',
'wma' : 'audio/x-ms-wma',
'wax' : 'audio/x-ms-wax',
'midi' : 'audio/midi',
'mp4a' : 'audio/mp4',
'ogg' : 'audio/ogg',
'weba' : 'audio/webm',
'ra' : 'audio/x-pn-realaudio',
'ram' : 'audio/x-pn-realaudio',
'rmp' : 'audio/x-pn-realaudio-plugin',
'm3u' : 'audio/x-mpegurl',
'mp3': 'audio/mpeg',
'amr': 'audio/amr',
'aac': 'audio/x-aac',
'aif': 'audio/x-aiff',
'aifc': 'audio/x-aiff',
'aiff': 'audio/x-aiff',
'wav': 'audio/x-wav',
'wma': 'audio/x-ms-wma',
'wax': 'audio/x-ms-wax',
'midi': 'audio/midi',
'mp4a': 'audio/mp4',
'ogg': 'audio/ogg',
'weba': 'audio/webm',
'ra': 'audio/x-pn-realaudio',
'ram': 'audio/x-pn-realaudio',
'rmp': 'audio/x-pn-realaudio-plugin',
'm3u': 'audio/x-mpegurl',
// video
'flv' : 'video/x-flv',
'qt' : 'video/quicktime',
'mov' : 'video/quicktime',
'wmv' : 'video/windows-media',
'avi' : 'video/x-msvideo',
'mpg' : 'video/mpeg',
'mpeg' : 'video/mpeg',
'mpe' : 'video/mpeg',
'm1v' : 'video/mpeg',
'm2v' : 'video/mpeg',
'3gp' : 'video/3gpp',
'3g2' : 'video/3gpp2',
'h261' : 'video/h261',
'h263' : 'video/h263',
'h264' : 'video/h264',
'jpgv' : 'video/jpgv',
'mp4' : 'video/mp4',
'mp4v' : 'video/mp4',
'mpg4' : 'video/mp4',
'ogv' : 'video/ogg',
'webm' : 'video/webm',
'm4v' : 'video/x-m4v',
'asf' : 'video/x-ms-asf',
'asx' : 'video/x-ms-asf',
'wm' : 'video/x-ms-wm',
'wmx' : 'video/x-ms-wmx',
'wvx' : 'video/x-ms-wvx',
'movie' : 'video/x-sgi-movie',
'flv': 'video/x-flv',
'qt': 'video/quicktime',
'mov': 'video/quicktime',
'wmv': 'video/windows-media',
'avi': 'video/x-msvideo',
'mpg': 'video/mpeg',
'mpeg': 'video/mpeg',
'mpe': 'video/mpeg',
'm1v': 'video/mpeg',
'm2v': 'video/mpeg',
'3gp': 'video/3gpp',
'3g2': 'video/3gpp2',
'h261': 'video/h261',
'h263': 'video/h263',
'h264': 'video/h264',
'jpgv': 'video/jpgv',
'mp4': 'video/mp4',
'mp4v': 'video/mp4',
'mpg4': 'video/mp4',
'ogv': 'video/ogg',
'webm': 'video/webm',
'm4v': 'video/x-m4v',
'asf': 'video/x-ms-asf',
'asx': 'video/x-ms-asf',
'wm': 'video/x-ms-wm',
'wmx': 'video/x-ms-wmx',
'wvx': 'video/x-ms-wvx',
'movie': 'video/x-sgi-movie',
// adobe
'pdf' : 'application/pdf',
'psd' : 'image/vnd.adobe.photoshop',
'ai' : 'application/postscript',
'eps' : 'application/postscript',
'ps' : 'application/postscript',
'pdf': 'application/pdf',
'psd': 'image/vnd.adobe.photoshop',
'ai': 'application/postscript',
'eps': 'application/postscript',
'ps': 'application/postscript',
// ms office
'doc' : 'application/msword',
'dot' : 'application/msword',
'rtf' : 'application/rtf',
'xls' : 'application/vnd.ms-excel',
'ppt' : 'application/vnd.ms-powerpoint',
'docx' : 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'xlsx' : 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'dotx' : 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
'pptx' : 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
'doc': 'application/msword',
'dot': 'application/msword',
'rtf': 'application/rtf',
'xls': 'application/vnd.ms-excel',
'ppt': 'application/vnd.ms-powerpoint',
'docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'dotx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
'pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
// open office
'odt' : 'application/vnd.oasis.opendocument.text',
'ods' : 'application/vnd.oasis.opendocument.spreadsheet'
'odt': 'application/vnd.oasis.opendocument.text',
'ods': 'application/vnd.oasis.opendocument.spreadsheet'
};
export {Mime, Mime as default};
export { Mime, Mime as default };

View file

@ -1,26 +1,32 @@
import window from 'window';
import _ from '_';
import $ from '$';
import moment from 'moment';
import {i18n} from 'Common/Translator';
import { i18n } from 'Common/Translator';
let _moment = null;
let _momentNow = 0;
const updateMomentNow = _.debounce(() => {
_moment = moment();
}, 500, true);
const updateMomentNow = _.debounce(
() => {
_moment = moment();
},
500,
true
);
const updateMomentNowUnix = _.debounce(() => {
_momentNow = moment().unix();
}, 500, true);
const updateMomentNowUnix = _.debounce(
() => {
_momentNow = moment().unix();
},
500,
true
);
/**
* @returns {moment}
*/
export function momentNow()
{
export function momentNow() {
updateMomentNow();
return _moment || moment();
}
@ -28,8 +34,7 @@ export function momentNow()
/**
* @returns {number}
*/
export function momentNowUnix()
{
export function momentNowUnix() {
updateMomentNowUnix();
return _momentNow || 0;
}
@ -38,29 +43,31 @@ export function momentNowUnix()
* @param {number} date
* @returns {string}
*/
export function searchSubtractFormatDateHelper(date)
{
return momentNow().clone().subtract(date, 'days').format('YYYY.MM.DD');
export function searchSubtractFormatDateHelper(date) {
return momentNow()
.clone()
.subtract(date, 'days')
.format('YYYY.MM.DD');
}
/**
* @param {Object} m
* @returns {string}
*/
function formatCustomShortDate(m)
{
function formatCustomShortDate(m) {
const now = momentNow();
if (m && now)
{
switch (true)
{
if (m && now) {
switch (true) {
case 4 >= now.diff(m, 'hours'):
return m.fromNow();
case now.format('L') === m.format('L'):
return i18n('MESSAGE_LIST/TODAY_AT', {
TIME: m.format('LT')
});
case now.clone().subtract(1, 'days').format('L') === m.format('L'):
case now
.clone()
.subtract(1, 'days')
.format('L') === m.format('L'):
return i18n('MESSAGE_LIST/YESTERDAY_AT', {
TIME: m.format('LT')
});
@ -78,29 +85,23 @@ function formatCustomShortDate(m)
* @param {string} formatStr
* @returns {string}
*/
export function format(timeStampInUTC, formatStr)
{
let
m = null,
export function format(timeStampInUTC, formatStr) {
let m = null,
result = '';
const now = momentNowUnix();
timeStampInUTC = 0 < timeStampInUTC ? timeStampInUTC : (0 === timeStampInUTC ? now : 0);
timeStampInUTC = 0 < timeStampInUTC ? timeStampInUTC : 0 === timeStampInUTC ? now : 0;
timeStampInUTC = now < timeStampInUTC ? now : timeStampInUTC;
m = 0 < timeStampInUTC ? moment.unix(timeStampInUTC) : null;
if (m && 1970 === m.year())
{
if (m && 1970 === m.year()) {
m = null;
}
if (m)
{
switch (formatStr)
{
if (m) {
switch (formatStr) {
case 'FROMNOW':
result = m.fromNow();
break;
@ -123,26 +124,20 @@ export function format(timeStampInUTC, formatStr)
* @param {Object} element
* @returns {void}
*/
export function momentToNode(element)
{
let
key = '',
export function momentToNode(element) {
let key = '',
time = 0;
const
$el = $(element);
const $el = $(element);
time = $el.data('moment-time');
if (time)
{
if (time) {
key = $el.data('moment-format');
if (key)
{
if (key) {
$el.text(format(time, key));
}
key = $el.data('moment-format-title');
if (key)
{
if (key) {
$el.attr('title', format(time, key));
}
}
@ -151,8 +146,7 @@ export function momentToNode(element)
/**
* @returns {void}
*/
export function reload()
{
export function reload() {
_.defer(() => {
$('.moment', window.document).each((index, item) => {
momentToNode(item);

View file

@ -1,11 +1,9 @@
import _ from '_';
import {isFunc, isArray, isUnd} from 'Common/Utils';
import {data as GlobalsData} from 'Common/Globals';
import { isFunc, isArray, isUnd } from 'Common/Utils';
import { data as GlobalsData } from 'Common/Globals';
import * as Settings from 'Storage/Settings';
const
SIMPLE_HOOKS = {},
const SIMPLE_HOOKS = {},
USER_VIEW_MODELS_HOOKS = [],
ADMIN_VIEW_MODELS_HOOKS = [];
@ -13,12 +11,9 @@ const
* @param {string} name
* @param {Function} callback
*/
export function addHook(name, callback)
{
if (isFunc(callback))
{
if (!isArray(SIMPLE_HOOKS[name]))
{
export function addHook(name, callback) {
if (isFunc(callback)) {
if (!isArray(SIMPLE_HOOKS[name])) {
SIMPLE_HOOKS[name] = [];
}
@ -30,10 +25,8 @@ export function addHook(name, callback)
* @param {string} name
* @param {Array=} args = []
*/
export function runHook(name, args = [])
{
if (isArray(SIMPLE_HOOKS[name]))
{
export function runHook(name, args = []) {
if (isArray(SIMPLE_HOOKS[name])) {
_.each(SIMPLE_HOOKS[name], (callback) => {
callback(...args);
});
@ -44,8 +37,7 @@ export function runHook(name, args = [])
* @param {string} name
* @returns {?}
*/
export function mainSettingsGet(name)
{
export function mainSettingsGet(name) {
return Settings.settingsGet(name);
}
@ -55,10 +47,8 @@ export function mainSettingsGet(name)
* @param {Object=} parameters
* @param {?number=} timeout
*/
export function remoteRequest(callback, action, parameters, timeout)
{
if (GlobalsData.__APP__)
{
export function remoteRequest(callback, action, parameters, timeout) {
if (GlobalsData.__APP__) {
GlobalsData.__APP__.remote().defaultRequest(callback, 'Plugin' + action, parameters, timeout);
}
}
@ -69,8 +59,7 @@ export function remoteRequest(callback, action, parameters, timeout)
* @param {string} template
* @param {string} route
*/
export function addSettingsViewModel(SettingsViewModelClass, template, labelName, route)
{
export function addSettingsViewModel(SettingsViewModelClass, template, labelName, route) {
USER_VIEW_MODELS_HOOKS.push([SettingsViewModelClass, template, labelName, route]);
}
@ -80,16 +69,14 @@ export function addSettingsViewModel(SettingsViewModelClass, template, labelName
* @param {string} template
* @param {string} route
*/
export function addSettingsViewModelForAdmin(SettingsViewModelClass, template, labelName, route)
{
export function addSettingsViewModelForAdmin(SettingsViewModelClass, template, labelName, route) {
ADMIN_VIEW_MODELS_HOOKS.push([SettingsViewModelClass, template, labelName, route]);
}
/**
* @param {boolean} admin
*/
export function runSettingsViewModelHooks(admin)
{
export function runSettingsViewModelHooks(admin) {
const Knoin = require('Knoin/Knoin');
_.each(admin ? ADMIN_VIEW_MODELS_HOOKS : USER_VIEW_MODELS_HOOKS, (view) => {
Knoin.addSettingsViewModel(view[0], view[1], view[2], view[3]);
@ -101,8 +88,7 @@ export function runSettingsViewModelHooks(admin)
* @param {string} name
* @returns {?}
*/
export function settingsGet(pluginSection, name)
{
export function settingsGet(pluginSection, name) {
let plugins = Settings.settingsGet('Plugins');
plugins = plugins && !isUnd(plugins[pluginSection]) ? plugins[pluginSection] : null;
return plugins ? (isUnd(plugins[name]) ? null : plugins[name]) : null;

View file

@ -1,13 +1,11 @@
import $ from '$';
import _ from '_';
import key from 'key';
import ko from 'ko';
import {EventKeyCode} from 'Common/Enums';
import {isArray, inArray, noop, noopTrue} from 'Common/Utils';
import { EventKeyCode } from 'Common/Enums';
import { isArray, inArray, noop, noopTrue } from 'Common/Utils';
class Selector
{
class Selector {
list;
listChecked;
isListChecked;
@ -41,12 +39,18 @@ class Selector
* @param {string} sItemCheckedSelector
* @param {string} sItemFocusedSelector
*/
constructor(koList, koSelectedItem, koFocusedItem,
sItemSelector, sItemSelectedSelector, sItemCheckedSelector, sItemFocusedSelector)
{
constructor(
koList,
koSelectedItem,
koFocusedItem,
sItemSelector,
sItemSelectedSelector,
sItemCheckedSelector,
sItemFocusedSelector
) {
this.list = koList;
this.listChecked = ko.computed(() => _.filter(this.list(), (item) => item.checked())).extend({rateLimit: 0});
this.listChecked = ko.computed(() => _.filter(this.list(), (item) => item.checked())).extend({ rateLimit: 0 });
this.isListChecked = ko.computed(() => 0 < this.listChecked().length);
this.focusedItem = koFocusedItem || ko.observable(null);
@ -55,51 +59,37 @@ class Selector
this.itemSelectedThrottle = _.debounce(_.bind(this.itemSelected, this), 300);
this.listChecked.subscribe((items) => {
if (0 < items.length)
{
if (null === this.selectedItem())
{
if (this.selectedItem.valueHasMutated)
{
if (0 < items.length) {
if (null === this.selectedItem()) {
if (this.selectedItem.valueHasMutated) {
this.selectedItem.valueHasMutated();
}
}
else
{
} else {
this.selectedItem(null);
}
}
else if (this.autoSelect() && this.focusedItem())
{
} else if (this.autoSelect() && this.focusedItem()) {
this.selectedItem(this.focusedItem());
}
}, this);
this.selectedItem.subscribe((item) => {
if (item)
{
if (this.isListChecked())
{
if (item) {
if (this.isListChecked()) {
_.each(this.listChecked(), (subItem) => {
subItem.checked(false);
});
}
if (this.selectedItemUseCallback)
{
if (this.selectedItemUseCallback) {
this.itemSelectedThrottle(item);
}
}
else if (this.selectedItemUseCallback)
{
} else if (this.selectedItemUseCallback) {
this.itemSelected(null);
}
}, this);
this.selectedItem = this.selectedItem.extend({toggleSubscribeProperty: [this, 'selected']});
this.focusedItem = this.focusedItem.extend({toggleSubscribeProperty: [null, 'focused']});
this.selectedItem = this.selectedItem.extend({ toggleSubscribeProperty: [this, 'selected'] });
this.focusedItem = this.focusedItem.extend({ toggleSubscribeProperty: [null, 'focused'] });
this.sItemSelector = sItemSelector;
this.sItemSelectedSelector = sItemSelectedSelector;
@ -107,87 +97,75 @@ class Selector
this.sItemFocusedSelector = sItemFocusedSelector;
this.focusedItem.subscribe((item) => {
if (item)
{
if (item) {
this.sLastUid = this.getItemUid(item);
}
}, this);
let
aCache = [],
let aCache = [],
aCheckedCache = [],
mFocused = null,
mSelected = null;
this.list.subscribe((items) => {
this.list.subscribe(
(items) => {
if (isArray(items)) {
_.each(items, (item) => {
if (item) {
const uid = this.getItemUid(item);
if (isArray(items))
{
_.each(items, (item) => {
if (item)
{
const uid = this.getItemUid(item);
aCache.push(uid);
if (item.checked())
{
aCheckedCache.push(uid);
aCache.push(uid);
if (item.checked()) {
aCheckedCache.push(uid);
}
if (null === mFocused && item.focused()) {
mFocused = uid;
}
if (null === mSelected && item.selected()) {
mSelected = uid;
}
}
if (null === mFocused && item.focused())
{
mFocused = uid;
}
if (null === mSelected && item.selected())
{
mSelected = uid;
}
}
});
}
}, this, 'beforeChange');
});
}
},
this,
'beforeChange'
);
this.list.subscribe((aItems) => {
let
temp = null,
let temp = null,
getNext = false,
isNextFocused = mFocused,
isChecked = false,
isSelected = false,
len = 0;
const
uids = [];
const uids = [];
this.selectedItemUseCallback = false;
this.focusedItem(null);
this.selectedItem(null);
if (isArray(aItems))
{
if (isArray(aItems)) {
len = aCheckedCache.length;
_.each(aItems, (item) => {
const uid = this.getItemUid(item);
uids.push(uid);
if (null !== mFocused && mFocused === uid)
{
if (null !== mFocused && mFocused === uid) {
this.focusedItem(item);
mFocused = null;
}
if (0 < len && -1 < inArray(uid, aCheckedCache))
{
if (0 < len && -1 < inArray(uid, aCheckedCache)) {
isChecked = true;
item.checked(true);
len -= 1;
}
if (!isChecked && null !== mSelected && mSelected === uid)
{
if (!isChecked && null !== mSelected && mSelected === uid) {
isSelected = true;
this.selectedItem(item);
mSelected = null;
@ -196,31 +174,22 @@ class Selector
this.selectedItemUseCallback = true;
if (!isChecked && !isSelected && this.autoSelect())
{
if (this.focusedItem())
{
if (!isChecked && !isSelected && this.autoSelect()) {
if (this.focusedItem()) {
this.selectedItem(this.focusedItem());
}
else if (0 < aItems.length)
{
if (null !== isNextFocused)
{
} else if (0 < aItems.length) {
if (null !== isNextFocused) {
getNext = false;
isNextFocused = _.find(aCache, (sUid) => {
if (getNext && -1 < inArray(sUid, uids))
{
if (getNext && -1 < inArray(sUid, uids)) {
return sUid;
}
else if (isNextFocused === sUid)
{
} else if (isNextFocused === sUid) {
getNext = true;
}
return false;
});
if (isNextFocused)
{
if (isNextFocused) {
temp = _.find(aItems, (oItem) => isNextFocused === this.getItemUid(oItem));
}
}
@ -230,23 +199,22 @@ class Selector
}
}
if ((0 !== this.iSelectNextHelper || 0 !== this.iFocusedNextHelper) && 0 < aItems.length && !this.focusedItem())
{
if (
(0 !== this.iSelectNextHelper || 0 !== this.iFocusedNextHelper) &&
0 < aItems.length &&
!this.focusedItem()
) {
temp = null;
if (0 !== this.iFocusedNextHelper)
{
if (0 !== this.iFocusedNextHelper) {
temp = aItems[-1 === this.iFocusedNextHelper ? aItems.length - 1 : 0] || null;
}
if (!temp && 0 !== this.iSelectNextHelper)
{
if (!temp && 0 !== this.iSelectNextHelper) {
temp = aItems[-1 === this.iSelectNextHelper ? aItems.length - 1 : 0] || null;
}
if (temp)
{
if (0 !== this.iSelectNextHelper)
{
if (temp) {
if (0 !== this.iSelectNextHelper) {
this.selectedItem(temp || null);
}
@ -266,21 +234,15 @@ class Selector
aCheckedCache = [];
mFocused = null;
mSelected = null;
});
}
itemSelected(item) {
if (this.isListChecked())
{
if (!item)
{
if (this.isListChecked()) {
if (!item) {
(this.oCallbacks.onItemSelect || noop)(item || null);
}
}
else if (item)
{
} else if (item) {
(this.oCallbacks.onItemSelect || noop)(item);
}
}
@ -305,16 +267,13 @@ class Selector
}
init(contentVisible, contentScrollable, keyScope = 'all') {
this.oContentVisible = contentVisible;
this.oContentScrollable = contentScrollable;
if (this.oContentVisible && this.oContentScrollable)
{
if (this.oContentVisible && this.oContentScrollable) {
$(this.oContentVisible)
.on('selectstart', (event) => {
if (event && event.preventDefault)
{
if (event && event.preventDefault) {
event.preventDefault();
}
})
@ -323,14 +282,10 @@ class Selector
})
.on('click', this.sItemCheckedSelector, (event) => {
const item = ko.dataFor(event.currentTarget);
if (item)
{
if (event && event.shiftKey)
{
if (item) {
if (event && event.shiftKey) {
this.actionClick(item, event);
}
else
{
} else {
this.focusedItem(item);
item.checked(!item.checked());
}
@ -338,8 +293,7 @@ class Selector
});
key('enter', keyScope, () => {
if (this.focusedItem() && !this.focusedItem().selected())
{
if (this.focusedItem() && !this.focusedItem().selected()) {
this.actionClick(this.focusedItem());
return false;
}
@ -350,11 +304,9 @@ class Selector
key('ctrl+up, command+up, ctrl+down, command+down', keyScope, () => false);
key('up, shift+up, down, shift+down, home, end, pageup, pagedown, insert, space', keyScope, (event, handler) => {
if (event && handler && handler.shortcut)
{
if (event && handler && handler.shortcut) {
let eventKey = 0;
switch (handler.shortcut)
{
switch (handler.shortcut) {
case 'up':
case 'shift+up':
eventKey = EventKeyCode.Up;
@ -384,8 +336,7 @@ class Selector
// no default
}
if (0 < eventKey)
{
if (0 < eventKey) {
this.newSelectPosition(eventKey, key.shift);
return false;
}
@ -415,12 +366,10 @@ class Selector
* @returns {string}
*/
getItemUid(item) {
let uid = '';
const getItemUidCallback = this.oCallbacks.onItemGetUid || null;
if (getItemUidCallback && item)
{
if (getItemUidCallback && item) {
uid = getItemUidCallback(item);
}
@ -433,64 +382,56 @@ class Selector
* @param {boolean=} bForceSelect = false
*/
newSelectPosition(iEventKeyCode, bShiftKey, bForceSelect) {
let
index = 0,
let index = 0,
isNext = false,
isStop = false,
result = null;
const
pageStep = 10,
const pageStep = 10,
list = this.list(),
listLen = list ? list.length : 0,
focused = this.focusedItem();
if (0 < listLen)
{
if (!focused)
{
if (EventKeyCode.Down === iEventKeyCode || EventKeyCode.Insert === iEventKeyCode ||
EventKeyCode.Space === iEventKeyCode || EventKeyCode.Home === iEventKeyCode ||
EventKeyCode.PageUp === iEventKeyCode)
{
if (0 < listLen) {
if (!focused) {
if (
EventKeyCode.Down === iEventKeyCode ||
EventKeyCode.Insert === iEventKeyCode ||
EventKeyCode.Space === iEventKeyCode ||
EventKeyCode.Home === iEventKeyCode ||
EventKeyCode.PageUp === iEventKeyCode
) {
result = list[0];
}
else if (EventKeyCode.Up === iEventKeyCode || EventKeyCode.End === iEventKeyCode ||
EventKeyCode.PageDown === iEventKeyCode)
{
} else if (
EventKeyCode.Up === iEventKeyCode ||
EventKeyCode.End === iEventKeyCode ||
EventKeyCode.PageDown === iEventKeyCode
) {
result = list[list.length - 1];
}
}
else if (focused)
{
if (EventKeyCode.Down === iEventKeyCode || EventKeyCode.Up === iEventKeyCode ||
EventKeyCode.Insert === iEventKeyCode || EventKeyCode.Space === iEventKeyCode)
{
} else if (focused) {
if (
EventKeyCode.Down === iEventKeyCode ||
EventKeyCode.Up === iEventKeyCode ||
EventKeyCode.Insert === iEventKeyCode ||
EventKeyCode.Space === iEventKeyCode
) {
_.each(list, (item) => {
if (!isStop)
{
switch (iEventKeyCode)
{
if (!isStop) {
switch (iEventKeyCode) {
case EventKeyCode.Up:
if (focused === item)
{
if (focused === item) {
isStop = true;
}
else
{
} else {
result = item;
}
break;
case EventKeyCode.Down:
case EventKeyCode.Insert:
if (isNext)
{
if (isNext) {
result = item;
isStop = true;
}
else if (focused === item)
{
} else if (focused === item) {
isNext = true;
}
break;
@ -499,41 +440,27 @@ class Selector
}
});
if (!result && (EventKeyCode.Down === iEventKeyCode || EventKeyCode.Up === iEventKeyCode))
{
if (!result && (EventKeyCode.Down === iEventKeyCode || EventKeyCode.Up === iEventKeyCode)) {
this.doUpUpOrDownDown(EventKeyCode.Up === iEventKeyCode);
}
}
else if (EventKeyCode.Home === iEventKeyCode || EventKeyCode.End === iEventKeyCode)
{
if (EventKeyCode.Home === iEventKeyCode)
{
} else if (EventKeyCode.Home === iEventKeyCode || EventKeyCode.End === iEventKeyCode) {
if (EventKeyCode.Home === iEventKeyCode) {
result = list[0];
}
else if (EventKeyCode.End === iEventKeyCode)
{
} else if (EventKeyCode.End === iEventKeyCode) {
result = list[list.length - 1];
}
}
else if (EventKeyCode.PageDown === iEventKeyCode)
{
for (; index < listLen; index++)
{
if (focused === list[index])
{
} else if (EventKeyCode.PageDown === iEventKeyCode) {
for (; index < listLen; index++) {
if (focused === list[index]) {
index += pageStep;
index = listLen - 1 < index ? listLen - 1 : index;
result = list[index];
break;
}
}
}
else if (EventKeyCode.PageUp === iEventKeyCode)
{
for (index = listLen; 0 <= index; index--)
{
if (focused === list[index])
{
} else if (EventKeyCode.PageUp === iEventKeyCode) {
for (index = listLen; 0 <= index; index--) {
if (focused === list[index]) {
index -= pageStep;
index = 0 > index ? 0 : index;
result = list[index];
@ -544,41 +471,28 @@ class Selector
}
}
if (result)
{
if (result) {
this.focusedItem(result);
if (focused)
{
if (bShiftKey)
{
if (EventKeyCode.Up === iEventKeyCode || EventKeyCode.Down === iEventKeyCode)
{
if (focused) {
if (bShiftKey) {
if (EventKeyCode.Up === iEventKeyCode || EventKeyCode.Down === iEventKeyCode) {
focused.checked(!focused.checked());
}
}
else if (EventKeyCode.Insert === iEventKeyCode || EventKeyCode.Space === iEventKeyCode)
{
} else if (EventKeyCode.Insert === iEventKeyCode || EventKeyCode.Space === iEventKeyCode) {
focused.checked(!focused.checked());
}
}
if ((this.autoSelect() || !!bForceSelect) &&
!this.isListChecked() && EventKeyCode.Space !== iEventKeyCode)
{
if ((this.autoSelect() || !!bForceSelect) && !this.isListChecked() && EventKeyCode.Space !== iEventKeyCode) {
this.selectedItem(result);
}
this.scrollToFocused();
}
else if (focused)
{
if (bShiftKey && (EventKeyCode.Up === iEventKeyCode || EventKeyCode.Down === iEventKeyCode))
{
} else if (focused) {
if (bShiftKey && (EventKeyCode.Up === iEventKeyCode || EventKeyCode.Down === iEventKeyCode)) {
focused.checked(!focused.checked());
}
else if (EventKeyCode.Insert === iEventKeyCode || EventKeyCode.Space === iEventKeyCode)
{
} else if (EventKeyCode.Insert === iEventKeyCode || EventKeyCode.Space === iEventKeyCode) {
focused.checked(!focused.checked());
}
@ -590,30 +504,25 @@ class Selector
* @returns {boolean}
*/
scrollToFocused() {
if (!this.oContentVisible || !this.oContentScrollable)
{
if (!this.oContentVisible || !this.oContentScrollable) {
return false;
}
const
offset = 20,
const offset = 20,
list = this.list(),
$focused = $(this.sItemFocusedSelector, this.oContentScrollable),
pos = $focused.position(),
visibleHeight = this.oContentVisible.height(),
focusedHeight = $focused.outerHeight();
if (list && list[0] && list[0].focused())
{
if (list && list[0] && list[0].focused()) {
this.oContentScrollable.scrollTop(0);
return true;
}
else if (pos && (0 > pos.top || pos.top + focusedHeight > visibleHeight))
{
this.oContentScrollable.scrollTop(0 > pos.top ?
this.oContentScrollable.scrollTop() + pos.top - offset :
this.oContentScrollable.scrollTop() + pos.top - visibleHeight + focusedHeight + offset
} else if (pos && (0 > pos.top || pos.top + focusedHeight > visibleHeight)) {
this.oContentScrollable.scrollTop(
0 > pos.top
? this.oContentScrollable.scrollTop() + pos.top - offset
: this.oContentScrollable.scrollTop() + pos.top - visibleHeight + focusedHeight + offset
);
return true;
@ -627,28 +536,21 @@ class Selector
* @returns {boolean}
*/
scrollToTop(fast = false) {
if (!this.oContentVisible || !this.oContentScrollable)
{
if (!this.oContentVisible || !this.oContentScrollable) {
return false;
}
if (fast || 50 > this.oContentScrollable.scrollTop())
{
if (fast || 50 > this.oContentScrollable.scrollTop()) {
this.oContentScrollable.scrollTop(0);
}
else
{
this.oContentScrollable.stop().animate({scrollTop: 0}, 200);
} else {
this.oContentScrollable.stop().animate({ scrollTop: 0 }, 200);
}
return true;
}
eventClickFunction(item, event) {
let
index = 0,
let index = 0,
length = 0,
changeRange = false,
isInRange = false,
@ -658,31 +560,25 @@ class Selector
lineUid = '';
const uid = this.getItemUid(item);
if (event && event.shiftKey)
{
if ('' !== uid && '' !== this.sLastUid && uid !== this.sLastUid)
{
if (event && event.shiftKey) {
if ('' !== uid && '' !== this.sLastUid && uid !== this.sLastUid) {
list = this.list();
checked = item.checked();
for (index = 0, length = list.length; index < length; index++)
{
for (index = 0, length = list.length; index < length; index++) {
listItem = list[index];
lineUid = this.getItemUid(listItem);
changeRange = false;
if (lineUid === this.sLastUid || lineUid === uid)
{
if (lineUid === this.sLastUid || lineUid === uid) {
changeRange = true;
}
if (changeRange)
{
if (changeRange) {
isInRange = !isInRange;
}
if (isInRange || changeRange)
{
if (isInRange || changeRange) {
listItem.checked(checked);
}
}
@ -697,17 +593,12 @@ class Selector
* @param {Object=} event
*/
actionClick(item, event = null) {
if (item)
{
if (item) {
let click = true;
if (event)
{
if (event.shiftKey && !(event.ctrlKey || event.metaKey) && !event.altKey)
{
if (event) {
if (event.shiftKey && !(event.ctrlKey || event.metaKey) && !event.altKey) {
click = false;
if ('' === this.sLastUid)
{
if ('' === this.sLastUid) {
this.sLastUid = this.getItemUid(item);
}
@ -715,14 +606,11 @@ class Selector
this.eventClickFunction(item, event);
this.focusedItem(item);
}
else if ((event.ctrlKey || event.metaKey) && !event.shiftKey && !event.altKey)
{
} else if ((event.ctrlKey || event.metaKey) && !event.shiftKey && !event.altKey) {
click = false;
this.focusedItem(item);
if (this.selectedItem() && item !== this.selectedItem())
{
if (this.selectedItem() && item !== this.selectedItem()) {
this.selectedItem().checked(true);
}
@ -730,8 +618,7 @@ class Selector
}
}
if (click)
{
if (click) {
this.selectMessageItem(item);
}
}
@ -748,4 +635,4 @@ class Selector
}
}
export {Selector, Selector as default};
export { Selector, Selector as default };

View file

@ -1,13 +1,12 @@
import window from 'window';
import _ from '_';
import $ from '$';
import ko from 'ko';
import {Notification, UploadErrorCode} from 'Common/Enums';
import {pInt, isUnd, isNull, has, microtime, inArray} from 'Common/Utils';
import {$html, bAnimationSupported} from 'Common/Globals';
import {reload as momentorReload} from 'Common/Momentor';
import {langLink} from 'Common/Links';
import { Notification, UploadErrorCode } from 'Common/Enums';
import { pInt, isUnd, isNull, has, microtime, inArray } from 'Common/Utils';
import { $html, bAnimationSupported } from 'Common/Globals';
import { reload as momentorReload } from 'Common/Momentor';
import { langLink } from 'Common/Links';
let I18N_DATA = window.rainloopI18N || {};
@ -91,23 +90,17 @@ export const trigger = ko.observable(false);
* @param {string=} defaulValue
* @returns {string}
*/
export function i18n(key, valueList, defaulValue)
{
let
valueName = '',
export function i18n(key, valueList, defaulValue) {
let valueName = '',
result = I18N_DATA[key];
if (isUnd(result))
{
if (isUnd(result)) {
result = isUnd(defaulValue) ? key : defaulValue;
}
if (!isUnd(valueList) && !isNull(valueList))
{
for (valueName in valueList)
{
if (has(valueList, valueName))
{
if (!isUnd(valueList) && !isNull(valueList)) {
for (valueName in valueList) {
if (has(valueList, valueName)) {
result = result.replace('%' + valueName + '%', valueList[valueName]);
}
}
@ -117,17 +110,12 @@ export function i18n(key, valueList, defaulValue)
}
const i18nToNode = (element) => {
const
$el = $(element),
const $el = $(element),
key = $el.data('i18n');
if (key)
{
if ('[' === key.substr(0, 1))
{
switch (key.substr(0, 6))
{
if (key) {
if ('[' === key.substr(0, 1)) {
switch (key.substr(0, 6)) {
case '[html]':
$el.html(i18n(key.substr(6)));
break;
@ -139,9 +127,7 @@ const i18nToNode = (element) => {
break;
// no default
}
}
else
{
} else {
$el.text(i18n(key));
}
}
@ -151,16 +137,13 @@ const i18nToNode = (element) => {
* @param {Object} elements
* @param {boolean=} animate = false
*/
export function i18nToNodes(elements, animate = false)
{
export function i18nToNodes(elements, animate = false) {
_.defer(() => {
$('[data-i18n]', elements).each((index, item) => {
i18nToNode(item);
});
if (animate && bAnimationSupported)
{
if (animate && bAnimationSupported) {
$('.i18n-animation[data-i18n]', elements).letterfx({
'fx': 'fall fade',
'backwards': false,
@ -174,8 +157,7 @@ export function i18nToNodes(elements, animate = false)
}
const reloadData = () => {
if (window.rainloopI18N)
{
if (window.rainloopI18N) {
I18N_DATA = window.rainloopI18N || {};
i18nToNodes(window.document, true);
@ -190,8 +172,7 @@ const reloadData = () => {
/**
* @returns {void}
*/
export function initNotificationLanguage()
{
export function initNotificationLanguage() {
I18N_NOTIFICATION_MAP.forEach((item) => {
I18N_NOTIFICATION_DATA[item[0]] = i18n(item[1]);
});
@ -201,28 +182,21 @@ export function initNotificationLanguage()
* @param {Function} startCallback
* @param {Function=} langCallback = null
*/
export function initOnStartOrLangChange(startCallback, langCallback = null)
{
if (startCallback)
{
export function initOnStartOrLangChange(startCallback, langCallback = null) {
if (startCallback) {
startCallback();
}
if (langCallback)
{
if (langCallback) {
trigger.subscribe(() => {
if (startCallback)
{
if (startCallback) {
startCallback();
}
if (langCallback)
{
if (langCallback) {
langCallback();
}
});
}
else if (startCallback)
{
} else if (startCallback) {
trigger.subscribe(startCallback);
}
}
@ -233,18 +207,18 @@ export function initOnStartOrLangChange(startCallback, langCallback = null)
* @param {*=} defCode = null
* @returns {string}
*/
export function getNotification(code, message = '', defCode = null)
{
export function getNotification(code, message = '', defCode = null) {
code = window.parseInt(code, 10) || 0;
if (Notification.ClientViewError === code && message)
{
if (Notification.ClientViewError === code && message) {
return message;
}
defCode = defCode ? (window.parseInt(defCode, 10)) || 0 : 0;
return isUnd(I18N_NOTIFICATION_DATA[code]) ? (
defCode && isUnd(I18N_NOTIFICATION_DATA[defCode]) ? I18N_NOTIFICATION_DATA[defCode] : ''
) : I18N_NOTIFICATION_DATA[code];
defCode = defCode ? window.parseInt(defCode, 10) || 0 : 0;
return isUnd(I18N_NOTIFICATION_DATA[code])
? defCode && isUnd(I18N_NOTIFICATION_DATA[defCode])
? I18N_NOTIFICATION_DATA[defCode]
: ''
: I18N_NOTIFICATION_DATA[code];
}
/**
@ -252,21 +226,19 @@ export function getNotification(code, message = '', defCode = null)
* @param {number} defCode = Notification.UnknownNotification
* @returns {string}
*/
export function getNotificationFromResponse(response, defCode = Notification.UnknownNotification)
{
return response && response.ErrorCode ?
getNotification(pInt(response.ErrorCode), response.ErrorMessage || '') : getNotification(defCode);
export function getNotificationFromResponse(response, defCode = Notification.UnknownNotification) {
return response && response.ErrorCode
? getNotification(pInt(response.ErrorCode), response.ErrorMessage || '')
: getNotification(defCode);
}
/**
* @param {*} code
* @returns {string}
*/
export function getUploadErrorDescByCode(code)
{
export function getUploadErrorDescByCode(code) {
let result = '';
switch (window.parseInt(code, 10) || 0)
{
switch (window.parseInt(code, 10) || 0) {
case UploadErrorCode.FileIsTooBig:
result = i18n('UPLOAD/ERROR_FILE_IS_TOO_BIG');
break;
@ -297,8 +269,7 @@ export function getUploadErrorDescByCode(code)
* @param {boolean} admin
* @param {string} language
*/
export function reload(admin, language)
{
export function reload(admin, language) {
const start = microtime();
$html.addClass('rl-changing-language');
@ -308,27 +279,31 @@ export function reload(admin, language)
url: langLink(language, admin),
dataType: 'script',
cache: true
}).then(() => {
_.delay(() => {
}).then(
() => {
_.delay(
() => {
reloadData();
reloadData();
const isRtl = -1 < inArray((language || '').toLowerCase(), ['ar', 'ar_sa', 'he', 'he_he', 'ur', 'ur_ir']);
const isRtl = -1 < inArray((language || '').toLowerCase(), ['ar', 'ar_sa', 'he', 'he_he', 'ur', 'ur_ir']);
$html
.removeClass('rl-changing-language')
.removeClass('rl-rtl rl-ltr')
// .attr('dir', isRtl ? 'rtl' : 'ltr')
.addClass(isRtl ? 'rl-rtl' : 'rl-ltr');
$html
.removeClass('rl-changing-language')
.removeClass('rl-rtl rl-ltr')
// .attr('dir', isRtl ? 'rtl' : 'ltr')
.addClass(isRtl ? 'rl-rtl' : 'rl-ltr');
resolve();
}, 500 < microtime() - start ? 1 : 500);
}, () => {
$html.removeClass('rl-changing-language');
window.rainloopI18N = null;
reject();
});
resolve();
},
500 < microtime() - start ? 1 : 500
);
},
() => {
$html.removeClass('rl-changing-language');
window.rainloopI18N = null;
reject();
}
);
});
}

File diff suppressed because it is too large Load diff

View file

@ -1,18 +1,15 @@
import $ from '$';
import ko from 'ko';
import {isUnd} from 'Common/Utils';
import {i18nToNodes} from 'Common/Translator';
import { isUnd } from 'Common/Utils';
import { i18nToNodes } from 'Common/Translator';
class AbstractComponent
{
class AbstractComponent {
disposable = [];
dispose() {
this.disposable.forEach((funcToDispose) => {
if (funcToDispose && funcToDispose.dispose)
{
if (funcToDispose && funcToDispose.dispose) {
funcToDispose.dispose();
}
});
@ -25,22 +22,19 @@ class AbstractComponent
* @returns {Object}
*/
const componentExportHelper = (ClassObject, templateID = '') => ({
template: templateID ? {element: templateID} : '<b></b>',
template: templateID ? { element: templateID } : '<b></b>',
viewModel: {
createViewModel: (params, componentInfo) => {
params = params || {};
params.element = null;
if (componentInfo && componentInfo.element)
{
if (componentInfo && componentInfo.element) {
params.component = componentInfo;
params.element = $(componentInfo.element);
i18nToNodes(params.element);
if (!isUnd(params.inline) && ko.unwrap(params.inline))
{
if (!isUnd(params.inline) && ko.unwrap(params.inline)) {
params.element.css('display', 'inline-block');
}
}
@ -50,4 +44,4 @@ const componentExportHelper = (ClassObject, templateID = '') => ({
}
});
export {AbstractComponent, componentExportHelper};
export { AbstractComponent, componentExportHelper };

View file

@ -1,16 +1,13 @@
import ko from 'ko';
import {isUnd, trim, pInt} from 'Common/Utils';
import {SaveSettingsStep} from 'Common/Enums';
import {AbstractComponent} from 'Component/Abstract';
import { isUnd, trim, pInt } from 'Common/Utils';
import { SaveSettingsStep } from 'Common/Enums';
import { AbstractComponent } from 'Component/Abstract';
class AbstractInput extends AbstractComponent
{
class AbstractInput extends AbstractComponent {
/**
* @param {Object} params
*/
constructor(params) {
super();
this.value = params.value || '';
@ -28,32 +25,26 @@ class AbstractInput extends AbstractComponent
this.classForTrigger = ko.observable('');
this.className = ko.computed(() => {
const
size = ko.unwrap(this.size),
const size = ko.unwrap(this.size),
suffixValue = this.trigger ? ' ' + trim('settings-saved-trigger-input ' + this.classForTrigger()) : '';
return (0 < size ? 'span' + size : '') + suffixValue;
});
if (!isUnd(params.width) && params.element)
{
if (!isUnd(params.width) && params.element) {
params.element.find('input,select,textarea').css('width', params.width);
}
this.disposable.push(this.className);
if (this.trigger)
{
if (this.trigger) {
this.setTriggerState(this.trigger());
this.disposable.push(
this.trigger.subscribe(this.setTriggerState, this)
);
this.disposable.push(this.trigger.subscribe(this.setTriggerState, this));
}
}
setTriggerState(value) {
switch (pInt(value))
{
switch (pInt(value)) {
case SaveSettingsStep.TrueResult:
this.classForTrigger('success');
break;
@ -67,4 +58,4 @@ class AbstractInput extends AbstractComponent
}
}
export {AbstractInput, AbstractInput as default};
export { AbstractInput, AbstractInput as default };

View file

@ -1,6 +1,5 @@
import {componentExportHelper} from 'Component/Abstract';
import {AbstractCheckbox} from 'Component/AbstractCheckbox';
import { componentExportHelper } from 'Component/Abstract';
import { AbstractCheckbox } from 'Component/AbstractCheckbox';
class CheckboxComponent extends AbstractCheckbox {}

View file

@ -1,6 +1,5 @@
import {componentExportHelper} from 'Component/Abstract';
import {AbstractCheckbox} from 'Component/AbstractCheckbox';
import { componentExportHelper } from 'Component/Abstract';
import { AbstractCheckbox } from 'Component/AbstractCheckbox';
class ClassicCheckboxComponent extends AbstractCheckbox {}

View file

@ -1,6 +1,5 @@
import {componentExportHelper} from 'Component/Abstract';
import {AbstractInput} from 'Component/AbstractInput';
import { componentExportHelper } from 'Component/Abstract';
import { AbstractInput } from 'Component/AbstractInput';
class DateComponent extends AbstractInput {}

View file

@ -1,6 +1,5 @@
import {componentExportHelper} from 'Component/Abstract';
import {AbstractInput} from 'Component/AbstractInput';
import { componentExportHelper } from 'Component/Abstract';
import { AbstractInput } from 'Component/AbstractInput';
class InputComponent extends AbstractInput {}

View file

@ -1,20 +1,17 @@
import _ from '_';
import ko from 'ko';
import {componentExportHelper} from 'Component/Abstract';
import {AbstractCheckbox} from 'Component/AbstractCheckbox';
import { componentExportHelper } from 'Component/Abstract';
import { AbstractCheckbox } from 'Component/AbstractCheckbox';
class CheckboxMaterialDesignComponent extends AbstractCheckbox
{
class CheckboxMaterialDesignComponent extends AbstractCheckbox {
/**
* @param {Object} params
*/
constructor(params) {
super(params);
this.animationBox = ko.observable(false).extend({falseTimeout: 200});
this.animationCheckmark = ko.observable(false).extend({falseTimeout: 200});
this.animationBox = ko.observable(false).extend({ falseTimeout: 200 });
this.animationCheckmark = ko.observable(false).extend({ falseTimeout: 200 });
this.animationBoxSetTrue = _.bind(this.animationBoxSetTrue, this);
this.animationCheckmarkSetTrue = _.bind(this.animationCheckmarkSetTrue, this);
@ -38,8 +35,7 @@ class CheckboxMaterialDesignComponent extends AbstractCheckbox
if (box) {
this.animationBoxSetTrue();
_.delay(this.animationCheckmarkSetTrue, 200);
}
else {
} else {
this.animationCheckmarkSetTrue();
_.delay(this.animationBoxSetTrue, 200);
}

View file

@ -1,6 +1,5 @@
import {componentExportHelper} from 'Component/Abstract';
import {AbstractRadio} from 'Component/AbstractRadio';
import { componentExportHelper } from 'Component/Abstract';
import { AbstractRadio } from 'Component/AbstractRadio';
class RadioComponent extends AbstractRadio {}

View file

@ -1,72 +1,74 @@
import { pInt } from 'Common/Utils';
import { SaveSettingsStep } from 'Common/Enums';
import { AbstractComponent, componentExportHelper } from 'Component/Abstract';
import {pInt} from 'Common/Utils';
import {SaveSettingsStep} from 'Common/Enums';
import {AbstractComponent, componentExportHelper} from 'Component/Abstract';
class SaveTriggerComponent extends AbstractComponent
{
class SaveTriggerComponent extends AbstractComponent {
/**
* @param {Object} params
*/
constructor(params) {
super();
this.element = params.element || null;
this.value = params.value && params.value.subscribe ? params.value : null;
if (this.element)
{
if (this.value)
{
if (this.element) {
if (this.value) {
this.element.css('display', 'inline-block');
if (params.verticalAlign)
{
if (params.verticalAlign) {
this.element.css('vertical-align', params.verticalAlign);
}
this.setState(this.value());
this.disposable.push(
this.value.subscribe(this.setState, this)
);
}
else
{
this.disposable.push(this.value.subscribe(this.setState, this));
} else {
this.element.hide();
}
}
}
setState(value) {
switch (pInt(value))
{
switch (pInt(value)) {
case SaveSettingsStep.TrueResult:
this.element
.find('.animated,.error').hide().removeClass('visible')
.find('.animated,.error')
.hide()
.removeClass('visible')
.end()
.find('.success').show().addClass('visible');
.find('.success')
.show()
.addClass('visible');
break;
case SaveSettingsStep.FalseResult:
this.element
.find('.animated,.success').hide().removeClass('visible')
.find('.animated,.success')
.hide()
.removeClass('visible')
.end()
.find('.error').show().addClass('visible');
.find('.error')
.show()
.addClass('visible');
break;
case SaveSettingsStep.Animate:
this.element
.find('.error,.success').hide().removeClass('visible')
.find('.error,.success')
.hide()
.removeClass('visible')
.end()
.find('.animated').show().addClass('visible');
.find('.animated')
.show()
.addClass('visible');
break;
case SaveSettingsStep.Idle:
default:
this.element
.find('.animated').hide()
.find('.animated')
.hide()
.end()
.find('.error,.success').removeClass('visible');
.find('.error,.success')
.removeClass('visible');
break;
}
}

View file

@ -1,36 +1,33 @@
import $ from '$';
import {AbstractComponent, componentExportHelper} from 'Component/Abstract';
import { AbstractComponent, componentExportHelper } from 'Component/Abstract';
class ScriptComponent extends AbstractComponent
{
class ScriptComponent extends AbstractComponent {
/**
* @param {Object} params
*/
constructor(params) {
super();
if (params.component && params.component.templateNodes && params.element &&
params.element[0] && params.element[0].outerHTML)
{
if (
params.component &&
params.component.templateNodes &&
params.element &&
params.element[0] &&
params.element[0].outerHTML
) {
let script = params.element[0].outerHTML;
script = !script ? '' : script
.replace(/<x-script/i, '<script')
.replace(/<b><\/b><\/x-script>/i, '</script>');
script = !script ? '' : script.replace(/<x-script/i, '<script').replace(/<b><\/b><\/x-script>/i, '</script>');
if (script)
{
if (script) {
params.element.text('');
params.element.replaceWith(
$(script).text(
params.component.templateNodes[0] && params.component.templateNodes[0].nodeValue ?
params.component.templateNodes[0].nodeValue : ''
params.component.templateNodes[0] && params.component.templateNodes[0].nodeValue
? params.component.templateNodes[0].nodeValue
: ''
)
);
}
else
{
} else {
params.element.remove();
}
}

View file

@ -1,16 +1,13 @@
import { i18n } from 'Common/Translator';
import { defautOptionsAfterRender } from 'Common/Utils';
import { componentExportHelper } from 'Component/Abstract';
import { AbstractInput } from 'Component/AbstractInput';
import {i18n} from 'Common/Translator';
import {defautOptionsAfterRender} from 'Common/Utils';
import {componentExportHelper} from 'Component/Abstract';
import {AbstractInput} from 'Component/AbstractInput';
class SelectComponent extends AbstractInput
{
class SelectComponent extends AbstractInput {
/**
* @param {Object} params
*/
constructor(params) {
super(params);
this.options = params.options || '';
@ -19,8 +16,7 @@ class SelectComponent extends AbstractInput
this.optionsValue = params.optionsValue || null;
this.optionsCaption = params.optionsCaption || null;
if (this.optionsCaption)
{
if (this.optionsCaption) {
this.optionsCaption = i18n(this.optionsCaption);
}

View file

@ -1,10 +1,8 @@
import $ from '$';
let cachedUrl = null;
const getUrl = () => {
if (!cachedUrl)
{
if (!cachedUrl) {
const version = $('#rlAppVersion').attr('content') || '0.0.0';
cachedUrl = `rainloop/v/${version}/static/css/svg/icons.svg`;
}
@ -15,9 +13,8 @@ const getUrl = () => {
export default {
template: '<b></b>',
viewModel: {
createViewModel: ({icon = 'null'}, componentInfo) => {
if (componentInfo && componentInfo.element)
{
createViewModel: ({ icon = 'null' }, componentInfo) => {
if (componentInfo && componentInfo.element) {
$(componentInfo.element).replaceWith(
`<svg class="svg-icon svg-icon-${icon}"><use xlink:href="${getUrl()}#svg-icon-${icon}"></use></svg>`
);

View file

@ -1,17 +1,14 @@
import {isUnd} from 'Common/Utils';
import {componentExportHelper} from 'Component/Abstract';
import {AbstractInput} from 'Component/AbstractInput';
import { isUnd } from 'Common/Utils';
import { componentExportHelper } from 'Component/Abstract';
import { AbstractInput } from 'Component/AbstractInput';
const DEFAULT_ROWS = 5;
class TextAreaComponent extends AbstractInput
{
class TextAreaComponent extends AbstractInput {
/**
* @param {Object} params
*/
constructor(params) {
super(params);
this.rows = params.rows || DEFAULT_ROWS;

View file

@ -1,4 +1,3 @@
import window from 'window';
const Opentip = window.Opentip || {};
@ -6,7 +5,6 @@ const Opentip = window.Opentip || {};
Opentip.styles = Opentip.styles || {};
Opentip.styles.rainloop = {
'extends': 'standard',
'fixed': true,
@ -43,4 +41,4 @@ Opentip.styles.rainloopErrorTip = {
'className': 'rainloopErrorTip'
};
export {Opentip, Opentip as default};
export { Opentip, Opentip as default };

535
dev/External/ko.js vendored

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,3 @@
/**
* @returns {AppAdmin}
*/

View file

@ -1,4 +1,3 @@
/**
* @returns {AppUser}
*/

View file

@ -1,6 +1,5 @@
import {isNonEmptyArray, isUnd} from 'Common/Utils';
import {EmailModel} from 'Model/Email';
import { isNonEmptyArray, isUnd } from 'Common/Utils';
import { EmailModel } from 'Model/Email';
/**
* @param {Array.<EmailModel>} emails
@ -9,15 +8,12 @@ import {EmailModel} from 'Model/Email';
* @returns {string}
*/
export function emailArrayToString(emails, friendlyView = false, wrapWithLink = false) {
let
index = 0,
let index = 0,
len = 0;
const result = [];
if (isNonEmptyArray(emails))
{
for (len = emails.length; index < len; index++)
{
if (isNonEmptyArray(emails)) {
for (len = emails.length; index < len; index++) {
result.push(emails[index].toLine(friendlyView, wrapWithLink));
}
}
@ -30,17 +26,13 @@ export function emailArrayToString(emails, friendlyView = false, wrapWithLink =
* @returns {string}
*/
export function emailArrayToStringClear(emails) {
let
index = 0,
let index = 0,
len = 0;
const result = [];
if (isNonEmptyArray(emails))
{
for (len = emails.length; index < len; index++)
{
if (emails[index] && emails[index].email && '' !== emails[index].name)
{
if (isNonEmptyArray(emails)) {
for (len = emails.length; index < len; index++) {
if (emails[index] && emails[index].email && '' !== emails[index].name) {
result.push(emails[index].email);
}
}
@ -54,19 +46,15 @@ export function emailArrayToStringClear(emails) {
* @returns {Array.<EmailModel>}
*/
export function emailArrayFromJson(json) {
let
index = 0,
let index = 0,
len = 0,
email = null;
const result = [];
if (isNonEmptyArray(json))
{
for (index = 0, len = json.length; index < len; index++)
{
if (isNonEmptyArray(json)) {
for (index = 0, len = json.length; index < len; index++) {
email = EmailModel.newInstanceFromJson(json[index]);
if (email)
{
if (email) {
result.push(email);
}
}
@ -81,16 +69,12 @@ export function emailArrayFromJson(json) {
* @param {Array} localEmails
*/
export function replyHelper(inputEmails, unic, localEmails) {
if (inputEmails && 0 < inputEmails.length)
{
if (inputEmails && 0 < inputEmails.length) {
let index = 0;
const len = inputEmails.length;
for (; index < len; index++)
{
if (isUnd(unic[inputEmails[index].email]))
{
for (; index < len; index++) {
if (isUnd(unic[inputEmails[index].email])) {
unic[inputEmails[index].email] = true;
localEmails.push(inputEmails[index]);
}

View file

@ -1,5 +1,5 @@
export class AbstractBoot
{
bootstart() {/* no-empty */}
export class AbstractBoot {
bootstart() {
/* no-empty */
}
}

View file

@ -1,33 +1,27 @@
import { isArray, disposeObject } from 'Common/Utils';
import {isArray, disposeObject} from 'Common/Utils';
export class AbstractModel
{
export class AbstractModel {
sModelName = '';
disposables = [];
/**
* @param {string} modelName = ''
*/
constructor(modelName = '')
{
constructor(modelName = '') {
this.sModelName = modelName || '';
}
regDisposables(value) {
if (isArray(value))
{
if (isArray(value)) {
value.forEach((item) => {
this.disposables.push(item);
});
}
else if (value)
{
} else if (value) {
this.disposables.push(value);
}
}
onDestroy() {
onDestroy() {
disposeObject(this);
}
}

View file

@ -1,16 +1,13 @@
import _ from '_';
import crossroads from 'crossroads';
import {isArray, isNonEmptyArray, noop} from 'Common/Utils';
import { isArray, isNonEmptyArray, noop } from 'Common/Utils';
export class AbstractScreen
{
export class AbstractScreen {
oCross = null;
sScreenName;
aViewModels;
constructor(screenName, viewModels = [])
{
constructor(screenName, viewModels = []) {
this.sScreenName = screenName;
this.aViewModels = isArray(viewModels) ? viewModels : [];
}
@ -47,19 +44,16 @@ export class AbstractScreen
* @returns {void}
*/
__start() {
let
route = null,
let route = null,
fMatcher = null;
const routes = this.routes();
if (isNonEmptyArray(routes))
{
if (isNonEmptyArray(routes)) {
fMatcher = _.bind(this.onRoute || noop, this);
route = crossroads.create();
routes.forEach((item) => {
if (item && route)
{
if (item && route) {
route.addRoute(item[0], fMatcher).rules = item[1];
}
});

View file

@ -1,18 +1,16 @@
import ko from 'ko';
import {delegateRun, inFocus} from 'Common/Utils';
import {KeyState, EventKeyCode} from 'Common/Enums';
import {$win, keyScope} from 'Common/Globals';
import { delegateRun, inFocus } from 'Common/Utils';
import { KeyState, EventKeyCode } from 'Common/Enums';
import { $win, keyScope } from 'Common/Globals';
export class AbstractViewNext
{
export class AbstractViewNext {
bDisabeCloseOnEsc = false;
sDefaultKeyScope = KeyState.None;
sCurrentKeyScope = KeyState.None;
viewModelVisibility = ko.observable(false);
modalVisibility = ko.observable(false).extend({rateLimit: 0});
modalVisibility = ko.observable(false).extend({ rateLimit: 0 });
viewModelName = '';
viewModelNames = [];
@ -38,15 +36,11 @@ export class AbstractViewNext
*/
registerPopupKeyDown() {
$win.on('keydown', (event) => {
if (event && this.modalVisibility && this.modalVisibility())
{
if (!this.bDisabeCloseOnEsc && EventKeyCode.Esc === event.keyCode)
{
if (event && this.modalVisibility && this.modalVisibility()) {
if (!this.bDisabeCloseOnEsc && EventKeyCode.Esc === event.keyCode) {
delegateRun(this, 'cancelCommand');
return false;
}
else if (EventKeyCode.Backspace === event.keyCode && !inFocus())
{
} else if (EventKeyCode.Backspace === event.keyCode && !inFocus()) {
return false;
}
}

View file

@ -1,21 +1,16 @@
import _ from '_';
import $ from '$';
import ko from 'ko';
import hasher from 'hasher';
import crossroads from 'crossroads';
import {Magics} from 'Common/Enums';
import {runHook} from 'Common/Plugins';
import {$html, VIEW_MODELS, popupVisibilityNames} from 'Common/Globals';
import { Magics } from 'Common/Enums';
import { runHook } from 'Common/Plugins';
import { $html, VIEW_MODELS, popupVisibilityNames } from 'Common/Globals';
import {
isArray, isUnd, pString, log, isFunc,
createCommandLegacy, delegateRun, isNonEmptyArray
} from 'Common/Utils';
import { isArray, isUnd, pString, log, isFunc, createCommandLegacy, delegateRun, isNonEmptyArray } from 'Common/Utils';
let
currentScreen = null,
let currentScreen = null,
defaultScreenName = '';
const SCREENS = {};
@ -30,10 +25,11 @@ export const ViewType = {
/**
* @returns {void}
*/
export function hideLoading()
{
export function hideLoading() {
$('#rl-content').addClass('rl-content-show');
$('#rl-loading').hide().remove();
$('#rl-loading')
.hide()
.remove();
}
/**
@ -41,8 +37,7 @@ export function hideLoading()
* @param {(Function|boolean|null)=} fCanExecute = true
* @returns {Function}
*/
export function createCommand(fExecute, fCanExecute = true)
{
export function createCommand(fExecute, fCanExecute = true) {
return createCommandLegacy(null, fExecute, fCanExecute);
}
@ -54,8 +49,7 @@ export function createCommand(fExecute, fCanExecute = true)
* @param {boolean=} isDefault = false
* @returns {void}
*/
export function addSettingsViewModel(SettingsViewModelClass, template, labelName, route, isDefault = false)
{
export function addSettingsViewModel(SettingsViewModelClass, template, labelName, route, isDefault = false) {
SettingsViewModelClass.__rlSettingsData = {
Label: labelName,
Template: template,
@ -70,8 +64,7 @@ export function addSettingsViewModel(SettingsViewModelClass, template, labelName
* @param {Function} SettingsViewModelClass
* @returns {void}
*/
export function removeSettingsViewModel(SettingsViewModelClass)
{
export function removeSettingsViewModel(SettingsViewModelClass) {
VIEW_MODELS['settings-removed'].push(SettingsViewModelClass);
}
@ -79,24 +72,21 @@ export function removeSettingsViewModel(SettingsViewModelClass)
* @param {Function} SettingsViewModelClass
* @returns {void}
*/
export function disableSettingsViewModel(SettingsViewModelClass)
{
export function disableSettingsViewModel(SettingsViewModelClass) {
VIEW_MODELS['settings-disabled'].push(SettingsViewModelClass);
}
/**
* @returns {void}
*/
export function routeOff()
{
export function routeOff() {
hasher.changed.active = false;
}
/**
* @returns {void}
*/
export function routeOn()
{
export function routeOn() {
hasher.changed.active = true;
}
@ -104,23 +94,19 @@ export function routeOn()
* @param {string} screenName
* @returns {?Object}
*/
export function screen(screenName)
{
return ('' !== screenName && !isUnd(SCREENS[screenName])) ? SCREENS[screenName] : null;
export function screen(screenName) {
return '' !== screenName && !isUnd(SCREENS[screenName]) ? SCREENS[screenName] : null;
}
/**
* @param {Function} ViewModelClassToShow
* @returns {Function|null}
*/
export function getScreenPopup(PopuViewModelClass)
{
export function getScreenPopup(PopuViewModelClass) {
let result = null;
if (PopuViewModelClass)
{
if (PopuViewModelClass) {
result = PopuViewModelClass;
if (PopuViewModelClass.default)
{
if (PopuViewModelClass.default) {
result = PopuViewModelClass.default;
}
}
@ -132,11 +118,9 @@ export function getScreenPopup(PopuViewModelClass)
* @param {Function} ViewModelClassToHide
* @returns {void}
*/
export function hideScreenPopup(ViewModelClassToHide)
{
export function hideScreenPopup(ViewModelClassToHide) {
const ModalView = getScreenPopup(ViewModelClassToHide);
if (ModalView && ModalView.__vm && ModalView.__dom)
{
if (ModalView && ModalView.__vm && ModalView.__dom) {
ModalView.__vm.modalVisibility(false);
}
}
@ -146,8 +130,7 @@ export function hideScreenPopup(ViewModelClassToHide)
* @param {Function} ViewModelClass
* @param {mixed=} params = null
*/
export function vmRunHook(hookName, ViewModelClass, params = null)
{
export function vmRunHook(hookName, ViewModelClass, params = null) {
_.each(ViewModelClass.__names, (name) => {
runHook(hookName, [name, ViewModelClass.__vm, params]);
});
@ -158,13 +141,10 @@ export function vmRunHook(hookName, ViewModelClass, params = null)
* @param {Object=} vmScreen
* @returns {*}
*/
export function buildViewModel(ViewModelClass, vmScreen)
{
if (ViewModelClass && !ViewModelClass.__builded)
{
export function buildViewModel(ViewModelClass, vmScreen) {
if (ViewModelClass && !ViewModelClass.__builded) {
let vmDom = null;
const
vm = new ViewModelClass(vmScreen),
const vm = new ViewModelClass(vmScreen),
position = ViewModelClass.__type || '',
vmPlace = position ? $('#rl-content #rl-' + position.toLowerCase()) : null;
@ -179,43 +159,39 @@ export function buildViewModel(ViewModelClass, vmScreen)
vm.viewModelTemplateID = ViewModelClass.__templateID;
vm.viewModelPosition = ViewModelClass.__type;
if (vmPlace && 1 === vmPlace.length)
{
vmDom = $('<div></div>').addClass('rl-view-model').addClass('RL-' + vm.viewModelTemplateID).hide();
if (vmPlace && 1 === vmPlace.length) {
vmDom = $('<div></div>')
.addClass('rl-view-model')
.addClass('RL-' + vm.viewModelTemplateID)
.hide();
vmDom.appendTo(vmPlace);
vm.viewModelDom = vmDom;
ViewModelClass.__dom = vmDom;
if (ViewType.Popup === position)
{
if (ViewType.Popup === position) {
vm.cancelCommand = vm.closeCommand = createCommand(() => {
hideScreenPopup(ViewModelClass);
});
vm.modalVisibility.subscribe((value) => {
if (value)
{
if (value) {
vm.viewModelDom.show();
vm.storeAndSetKeyScope();
popupVisibilityNames.push(vm.viewModelName);
vm.viewModelDom.css('z-index', 3000 + popupVisibilityNames().length + 10);
if (vm.onShowTrigger)
{
if (vm.onShowTrigger) {
vm.onShowTrigger(!vm.onShowTrigger());
}
delegateRun(vm, 'onShowWithDelay', [], 500);
}
else
{
} else {
delegateRun(vm, 'onHide');
delegateRun(vm, 'onHideWithDelay', [], 500);
if (vm.onHideTrigger)
{
if (vm.onHideTrigger) {
vm.onHideTrigger(!vm.onHideTrigger());
}
@ -233,21 +209,22 @@ export function buildViewModel(ViewModelClass, vmScreen)
vmRunHook('view-model-pre-build', ViewModelClass, vmDom);
ko.applyBindingAccessorsToNode(vmDom[0], {
translatorInit: true,
template: () => ({name: vm.viewModelTemplateID})
}, vm);
ko.applyBindingAccessorsToNode(
vmDom[0],
{
translatorInit: true,
template: () => ({ name: vm.viewModelTemplateID })
},
vm
);
delegateRun(vm, 'onBuild', [vmDom]);
if (vm && ViewType.Popup === position)
{
if (vm && ViewType.Popup === position) {
vm.registerPopupKeyDown();
}
vmRunHook('view-model-post-build', ViewModelClass, vmDom);
}
else
{
} else {
log('Cannot find view model position: ' + position);
}
}
@ -260,15 +237,12 @@ export function buildViewModel(ViewModelClass, vmScreen)
* @param {Array=} params
* @returns {void}
*/
export function showScreenPopup(ViewModelClassToShow, params = [])
{
export function showScreenPopup(ViewModelClassToShow, params = []) {
const ModalView = getScreenPopup(ViewModelClassToShow);
if (ModalView)
{
if (ModalView) {
buildViewModel(ModalView);
if (ModalView.__vm && ModalView.__dom)
{
if (ModalView.__vm && ModalView.__dom) {
delegateRun(ModalView.__vm, 'onBeforeShow', params || []);
ModalView.__vm.modalVisibility(true);
@ -284,15 +258,12 @@ export function showScreenPopup(ViewModelClassToShow, params = [])
* @param {Function} ViewModelClassToShow
* @returns {void}
*/
export function warmUpScreenPopup(ViewModelClassToShow)
{
export function warmUpScreenPopup(ViewModelClassToShow) {
const ModalView = getScreenPopup(ViewModelClassToShow);
if (ModalView)
{
if (ModalView) {
buildViewModel(ModalView);
if (ModalView.__vm && ModalView.__dom)
{
if (ModalView.__vm && ModalView.__dom) {
delegateRun(ModalView.__vm, 'onWarmUp');
}
}
@ -302,8 +273,7 @@ export function warmUpScreenPopup(ViewModelClassToShow)
* @param {Function} ViewModelClassToShow
* @returns {boolean}
*/
export function isPopupVisible(ViewModelClassToShow)
{
export function isPopupVisible(ViewModelClassToShow) {
const ModalView = getScreenPopup(ViewModelClassToShow);
return ModalView && ModalView.__vm ? ModalView.__vm.modalVisibility() : false;
}
@ -313,41 +283,32 @@ export function isPopupVisible(ViewModelClassToShow)
* @param {string} subPart
* @returns {void}
*/
export function screenOnRoute(screenName, subPart)
{
let
vmScreen = null,
export function screenOnRoute(screenName, subPart) {
let vmScreen = null,
isSameScreen = false,
cross = null;
if ('' === pString(screenName))
{
if ('' === pString(screenName)) {
screenName = defaultScreenName;
}
if ('' !== screenName)
{
if ('' !== screenName) {
vmScreen = screen(screenName);
if (!vmScreen)
{
if (!vmScreen) {
vmScreen = screen(defaultScreenName);
if (vmScreen)
{
if (vmScreen) {
subPart = screenName + '/' + subPart;
screenName = defaultScreenName;
}
}
if (vmScreen && vmScreen.__started)
{
if (vmScreen && vmScreen.__started) {
isSameScreen = currentScreen && vmScreen === currentScreen;
if (!vmScreen.__builded)
{
if (!vmScreen.__builded) {
vmScreen.__builded = true;
if (isNonEmptyArray(vmScreen.viewModels()))
{
if (isNonEmptyArray(vmScreen.viewModels())) {
_.each(vmScreen.viewModels(), (ViewModelClass) => {
buildViewModel(ViewModelClass, vmScreen);
});
@ -358,29 +319,28 @@ export function screenOnRoute(screenName, subPart)
_.defer(() => {
// hide screen
if (currentScreen && !isSameScreen)
{
if (currentScreen && !isSameScreen) {
delegateRun(currentScreen, 'onHide');
delegateRun(currentScreen, 'onHideWithDelay', [], 500);
if (currentScreen.onHideTrigger)
{
if (currentScreen.onHideTrigger) {
currentScreen.onHideTrigger(!currentScreen.onHideTrigger());
}
if (isNonEmptyArray(currentScreen.viewModels()))
{
if (isNonEmptyArray(currentScreen.viewModels())) {
_.each(currentScreen.viewModels(), (ViewModelClass) => {
if (ViewModelClass.__vm && ViewModelClass.__dom && ViewType.Popup !== ViewModelClass.__vm.viewModelPosition)
{
if (
ViewModelClass.__vm &&
ViewModelClass.__dom &&
ViewType.Popup !== ViewModelClass.__vm.viewModelPosition
) {
ViewModelClass.__dom.hide();
ViewModelClass.__vm.viewModelVisibility(false);
delegateRun(ViewModelClass.__vm, 'onHide');
delegateRun(ViewModelClass.__vm, 'onHideWithDelay', [], 500);
if (ViewModelClass.__vm.onHideTrigger)
{
if (ViewModelClass.__vm.onHideTrigger) {
ViewModelClass.__vm.onHideTrigger(!ViewModelClass.__vm.onHideTrigger());
}
}
@ -392,45 +352,41 @@ export function screenOnRoute(screenName, subPart)
currentScreen = vmScreen;
// show screen
if (currentScreen && !isSameScreen)
{
if (currentScreen && !isSameScreen) {
delegateRun(currentScreen, 'onShow');
if (currentScreen.onShowTrigger)
{
if (currentScreen.onShowTrigger) {
currentScreen.onShowTrigger(!currentScreen.onShowTrigger());
}
runHook('screen-on-show', [currentScreen.screenName(), currentScreen]);
if (isNonEmptyArray(currentScreen.viewModels()))
{
if (isNonEmptyArray(currentScreen.viewModels())) {
_.each(currentScreen.viewModels(), (ViewModelClass) => {
if (ViewModelClass.__vm && ViewModelClass.__dom && ViewType.Popup !== ViewModelClass.__vm.viewModelPosition)
{
if (
ViewModelClass.__vm &&
ViewModelClass.__dom &&
ViewType.Popup !== ViewModelClass.__vm.viewModelPosition
) {
delegateRun(ViewModelClass.__vm, 'onBeforeShow');
ViewModelClass.__dom.show();
ViewModelClass.__vm.viewModelVisibility(true);
delegateRun(ViewModelClass.__vm, 'onShow');
if (ViewModelClass.__vm.onShowTrigger)
{
if (ViewModelClass.__vm.onShowTrigger) {
ViewModelClass.__vm.onShowTrigger(!ViewModelClass.__vm.onShowTrigger());
}
delegateRun(ViewModelClass.__vm, 'onShowWithDelay', [], 200);
vmRunHook('view-model-on-show', ViewModelClass);
}
});
}
}
// --
cross = vmScreen && vmScreen.__cross ? vmScreen.__cross() : null;
if (cross)
{
if (cross) {
cross.parse(subPart);
}
});
@ -442,19 +398,14 @@ export function screenOnRoute(screenName, subPart)
* @param {Array} screensClasses
* @returns {void}
*/
export function startScreens(screensClasses)
{
export function startScreens(screensClasses) {
_.each(screensClasses, (CScreen) => {
if (CScreen)
{
const
vmScreen = new CScreen(),
if (CScreen) {
const vmScreen = new CScreen(),
screenName = vmScreen ? vmScreen.screenName() : '';
if (vmScreen && '' !== screenName)
{
if ('' === defaultScreenName)
{
if (vmScreen && '' !== screenName) {
if ('' === defaultScreenName) {
defaultScreenName = screenName;
}
@ -464,8 +415,7 @@ export function startScreens(screensClasses)
});
_.each(SCREENS, (vmScreen) => {
if (vmScreen && !vmScreen.__started && vmScreen.__start)
{
if (vmScreen && !vmScreen.__started && vmScreen.__start) {
vmScreen.__started = true;
vmScreen.__start();
@ -476,7 +426,7 @@ export function startScreens(screensClasses)
});
const cross = crossroads.create();
cross.addRoute(/^([a-zA-Z0-9\-]*)\/?(.*)$/, screenOnRoute);
cross.addRoute(/^([a-zA-Z0-9-]*)\/?(.*)$/, screenOnRoute);
hasher.initialized.add(cross.parse, cross);
hasher.changed.add(cross.parse, cross);
@ -492,21 +442,17 @@ export function startScreens(screensClasses)
* @param {boolean=} replace = false
* @returns {void}
*/
export function setHash(hash, silence = false, replace = false)
{
export function setHash(hash, silence = false, replace = false) {
hash = '#' === hash.substr(0, 1) ? hash.substr(1) : hash;
hash = '/' === hash.substr(0, 1) ? hash.substr(1) : hash;
const cmd = replace ? 'replaceHash' : 'setHash';
if (silence)
{
if (silence) {
hasher.changed.active = false;
hasher[cmd](hash);
hasher.changed.active = true;
}
else
{
} else {
hasher.changed.active = true;
hasher[cmd](hash);
hasher.setHash(hash);
@ -517,32 +463,24 @@ export function setHash(hash, silence = false, replace = false)
* @param {Object} params
* @returns {Function}
*/
function viewDecorator({name, type, templateID})
{
function viewDecorator({ name, type, templateID }) {
return (target) => {
if (target)
{
if (name)
{
if (isArray(name))
{
if (target) {
if (name) {
if (isArray(name)) {
target.__names = name;
}
else
{
} else {
target.__names = [name];
}
target.__name = target.__names[0];
}
if (type)
{
if (type) {
target.__type = type;
}
if (templateID)
{
if (templateID) {
target.__templateID = templateID;
}
}
@ -553,31 +491,25 @@ function viewDecorator({name, type, templateID})
* @param {Object} params
* @returns {Function}
*/
function popupDecorator({name, templateID})
{
return viewDecorator({name, type: ViewType.Popup, templateID});
function popupDecorator({ name, templateID }) {
return viewDecorator({ name, type: ViewType.Popup, templateID });
}
/**
* @param {Function} canExecute
* @returns {Function}
*/
function commandDecorator(canExecute = true)
{
function commandDecorator(canExecute = true) {
return (target, key, descriptor) => {
if (!key || !key.match(/Command$/))
{
if (!key || !key.match(/Command$/)) {
throw new Error(`name "${key}" should end with Command suffix`);
}
const
value = descriptor.value || descriptor.initializer(),
const value = descriptor.value || descriptor.initializer(),
normCanExecute = isFunc(canExecute) ? canExecute : () => !!canExecute;
descriptor.value = function(...args) {
if (normCanExecute.call(this, this))
{
if (normCanExecute.call(this, this)) {
value.apply(this, args);
}
@ -595,37 +527,33 @@ function commandDecorator(canExecute = true)
* @param {miced} $items
* @returns {Function}
*/
function settingsMenuKeysHandler($items)
{
function settingsMenuKeysHandler($items) {
return _.throttle((event, handler) => {
const up = handler && 'up' === handler.shortcut;
if (event && $items.length)
{
if (event && $items.length) {
let index = $items.index($items.filter('.selected'));
if (up && 0 < index)
{
if (up && 0 < index) {
index -= 1;
}
else if (!up && index < $items.length - 1)
{
} else if (!up && index < $items.length - 1) {
index += 1;
}
const resultHash = $items.eq(index).attr('href');
if (resultHash)
{
if (resultHash) {
setHash(resultHash, false, true);
}
}
}, Magics.Time200ms);
}
export {
commandDecorator, commandDecorator as command,
viewDecorator, viewDecorator as view, viewDecorator as viewModel,
popupDecorator, popupDecorator as popup,
commandDecorator,
commandDecorator as command,
viewDecorator,
viewDecorator as view,
viewDecorator as viewModel,
popupDecorator,
popupDecorator as popup,
settingsMenuKeysHandler
};

View file

@ -1,19 +1,16 @@
import ko from 'ko';
import {change} from 'Common/Links';
import { change } from 'Common/Links';
import {AbstractModel} from 'Knoin/AbstractModel';
import { AbstractModel } from 'Knoin/AbstractModel';
class AccountModel extends AbstractModel
{
class AccountModel extends AbstractModel {
/**
* @param {string} email
* @param {boolean=} canBeDelete = true
* @param {number=} count = 0
*/
constructor(email, canBeDelete = true, count = 0)
{
constructor(email, canBeDelete = true, count = 0) {
super('AccountModel');
this.email = email;
@ -33,4 +30,4 @@ class AccountModel extends AbstractModel
}
}
export {AccountModel, AccountModel as default};
export { AccountModel, AccountModel as default };

View file

@ -1,14 +1,19 @@
import window from 'window';
import _ from '_';
import ko from 'ko';
import {FileType} from 'Common/Enums';
import {bAllowPdfPreview, data as GlobalsData} from 'Common/Globals';
import {trim, pInt, inArray, isNonEmptyArray, getFileExtension, friendlySize} from 'Common/Utils';
import {attachmentDownload, attachmentPreview, attachmentFramed, attachmentPreviewAsPlain, attachmentThumbnailPreview} from 'Common/Links';
import { FileType } from 'Common/Enums';
import { bAllowPdfPreview, data as GlobalsData } from 'Common/Globals';
import { trim, pInt, inArray, isNonEmptyArray, getFileExtension, friendlySize } from 'Common/Utils';
import {
attachmentDownload,
attachmentPreview,
attachmentFramed,
attachmentPreviewAsPlain,
attachmentThumbnailPreview
} from 'Common/Links';
import {AbstractModel} from 'Knoin/AbstractModel';
import { AbstractModel } from 'Knoin/AbstractModel';
import Audio from 'Common/Audio';
@ -24,90 +29,99 @@ export const staticFileType = _.memoize((ext, mimeType) => {
let result = FileType.Unknown;
const mimeTypeParts = mimeType.split('/');
switch (true)
{
case 'image' === mimeTypeParts[0] || -1 < inArray(ext, [
'png', 'jpg', 'jpeg', 'gif', 'bmp'
]):
switch (true) {
case 'image' === mimeTypeParts[0] || -1 < inArray(ext, ['png', 'jpg', 'jpeg', 'gif', 'bmp']):
result = FileType.Image;
break;
case 'audio' === mimeTypeParts[0] || -1 < inArray(ext, [
'mp3', 'ogg', 'oga', 'wav'
]):
case 'audio' === mimeTypeParts[0] || -1 < inArray(ext, ['mp3', 'ogg', 'oga', 'wav']):
result = FileType.Audio;
break;
case 'video' === mimeTypeParts[0] || -1 < inArray(ext, [
'mkv', 'avi'
]):
case 'video' === mimeTypeParts[0] || -1 < inArray(ext, ['mkv', 'avi']):
result = FileType.Video;
break;
case -1 < inArray(ext, [
'php', 'js', 'css'
]):
case -1 < inArray(ext, ['php', 'js', 'css']):
result = FileType.Code;
break;
case 'eml' === ext || -1 < inArray(mimeType, [
'message/delivery-status', 'message/rfc822'
]):
case 'eml' === ext || -1 < inArray(mimeType, ['message/delivery-status', 'message/rfc822']):
result = FileType.Eml;
break;
case ('text' === mimeTypeParts[0] && 'html' !== mimeTypeParts[1]) || -1 < inArray(ext, [
'txt', 'log'
]):
case ('text' === mimeTypeParts[0] && 'html' !== mimeTypeParts[1]) || -1 < inArray(ext, ['txt', 'log']):
result = FileType.Text;
break;
case ('text/html' === mimeType) || -1 < inArray(ext, [
'html'
]):
case 'text/html' === mimeType || -1 < inArray(ext, ['html']):
result = FileType.Html;
break;
case -1 < inArray(mimeTypeParts[1], [
'zip', '7z', 'tar', 'rar', 'gzip', 'bzip', 'bzip2', 'x-zip', 'x-7z', 'x-rar', 'x-tar', 'x-gzip', 'x-bzip', 'x-bzip2', 'x-zip-compressed', 'x-7z-compressed', 'x-rar-compressed'
]) || -1 < inArray(ext, ['zip', '7z', 'tar', 'rar', 'gzip', 'bzip', 'bzip2']):
case -1 <
inArray(mimeTypeParts[1], [
'zip',
'7z',
'tar',
'rar',
'gzip',
'bzip',
'bzip2',
'x-zip',
'x-7z',
'x-rar',
'x-tar',
'x-gzip',
'x-bzip',
'x-bzip2',
'x-zip-compressed',
'x-7z-compressed',
'x-rar-compressed'
]) || -1 < inArray(ext, ['zip', '7z', 'tar', 'rar', 'gzip', 'bzip', 'bzip2']):
result = FileType.Archive;
break;
case -1 < inArray(mimeTypeParts[1], ['pdf', 'x-pdf']) || -1 < inArray(ext, ['pdf']):
result = FileType.Pdf;
break;
case -1 < inArray(mimeType, [
'application/pgp-signature', 'application/pgp-keys'
]) || -1 < inArray(ext, ['asc', 'pem', 'ppk']):
case -1 < inArray(mimeType, ['application/pgp-signature', 'application/pgp-keys']) ||
-1 < inArray(ext, ['asc', 'pem', 'ppk']):
result = FileType.Certificate;
break;
case -1 < inArray(mimeType, ['application/pkcs7-signature']) ||
-1 < inArray(ext, ['p7s']):
case -1 < inArray(mimeType, ['application/pkcs7-signature']) || -1 < inArray(ext, ['p7s']):
result = FileType.CertificateBin;
break;
case -1 < inArray(mimeTypeParts[1], [
'rtf', 'msword', 'vnd.msword', 'vnd.openxmlformats-officedocument.wordprocessingml.document',
'vnd.openxmlformats-officedocument.wordprocessingml.template',
'vnd.ms-word.document.macroEnabled.12',
'vnd.ms-word.template.macroEnabled.12'
]):
case -1 <
inArray(mimeTypeParts[1], [
'rtf',
'msword',
'vnd.msword',
'vnd.openxmlformats-officedocument.wordprocessingml.document',
'vnd.openxmlformats-officedocument.wordprocessingml.template',
'vnd.ms-word.document.macroEnabled.12',
'vnd.ms-word.template.macroEnabled.12'
]):
result = FileType.WordText;
break;
case -1 < inArray(mimeTypeParts[1], [
'excel', 'ms-excel', 'vnd.ms-excel',
'vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'vnd.openxmlformats-officedocument.spreadsheetml.template',
'vnd.ms-excel.sheet.macroEnabled.12',
'vnd.ms-excel.template.macroEnabled.12',
'vnd.ms-excel.addin.macroEnabled.12',
'vnd.ms-excel.sheet.binary.macroEnabled.12'
]):
case -1 <
inArray(mimeTypeParts[1], [
'excel',
'ms-excel',
'vnd.ms-excel',
'vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'vnd.openxmlformats-officedocument.spreadsheetml.template',
'vnd.ms-excel.sheet.macroEnabled.12',
'vnd.ms-excel.template.macroEnabled.12',
'vnd.ms-excel.addin.macroEnabled.12',
'vnd.ms-excel.sheet.binary.macroEnabled.12'
]):
result = FileType.Sheet;
break;
case -1 < inArray(mimeTypeParts[1], [
'powerpoint', 'ms-powerpoint', 'vnd.ms-powerpoint',
'vnd.openxmlformats-officedocument.presentationml.presentation',
'vnd.openxmlformats-officedocument.presentationml.template',
'vnd.openxmlformats-officedocument.presentationml.slideshow',
'vnd.ms-powerpoint.addin.macroEnabled.12',
'vnd.ms-powerpoint.presentation.macroEnabled.12',
'vnd.ms-powerpoint.template.macroEnabled.12',
'vnd.ms-powerpoint.slideshow.macroEnabled.12'
]):
case -1 <
inArray(mimeTypeParts[1], [
'powerpoint',
'ms-powerpoint',
'vnd.ms-powerpoint',
'vnd.openxmlformats-officedocument.presentationml.presentation',
'vnd.openxmlformats-officedocument.presentationml.template',
'vnd.openxmlformats-officedocument.presentationml.slideshow',
'vnd.ms-powerpoint.addin.macroEnabled.12',
'vnd.ms-powerpoint.presentation.macroEnabled.12',
'vnd.ms-powerpoint.template.macroEnabled.12',
'vnd.ms-powerpoint.slideshow.macroEnabled.12'
]):
result = FileType.Presentation;
break;
// no default
@ -121,12 +135,10 @@ export const staticFileType = _.memoize((ext, mimeType) => {
* @returns {string}
*/
export const staticIconClass = _.memoize((fileType) => {
let
resultText = '',
let resultText = '',
resultClass = 'icon-file';
switch (fileType)
{
switch (fileType) {
case FileType.Text:
case FileType.Eml:
case FileType.WordText:
@ -174,19 +186,15 @@ export const staticIconClass = _.memoize((fileType) => {
* @returns {string}
*/
export const staticCombinedIconClass = (data) => {
let
result = '',
let result = '',
types = [];
if (isNonEmptyArray(data))
{
if (isNonEmptyArray(data)) {
result = 'icon-attachment';
types = _.uniq(_.compact(_.map(data, (item) => (item ? staticFileType(getFileExtension(item[0]), item[1]) : ''))));
if (types && 1 === types.length && types[0])
{
switch (types[0])
{
if (types && 1 === types.length && types[0]) {
switch (types[0]) {
case FileType.Text:
case FileType.WordText:
result = 'icon-file-text';
@ -225,8 +233,7 @@ export const staticCombinedIconClass = (data) => {
return result;
};
class AttachmentModel extends AbstractModel
{
class AttachmentModel extends AbstractModel {
constructor() {
super('AttachmentModel');
@ -267,8 +274,7 @@ class AttachmentModel extends AbstractModel
*/
initByJson(json) {
let bResult = false;
if (json && 'Object/Attachment' === json['@Object'])
{
if (json && 'Object/Attachment' === json['@Object']) {
this.mimeType = trim((json.MimeType || '').toLowerCase());
this.fileName = trim(json.FileName);
this.estimatedSize = pInt(json.EstimatedSize);
@ -335,8 +341,13 @@ class AttachmentModel extends AbstractModel
* @returns {boolean}
*/
isText() {
return FileType.Text === this.fileType || FileType.Eml === this.fileType ||
FileType.Certificate === this.fileType || FileType.Html === this.fileType || FileType.Code === this.fileType;
return (
FileType.Text === this.fileType ||
FileType.Eml === this.fileType ||
FileType.Certificate === this.fileType ||
FileType.Html === this.fileType ||
FileType.Code === this.fileType
);
}
/**
@ -350,8 +361,13 @@ class AttachmentModel extends AbstractModel
* @returns {boolean}
*/
isFramed() {
return this.framed && (GlobalsData.__APP__ && GlobalsData.__APP__.googlePreviewSupported()) &&
!(this.isPdf() && bAllowPdfPreview) && !this.isText() && !this.isImage();
return (
this.framed &&
(GlobalsData.__APP__ && GlobalsData.__APP__.googlePreviewSupported()) &&
!(this.isPdf() && bAllowPdfPreview) &&
!this.isText() &&
!this.isImage()
);
}
/**
@ -365,7 +381,11 @@ class AttachmentModel extends AbstractModel
* @returns {boolean}
*/
hasPreplay() {
return (Audio.supportedMp3 && this.isMp3()) || (Audio.supportedOgg && this.isOgg()) || (Audio.supportedWav && this.isWav());
return (
(Audio.supportedMp3 && this.isMp3()) ||
(Audio.supportedOgg && this.isOgg()) ||
(Audio.supportedWav && this.isWav())
);
}
/**
@ -416,8 +436,7 @@ class AttachmentModel extends AbstractModel
*/
linkPreviewMain() {
let result = '';
switch (true)
{
switch (true) {
case this.isImage():
case this.isPdf() && bAllowPdfPreview:
result = this.linkPreview();
@ -439,8 +458,7 @@ class AttachmentModel extends AbstractModel
*/
generateTransferDownloadUrl() {
let link = this.linkDownload();
if ('http' !== link.substr(0, 4))
{
if ('http' !== link.substr(0, 4)) {
link = window.location.protocol + '//' + window.location.host + window.location.pathname + link;
}
@ -454,8 +472,7 @@ class AttachmentModel extends AbstractModel
*/
eventDragStart(attachment, event) {
const localEvent = event.originalEvent || event;
if (attachment && localEvent && localEvent.dataTransfer && localEvent.dataTransfer.setData)
{
if (attachment && localEvent && localEvent.dataTransfer && localEvent.dataTransfer.setData) {
localEvent.dataTransfer.setData('DownloadURL', this.generateTransferDownloadUrl());
}
@ -477,4 +494,4 @@ class AttachmentModel extends AbstractModel
}
}
export {AttachmentModel, AttachmentModel as default};
export { AttachmentModel, AttachmentModel as default };

View file

@ -1,12 +1,10 @@
import ko from 'ko';
import {isUnd, pInt, friendlySize, mimeContentType, getFileExtension} from 'Common/Utils';
import { isUnd, pInt, friendlySize, mimeContentType, getFileExtension } from 'Common/Utils';
import {staticIconClass, staticFileType} from 'Model/Attachment';
import {AbstractModel} from 'Knoin/AbstractModel';
import { staticIconClass, staticFileType } from 'Model/Attachment';
import { AbstractModel } from 'Knoin/AbstractModel';
class ComposeAttachmentModel extends AbstractModel
{
class ComposeAttachmentModel extends AbstractModel {
/**
* @param {string} id
* @param {string} fileName
@ -16,8 +14,7 @@ class ComposeAttachmentModel extends AbstractModel
* @param {string=} CID = ''
* @param {string=} contentLocation = ''
*/
constructor(id, fileName, size = null, isInline = false, isLinked = false, CID = '', contentLocation = '')
{
constructor(id, fileName, size = null, isInline = false, isLinked = false, CID = '', contentLocation = '') {
super('ComposeAttachmentModel');
this.id = id;
@ -61,7 +58,14 @@ class ComposeAttachmentModel extends AbstractModel
this.mimeType = ko.computed(() => mimeContentType(this.fileName()));
this.fileExt = ko.computed(() => getFileExtension(this.fileName()));
this.regDisposables([this.progressText, this.progressStyle, this.title, this.friendlySize, this.mimeType, this.fileExt]);
this.regDisposables([
this.progressText,
this.progressStyle,
this.title,
this.friendlySize,
this.mimeType,
this.fileExt
]);
}
/**
@ -70,8 +74,7 @@ class ComposeAttachmentModel extends AbstractModel
*/
initByUploadJson(json) {
let bResult = false;
if (json)
{
if (json) {
this.fileName(json.Name);
this.size(isUnd(json.Size) ? 0 : pInt(json.Size));
this.tempName(isUnd(json.TempName) ? '' : json.TempName);
@ -98,4 +101,4 @@ class ComposeAttachmentModel extends AbstractModel
}
}
export {ComposeAttachmentModel, ComposeAttachmentModel as default};
export { ComposeAttachmentModel, ComposeAttachmentModel as default };

View file

@ -1,15 +1,13 @@
import _ from '_';
import ko from 'ko';
import {ContactPropertyType} from 'Common/Enums';
import {trim, isNonEmptyArray, isNormal, pInt, pString} from 'Common/Utils';
import {emptyContactPic} from 'Common/Links';
import { ContactPropertyType } from 'Common/Enums';
import { trim, isNonEmptyArray, isNormal, pInt, pString } from 'Common/Utils';
import { emptyContactPic } from 'Common/Links';
import {AbstractModel} from 'Knoin/AbstractModel';
import { AbstractModel } from 'Knoin/AbstractModel';
class ContactModel extends AbstractModel
{
class ContactModel extends AbstractModel {
constructor() {
super('ContactModel');
@ -28,25 +26,17 @@ class ContactModel extends AbstractModel
* @returns {Array|null}
*/
getNameAndEmailHelper() {
let
name = '',
let name = '',
email = '';
if (isNonEmptyArray(this.properties))
{
if (isNonEmptyArray(this.properties)) {
_.each(this.properties, (property) => {
if (property)
{
if (ContactPropertyType.FirstName === property[0])
{
if (property) {
if (ContactPropertyType.FirstName === property[0]) {
name = trim(property[1] + ' ' + name);
}
else if (ContactPropertyType.LastName === property[0])
{
} else if (ContactPropertyType.LastName === property[0]) {
name = trim(name + ' ' + property[1]);
}
else if ('' === email && ContactPropertyType.Email === property[0])
{
} else if ('' === email && ContactPropertyType.Email === property[0]) {
email = property[1];
}
}
@ -62,17 +52,14 @@ class ContactModel extends AbstractModel
*/
parse(json) {
let result = false;
if (json && 'Object/Contact' === json['@Object'])
{
if (json && 'Object/Contact' === json['@Object']) {
this.idContact = pInt(json.IdContact);
this.display = pString(json.Display);
this.readOnly = !!json.ReadOnly;
if (isNonEmptyArray(json.Properties))
{
if (isNonEmptyArray(json.Properties)) {
_.each(json.Properties, (property) => {
if (property && property.Type && isNormal(property.Value) && isNormal(property.TypeStr))
{
if (property && property.Type && isNormal(property.Value) && isNormal(property.TypeStr)) {
this.properties.push([pInt(property.Type), pString(property.Value), pString(property.TypeStr)]);
}
});
@ -103,20 +90,16 @@ class ContactModel extends AbstractModel
*/
lineAsCss() {
const result = [];
if (this.deleted())
{
if (this.deleted()) {
result.push('deleted');
}
if (this.selected())
{
if (this.selected()) {
result.push('selected');
}
if (this.checked())
{
if (this.checked()) {
result.push('checked');
}
if (this.focused())
{
if (this.focused()) {
result.push('focused');
}
@ -124,4 +107,4 @@ class ContactModel extends AbstractModel
}
}
export {ContactModel, ContactModel as default};
export { ContactModel, ContactModel as default };

View file

@ -1,14 +1,12 @@
import ko from 'ko';
import {ContactPropertyType} from 'Common/Enums';
import {pInt, pString} from 'Common/Utils';
import {i18n} from 'Common/Translator';
import { ContactPropertyType } from 'Common/Enums';
import { pInt, pString } from 'Common/Utils';
import { i18n } from 'Common/Translator';
import {AbstractModel} from 'Knoin/AbstractModel';
import { AbstractModel } from 'Knoin/AbstractModel';
class ContactPropertyModel extends AbstractModel
{
class ContactPropertyModel extends AbstractModel {
/**
* @param {number=} type = Enums.ContactPropertyType.Unknown
* @param {string=} typeStr = ''
@ -16,8 +14,7 @@ class ContactPropertyModel extends AbstractModel
* @param {boolean=} focused = false
* @param {string=} placeholder = ''
*/
constructor(type = ContactPropertyType.Unknown, typeStr = '', value = '', focused = false, placeholder = '')
{
constructor(type = ContactPropertyType.Unknown, typeStr = '', value = '', focused = false, placeholder = '') {
super('ContactPropertyModel');
this.type = ko.observable(pInt(type));
@ -38,4 +35,4 @@ class ContactPropertyModel extends AbstractModel
}
}
export {ContactPropertyModel, ContactPropertyModel as default};
export { ContactPropertyModel, ContactPropertyModel as default };

View file

@ -1,10 +1,8 @@
import _ from '_';
import addressparser from 'emailjs-addressparser';
import {trim, encodeHtml, isNonEmptyArray} from 'Common/Utils';
import { trim, encodeHtml, isNonEmptyArray } from 'Common/Utils';
class EmailModel
{
class EmailModel {
email = '';
name = '';
dkimStatus = '';
@ -16,8 +14,7 @@ class EmailModel
* @param {string=} dkimStatus = 'none'
* @param {string=} dkimValue = ''
*/
constructor(email = '', name = '', dkimStatus = 'none', dkimValue = '')
{
constructor(email = '', name = '', dkimStatus = 'none', dkimValue = '') {
this.email = email;
this.name = name;
this.dkimStatus = dkimStatus;
@ -66,8 +63,7 @@ class EmailModel
* @returns {void}
*/
clearDuplicateName() {
if (this.name === this.email)
{
if (this.name === this.email) {
this.name = '';
}
}
@ -86,8 +82,7 @@ class EmailModel
*/
initByJson(json) {
let result = false;
if (json && 'Object/Email' === json['@Object'])
{
if (json && 'Object/Email' === json['@Object']) {
this.name = trim(json.Name);
this.email = trim(json.Email);
this.dkimStatus = trim(json.DkimStatus || '');
@ -108,24 +103,31 @@ class EmailModel
*/
toLine(friendlyView, wrapWithLink = false, useEncodeHtml = false) {
let result = '';
if ('' !== this.email)
{
if (friendlyView && '' !== this.name)
{
result = wrapWithLink ? '<a href="mailto:' + encodeHtml(this.email) + '?to=' + encodeHtml('"' + this.name + '" <' + this.email + '>') +
'" target="_blank" tabindex="-1">' + encodeHtml(this.name) + '</a>' : (useEncodeHtml ? encodeHtml(this.name) : this.name);
if ('' !== this.email) {
if (friendlyView && '' !== this.name) {
result = wrapWithLink
? '<a href="mailto:' +
encodeHtml(this.email) +
'?to=' +
encodeHtml('"' + this.name + '" <' + this.email + '>') +
'" target="_blank" tabindex="-1">' +
encodeHtml(this.name) +
'</a>'
: useEncodeHtml
? encodeHtml(this.name)
: this.name;
// result = wrapWithLink ? '<a href="mailto:' + encodeHtml('"' + this.name + '" <' + this.email + '>') +
// '" target="_blank" tabindex="-1">' + encodeHtml(this.name) + '</a>' : (useEncodeHtml ? encodeHtml(this.name) : this.name);
}
else
{
} else {
result = this.email;
if ('' !== this.name)
{
if (wrapWithLink)
{
result = encodeHtml('"' + this.name + '" <') + '<a href="mailto:' +
encodeHtml(this.email) + '?to=' + encodeHtml('"' + this.name + '" <' + this.email + '>') +
if ('' !== this.name) {
if (wrapWithLink) {
result =
encodeHtml('"' + this.name + '" <') +
'<a href="mailto:' +
encodeHtml(this.email) +
'?to=' +
encodeHtml('"' + this.name + '" <' + this.email + '>') +
'" target="_blank" tabindex="-1">' +
encodeHtml(result) +
'</a>' +
@ -136,19 +138,19 @@ class EmailModel
// encodeHtml(result) +
// '</a>' +
// encodeHtml('>');
}
else
{
} else {
result = '"' + this.name + '" <' + result + '>';
if (useEncodeHtml)
{
if (useEncodeHtml) {
result = encodeHtml(result);
}
}
}
else if (wrapWithLink)
{
result = '<a href="mailto:' + encodeHtml(this.email) + '" target="_blank" tabindex="-1">' + encodeHtml(this.email) + '</a>';
} else if (wrapWithLink) {
result =
'<a href="mailto:' +
encodeHtml(this.email) +
'" target="_blank" tabindex="-1">' +
encodeHtml(this.email) +
'</a>';
}
}
}
@ -158,15 +160,13 @@ class EmailModel
static splitEmailLine(line) {
const parsedResult = addressparser(line);
if (isNonEmptyArray(parsedResult))
{
if (isNonEmptyArray(parsedResult)) {
const result = [];
let exists = false;
parsedResult.forEach((item) => {
const address = item.address ? new EmailModel(
item.address.replace(/^[<]+(.*)[>]+$/g, '$1'),
item.name || ''
) : null;
const address = item.address
? new EmailModel(item.address.replace(/^[<]+(.*)[>]+$/g, '$1'), item.name || '')
: null;
if (address && address.email) {
exists = true;
@ -183,14 +183,12 @@ class EmailModel
static parseEmailLine(line) {
const parsedResult = addressparser(line);
if (isNonEmptyArray(parsedResult))
{
return _.compact(parsedResult.map(
(item) => (item.address ? new EmailModel(
item.address.replace(/^[<]+(.*)[>]+$/g, '$1'),
item.name || ''
) : null)
));
if (isNonEmptyArray(parsedResult)) {
return _.compact(
parsedResult.map((item) =>
item.address ? new EmailModel(item.address.replace(/^[<]+(.*)[>]+$/g, '$1'), item.name || '') : null
)
);
}
return [];
@ -202,14 +200,12 @@ class EmailModel
*/
parse(emailAddress) {
emailAddress = trim(emailAddress);
if ('' === emailAddress)
{
if ('' === emailAddress) {
return false;
}
const result = addressparser(emailAddress);
if (isNonEmptyArray(result) && result[0])
{
if (isNonEmptyArray(result) && result[0]) {
this.name = result[0].name || '';
this.email = result[0].address || '';
this.clearDuplicateName();
@ -221,4 +217,4 @@ class EmailModel
}
}
export {EmailModel, EmailModel as default};
export { EmailModel, EmailModel as default };

View file

@ -1,19 +1,17 @@
import _ from '_';
import ko from 'ko';
import {FilterRulesType, FiltersAction} from 'Common/Enums';
import {pString, inArray, isNonEmptyArray, fakeMd5, delegateRunOnDestroy, windowResizeCallback} from 'Common/Utils';
import {i18n} from 'Common/Translator';
import {getFolderFromCacheList} from 'Common/Cache';
import { FilterRulesType, FiltersAction } from 'Common/Enums';
import { pString, inArray, isNonEmptyArray, fakeMd5, delegateRunOnDestroy, windowResizeCallback } from 'Common/Utils';
import { i18n } from 'Common/Translator';
import { getFolderFromCacheList } from 'Common/Cache';
import AccountStore from 'Stores/User/Account';
import {FilterConditionModel} from 'Model/FilterCondition';
import {AbstractModel} from 'Knoin/AbstractModel';
import { FilterConditionModel } from 'Model/FilterCondition';
import { AbstractModel } from 'Knoin/AbstractModel';
class FilterModel extends AbstractModel
{
class FilterModel extends AbstractModel {
constructor() {
super('FilterModel');
@ -56,15 +54,14 @@ class FilterModel extends AbstractModel
const fGetRealFolderName = (folderFullNameRaw) => {
const folder = getFolderFromCacheList(folderFullNameRaw);
return folder ? folder.fullName.replace('.' === folder.delimiter ? /\./ : /[\\\/]+/, ' / ') : folderFullNameRaw;
return folder ? folder.fullName.replace('.' === folder.delimiter ? /\./ : /[\\/]+/, ' / ') : folderFullNameRaw;
};
this.nameSub = ko.computed(() => {
let result = '';
const actionValue = this.actionValue();
switch (this.actionType())
{
switch (this.actionType()) {
case FiltersAction.MoveTo:
result = i18n('SETTINGS_FILTERS/SUBNAME_MOVE_TO', {
FOLDER: fGetRealFolderName(actionValue)
@ -93,8 +90,7 @@ class FilterModel extends AbstractModel
this.actionTemplate = ko.computed(() => {
let result = '';
switch (this.actionType())
{
switch (this.actionType()) {
case FiltersAction.Forward:
result = 'SettingsFiltersActionForward';
break;
@ -121,13 +117,17 @@ class FilterModel extends AbstractModel
this.regDisposables(this.conditions.subscribe(windowResizeCallback));
this.regDisposables(this.name.subscribe((sValue) => {
this.name.error('' === sValue);
}));
this.regDisposables(
this.name.subscribe((sValue) => {
this.name.error('' === sValue);
})
);
this.regDisposables(this.actionValue.subscribe((sValue) => {
this.actionValue.error('' === sValue);
}));
this.regDisposables(
this.actionValue.subscribe((sValue) => {
this.actionValue.error('' === sValue);
})
);
this.regDisposables([this.actionNoStop, this.actionTemplate]);
@ -140,42 +140,42 @@ class FilterModel extends AbstractModel
}
verify() {
if ('' === this.name())
{
if ('' === this.name()) {
this.name.error(true);
return false;
}
if (0 < this.conditions().length)
{
if (_.find(this.conditions(), (cond) => cond && !cond.verify()))
{
if (0 < this.conditions().length) {
if (_.find(this.conditions(), (cond) => cond && !cond.verify())) {
return false;
}
}
if ('' === this.actionValue())
{
if (-1 < inArray(this.actionType(), [
FiltersAction.MoveTo, FiltersAction.Forward, FiltersAction.Reject, FiltersAction.Vacation
]))
{
if ('' === this.actionValue()) {
if (
-1 <
inArray(this.actionType(), [
FiltersAction.MoveTo,
FiltersAction.Forward,
FiltersAction.Reject,
FiltersAction.Vacation
])
) {
this.actionValue.error(true);
return false;
}
}
if (FiltersAction.Forward === this.actionType() &&
-1 === this.actionValue().indexOf('@'))
{
if (FiltersAction.Forward === this.actionType() && -1 === this.actionValue().indexOf('@')) {
this.actionValue.error(true);
return false;
}
if (FiltersAction.Vacation === this.actionType() &&
'' !== this.actionValueFourth() && -1 === this.actionValueFourth().indexOf('@')
)
{
if (
FiltersAction.Vacation === this.actionType() &&
'' !== this.actionValueFourth() &&
-1 === this.actionValueFourth().indexOf('@')
) {
this.actionValueFourth.error(true);
return false;
}
@ -221,8 +221,7 @@ class FilterModel extends AbstractModel
parse(json) {
let result = false;
if (json && 'Object/Filter' === json['@Object'])
{
if (json && 'Object/Filter' === json['@Object']) {
this.id = pString(json.ID);
this.name(pString(json.Name));
this.enabled(!!json.Enabled);
@ -231,12 +230,15 @@ class FilterModel extends AbstractModel
this.conditions([]);
if (isNonEmptyArray(json.Conditions))
{
this.conditions(_.compact(_.map(json.Conditions, (aData) => {
const filterCondition = new FilterConditionModel();
return filterCondition && filterCondition.parse(aData) ? filterCondition : null;
})));
if (isNonEmptyArray(json.Conditions)) {
this.conditions(
_.compact(
_.map(json.Conditions, (aData) => {
const filterCondition = new FilterConditionModel();
return filterCondition && filterCondition.parse(aData) ? filterCondition : null;
})
)
);
}
this.actionType(pString(json.ActionType));
@ -257,7 +259,6 @@ class FilterModel extends AbstractModel
}
cloneSelf() {
const filter = new FilterModel();
filter.id = this.id;
@ -289,4 +290,4 @@ class FilterModel extends AbstractModel
}
}
export {FilterModel, FilterModel as default};
export { FilterModel, FilterModel as default };

View file

@ -1,13 +1,11 @@
import ko from 'ko';
import {FilterConditionField, FilterConditionType} from 'Common/Enums';
import {pString} from 'Common/Utils';
import { FilterConditionField, FilterConditionType } from 'Common/Enums';
import { pString } from 'Common/Utils';
import {AbstractModel} from 'Knoin/AbstractModel';
import { AbstractModel } from 'Knoin/AbstractModel';
class FilterConditionModel extends AbstractModel
{
class FilterConditionModel extends AbstractModel {
constructor() {
super('FilterConditionModel');
@ -20,10 +18,8 @@ class FilterConditionModel extends AbstractModel
this.valueSecond.error = ko.observable(false);
this.template = ko.computed(() => {
let template = '';
switch (this.field())
{
switch (this.field()) {
case FilterConditionField.Size:
template = 'SettingsFiltersConditionSize';
break;
@ -36,7 +32,6 @@ class FilterConditionModel extends AbstractModel
}
return template;
}, this);
this.field.subscribe(() => {
@ -48,14 +43,12 @@ class FilterConditionModel extends AbstractModel
}
verify() {
if ('' === this.value())
{
if ('' === this.value()) {
this.value.error(true);
return false;
}
if (FilterConditionField.Header === this.field() && '' === this.valueSecond())
{
if (FilterConditionField.Header === this.field() && '' === this.valueSecond()) {
this.valueSecond.error(true);
return false;
}
@ -64,8 +57,7 @@ class FilterConditionModel extends AbstractModel
}
parse(json) {
if (json && json.Field && json.Type)
{
if (json && json.Field && json.Type) {
this.field(pString(json.Field));
this.type(pString(json.Type));
this.value(pString(json.Value));
@ -98,4 +90,4 @@ class FilterConditionModel extends AbstractModel
}
}
export {FilterConditionModel, FilterConditionModel as default};
export { FilterConditionModel, FilterConditionModel as default };

View file

@ -1,17 +1,15 @@
import _ from '_';
import ko from 'ko';
import {FolderType} from 'Common/Enums';
import {isPosNumeric} from 'Common/Utils';
import {i18n, trigger as translatorTrigger} from 'Common/Translator';
import {getFolderInboxName} from 'Common/Cache';
import { FolderType } from 'Common/Enums';
import { isPosNumeric } from 'Common/Utils';
import { i18n, trigger as translatorTrigger } from 'Common/Translator';
import { getFolderInboxName } from 'Common/Cache';
import * as Events from 'Common/Events';
import {AbstractModel} from 'Knoin/AbstractModel';
import { AbstractModel } from 'Knoin/AbstractModel';
class FolderModel extends AbstractModel
{
class FolderModel extends AbstractModel {
constructor() {
super('FolderModel');
@ -36,7 +34,7 @@ class FolderModel extends AbstractModel
this.checkable = ko.observable(false);
this.subFolders = ko.observableArray([]);
this.deleteAccess = ko.observable(false);
this.actionBlink = ko.observable(false).extend({falseTimeout: 1000});
this.actionBlink = ko.observable(false).extend({ falseTimeout: 1000 });
this.nameForEdit = ko.observable('');
@ -65,24 +63,26 @@ class FolderModel extends AbstractModel
this.isInbox = ko.computed(() => FolderType.Inbox === this.type());
this.hasSubScribedSubfolders = ko.computed(
() => !!_.find(this.subFolders(), (oFolder) => (oFolder.subScribed() || oFolder.hasSubScribedSubfolders()) && !oFolder.isSystemFolder())
() =>
!!_.find(
this.subFolders(),
(oFolder) => (oFolder.subScribed() || oFolder.hasSubScribedSubfolders()) && !oFolder.isSystemFolder()
)
);
this.canBeEdited = ko.computed(() => FolderType.User === this.type() && this.existen && this.selectable);
this.visible = ko.computed(() => {
const
isSubScribed = this.subScribed(),
const isSubScribed = this.subScribed(),
isSubFolders = this.hasSubScribedSubfolders();
return (isSubScribed || (isSubFolders && (!this.existen || !this.selectable)));
return isSubScribed || (isSubFolders && (!this.existen || !this.selectable));
});
this.isSystemFolder = ko.computed(() => FolderType.User !== this.type());
this.hidden = ko.computed(() => {
const
isSystem = this.isSystemFolder(),
const isSystem = this.isSystemFolder(),
isSubFolders = this.hasSubScribedSubfolders();
return (isSystem && !isSubFolders) || (!this.selectable && !isSubFolders);
@ -90,48 +90,46 @@ class FolderModel extends AbstractModel
this.selectableForFolderList = ko.computed(() => !this.isSystemFolder() && this.selectable);
this.messageCountAll = ko.computed({
read: this.privateMessageCountAll,
write: (iValue) => {
if (isPosNumeric(iValue, true))
{
this.privateMessageCountAll(iValue);
this.messageCountAll = ko
.computed({
read: this.privateMessageCountAll,
write: (iValue) => {
if (isPosNumeric(iValue, true)) {
this.privateMessageCountAll(iValue);
} else {
this.privateMessageCountAll.valueHasMutated();
}
}
else
{
this.privateMessageCountAll.valueHasMutated();
}
}
}).extend({notify: 'always'});
})
.extend({ notify: 'always' });
this.messageCountUnread = ko.computed({
read: this.privateMessageCountUnread,
write: (value) => {
if (isPosNumeric(value, true))
{
this.privateMessageCountUnread(value);
this.messageCountUnread = ko
.computed({
read: this.privateMessageCountUnread,
write: (value) => {
if (isPosNumeric(value, true)) {
this.privateMessageCountUnread(value);
} else {
this.privateMessageCountUnread.valueHasMutated();
}
}
else
{
this.privateMessageCountUnread.valueHasMutated();
}
}
}).extend({notify: 'always'});
})
.extend({ notify: 'always' });
this.printableUnreadCount = ko.computed(() => {
const
count = this.messageCountAll(),
const count = this.messageCountAll(),
unread = this.messageCountUnread(),
type = this.type();
if (0 < count)
{
if (FolderType.Draft === type)
{
if (0 < count) {
if (FolderType.Draft === type) {
return '' + count;
}
else if (0 < unread && FolderType.Trash !== type && FolderType.Archive !== type && FolderType.SentItems !== type)
{
} else if (
0 < unread &&
FolderType.Trash !== type &&
FolderType.Archive !== type &&
FolderType.SentItems !== type
) {
return '' + unread;
}
}
@ -144,21 +142,20 @@ class FolderModel extends AbstractModel
return !bSystem && 0 === this.subFolders().length && inboxFolderName !== this.fullNameRaw;
});
this.canBeSubScribed = ko.computed(() => !this.isSystemFolder() && this.selectable && inboxFolderName !== this.fullNameRaw);
this.canBeSubScribed = ko.computed(
() => !this.isSystemFolder() && this.selectable && inboxFolderName !== this.fullNameRaw
);
this.canBeChecked = this.canBeSubScribed;
this.localName = ko.computed(() => {
translatorTrigger();
let name = this.name();
const type = this.type();
if (this.isSystemFolder())
{
switch (type)
{
if (this.isSystemFolder()) {
switch (type) {
case FolderType.Inbox:
name = i18n('FOLDER_LIST/INBOX_NAME');
break;
@ -185,18 +182,14 @@ class FolderModel extends AbstractModel
});
this.manageFolderSystemName = ko.computed(() => {
translatorTrigger();
let suffix = '';
const
type = this.type(),
const type = this.type(),
name = this.name();
if (this.isSystemFolder())
{
switch (type)
{
if (this.isSystemFolder()) {
switch (type) {
case FolderType.Inbox:
suffix = '(' + i18n('FOLDER_LIST/INBOX_NAME') + ')';
break;
@ -219,8 +212,7 @@ class FolderModel extends AbstractModel
}
}
if ('' !== suffix && '(' + name + ')' === suffix || '(inbox)' === suffix.toLowerCase())
{
if (('' !== suffix && '(' + name + ')' === suffix) || '(inbox)' === suffix.toLowerCase()) {
suffix = '';
}
@ -237,7 +229,11 @@ class FolderModel extends AbstractModel
this.hasUnreadMessages = ko.computed(() => 0 < this.messageCountUnread() && '' !== this.printableUnreadCount());
this.hasSubScribedUnreadMessagesSubfolders = ko.computed(
() => !!_.find(this.subFolders(), (folder) => folder.hasUnreadMessages() || folder.hasSubScribedUnreadMessagesSubfolders())
() =>
!!_.find(
this.subFolders(),
(folder) => folder.hasUnreadMessages() || folder.hasSubScribedUnreadMessagesSubfolders()
)
);
// subscribe
@ -246,15 +242,13 @@ class FolderModel extends AbstractModel
});
this.edited.subscribe((value) => {
if (value)
{
if (value) {
this.nameForEdit(this.name());
}
});
this.messageCountUnread.subscribe((unread) => {
if (FolderType.Inbox === this.type())
{
if (FolderType.Inbox === this.type()) {
Events.pub('mailbox.inbox-unread-count', [unread]);
}
});
@ -266,8 +260,11 @@ class FolderModel extends AbstractModel
* @returns {string}
*/
collapsedCss() {
return this.hasSubScribedSubfolders() ?
(this.collapsed() ? 'icon-right-mini e-collapsed-sign' : 'icon-down-mini e-collapsed-sign') : 'icon-none e-collapsed-sign';
return this.hasSubScribedSubfolders()
? this.collapsed()
? 'icon-right-mini e-collapsed-sign'
: 'icon-down-mini e-collapsed-sign'
: 'icon-none e-collapsed-sign';
}
/**
@ -278,8 +275,7 @@ class FolderModel extends AbstractModel
let bResult = false;
const sInboxFolderName = getFolderInboxName();
if (json && 'Object/Folder' === json['@Object'])
{
if (json && 'Object/Folder' === json['@Object']) {
this.name(json.Name);
this.delimiter = json.Delimiter;
this.fullName = json.FullName;
@ -308,4 +304,4 @@ class FolderModel extends AbstractModel
}
}
export {FolderModel, FolderModel as default};
export { FolderModel, FolderModel as default };

View file

@ -1,16 +1,13 @@
import ko from 'ko';
import {AbstractModel} from 'Knoin/AbstractModel';
import { AbstractModel } from 'Knoin/AbstractModel';
class IdentityModel extends AbstractModel
{
class IdentityModel extends AbstractModel {
/**
* @param {string} id
* @param {string} email
*/
constructor(id, email)
{
constructor(id, email) {
super('IdentityModel');
this.id = ko.observable(id || '');
@ -31,12 +28,11 @@ class IdentityModel extends AbstractModel
* @returns {string}
*/
formattedName() {
const
name = this.name(),
const name = this.name(),
email = this.email();
return '' !== name ? name + ' (' + email + ')' : email;
}
}
export {IdentityModel, IdentityModel as default};
export { IdentityModel, IdentityModel as default };

View file

@ -1,4 +1,3 @@
import _ from '_';
import $ from '$';
import ko from 'ko';
@ -6,28 +5,34 @@ import moment from 'moment';
import classnames from 'classnames';
import lozad from 'lozad';
import {MessagePriority, SignedVerifyStatus} from 'Common/Enums';
import {i18n} from 'Common/Translator';
import {DATA_IMAGE_LAZY_PLACEHOLDER_PIC} from 'Common/Consts';
import { MessagePriority, SignedVerifyStatus } from 'Common/Enums';
import { i18n } from 'Common/Translator';
import { DATA_IMAGE_LAZY_PLACEHOLDER_PIC } from 'Common/Consts';
import {
pInt, inArray, isArray, isUnd, trim,
previewMessage, windowResize, friendlySize, isNonEmptyArray
pInt,
inArray,
isArray,
isUnd,
trim,
previewMessage,
windowResize,
friendlySize,
isNonEmptyArray
} from 'Common/Utils';
import {$win} from 'Common/Globals';
import {messageViewLink, messageDownloadLink} from 'Common/Links';
import { $win } from 'Common/Globals';
import { messageViewLink, messageDownloadLink } from 'Common/Links';
import FolderStore from 'Stores/User/Folder';
import PgpStore from 'Stores/User/Pgp';
import {emailArrayFromJson, emailArrayToStringClear, emailArrayToString, replyHelper} from 'Helper/Message';
import { emailArrayFromJson, emailArrayToStringClear, emailArrayToString, replyHelper } from 'Helper/Message';
import {AttachmentModel, staticCombinedIconClass} from 'Model/Attachment';
import {AbstractModel} from 'Knoin/AbstractModel';
import { AttachmentModel, staticCombinedIconClass } from 'Model/Attachment';
import { AbstractModel } from 'Knoin/AbstractModel';
class MessageModel extends AbstractModel
{
class MessageModel extends AbstractModel {
constructor() {
super('MessageModel');
@ -78,7 +83,9 @@ class MessageModel extends AbstractModel
this.hasAttachments = ko.observable(false);
this.attachmentsSpecData = ko.observableArray([]);
this.attachmentIconClass = ko.computed(() => staticCombinedIconClass(this.hasAttachments() ? this.attachmentsSpecData() : []));
this.attachmentIconClass = ko.computed(() =>
staticCombinedIconClass(this.hasAttachments() ? this.attachmentsSpecData() : [])
);
this.body = null;
@ -194,10 +201,13 @@ class MessageModel extends AbstractModel
* @returns {Array}
*/
getEmails(properties) {
return _.compact(_.uniq(_.map(
_.reduce(properties, (carry, property) => carry.concat(this[property]), []),
(oItem) => (oItem ? oItem.email : '')
)));
return _.compact(
_.uniq(
_.map(_.reduce(properties, (carry, property) => carry.concat(this[property]), []), (oItem) =>
oItem ? oItem.email : ''
)
)
);
}
/**
@ -215,15 +225,20 @@ class MessageModel extends AbstractModel
}
computeSenderEmail() {
const
sentFolder = FolderStore.sentFolder(),
const sentFolder = FolderStore.sentFolder(),
draftFolder = FolderStore.draftFolder();
this.senderEmailsString(this.folderFullNameRaw === sentFolder || this.folderFullNameRaw === draftFolder ?
this.toEmailsString() : this.fromEmailString());
this.senderEmailsString(
this.folderFullNameRaw === sentFolder || this.folderFullNameRaw === draftFolder
? this.toEmailsString()
: this.fromEmailString()
);
this.senderClearEmailsString(this.folderFullNameRaw === sentFolder || this.folderFullNameRaw === draftFolder ?
this.toClearEmailsString() : this.fromClearEmailString());
this.senderClearEmailsString(
this.folderFullNameRaw === sentFolder || this.folderFullNameRaw === draftFolder
? this.toClearEmailsString()
: this.fromClearEmailString()
);
}
/**
@ -231,14 +246,14 @@ class MessageModel extends AbstractModel
* @returns {boolean}
*/
initByJson(json) {
let
result = false,
let result = false,
priority = MessagePriority.Normal;
if (json && 'Object/Message' === json['@Object'])
{
if (json && 'Object/Message' === json['@Object']) {
priority = pInt(json.Priority);
this.priority(-1 < inArray(priority, [MessagePriority.High, MessagePriority.Low]) ? priority : MessagePriority.Normal);
this.priority(
-1 < inArray(priority, [MessagePriority.High, MessagePriority.Low]) ? priority : MessagePriority.Normal
);
this.folderFullNameRaw = json.Folder;
this.uid = json.Uid;
@ -258,13 +273,10 @@ class MessageModel extends AbstractModel
this.unsubsribeLinks = isNonEmptyArray(json.UnsubsribeLinks) ? json.UnsubsribeLinks : [];
this.subject(json.Subject);
if (isArray(json.SubjectParts))
{
if (isArray(json.SubjectParts)) {
this.subjectPrefix(json.SubjectParts[0]);
this.subjectSuffix(json.SubjectParts[1]);
}
else
{
} else {
this.subjectPrefix('');
this.subjectSuffix(this.subject());
}
@ -294,15 +306,14 @@ class MessageModel extends AbstractModel
* @returns {boolean}
*/
initUpdateByMessageJson(json) {
let
result = false,
let result = false,
priority = MessagePriority.Normal;
if (json && 'Object/Message' === json['@Object'])
{
if (json && 'Object/Message' === json['@Object']) {
priority = pInt(json.Priority);
this.priority(-1 < inArray(priority, [MessagePriority.High, MessagePriority.Low]) ?
priority : MessagePriority.Normal);
this.priority(
-1 < inArray(priority, [MessagePriority.High, MessagePriority.Low]) ? priority : MessagePriority.Normal
);
this.aDraftInfo = json.DraftInfo;
@ -312,8 +323,7 @@ class MessageModel extends AbstractModel
this.proxy = !!json.ExternalProxy;
if (PgpStore.capaOpenPGP())
{
if (PgpStore.capaOpenPGP()) {
this.isPgpSigned(!!json.PgpSigned);
this.isPgpEncrypted(!!json.PgpEncrypted);
}
@ -339,22 +349,20 @@ class MessageModel extends AbstractModel
* @returns {Array}
*/
initAttachmentsFromJson(json) {
let
index = 0,
let index = 0,
len = 0,
attachment = null;
const result = [];
if (json && 'Collection/AttachmentCollection' === json['@Object'] && isNonEmptyArray(json['@Collection']))
{
for (index = 0, len = json['@Collection'].length; index < len; index++)
{
if (json && 'Collection/AttachmentCollection' === json['@Object'] && isNonEmptyArray(json['@Collection'])) {
for (index = 0, len = json['@Collection'].length; index < len; index++) {
attachment = AttachmentModel.newInstanceFromJson(json['@Collection'][index]);
if (attachment)
{
if ('' !== attachment.cidWithOutTags && 0 < this.foundedCIDs.length &&
0 <= inArray(attachment.cidWithOutTags, this.foundedCIDs))
{
if (attachment) {
if (
'' !== attachment.cidWithOutTags &&
0 < this.foundedCIDs.length &&
0 <= inArray(attachment.cidWithOutTags, this.foundedCIDs)
) {
attachment.isLinked = true;
}
@ -377,7 +385,7 @@ class MessageModel extends AbstractModel
* @returns {string}
*/
getFirstUnsubsribeLink() {
return this.unsubsribeLinks && 0 < this.unsubsribeLinks.length ? (this.unsubsribeLinks[0] || '') : '';
return this.unsubsribeLinks && 0 < this.unsubsribeLinks.length ? this.unsubsribeLinks[0] || '' : '';
}
/**
@ -386,8 +394,7 @@ class MessageModel extends AbstractModel
*/
initFlagsByJson(json) {
let result = false;
if (json && 'Object/Message' === json['@Object'])
{
if (json && 'Object/Message' === json['@Object']) {
this.unseen(!json.IsSeen);
this.flagged(!!json.IsFlagged);
this.answered(!!json.IsAnswered);
@ -415,8 +422,7 @@ class MessageModel extends AbstractModel
*/
fromDkimData() {
let result = ['none', ''];
if (isNonEmptyArray(this.from) && 1 === this.from.length && this.from[0] && this.from[0].dkimStatus)
{
if (isNonEmptyArray(this.from) && 1 === this.from.length && this.from[0] && this.from[0].dkimStatus) {
result = [this.from[0].dkimStatus, this.from[0].dkimValue || ''];
}
@ -498,8 +504,7 @@ class MessageModel extends AbstractModel
let result = null;
const attachments = this.attachments();
if (isNonEmptyArray(attachments))
{
if (isNonEmptyArray(attachments)) {
cid = cid.replace(/^<+/, '').replace(/>+$/, '');
result = _.find(attachments, (item) => cid === item.cidWithOutTags);
}
@ -515,8 +520,7 @@ class MessageModel extends AbstractModel
let result = null;
const attachments = this.attachments();
if (isNonEmptyArray(attachments))
{
if (isNonEmptyArray(attachments)) {
result = _.find(attachments, (item) => contentLocation === item.contentLocation);
}
@ -571,18 +575,15 @@ class MessageModel extends AbstractModel
* @returns {Array}
*/
replyEmails(excludeEmails, last = false) {
const
result = [],
const result = [],
unic = isUnd(excludeEmails) ? {} : excludeEmails;
replyHelper(this.replyTo, unic, result);
if (0 === result.length)
{
if (0 === result.length) {
replyHelper(this.from, unic, result);
}
if (0 === result.length && !last)
{
if (0 === result.length && !last) {
return this.replyEmails({}, true);
}
@ -596,22 +597,19 @@ class MessageModel extends AbstractModel
*/
replyAllEmails(excludeEmails, last = false) {
let data = [];
const
toResult = [],
const toResult = [],
ccResult = [],
unic = isUnd(excludeEmails) ? {} : excludeEmails;
replyHelper(this.replyTo, unic, toResult);
if (0 === toResult.length)
{
if (0 === toResult.length) {
replyHelper(this.from, unic, toResult);
}
replyHelper(this.to, unic, toResult);
replyHelper(this.cc, unic, ccResult);
if (0 === toResult.length && !last)
{
if (0 === toResult.length && !last) {
data = this.replyAllEmails({}, true);
return [data[0], ccResult];
}
@ -640,22 +638,26 @@ class MessageModel extends AbstractModel
viewPopupMessage(print = false) {
this.showLazyExternalImagesInBody();
const
timeStampInUTC = this.dateTimeStampInUTC() || 0,
const timeStampInUTC = this.dateTimeStampInUTC() || 0,
ccLine = this.ccToLine(false),
m = 0 < timeStampInUTC ? moment.unix(timeStampInUTC) : null;
previewMessage({
title: this.subject(),
subject: this.subject(),
date: m ? m.format('LLL') : '',
fromCreds: this.fromToLine(false),
toLabel: i18n('MESSAGE/LABEL_TO'),
toCreds: this.toToLine(false),
ccClass: ccLine ? '' : 'rl-preview-hide',
ccLabel: i18n('MESSAGE/LABEL_CC'),
ccCreds: ccLine
}, this.body, this.isHtml(), print);
previewMessage(
{
title: this.subject(),
subject: this.subject(),
date: m ? m.format('LLL') : '',
fromCreds: this.fromToLine(false),
toLabel: i18n('MESSAGE/LABEL_TO'),
toCreds: this.toToLine(false),
ccClass: ccLine ? '' : 'rl-preview-hide',
ccLabel: i18n('MESSAGE/LABEL_CC'),
ccCreds: ccLine
},
this.body,
this.isHtml(),
print
);
}
printMessage() {
@ -674,8 +676,7 @@ class MessageModel extends AbstractModel
* @returns {MessageModel}
*/
populateByMessageListItem(message) {
if (message)
{
if (message) {
this.folderFullNameRaw = message.folderFullNameRaw;
this.uid = message.uid;
this.hash = message.hash;
@ -686,8 +687,7 @@ class MessageModel extends AbstractModel
this.subjectPrefix(this.subjectPrefix());
this.subjectSuffix(this.subjectSuffix());
if (message)
{
if (message) {
this.size(message.size());
this.dateTimeStampInUTC(message.dateTimeStampInUTC());
this.priority(message.priority());
@ -731,8 +731,7 @@ class MessageModel extends AbstractModel
this.sInReplyTo = '';
this.sReferences = '';
if (message)
{
if (message) {
this.threads(message.threads());
}
@ -742,11 +741,12 @@ class MessageModel extends AbstractModel
}
showLazyExternalImagesInBody() {
if (this.body)
{
if (this.body) {
$('.lazy.lazy-inited[data-original]', this.body).each(function() {
$(this).attr('src', $(this).attr('data-original')) // eslint-disable-line no-invalid-this
.removeAttr('data-original').removeAttr('data-loaded');
$(this)
.attr('src', $(this).attr('data-original')) // eslint-disable-line no-invalid-this
.removeAttr('data-original')
.removeAttr('data-loaded');
});
}
}
@ -762,32 +762,27 @@ class MessageModel extends AbstractModel
.attr('src', element.dataset.original)
.removeAttr('data-loaded')
.removeAttr('data-original')
.css({opacity: 0.3})
.animate({opacity: 1}, 500);
.css({ opacity: 0.3 })
.animate({ opacity: 1 }, 500);
}
}).observe();
}
showExternalImages(lazy = false) {
if (this.body && this.body.data('rl-has-images'))
{
if (this.body && this.body.data('rl-has-images')) {
this.hasImages(false);
this.body.data('rl-has-images', false);
let attr = this.proxy ? 'data-x-additional-src' : 'data-x-src';
$('[' + attr + ']', this.body).each(function() {
const $this = $(this); // eslint-disable-line no-invalid-this
if (lazy && $this.is('img'))
{
if (lazy && $this.is('img')) {
$this
.addClass('lazy')
.attr('data-original', $this.attr(attr))
.removeAttr('data-loaded');
}
else
{
$this.attr('src', $this.attr(attr))
.removeAttr('data-loaded');
} else {
$this.attr('src', $this.attr(attr)).removeAttr('data-loaded');
}
});
@ -795,12 +790,11 @@ class MessageModel extends AbstractModel
$('[' + attr + ']', this.body).each(function() {
const $this = $(this); // eslint-disable-line no-invalid-this
let style = trim($this.attr('style'));
style = '' === style ? '' : (';' === style.substr(-1) ? style + ' ' : style + '; ');
style = '' === style ? '' : ';' === style.substr(-1) ? style + ' ' : style + '; ';
$this.attr('style', style + $this.attr(attr));
});
if (lazy)
{
if (lazy) {
this.lozad();
$win.resize();
}
@ -810,27 +804,19 @@ class MessageModel extends AbstractModel
}
showInternalImages(lazy = false) {
if (this.body && !this.body.data('rl-init-internal-images'))
{
if (this.body && !this.body.data('rl-init-internal-images')) {
this.body.data('rl-init-internal-images', true);
const self = this;
$('[data-x-src-cid]', this.body).each(function() {
const
$this = $(this), // eslint-disable-line no-invalid-this
const $this = $(this), // eslint-disable-line no-invalid-this
attachment = self.findAttachmentByCid($this.attr('data-x-src-cid'));
if (attachment && attachment.download)
{
if (lazy && $this.is('img'))
{
$this
.addClass('lazy')
.attr('data-original', attachment.linkPreview());
}
else
{
if (attachment && attachment.download) {
if (lazy && $this.is('img')) {
$this.addClass('lazy').attr('data-original', attachment.linkPreview());
} else {
$this.attr('src', attachment.linkPreview());
}
}
@ -839,49 +825,37 @@ class MessageModel extends AbstractModel
$('[data-x-src-location]', this.body).each(function() {
const $this = $(this); // eslint-disable-line no-invalid-this
let attachment = self.findAttachmentByContentLocation($this.attr('data-x-src-location'));
if (!attachment)
{
if (!attachment) {
attachment = self.findAttachmentByCid($this.attr('data-x-src-location'));
}
if (attachment && attachment.download)
{
if (lazy && $this.is('img'))
{
$this
.addClass('lazy')
.attr('data-original', attachment.linkPreview());
}
else
{
if (attachment && attachment.download) {
if (lazy && $this.is('img')) {
$this.addClass('lazy').attr('data-original', attachment.linkPreview());
} else {
$this.attr('src', attachment.linkPreview());
}
}
});
$('[data-x-style-cid]', this.body).each(function() {
let
style = '',
let style = '',
name = '';
const
$this = $(this), // eslint-disable-line no-invalid-this
const $this = $(this), // eslint-disable-line no-invalid-this
attachment = self.findAttachmentByCid($this.attr('data-x-style-cid'));
if (attachment && attachment.linkPreview)
{
if (attachment && attachment.linkPreview) {
name = $this.attr('data-x-style-cid-name');
if ('' !== name)
{
if ('' !== name) {
style = trim($this.attr('style'));
style = '' === style ? '' : (';' === style.substr(-1) ? style + ' ' : style + '; ');
$this.attr('style', style + name + ': url(\'' + attachment.linkPreview() + '\')');
style = '' === style ? '' : ';' === style.substr(-1) ? style + ' ' : style + '; ';
$this.attr('style', style + name + ": url('" + attachment.linkPreview() + "')");
}
}
});
if (lazy)
{
if (lazy) {
// $('.RL-MailMessageView .messageView .messageItem .content')[0]
_.delay(() => this.lozad(), 300);
}
@ -891,24 +865,21 @@ class MessageModel extends AbstractModel
}
storeDataInDom() {
if (this.body)
{
if (this.body) {
this.body.data('rl-is-html', !!this.isHtml());
this.body.data('rl-has-images', !!this.hasImages());
}
}
fetchDataFromDom() {
if (this.body)
{
if (this.body) {
this.isHtml(!!this.body.data('rl-is-html'));
this.hasImages(!!this.body.data('rl-has-images'));
}
}
replacePlaneTextBody(plain) {
if (this.body)
{
if (this.body) {
this.body.html(plain).addClass('b-text-part plain');
}
}
@ -917,8 +888,16 @@ class MessageModel extends AbstractModel
* @returns {string}
*/
flagHash() {
return [this.deleted(), this.deletedMark(), this.unseen(), this.flagged(), this.answered(), this.forwarded(), this.isReadReceipt()].join(',');
return [
this.deleted(),
this.deletedMark(),
this.unseen(),
this.flagged(),
this.answered(),
this.forwarded(),
this.isReadReceipt()
].join(',');
}
}
export {MessageModel, MessageModel as default};
export { MessageModel, MessageModel as default };

View file

@ -1,14 +1,12 @@
import ko from 'ko';
import {isNonEmptyArray, log} from 'Common/Utils';
import { isNonEmptyArray, log } from 'Common/Utils';
import {AbstractModel} from 'Knoin/AbstractModel';
import { AbstractModel } from 'Knoin/AbstractModel';
import PgpStore from 'Stores/User/Pgp';
class OpenPgpKeyModel extends AbstractModel
{
class OpenPgpKeyModel extends AbstractModel {
/**
* @param {string} index
* @param {string} guID
@ -20,8 +18,7 @@ class OpenPgpKeyModel extends AbstractModel
* @param {string} armor
* @param {string} userID
*/
constructor(index, guID, ID, IDs, userIDs, emails, isPrivate, armor, userID)
{
constructor(index, guID, ID, IDs, userIDs, emails, isPrivate, armor, userID) {
super('OpenPgpKeyModel');
this.index = index;
@ -42,16 +39,12 @@ class OpenPgpKeyModel extends AbstractModel
getNativeKey() {
let key = null;
try
{
try {
key = PgpStore.openpgp.key.readArmored(this.armor);
if (key && !key.err && key.keys && key.keys[0])
{
if (key && !key.err && key.keys && key.keys[0]) {
return key;
}
}
catch (e)
{
} catch (e) {
log(e);
}
@ -64,11 +57,9 @@ class OpenPgpKeyModel extends AbstractModel
}
select(pattern, property) {
if (this[property])
{
if (this[property]) {
const index = this[property].indexOf(pattern);
if (-1 !== index)
{
if (-1 !== index) {
this.user = this.users[index];
this.email = this.emails[index];
}
@ -84,4 +75,4 @@ class OpenPgpKeyModel extends AbstractModel
}
}
export {OpenPgpKeyModel, OpenPgpKeyModel as default};
export { OpenPgpKeyModel, OpenPgpKeyModel as default };

View file

@ -1,19 +1,16 @@
import ko from 'ko';
import {pString} from 'Common/Utils';
import { pString } from 'Common/Utils';
import {AbstractModel} from 'Knoin/AbstractModel';
import { AbstractModel } from 'Knoin/AbstractModel';
class TemplateModel extends AbstractModel
{
class TemplateModel extends AbstractModel {
/**
* @param {string} id
* @param {string} name
* @param {string} body
*/
constructor(id, name, body)
{
constructor(id, name, body) {
super('TemplateModel');
this.id = id;
@ -29,8 +26,7 @@ class TemplateModel extends AbstractModel
*/
parse(json) {
let result = false;
if (json && 'Object/Template' === json['@Object'])
{
if (json && 'Object/Template' === json['@Object']) {
this.id = pString(json.ID);
this.name = pString(json.Name);
this.body = pString(json.Body);
@ -43,4 +39,4 @@ class TemplateModel extends AbstractModel
}
}
export {TemplateModel, TemplateModel as default};
export { TemplateModel, TemplateModel as default };

View file

@ -1,19 +1,17 @@
import window from 'window';
import $ from '$';
import {ajax} from 'Common/Links';
import {microtime, isUnd, isNormal, pString, pInt, inArray} from 'Common/Utils';
import {DEFAULT_AJAX_TIMEOUT, TOKEN_ERROR_LIMIT, AJAX_ERROR_LIMIT} from 'Common/Consts';
import {StorageResultType, Notification} from 'Common/Enums';
import {data as GlobalsData} from 'Common/Globals';
import { ajax } from 'Common/Links';
import { microtime, isUnd, isNormal, pString, pInt, inArray } from 'Common/Utils';
import { DEFAULT_AJAX_TIMEOUT, TOKEN_ERROR_LIMIT, AJAX_ERROR_LIMIT } from 'Common/Consts';
import { StorageResultType, Notification } from 'Common/Enums';
import { data as GlobalsData } from 'Common/Globals';
import * as Plugins from 'Common/Plugins';
import * as Settings from 'Storage/Settings';
import {AbstractBasicPromises} from 'Promises/AbstractBasic';
import { AbstractBasicPromises } from 'Promises/AbstractBasic';
class AbstractAjaxPromises extends AbstractBasicPromises
{
class AbstractAjaxPromises extends AbstractBasicPromises {
oRequests = {};
constructor() {
@ -27,10 +25,8 @@ class AbstractAjaxPromises extends AbstractBasicPromises
}
abort(sAction, bClearOnly) {
if (this.oRequests[sAction])
{
if (!bClearOnly && this.oRequests[sAction].abort)
{
if (this.oRequests[sAction]) {
if (!bClearOnly && this.oRequests[sAction].abort) {
this.oRequests[sAction].__aborted__ = true;
this.oRequests[sAction].abort();
}
@ -43,16 +39,13 @@ class AbstractAjaxPromises extends AbstractBasicPromises
}
ajaxRequest(action, isPost, timeOut, params, additionalGetString, fTrigger) {
return new window.Promise((resolve, reject) => {
const start = microtime();
timeOut = isNormal(timeOut) ? timeOut : DEFAULT_AJAX_TIMEOUT;
additionalGetString = isUnd(additionalGetString) ? '' : pString(additionalGetString);
if (isPost)
{
if (isPost) {
params.XToken = Settings.appSettingsGet('token');
}
@ -65,24 +58,20 @@ class AbstractAjaxPromises extends AbstractBasicPromises
url: ajax(additionalGetString),
async: true,
dataType: 'json',
data: isPost ? (params || {}) : {},
data: isPost ? params || {} : {},
timeout: timeOut,
global: true
}).always((data, textStatus) => {
let
isCached = false,
let isCached = false,
errorData = null;
if (data && data.Time)
{
if (data && data.Time) {
isCached = pInt(data.Time) > microtime() - start;
}
// backward capability
let type = '';
switch (true)
{
switch (true) {
case 'success' === textStatus && data && data.Result && action === data.Action:
type = StorageResultType.Success;
break;
@ -95,97 +84,84 @@ class AbstractAjaxPromises extends AbstractBasicPromises
}
Plugins.runHook('ajax-default-response', [
action, StorageResultType.Success === type ? data : null, type, isCached, params
action,
StorageResultType.Success === type ? data : null,
type,
isCached,
params
]);
if ('success' === textStatus)
{
if (data && data.Result && action === data.Action)
{
if ('success' === textStatus) {
if (data && data.Result && action === data.Action) {
data.__cached__ = isCached;
resolve(data);
}
else if (data && data.Action)
{
} else if (data && data.Action) {
errorData = data;
reject(data.ErrorCode ? data.ErrorCode : Notification.AjaxFalse);
}
else
{
} else {
errorData = data;
reject(Notification.AjaxParse);
}
}
else if ('timeout' === textStatus)
{
} else if ('timeout' === textStatus) {
errorData = data;
reject(Notification.AjaxTimeout);
}
else if ('abort' === textStatus)
{
if (!data || !data.__aborted__)
{
} else if ('abort' === textStatus) {
if (!data || !data.__aborted__) {
reject(Notification.AjaxAbort);
}
}
else
{
} else {
errorData = data;
reject(Notification.AjaxParse);
}
if (this.oRequests[action])
{
if (this.oRequests[action]) {
this.oRequests[action] = null;
delete this.oRequests[action];
}
this.setTrigger(fTrigger, false);
if (errorData)
{
if (-1 < inArray(errorData.ErrorCode, [
Notification.AuthError, Notification.AccessError,
Notification.ConnectionError, Notification.DomainNotAllowed, Notification.AccountNotAllowed,
Notification.MailServerError, Notification.UnknownNotification, Notification.UnknownError
]))
{
if (errorData) {
if (
-1 <
inArray(errorData.ErrorCode, [
Notification.AuthError,
Notification.AccessError,
Notification.ConnectionError,
Notification.DomainNotAllowed,
Notification.AccountNotAllowed,
Notification.MailServerError,
Notification.UnknownNotification,
Notification.UnknownError
])
) {
GlobalsData.iAjaxErrorCount += 1;
}
if (Notification.InvalidToken === errorData.ErrorCode)
{
if (Notification.InvalidToken === errorData.ErrorCode) {
GlobalsData.iTokenErrorCount += 1;
}
if (TOKEN_ERROR_LIMIT < GlobalsData.iTokenErrorCount)
{
if (GlobalsData.__APP__ && GlobalsData.__APP__.loginAndLogoutReload)
{
if (TOKEN_ERROR_LIMIT < GlobalsData.iTokenErrorCount) {
if (GlobalsData.__APP__ && GlobalsData.__APP__.loginAndLogoutReload) {
GlobalsData.__APP__.loginAndLogoutReload(false, true);
}
}
if (errorData.ClearAuth || errorData.Logout || AJAX_ERROR_LIMIT < GlobalsData.iAjaxErrorCount)
{
if (GlobalsData.__APP__ && GlobalsData.__APP__.clearClientSideToken)
{
if (errorData.ClearAuth || errorData.Logout || AJAX_ERROR_LIMIT < GlobalsData.iAjaxErrorCount) {
if (GlobalsData.__APP__ && GlobalsData.__APP__.clearClientSideToken) {
GlobalsData.__APP__.clearClientSideToken();
}
if (GlobalsData.__APP__ && !errorData.ClearAuth && GlobalsData.__APP__.loginAndLogoutReload)
{
if (GlobalsData.__APP__ && !errorData.ClearAuth && GlobalsData.__APP__.loginAndLogoutReload) {
GlobalsData.__APP__.loginAndLogoutReload(false, true);
}
}
}
});
if (oH)
{
if (this.oRequests[action])
{
if (oH) {
if (this.oRequests[action]) {
this.oRequests[action] = null;
delete this.oRequests[action];
}
@ -196,7 +172,6 @@ class AbstractAjaxPromises extends AbstractBasicPromises
}
getRequest(sAction, fTrigger, sAdditionalGetString, iTimeOut) {
sAdditionalGetString = isUnd(sAdditionalGetString) ? '' : pString(sAdditionalGetString);
sAdditionalGetString = sAction + '/' + sAdditionalGetString;
@ -204,7 +179,6 @@ class AbstractAjaxPromises extends AbstractBasicPromises
}
postRequest(action, fTrigger, params, timeOut) {
params = params || {};
params.Action = action;
@ -212,4 +186,4 @@ class AbstractAjaxPromises extends AbstractBasicPromises
}
}
export {AbstractAjaxPromises, AbstractAjaxPromises as default};
export { AbstractAjaxPromises, AbstractAjaxPromises as default };

View file

@ -1,9 +1,7 @@
import window from 'window';
import {isArray} from 'Common/Utils';
import { isArray } from 'Common/Utils';
export class AbstractBasicPromises
{
export class AbstractBasicPromises {
oPromisesStack = {};
func(fFunc) {
@ -20,12 +18,10 @@ export class AbstractBasicPromises
}
setTrigger(trigger, value) {
if (trigger)
{
if (trigger) {
value = !!value;
(isArray(trigger) ? trigger : [trigger]).forEach((fTrigger) => {
if (fTrigger)
{
if (fTrigger) {
fTrigger(value);
}
});

View file

@ -1,11 +1,9 @@
import window from 'window';
import PromisesPopulator from 'Promises/User/Populator';
import {AbstractAjaxPromises} from 'Promises/AbstractAjax';
import { AbstractAjaxPromises } from 'Promises/AbstractAjax';
class UserAjaxUserPromises extends AbstractAjaxPromises
{
class UserAjaxUserPromises extends AbstractAjaxPromises {
constructor() {
super();
@ -13,11 +11,13 @@ class UserAjaxUserPromises extends AbstractAjaxPromises
}
foldersReload(fTrigger) {
return this.abort('Folders').postRequest('Folders', fTrigger).then((data) => {
PromisesPopulator.foldersList(data.Result);
PromisesPopulator.foldersAdditionalParameters(data.Result);
return true;
});
return this.abort('Folders')
.postRequest('Folders', fTrigger)
.then((data) => {
PromisesPopulator.foldersList(data.Result);
PromisesPopulator.foldersAdditionalParameters(data.Result);
return true;
});
}
foldersReloadWithTimeout(fTrigger) {

View file

@ -1,9 +1,8 @@
import _ from '_';
import {UNUSED_OPTION_VALUE} from 'Common/Consts';
import {isArray, isNormal, pInt, isUnd, noop} from 'Common/Utils';
import {ClientSideKeyName, ServerFolderType} from 'Common/Enums';
import { UNUSED_OPTION_VALUE } from 'Common/Consts';
import { isArray, isNormal, pInt, isUnd, noop } from 'Common/Utils';
import { ClientSideKeyName, ServerFolderType } from 'Common/Enums';
import * as Cache from 'Common/Cache';
import * as Settings from 'Storage/Settings';
@ -14,11 +13,10 @@ import FolderStore from 'Stores/User/Folder';
import Remote from 'Remote/User/Ajax';
import {FolderModel} from 'Model/Folder';
import {AbstractBasicPromises} from 'Promises/AbstractBasic';
import { FolderModel } from 'Model/Folder';
import { AbstractBasicPromises } from 'Promises/AbstractBasic';
class PromisesUserPopulator extends AbstractBasicPromises
{
class PromisesUserPopulator extends AbstractBasicPromises {
/**
* @param {string} sFullNameHash
* @param {Array?} expandedFolders
@ -33,8 +31,11 @@ class PromisesUserPopulator extends AbstractBasicPromises
* @returns {string}
*/
normalizeFolder(sFolderFullNameRaw) {
return ('' === sFolderFullNameRaw || UNUSED_OPTION_VALUE === sFolderFullNameRaw ||
null !== Cache.getFolderFromCacheList(sFolderFullNameRaw)) ? sFolderFullNameRaw : '';
return '' === sFolderFullNameRaw ||
UNUSED_OPTION_VALUE === sFolderFullNameRaw ||
null !== Cache.getFolderFromCacheList(sFolderFullNameRaw)
? sFolderFullNameRaw
: '';
}
/**
@ -44,61 +45,52 @@ class PromisesUserPopulator extends AbstractBasicPromises
* @returns {Array}
*/
folderResponseParseRec(sNamespace, aFolders, expandedFolders) {
const
bDisplaySpecSetting = FolderStore.displaySpecSetting(),
const bDisplaySpecSetting = FolderStore.displaySpecSetting(),
aList = [];
_.each(aFolders, (oFolder) => {
if (oFolder)
{
if (oFolder) {
let oCacheFolder = Cache.getFolderFromCacheList(oFolder.FullNameRaw);
if (!oCacheFolder)
{
if (!oCacheFolder) {
oCacheFolder = FolderModel.newInstanceFromJson(oFolder);
if (oCacheFolder)
{
if (oCacheFolder) {
Cache.setFolderToCacheList(oFolder.FullNameRaw, oCacheFolder);
Cache.setFolderFullNameRaw(oCacheFolder.fullNameHash, oFolder.FullNameRaw, oCacheFolder);
}
}
if (oCacheFolder)
{
if (bDisplaySpecSetting)
{
if (oCacheFolder) {
if (bDisplaySpecSetting) {
oCacheFolder.checkable(!!oFolder.Checkable);
}
else
{
} else {
oCacheFolder.checkable(true);
}
oCacheFolder.collapsed(!this.isFolderExpanded(oCacheFolder.fullNameHash, expandedFolders));
if (oFolder.Extended)
{
if (oFolder.Extended.Hash)
{
if (oFolder.Extended) {
if (oFolder.Extended.Hash) {
Cache.setFolderHash(oCacheFolder.fullNameRaw, oFolder.Extended.Hash);
}
if (isNormal(oFolder.Extended.MessageCount))
{
if (isNormal(oFolder.Extended.MessageCount)) {
oCacheFolder.messageCountAll(oFolder.Extended.MessageCount);
}
if (isNormal(oFolder.Extended.MessageUnseenCount))
{
if (isNormal(oFolder.Extended.MessageUnseenCount)) {
oCacheFolder.messageCountUnread(oFolder.Extended.MessageUnseenCount);
}
}
if (oFolder.SubFolders && 'Collection/FolderCollection' === oFolder.SubFolders['@Object'] &&
oFolder.SubFolders['@Collection'] && isArray(oFolder.SubFolders['@Collection']))
{
if (
oFolder.SubFolders &&
'Collection/FolderCollection' === oFolder.SubFolders['@Object'] &&
oFolder.SubFolders['@Collection'] &&
isArray(oFolder.SubFolders['@Collection'])
) {
oCacheFolder.subFolders(
this.folderResponseParseRec(sNamespace, oFolder.SubFolders['@Collection'], expandedFolders));
this.folderResponseParseRec(sNamespace, oFolder.SubFolders['@Collection'], expandedFolders)
);
}
aList.push(oCacheFolder);
@ -110,29 +102,39 @@ class PromisesUserPopulator extends AbstractBasicPromises
}
foldersList(oData) {
if (oData && 'Collection/FolderCollection' === oData['@Object'] &&
oData['@Collection'] && isArray(oData['@Collection']))
{
const
expandedFolders = Local.get(ClientSideKeyName.ExpandedFolders),
if (
oData &&
'Collection/FolderCollection' === oData['@Object'] &&
oData['@Collection'] &&
isArray(oData['@Collection'])
) {
const expandedFolders = Local.get(ClientSideKeyName.ExpandedFolders),
cnt = pInt(oData.CountRec);
let limit = pInt(Settings.appSettingsGet('folderSpecLimit'));
limit = 100 < limit ? 100 : (10 > limit ? 10 : limit);
limit = 100 < limit ? 100 : 10 > limit ? 10 : limit;
FolderStore.displaySpecSetting(0 >= cnt || limit < cnt);
FolderStore.folderList(this.folderResponseParseRec(
isUnd(oData.Namespace) ? '' : oData.Namespace, oData['@Collection'], expandedFolders)); // @todo optimization required
FolderStore.folderList(
this.folderResponseParseRec(
isUnd(oData.Namespace) ? '' : oData.Namespace,
oData['@Collection'],
expandedFolders
)
); // @todo optimization required
}
}
foldersAdditionalParameters(oData) {
if (oData && oData && 'Collection/FolderCollection' === oData['@Object'] &&
oData['@Collection'] && isArray(oData['@Collection']))
{
if (!isUnd(oData.Namespace))
{
if (
oData &&
oData &&
'Collection/FolderCollection' === oData['@Object'] &&
oData['@Collection'] &&
isArray(oData['@Collection'])
) {
if (!isUnd(oData.Namespace)) {
FolderStore.namespace = oData.Namespace;
}
@ -142,14 +144,17 @@ class PromisesUserPopulator extends AbstractBasicPromises
let update = false;
if (oData.SystemFolders && '' === '' +
Settings.settingsGet('SentFolder') +
Settings.settingsGet('DraftFolder') +
Settings.settingsGet('SpamFolder') +
Settings.settingsGet('TrashFolder') +
Settings.settingsGet('ArchiveFolder') +
Settings.settingsGet('NullFolder'))
{
if (
oData.SystemFolders &&
'' ===
'' +
Settings.settingsGet('SentFolder') +
Settings.settingsGet('DraftFolder') +
Settings.settingsGet('SpamFolder') +
Settings.settingsGet('TrashFolder') +
Settings.settingsGet('ArchiveFolder') +
Settings.settingsGet('NullFolder')
) {
Settings.settingsSet('SentFolder', oData.SystemFolders[ServerFolderType.SENT] || null);
Settings.settingsSet('DraftFolder', oData.SystemFolders[ServerFolderType.DRAFTS] || null);
Settings.settingsSet('SpamFolder', oData.SystemFolders[ServerFolderType.JUNK] || null);
@ -165,8 +170,7 @@ class PromisesUserPopulator extends AbstractBasicPromises
FolderStore.trashFolder(this.normalizeFolder(Settings.settingsGet('TrashFolder')));
FolderStore.archiveFolder(this.normalizeFolder(Settings.settingsGet('ArchiveFolder')));
if (update)
{
if (update) {
Remote.saveSystemFolders(noop, {
SentFolder: FolderStore.sentFolder(),
DraftFolder: FolderStore.draftFolder(),

View file

@ -1,19 +1,17 @@
import window from 'window';
import _ from '_';
import $ from '$';
import {TOKEN_ERROR_LIMIT, AJAX_ERROR_LIMIT, DEFAULT_AJAX_TIMEOUT} from 'Common/Consts';
import {StorageResultType, Notification} from 'Common/Enums';
import {inArray, pInt, pString, isUnd} from 'Common/Utils';
import {data as GlobalsData} from 'Common/Globals';
import {ajax} from 'Common/Links';
import {runHook} from 'Common/Plugins';
import { TOKEN_ERROR_LIMIT, AJAX_ERROR_LIMIT, DEFAULT_AJAX_TIMEOUT } from 'Common/Consts';
import { StorageResultType, Notification } from 'Common/Enums';
import { inArray, pInt, pString, isUnd } from 'Common/Utils';
import { data as GlobalsData } from 'Common/Globals';
import { ajax } from 'Common/Links';
import { runHook } from 'Common/Plugins';
import * as Settings from 'Storage/Settings';
class AbstractAjaxRemote
{
class AbstractAjaxRemote {
constructor() {
this.oRequests = {};
}
@ -27,72 +25,73 @@ class AbstractAjaxRemote
* @param {*=} oRequestParameters
*/
defaultResponse(fCallback, sRequestAction, sType, oData, bCached, oRequestParameters) {
const
fCall = () => {
if (StorageResultType.Success !== sType && GlobalsData.bUnload)
{
sType = StorageResultType.Unload;
const fCall = () => {
if (StorageResultType.Success !== sType && GlobalsData.bUnload) {
sType = StorageResultType.Unload;
}
if (StorageResultType.Success === sType && oData && !oData.Result) {
if (
oData &&
-1 <
inArray(oData.ErrorCode, [
Notification.AuthError,
Notification.AccessError,
Notification.ConnectionError,
Notification.DomainNotAllowed,
Notification.AccountNotAllowed,
Notification.MailServerError,
Notification.UnknownNotification,
Notification.UnknownError
])
) {
GlobalsData.iAjaxErrorCount += 1;
}
if (StorageResultType.Success === sType && oData && !oData.Result)
{
if (oData && -1 < inArray(oData.ErrorCode, [
Notification.AuthError, Notification.AccessError,
Notification.ConnectionError, Notification.DomainNotAllowed, Notification.AccountNotAllowed,
Notification.MailServerError, Notification.UnknownNotification, Notification.UnknownError
]))
{
GlobalsData.iAjaxErrorCount += 1;
}
if (oData && Notification.InvalidToken === oData.ErrorCode) {
GlobalsData.iTokenErrorCount += 1;
}
if (oData && Notification.InvalidToken === oData.ErrorCode)
{
GlobalsData.iTokenErrorCount += 1;
if (TOKEN_ERROR_LIMIT < GlobalsData.iTokenErrorCount) {
if (GlobalsData.__APP__ && GlobalsData.__APP__.loginAndLogoutReload) {
GlobalsData.__APP__.loginAndLogoutReload(false, true);
}
}
if (TOKEN_ERROR_LIMIT < GlobalsData.iTokenErrorCount)
{
if (GlobalsData.__APP__ && GlobalsData.__APP__.loginAndLogoutReload)
{
if (oData.ClearAuth || oData.Logout || AJAX_ERROR_LIMIT < GlobalsData.iAjaxErrorCount) {
if (GlobalsData.__APP__ && GlobalsData.__APP__.clearClientSideToken) {
GlobalsData.__APP__.clearClientSideToken();
if (!oData.ClearAuth && GlobalsData.__APP__.loginAndLogoutReload) {
GlobalsData.__APP__.loginAndLogoutReload(false, true);
}
}
if (oData.ClearAuth || oData.Logout || AJAX_ERROR_LIMIT < GlobalsData.iAjaxErrorCount)
{
if (GlobalsData.__APP__ && GlobalsData.__APP__.clearClientSideToken)
{
GlobalsData.__APP__.clearClientSideToken();
if (!oData.ClearAuth && GlobalsData.__APP__.loginAndLogoutReload)
{
GlobalsData.__APP__.loginAndLogoutReload(false, true);
}
}
}
}
else if (StorageResultType.Success === sType && oData && oData.Result)
{
GlobalsData.iAjaxErrorCount = 0;
GlobalsData.iTokenErrorCount = 0;
}
} else if (StorageResultType.Success === sType && oData && oData.Result) {
GlobalsData.iAjaxErrorCount = 0;
GlobalsData.iTokenErrorCount = 0;
}
runHook('ajax-default-response', [sRequestAction, StorageResultType.Success === sType ? oData : null, sType, bCached, oRequestParameters]);
runHook('ajax-default-response', [
sRequestAction,
StorageResultType.Success === sType ? oData : null,
sType,
bCached,
oRequestParameters
]);
if (fCallback)
{
fCallback(
sType,
StorageResultType.Success === sType ? oData : null,
bCached,
sRequestAction,
oRequestParameters
);
}
};
if (fCallback) {
fCallback(
sType,
StorageResultType.Success === sType ? oData : null,
bCached,
sRequestAction,
oRequestParameters
);
}
};
switch (sType)
{
switch (sType) {
case 'success':
sType = StorageResultType.Success;
break;
@ -104,12 +103,9 @@ class AbstractAjaxRemote
break;
}
if (StorageResultType.Error === sType)
{
if (StorageResultType.Error === sType) {
_.delay(fCall, 300);
}
else
{
} else {
fCall();
}
}
@ -123,25 +119,20 @@ class AbstractAjaxRemote
* @returns {jQuery.jqXHR}
*/
ajaxRequest(fResultCallback, params, iTimeOut = 20000, sGetAdd = '', abortActions = []) {
const
isPost = '' === sGetAdd,
const isPost = '' === sGetAdd,
headers = {},
start = (new window.Date()).getTime();
start = new window.Date().getTime();
let
action = '';
let action = '';
params = params || {};
action = params.Action || '';
if (action && 0 < abortActions.length)
{
if (action && 0 < abortActions.length) {
_.each(abortActions, (actionToAbort) => {
if (this.oRequests[actionToAbort])
{
if (this.oRequests[actionToAbort]) {
this.oRequests[actionToAbort].__aborted = true;
if (this.oRequests[actionToAbort].abort)
{
if (this.oRequests[actionToAbort].abort) {
this.oRequests[actionToAbort].abort();
}
this.oRequests[actionToAbort] = null;
@ -149,8 +140,7 @@ class AbstractAjaxRemote
});
}
if (isPost)
{
if (isPost) {
params.XToken = Settings.appSettingsGet('token');
}
@ -166,17 +156,13 @@ class AbstractAjaxRemote
});
oDefAjax.always((oData, sType) => {
let cached = false;
if (oData && oData.Time)
{
cached = pInt(oData.Time) > (new window.Date()).getTime() - start;
if (oData && oData.Time) {
cached = pInt(oData.Time) > new window.Date().getTime() - start;
}
if (action && this.oRequests[action])
{
if (this.oRequests[action].__aborted)
{
if (action && this.oRequests[action]) {
if (this.oRequests[action].__aborted) {
sType = 'abort';
}
@ -186,13 +172,10 @@ class AbstractAjaxRemote
this.defaultResponse(fResultCallback, action, sType, oData, cached, params);
});
if (action && 0 < abortActions.length && -1 < inArray(action, abortActions))
{
if (this.oRequests[action])
{
if (action && 0 < abortActions.length && -1 < inArray(action, abortActions)) {
if (this.oRequests[action]) {
this.oRequests[action].__aborted = true;
if (this.oRequests[action].abort)
{
if (this.oRequests[action].abort) {
this.oRequests[action].abort();
}
this.oRequests[action] = null;
@ -201,6 +184,7 @@ class AbstractAjaxRemote
this.oRequests[action] = oDefAjax;
}
// eslint-disable-next-line no-console
oDefAjax.catch(console.log);
return oDefAjax;
}
@ -221,8 +205,13 @@ class AbstractAjaxRemote
runHook('ajax-default-request', [sAction, oParameters, sGetAdd]);
return this.ajaxRequest(fCallback, oParameters,
isUnd(iTimeout) ? DEFAULT_AJAX_TIMEOUT : pInt(iTimeout), sGetAdd, aAbortActions);
return this.ajaxRequest(
fCallback,
oParameters,
isUnd(iTimeout) ? DEFAULT_AJAX_TIMEOUT : pInt(iTimeout),
sGetAdd,
aAbortActions
);
}
/**
@ -284,4 +273,4 @@ class AbstractAjaxRemote
}
}
export {AbstractAjaxRemote, AbstractAjaxRemote as default};
export { AbstractAjaxRemote, AbstractAjaxRemote as default };

View file

@ -1,8 +1,6 @@
import { AbstractAjaxRemote } from 'Remote/AbstractAjax';
import {AbstractAjaxRemote} from 'Remote/AbstractAjax';
class RemoteAdminAjax extends AbstractAjaxRemote
{
class RemoteAdminAjax extends AbstractAjaxRemote {
constructor() {
super();
@ -92,11 +90,16 @@ class RemoteAdminAjax extends AbstractAjaxRemote
* @param {Object} oPackage
*/
packageInstall(fCallback, oPackage) {
this.defaultRequest(fCallback, 'AdminPackageInstall', {
'Id': oPackage.id,
'Type': oPackage.type,
'File': oPackage.file
}, 60000);
this.defaultRequest(
fCallback,
'AdminPackageInstall',
{
'Id': oPackage.id,
'Type': oPackage.type,
'File': oPackage.file
},
60000
);
}
/**
@ -200,11 +203,25 @@ class RemoteAdminAjax extends AbstractAjaxRemote
});
}
createOrUpdateDomain(fCallback,
bCreate, sName,
sIncHost, iIncPort, sIncSecure, bIncShortLogin,
bUseSieve, sSieveAllowRaw, sSieveHost, iSievePort, sSieveSecure,
sOutHost, iOutPort, sOutSecure, bOutShortLogin, bOutAuth, bOutPhpMail,
createOrUpdateDomain(
fCallback,
bCreate,
sName,
sIncHost,
iIncPort,
sIncSecure,
bIncShortLogin,
bUseSieve,
sSieveAllowRaw,
sSieveHost,
iSievePort,
sSieveSecure,
sOutHost,
iOutPort,
sOutSecure,
bOutShortLogin,
bOutAuth,
bOutPhpMail,
sWhiteList
) {
this.defaultRequest(fCallback, 'AdminDomainSave', {
@ -233,10 +250,21 @@ class RemoteAdminAjax extends AbstractAjaxRemote
});
}
testConnectionForDomain(fCallback, sName,
sIncHost, iIncPort, sIncSecure,
bUseSieve, sSieveHost, iSievePort, sSieveSecure,
sOutHost, iOutPort, sOutSecure, bOutAuth, bOutPhpMail
testConnectionForDomain(
fCallback,
sName,
sIncHost,
iIncPort,
sIncSecure,
bUseSieve,
sSieveHost,
iSievePort,
sSieveSecure,
sOutHost,
iOutPort,
sOutSecure,
bOutAuth,
bOutPhpMail
) {
this.defaultRequest(fCallback, 'AdminDomainTest', {
'Name': sName,

View file

@ -1,7 +1,6 @@
import _ from '_';
import {pString, pInt, isArray, trim, boolToAjax} from 'Common/Utils';
import { pString, pInt, isArray, trim, boolToAjax } from 'Common/Utils';
import {
CONTACTS_SYNC_AJAX_TIMEOUT,
@ -19,19 +18,18 @@ import {
getMessageFlagsFromCache
} from 'Common/Cache';
import {subQueryPrefix} from 'Common/Links';
import { subQueryPrefix } from 'Common/Links';
import * as Base64 from 'Common/Base64';
import * as Settings from 'Storage/Settings';
import AppStore from 'Stores/User/App';
import SettingsStore from 'Stores/User/Settings';
import {getApp} from 'Helper/Apps/User';
import { getApp } from 'Helper/Apps/User';
import {AbstractAjaxRemote} from 'Remote/AbstractAjax';
import { AbstractAjaxRemote } from 'Remote/AbstractAjax';
class RemoteUserAjax extends AbstractAjaxRemote
{
class RemoteUserAjax extends AbstractAjaxRemote {
constructor() {
super();
this.oRequests = {};
@ -41,13 +39,20 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {?Function} fCallback
*/
folders(fCallback) {
this.defaultRequest(fCallback, 'Folders', {
'SentFolder': Settings.settingsGet('SentFolder'),
'DraftFolder': Settings.settingsGet('DraftFolder'),
'SpamFolder': Settings.settingsGet('SpamFolder'),
'TrashFolder': Settings.settingsGet('TrashFolder'),
'ArchiveFolder': Settings.settingsGet('ArchiveFolder')
}, null, '', ['Folders']);
this.defaultRequest(
fCallback,
'Folders',
{
'SentFolder': Settings.settingsGet('SentFolder'),
'DraftFolder': Settings.settingsGet('DraftFolder'),
'SpamFolder': Settings.settingsGet('SpamFolder'),
'TrashFolder': Settings.settingsGet('TrashFolder'),
'ArchiveFolder': Settings.settingsGet('ArchiveFolder')
},
null,
'',
['Folders']
);
}
/**
@ -304,40 +309,54 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {boolean=} bSilent = false
*/
messageList(fCallback, sFolderFullNameRaw, iOffset = 0, iLimit = 20, sSearch = '', sThreadUid = '', bSilent = false) {
sFolderFullNameRaw = pString(sFolderFullNameRaw);
const
folderHash = getFolderHash(sFolderFullNameRaw),
const folderHash = getFolderHash(sFolderFullNameRaw),
useThreads = AppStore.threadsAllowed() && SettingsStore.useThreads(),
inboxUidNext = getFolderInboxName() === sFolderFullNameRaw ? getFolderUidNext(sFolderFullNameRaw) : '';
if ('' !== folderHash && ('' === sSearch || -1 === sSearch.indexOf('is:')))
{
return this.defaultRequest(fCallback, 'MessageList', {},
if ('' !== folderHash && ('' === sSearch || -1 === sSearch.indexOf('is:'))) {
return this.defaultRequest(
fCallback,
'MessageList',
{},
'' === sSearch ? DEFAULT_AJAX_TIMEOUT : SEARCH_AJAX_TIMEOUT,
'MessageList/' + subQueryPrefix() + '/' + Base64.urlsafe_encode([
sFolderFullNameRaw,
iOffset,
iLimit,
sSearch,
AppStore.projectHash(),
folderHash,
inboxUidNext,
useThreads ? '1' : '0',
useThreads ? sThreadUid : ''
].join(String.fromCharCode(0))), bSilent ? [] : ['MessageList']);
'MessageList/' +
subQueryPrefix() +
'/' +
Base64.urlsafe_encode(
[
sFolderFullNameRaw,
iOffset,
iLimit,
sSearch,
AppStore.projectHash(),
folderHash,
inboxUidNext,
useThreads ? '1' : '0',
useThreads ? sThreadUid : ''
].join(String.fromCharCode(0))
),
bSilent ? [] : ['MessageList']
);
}
return this.defaultRequest(fCallback, 'MessageList', {
Folder: sFolderFullNameRaw,
Offset: iOffset,
Limit: iLimit,
Search: sSearch,
UidNext: inboxUidNext,
UseThreads: useThreads ? '1' : '0',
ThreadUid: useThreads ? sThreadUid : ''
}, '' === sSearch ? DEFAULT_AJAX_TIMEOUT : SEARCH_AJAX_TIMEOUT, '', bSilent ? [] : ['MessageList']);
return this.defaultRequest(
fCallback,
'MessageList',
{
Folder: sFolderFullNameRaw,
Offset: iOffset,
Limit: iLimit,
Search: sSearch,
UidNext: inboxUidNext,
UseThreads: useThreads ? '1' : '0',
ThreadUid: useThreads ? sThreadUid : ''
},
'' === sSearch ? DEFAULT_AJAX_TIMEOUT : SEARCH_AJAX_TIMEOUT,
'',
bSilent ? [] : ['MessageList']
);
}
/**
@ -345,9 +364,14 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {Array} aDownloads
*/
messageUploadAttachments(fCallback, aDownloads) {
this.defaultRequest(fCallback, 'MessageUploadAttachments', {
'Attachments': aDownloads
}, 999000);
this.defaultRequest(
fCallback,
'MessageUploadAttachments',
{
'Attachments': aDownloads
},
999000
);
}
/**
@ -357,19 +381,28 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @returns {boolean}
*/
message(fCallback, sFolderFullNameRaw, iUid) {
sFolderFullNameRaw = pString(sFolderFullNameRaw);
iUid = pInt(iUid);
if (getFolderFromCacheList(sFolderFullNameRaw) && 0 < iUid)
{
this.defaultRequest(fCallback, 'Message', {}, null,
'Message/' + subQueryPrefix() + '/' + Base64.urlsafe_encode([
sFolderFullNameRaw,
iUid,
AppStore.projectHash(),
AppStore.threadsAllowed() && SettingsStore.useThreads() ? '1' : '0'
].join(String.fromCharCode(0))), ['Message']);
if (getFolderFromCacheList(sFolderFullNameRaw) && 0 < iUid) {
this.defaultRequest(
fCallback,
'Message',
{},
null,
'Message/' +
subQueryPrefix() +
'/' +
Base64.urlsafe_encode(
[
sFolderFullNameRaw,
iUid,
AppStore.projectHash(),
AppStore.threadsAllowed() && SettingsStore.useThreads() ? '1' : '0'
].join(String.fromCharCode(0))
),
['Message']
);
return true;
}
@ -382,9 +415,14 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {Array} aExternals
*/
composeUploadExternals(fCallback, aExternals) {
this.defaultRequest(fCallback, 'ComposeUploadExternals', {
'Externals': aExternals
}, 999000);
this.defaultRequest(
fCallback,
'ComposeUploadExternals',
{
'Externals': aExternals
},
999000
);
}
/**
@ -393,10 +431,15 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {string} sAccessToken
*/
composeUploadDrive(fCallback, sUrl, sAccessToken) {
this.defaultRequest(fCallback, 'ComposeUploadDrive', {
'AccessToken': sAccessToken,
'Url': sUrl
}, 999000);
this.defaultRequest(
fCallback,
'ComposeUploadDrive',
{
'AccessToken': sAccessToken,
'Url': sUrl
},
999000
);
}
/**
@ -405,46 +448,37 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {Array=} list = []
*/
folderInformation(fCallback, folder, list = []) {
let request = true;
const uids = [];
if (isArray(list) && 0 < list.length)
{
if (isArray(list) && 0 < list.length) {
request = false;
_.each(list, (messageListItem) => {
if (!getMessageFlagsFromCache(messageListItem.folderFullNameRaw, messageListItem.uid))
{
if (!getMessageFlagsFromCache(messageListItem.folderFullNameRaw, messageListItem.uid)) {
uids.push(messageListItem.uid);
}
if (0 < messageListItem.threads().length)
{
if (0 < messageListItem.threads().length) {
_.each(messageListItem.threads(), (uid) => {
if (!getMessageFlagsFromCache(messageListItem.folderFullNameRaw, uid))
{
if (!getMessageFlagsFromCache(messageListItem.folderFullNameRaw, uid)) {
uids.push(uid);
}
});
}
});
if (0 < uids.length)
{
if (0 < uids.length) {
request = true;
}
}
if (request)
{
if (request) {
this.defaultRequest(fCallback, 'FolderInformation', {
'Folder': folder,
'FlagsUids': isArray(uids) ? uids.join(',') : '',
'UidNext': getFolderInboxName() === folder ? getFolderUidNext(folder) : ''
});
}
else if (SettingsStore.useThreads())
{
} else if (SettingsStore.useThreads()) {
getApp().reloadFlagsCurrentMessageListAndMessageFromCache();
}
}
@ -527,27 +561,48 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {string} sReferences
* @param {boolean} bMarkAsImportant
*/
saveMessage(fCallback, sIdentityID, sMessageFolder, sMessageUid, sDraftFolder,
sTo, sCc, sBcc, sReplyTo, sSubject, bTextIsHtml, sText, aAttachments, aDraftInfo, sInReplyTo, sReferences, bMarkAsImportant) {
this.defaultRequest(fCallback, 'SaveMessage', {
'IdentityID': sIdentityID,
'MessageFolder': sMessageFolder,
'MessageUid': sMessageUid,
'DraftFolder': sDraftFolder,
'To': sTo,
'Cc': sCc,
'Bcc': sBcc,
'ReplyTo': sReplyTo,
'Subject': sSubject,
'TextIsHtml': bTextIsHtml ? '1' : '0',
'Text': sText,
'DraftInfo': aDraftInfo,
'InReplyTo': sInReplyTo,
'References': sReferences,
'MarkAsImportant': bMarkAsImportant ? '1' : '0',
'Attachments': aAttachments
}, SAVE_MESSAGE_AJAX_TIMEOUT);
saveMessage(
fCallback,
sIdentityID,
sMessageFolder,
sMessageUid,
sDraftFolder,
sTo,
sCc,
sBcc,
sReplyTo,
sSubject,
bTextIsHtml,
sText,
aAttachments,
aDraftInfo,
sInReplyTo,
sReferences,
bMarkAsImportant
) {
this.defaultRequest(
fCallback,
'SaveMessage',
{
'IdentityID': sIdentityID,
'MessageFolder': sMessageFolder,
'MessageUid': sMessageUid,
'DraftFolder': sDraftFolder,
'To': sTo,
'Cc': sCc,
'Bcc': sBcc,
'ReplyTo': sReplyTo,
'Subject': sSubject,
'TextIsHtml': bTextIsHtml ? '1' : '0',
'Text': sText,
'DraftInfo': aDraftInfo,
'InReplyTo': sInReplyTo,
'References': sReferences,
'MarkAsImportant': bMarkAsImportant ? '1' : '0',
'Attachments': aAttachments
},
SAVE_MESSAGE_AJAX_TIMEOUT
);
}
/**
@ -589,30 +644,52 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {boolean} bRequestReadReceipt
* @param {boolean} bMarkAsImportant
*/
sendMessage(fCallback, sIdentityID, sMessageFolder, sMessageUid, sSentFolder,
sTo, sCc, sBcc, sReplyTo, sSubject, bTextIsHtml, sText, aAttachments, aDraftInfo, sInReplyTo, sReferences,
bRequestDsn, bRequestReadReceipt, bMarkAsImportant) {
this.defaultRequest(fCallback, 'SendMessage', {
'IdentityID': sIdentityID,
'MessageFolder': sMessageFolder,
'MessageUid': sMessageUid,
'SentFolder': sSentFolder,
'To': sTo,
'Cc': sCc,
'Bcc': sBcc,
'ReplyTo': sReplyTo,
'Subject': sSubject,
'TextIsHtml': bTextIsHtml ? '1' : '0',
'Text': sText,
'DraftInfo': aDraftInfo,
'InReplyTo': sInReplyTo,
'References': sReferences,
'Dsn': bRequestDsn ? '1' : '0',
'ReadReceiptRequest': bRequestReadReceipt ? '1' : '0',
'MarkAsImportant': bMarkAsImportant ? '1' : '0',
'Attachments': aAttachments
}, SEND_MESSAGE_AJAX_TIMEOUT);
sendMessage(
fCallback,
sIdentityID,
sMessageFolder,
sMessageUid,
sSentFolder,
sTo,
sCc,
sBcc,
sReplyTo,
sSubject,
bTextIsHtml,
sText,
aAttachments,
aDraftInfo,
sInReplyTo,
sReferences,
bRequestDsn,
bRequestReadReceipt,
bMarkAsImportant
) {
this.defaultRequest(
fCallback,
'SendMessage',
{
'IdentityID': sIdentityID,
'MessageFolder': sMessageFolder,
'MessageUid': sMessageUid,
'SentFolder': sSentFolder,
'To': sTo,
'Cc': sCc,
'Bcc': sBcc,
'ReplyTo': sReplyTo,
'Subject': sSubject,
'TextIsHtml': bTextIsHtml ? '1' : '0',
'Text': sText,
'DraftInfo': aDraftInfo,
'InReplyTo': sInReplyTo,
'References': sReferences,
'Dsn': bRequestDsn ? '1' : '0',
'ReadReceiptRequest': bRequestReadReceipt ? '1' : '0',
'MarkAsImportant': bMarkAsImportant ? '1' : '0',
'Attachments': aAttachments
},
SEND_MESSAGE_AJAX_TIMEOUT
);
}
/**
@ -699,13 +776,20 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {boolean=} bMarkAsRead
*/
messagesMove(fCallback, sFolder, sToFolder, aUids, sLearning, bMarkAsRead) {
this.defaultRequest(fCallback, 'MessageMove', {
'FromFolder': sFolder,
'ToFolder': sToFolder,
'Uids': aUids.join(','),
'MarkAsRead': bMarkAsRead ? '1' : '0',
'Learning': sLearning || ''
}, null, '', ['MessageList']);
this.defaultRequest(
fCallback,
'MessageMove',
{
'FromFolder': sFolder,
'ToFolder': sToFolder,
'Uids': aUids.join(','),
'MarkAsRead': bMarkAsRead ? '1' : '0',
'Learning': sLearning || ''
},
null,
'',
['MessageList']
);
}
/**
@ -728,10 +812,17 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {Array} aUids
*/
messagesDelete(fCallback, sFolder, aUids) {
this.defaultRequest(fCallback, 'MessageDelete', {
'Folder': sFolder,
'Uids': aUids.join(',')
}, null, '', ['MessageList']);
this.defaultRequest(
fCallback,
'MessageDelete',
{
'Folder': sFolder,
'Uids': aUids.join(',')
},
null,
'',
['MessageList']
);
}
/**
@ -755,11 +846,18 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {string} sSearch
*/
contacts(fCallback, iOffset, iLimit, sSearch) {
this.defaultRequest(fCallback, 'Contacts', {
'Offset': iOffset,
'Limit': iLimit,
'Search': sSearch
}, null, '', ['Contacts']);
this.defaultRequest(
fCallback,
'Contacts',
{
'Offset': iOffset,
'Limit': iLimit,
'Search': sSearch
},
null,
'',
['Contacts']
);
}
/**
@ -792,10 +890,17 @@ class RemoteUserAjax extends AbstractAjaxRemote
* @param {number} iPage
*/
suggestions(fCallback, sQuery, iPage) {
this.defaultRequest(fCallback, 'Suggestions', {
'Query': sQuery,
'Page': iPage
}, null, '', ['Suggestions']);
this.defaultRequest(
fCallback,
'Suggestions',
{
'Query': sQuery,
'Page': iPage
},
null,
'',
['Suggestions']
);
}
/**

View file

@ -1,22 +1,19 @@
import _ from '_';
import $ from '$';
import ko from 'ko';
import {VIEW_MODELS} from 'Common/Globals';
import {delegateRun, windowResize, log, isUnd, pString} from 'Common/Utils';
import {settings} from 'Common/Links';
import { VIEW_MODELS } from 'Common/Globals';
import { delegateRun, windowResize, log, isUnd, pString } from 'Common/Utils';
import { settings } from 'Common/Links';
import {setHash} from 'Knoin/Knoin';
import {AbstractScreen} from 'Knoin/AbstractScreen';
import { setHash } from 'Knoin/Knoin';
import { AbstractScreen } from 'Knoin/AbstractScreen';
class AbstractSettingsScreen extends AbstractScreen
{
class AbstractSettingsScreen extends AbstractScreen {
/**
* @param {Array} viewModels
*/
constructor(viewModels)
{
constructor(viewModels) {
super('settings', viewModels);
this.menu = ko.observableArray([]);
@ -31,51 +28,57 @@ class AbstractSettingsScreen extends AbstractScreen
* @param {Function=} fCallback
*/
setupSettings(fCallback = null) {
if (fCallback)
{
if (fCallback) {
fCallback();
}
}
onRoute(subName) {
let
settingsScreen = null,
let settingsScreen = null,
RoutedSettingsViewModel = null,
viewModelPlace = null,
viewModelDom = null;
RoutedSettingsViewModel = _.find(VIEW_MODELS.settings,
(SettingsViewModel) => SettingsViewModel && SettingsViewModel.__rlSettingsData && subName === SettingsViewModel.__rlSettingsData.Route
RoutedSettingsViewModel = _.find(
VIEW_MODELS.settings,
(SettingsViewModel) =>
SettingsViewModel && SettingsViewModel.__rlSettingsData && subName === SettingsViewModel.__rlSettingsData.Route
);
if (RoutedSettingsViewModel)
{
if (_.find(VIEW_MODELS['settings-removed'], (DisabledSettingsViewModel) => DisabledSettingsViewModel && DisabledSettingsViewModel === RoutedSettingsViewModel))
{
if (RoutedSettingsViewModel) {
if (
_.find(
VIEW_MODELS['settings-removed'],
(DisabledSettingsViewModel) =>
DisabledSettingsViewModel && DisabledSettingsViewModel === RoutedSettingsViewModel
)
) {
RoutedSettingsViewModel = null;
}
if (RoutedSettingsViewModel && _.find(VIEW_MODELS['settings-disabled'],
(DisabledSettingsViewModel) => DisabledSettingsViewModel && DisabledSettingsViewModel === RoutedSettingsViewModel))
{
if (
RoutedSettingsViewModel &&
_.find(
VIEW_MODELS['settings-disabled'],
(DisabledSettingsViewModel) =>
DisabledSettingsViewModel && DisabledSettingsViewModel === RoutedSettingsViewModel
)
) {
RoutedSettingsViewModel = null;
}
}
if (RoutedSettingsViewModel)
{
if (RoutedSettingsViewModel.__builded && RoutedSettingsViewModel.__vm)
{
if (RoutedSettingsViewModel) {
if (RoutedSettingsViewModel.__builded && RoutedSettingsViewModel.__vm) {
settingsScreen = RoutedSettingsViewModel.__vm;
}
else
{
} else {
viewModelPlace = this.oViewModelPlace;
if (viewModelPlace && 1 === viewModelPlace.length)
{
if (viewModelPlace && 1 === viewModelPlace.length) {
settingsScreen = new RoutedSettingsViewModel();
viewModelDom = $('<div></div>').addClass('rl-settings-view-model').hide();
viewModelDom = $('<div></div>')
.addClass('rl-settings-view-model')
.hide();
viewModelDom.appendTo(viewModelPlace);
settingsScreen.viewModelDom = viewModelDom;
@ -86,26 +89,26 @@ class AbstractSettingsScreen extends AbstractScreen
RoutedSettingsViewModel.__builded = true;
RoutedSettingsViewModel.__vm = settingsScreen;
const tmpl = {name: RoutedSettingsViewModel.__rlSettingsData.Template};
ko.applyBindingAccessorsToNode(viewModelDom[0], {
translatorInit: true,
template: () => tmpl
}, settingsScreen);
const tmpl = { name: RoutedSettingsViewModel.__rlSettingsData.Template };
ko.applyBindingAccessorsToNode(
viewModelDom[0],
{
translatorInit: true,
template: () => tmpl
},
settingsScreen
);
delegateRun(settingsScreen, 'onBuild', [viewModelDom]);
}
else
{
} else {
log('Cannot find sub settings view model position: SettingsSubScreen');
}
}
if (settingsScreen)
{
if (settingsScreen) {
_.defer(() => {
// hide
if (this.oCurrentSubScreen)
{
if (this.oCurrentSubScreen) {
delegateRun(this.oCurrentSubScreen, 'onHide');
this.oCurrentSubScreen.viewModelDom.hide();
}
@ -114,15 +117,18 @@ class AbstractSettingsScreen extends AbstractScreen
this.oCurrentSubScreen = settingsScreen;
// show
if (this.oCurrentSubScreen)
{
if (this.oCurrentSubScreen) {
delegateRun(this.oCurrentSubScreen, 'onBeforeShow');
this.oCurrentSubScreen.viewModelDom.show();
delegateRun(this.oCurrentSubScreen, 'onShow');
delegateRun(this.oCurrentSubScreen, 'onShowWithDelay', [], 200);
_.each(this.menu(), (item) => {
item.selected(settingsScreen && settingsScreen.__rlSettingsData && item.route === settingsScreen.__rlSettingsData.Route);
item.selected(
settingsScreen &&
settingsScreen.__rlSettingsData &&
item.route === settingsScreen.__rlSettingsData.Route
);
});
$('#rl-content .b-settings .b-content .content').scrollTop(0);
@ -132,16 +138,13 @@ class AbstractSettingsScreen extends AbstractScreen
windowResize();
});
}
}
else
{
} else {
setHash(settings(), false, true);
}
}
onHide() {
if (this.oCurrentSubScreen && this.oCurrentSubScreen.viewModelDom)
{
if (this.oCurrentSubScreen && this.oCurrentSubScreen.viewModelDom) {
delegateRun(this.oCurrentSubScreen, 'onHide');
this.oCurrentSubScreen.viewModelDom.hide();
}
@ -149,15 +152,22 @@ class AbstractSettingsScreen extends AbstractScreen
onBuild() {
_.each(VIEW_MODELS.settings, (SettingsViewModel) => {
if (SettingsViewModel && SettingsViewModel.__rlSettingsData && !_.find(VIEW_MODELS['settings-removed'],
(RemoveSettingsViewModel) => RemoveSettingsViewModel && RemoveSettingsViewModel === SettingsViewModel))
{
if (
SettingsViewModel &&
SettingsViewModel.__rlSettingsData &&
!_.find(
VIEW_MODELS['settings-removed'],
(RemoveSettingsViewModel) => RemoveSettingsViewModel && RemoveSettingsViewModel === SettingsViewModel
)
) {
this.menu.push({
route: SettingsViewModel.__rlSettingsData.Route,
label: SettingsViewModel.__rlSettingsData.Label,
selected: ko.observable(false),
disabled: !!_.find(VIEW_MODELS['settings-disabled'],
(DisabledSettingsViewModel) => DisabledSettingsViewModel && DisabledSettingsViewModel === SettingsViewModel)
disabled: !!_.find(
VIEW_MODELS['settings-disabled'],
(DisabledSettingsViewModel) => DisabledSettingsViewModel && DisabledSettingsViewModel === SettingsViewModel
)
});
}
});
@ -166,12 +176,13 @@ class AbstractSettingsScreen extends AbstractScreen
}
routes() {
const
DefaultViewModel = _.find(
const DefaultViewModel = _.find(
VIEW_MODELS.settings,
(SettingsViewModel) => SettingsViewModel && SettingsViewModel.__rlSettingsData && SettingsViewModel.__rlSettingsData.IsDefault
(SettingsViewModel) =>
SettingsViewModel && SettingsViewModel.__rlSettingsData && SettingsViewModel.__rlSettingsData.IsDefault
),
defaultRoute = DefaultViewModel && DefaultViewModel.__rlSettingsData ? DefaultViewModel.__rlSettingsData.Route : 'general',
defaultRoute =
DefaultViewModel && DefaultViewModel.__rlSettingsData ? DefaultViewModel.__rlSettingsData.Route : 'general',
rules = {
subname: /^(.*)$/,
normalize_: (rquest, vals) => {
@ -180,12 +191,8 @@ class AbstractSettingsScreen extends AbstractScreen
}
};
return [
['{subname}/', rules],
['{subname}', rules],
['', rules]
];
return [['{subname}/', rules], ['{subname}', rules], ['', rules]];
}
}
export {AbstractSettingsScreen, AbstractSettingsScreen as default};
export { AbstractSettingsScreen, AbstractSettingsScreen as default };

View file

@ -1,16 +1,12 @@
import { AbstractScreen } from 'Knoin/AbstractScreen';
import {AbstractScreen} from 'Knoin/AbstractScreen';
import { getApp } from 'Helper/Apps/Admin';
import {getApp} from 'Helper/Apps/Admin';
import { LoginAdminView } from 'View/Admin/Login';
import {LoginAdminView} from 'View/Admin/Login';
class LoginAdminScreen extends AbstractScreen
{
class LoginAdminScreen extends AbstractScreen {
constructor() {
super('login', [
LoginAdminView
]);
super('login', [LoginAdminView]);
}
onShow() {
@ -18,4 +14,4 @@ class LoginAdminScreen extends AbstractScreen
}
}
export {LoginAdminScreen, LoginAdminScreen as default};
export { LoginAdminScreen, LoginAdminScreen as default };

View file

@ -1,93 +1,82 @@
import {addSettingsViewModel} from 'Knoin/Knoin';
import {runSettingsViewModelHooks} from 'Common/Plugins';
import { addSettingsViewModel } from 'Knoin/Knoin';
import { runSettingsViewModelHooks } from 'Common/Plugins';
import {AbstractSettingsScreen} from 'Screen/AbstractSettings';
import { AbstractSettingsScreen } from 'Screen/AbstractSettings';
import {GeneralAdminSettings} from 'Settings/Admin/General';
import {DomainsAdminSettings} from 'Settings/Admin/Domains';
import {LoginAdminSettings} from 'Settings/Admin/Login';
import {ContactsAdminSettings} from 'Settings/Admin/Contacts';
import {SecurityAdminSettings} from 'Settings/Admin/Security';
import {SocialAdminSettings} from 'Settings/Admin/Social';
import {PluginsAdminSettings} from 'Settings/Admin/Plugins';
import {PackagesAdminSettings} from 'Settings/Admin/Packages';
import {AboutAdminSettings} from 'Settings/Admin/About';
import { GeneralAdminSettings } from 'Settings/Admin/General';
import { DomainsAdminSettings } from 'Settings/Admin/Domains';
import { LoginAdminSettings } from 'Settings/Admin/Login';
import { ContactsAdminSettings } from 'Settings/Admin/Contacts';
import { SecurityAdminSettings } from 'Settings/Admin/Security';
import { SocialAdminSettings } from 'Settings/Admin/Social';
import { PluginsAdminSettings } from 'Settings/Admin/Plugins';
import { PackagesAdminSettings } from 'Settings/Admin/Packages';
import { AboutAdminSettings } from 'Settings/Admin/About';
import {getApp} from 'Helper/Apps/Admin';
import { getApp } from 'Helper/Apps/Admin';
import {MenuSettingsAdminView} from 'View/Admin/Settings/Menu';
import {PaneSettingsAdminView} from 'View/Admin/Settings/Pane';
import { MenuSettingsAdminView } from 'View/Admin/Settings/Menu';
import { PaneSettingsAdminView } from 'View/Admin/Settings/Pane';
class SettingsAdminScreen extends AbstractSettingsScreen
{
class SettingsAdminScreen extends AbstractSettingsScreen {
constructor() {
super([
MenuSettingsAdminView,
PaneSettingsAdminView
]);
super([MenuSettingsAdminView, PaneSettingsAdminView]);
}
/**
* @param {Function=} fCallback = null
*/
setupSettings(fCallback = null) {
let branding = null,
licensing = null;
if (RL_COMMUNITY)
{
if (RL_COMMUNITY) {
branding = require('Settings/Admin/Branding').default;
}
else
{
} else {
branding = require('Settings/Admin/Prem/Branding').default;
licensing = require('Settings/Admin/Prem/Licensing').default;
}
addSettingsViewModel(GeneralAdminSettings,
'AdminSettingsGeneral', 'TABS_LABELS/LABEL_GENERAL_NAME', 'general', true);
addSettingsViewModel(
GeneralAdminSettings,
'AdminSettingsGeneral',
'TABS_LABELS/LABEL_GENERAL_NAME',
'general',
true
);
addSettingsViewModel(DomainsAdminSettings,
'AdminSettingsDomains', 'TABS_LABELS/LABEL_DOMAINS_NAME', 'domains');
addSettingsViewModel(DomainsAdminSettings, 'AdminSettingsDomains', 'TABS_LABELS/LABEL_DOMAINS_NAME', 'domains');
addSettingsViewModel(LoginAdminSettings,
'AdminSettingsLogin', 'TABS_LABELS/LABEL_LOGIN_NAME', 'login');
addSettingsViewModel(LoginAdminSettings, 'AdminSettingsLogin', 'TABS_LABELS/LABEL_LOGIN_NAME', 'login');
if (branding)
{
addSettingsViewModel(branding,
'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding');
if (branding) {
addSettingsViewModel(branding, 'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding');
}
addSettingsViewModel(ContactsAdminSettings,
'AdminSettingsContacts', 'TABS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
addSettingsViewModel(ContactsAdminSettings, 'AdminSettingsContacts', 'TABS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
addSettingsViewModel(SecurityAdminSettings,
'AdminSettingsSecurity', 'TABS_LABELS/LABEL_SECURITY_NAME', 'security');
addSettingsViewModel(SecurityAdminSettings, 'AdminSettingsSecurity', 'TABS_LABELS/LABEL_SECURITY_NAME', 'security');
addSettingsViewModel(SocialAdminSettings,
'AdminSettingsSocial', 'TABS_LABELS/LABEL_INTEGRATION_NAME', 'integrations');
addSettingsViewModel(
SocialAdminSettings,
'AdminSettingsSocial',
'TABS_LABELS/LABEL_INTEGRATION_NAME',
'integrations'
);
addSettingsViewModel(PluginsAdminSettings,
'AdminSettingsPlugins', 'TABS_LABELS/LABEL_PLUGINS_NAME', 'plugins');
addSettingsViewModel(PluginsAdminSettings, 'AdminSettingsPlugins', 'TABS_LABELS/LABEL_PLUGINS_NAME', 'plugins');
addSettingsViewModel(PackagesAdminSettings,
'AdminSettingsPackages', 'TABS_LABELS/LABEL_PACKAGES_NAME', 'packages');
addSettingsViewModel(PackagesAdminSettings, 'AdminSettingsPackages', 'TABS_LABELS/LABEL_PACKAGES_NAME', 'packages');
if (licensing)
{
addSettingsViewModel(licensing,
'AdminSettingsLicensing', 'TABS_LABELS/LABEL_LICENSING_NAME', 'licensing');
if (licensing) {
addSettingsViewModel(licensing, 'AdminSettingsLicensing', 'TABS_LABELS/LABEL_LICENSING_NAME', 'licensing');
}
addSettingsViewModel(AboutAdminSettings,
'AdminSettingsAbout', 'TABS_LABELS/LABEL_ABOUT_NAME', 'about');
addSettingsViewModel(AboutAdminSettings, 'AdminSettingsAbout', 'TABS_LABELS/LABEL_ABOUT_NAME', 'about');
runSettingsViewModelHooks(true);
if (fCallback)
{
if (fCallback) {
fCallback();
}
}
@ -97,4 +86,4 @@ class SettingsAdminScreen extends AbstractSettingsScreen
}
}
export {SettingsAdminScreen, SettingsAdminScreen as default};
export { SettingsAdminScreen, SettingsAdminScreen as default };

View file

@ -1,12 +1,10 @@
import { AbstractScreen } from 'Knoin/AbstractScreen';
import {AbstractScreen} from 'Knoin/AbstractScreen';
import { AboutUserView } from 'View/User/About';
import {AboutUserView} from 'View/User/About';
import { getApp } from 'Helper/Apps/User';
import {getApp} from 'Helper/Apps/User';
class AboutUserScreen extends AbstractScreen
{
class AboutUserScreen extends AbstractScreen {
constructor() {
super('about', [AboutUserView]);
}
@ -16,4 +14,4 @@ class AboutUserScreen extends AbstractScreen
}
}
export {AboutUserScreen, AboutUserScreen as default};
export { AboutUserScreen, AboutUserScreen as default };

View file

@ -1,12 +1,10 @@
import { AbstractScreen } from 'Knoin/AbstractScreen';
import {AbstractScreen} from 'Knoin/AbstractScreen';
import { LoginUserView } from 'View/User/Login';
import {LoginUserView} from 'View/User/Login';
import { getApp } from 'Helper/Apps/User';
import {getApp} from 'Helper/Apps/User';
class LoginUserScreen extends AbstractScreen
{
class LoginUserScreen extends AbstractScreen {
constructor() {
super('login', [LoginUserView]);
}
@ -16,4 +14,4 @@ class LoginUserScreen extends AbstractScreen
}
}
export {LoginUserScreen, LoginUserScreen as default};
export { LoginUserScreen, LoginUserScreen as default };

View file

@ -1,11 +1,10 @@
import _ from '_';
import {Focused, Capa, ClientSideKeyName, Magics} from 'Common/Enums';
import {$html, leftPanelDisabled, leftPanelType, moveAction, bMobileDevice} from 'Common/Globals';
import {pString, pInt, decodeURI, windowResizeCallback} from 'Common/Utils';
import {getFolderFromCacheList, getFolderFullNameRaw, getFolderInboxName} from 'Common/Cache';
import {i18n} from 'Common/Translator';
import { Focused, Capa, ClientSideKeyName, Magics } from 'Common/Enums';
import { $html, leftPanelDisabled, leftPanelType, moveAction, bMobileDevice } from 'Common/Globals';
import { pString, pInt, decodeURI, windowResizeCallback } from 'Common/Utils';
import { getFolderFromCacheList, getFolderFullNameRaw, getFolderInboxName } from 'Common/Cache';
import { i18n } from 'Common/Translator';
import * as Events from 'Common/Events';
import * as Settings from 'Storage/Settings';
@ -16,19 +15,18 @@ import SettingsStore from 'Stores/User/Settings';
import FolderStore from 'Stores/User/Folder';
import MessageStore from 'Stores/User/Message';
import {SystemDropDownMailBoxUserView} from 'View/User/MailBox/SystemDropDown';
import {FolderListMailBoxUserView} from 'View/User/MailBox/FolderList';
import {MessageListMailBoxUserView} from 'View/User/MailBox/MessageList';
import {MessageViewMailBoxUserView} from 'View/User/MailBox/MessageView';
import { SystemDropDownMailBoxUserView } from 'View/User/MailBox/SystemDropDown';
import { FolderListMailBoxUserView } from 'View/User/MailBox/FolderList';
import { MessageListMailBoxUserView } from 'View/User/MailBox/MessageList';
import { MessageViewMailBoxUserView } from 'View/User/MailBox/MessageView';
import {getApp} from 'Helper/Apps/User';
import { getApp } from 'Helper/Apps/User';
import {warmUpScreenPopup} from 'Knoin/Knoin';
import { warmUpScreenPopup } from 'Knoin/Knoin';
import {AbstractScreen} from 'Knoin/AbstractScreen';
import { AbstractScreen } from 'Knoin/AbstractScreen';
class MailBoxUserScreen extends AbstractScreen
{
class MailBoxUserScreen extends AbstractScreen {
constructor() {
super('mailbox', [
SystemDropDownMailBoxUserView,
@ -45,12 +43,16 @@ class MailBoxUserScreen extends AbstractScreen
let foldersInboxUnreadCount = FolderStore.foldersInboxUnreadCount();
const email = AccountStore.email();
if (Settings.appSettingsGet('listPermanentFiltered'))
{
if (Settings.appSettingsGet('listPermanentFiltered')) {
foldersInboxUnreadCount = 0;
}
getApp().setWindowTitle(('' === email ? '' : '' + (0 < foldersInboxUnreadCount ? '(' + foldersInboxUnreadCount + ') ' : ' ') + email + ' - ') + i18n('TITLES/MAILBOX'));
getApp().setWindowTitle(
('' === email
? ''
: '' + (0 < foldersInboxUnreadCount ? '(' + foldersInboxUnreadCount + ') ' : ' ') + email + ' - ') +
i18n('TITLES/MAILBOX')
);
}
/**
@ -62,17 +64,13 @@ class MailBoxUserScreen extends AbstractScreen
AppStore.focusedState(Focused.None);
AppStore.focusedState(Focused.MessageList);
if (Settings.appSettingsGet('mobile'))
{
if (Settings.appSettingsGet('mobile')) {
leftPanelDisabled(true);
}
if (!Settings.capa(Capa.Folders))
{
if (!Settings.capa(Capa.Folders)) {
leftPanelType(Settings.capa(Capa.Composer) || Settings.capa(Capa.Contacts) ? 'short' : 'none');
}
else
{
} else {
leftPanelType('');
}
}
@ -87,10 +85,8 @@ class MailBoxUserScreen extends AbstractScreen
let threadUid = folderHash.replace(/^(.+)~([\d]+)$/, '$2');
const folder = getFolderFromCacheList(getFolderFullNameRaw(folderHash.replace(/~([\d]+)$/, '')));
if (folder)
{
if (folderHash === threadUid)
{
if (folder) {
if (folderHash === threadUid) {
threadUid = '';
}
@ -121,8 +117,7 @@ class MailBoxUserScreen extends AbstractScreen
const email = AccountStore.email();
_.each(AccountStore.accounts(), (item) => {
if (item && email === item.email)
{
if (item && email === item.email) {
item.count(count);
}
});
@ -135,8 +130,7 @@ class MailBoxUserScreen extends AbstractScreen
* @returns {void}
*/
onBuild() {
if (!bMobileDevice && !Settings.appSettingsGet('mobile'))
{
if (!bMobileDevice && !Settings.appSettingsGet('mobile')) {
_.defer(() => {
getApp().initHorizontalLayoutResizer(ClientSideKeyName.MessageListSize);
});
@ -151,16 +145,14 @@ class MailBoxUserScreen extends AbstractScreen
* @returns {Array}
*/
routes() {
const
inboxFolderName = getFolderInboxName(),
const inboxFolderName = getFolderInboxName(),
fNormS = (request, vals) => {
vals[0] = pString(vals[0]);
vals[1] = pInt(vals[1]);
vals[1] = 0 >= vals[1] ? 1 : vals[1];
vals[2] = pString(vals[2]);
if ('' === request)
{
if ('' === request) {
vals[0] = inboxFolderName;
vals[1] = 1;
}
@ -171,8 +163,7 @@ class MailBoxUserScreen extends AbstractScreen
vals[0] = pString(vals[0]);
vals[1] = pString(vals[1]);
if ('' === request)
{
if ('' === request) {
vals[0] = inboxFolderName;
}
@ -180,12 +171,12 @@ class MailBoxUserScreen extends AbstractScreen
};
return [
[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)\/(.+)\/?$/, {'normalize_': fNormS}],
[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)$/, {'normalize_': fNormS}],
[/^([a-zA-Z0-9~]+)\/(.+)\/?$/, {'normalize_': fNormD}],
[/^([^\/]*)$/, {'normalize_': fNormS}]
[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)\/(.+)\/?$/, { 'normalize_': fNormS }],
[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)$/, { 'normalize_': fNormS }],
[/^([a-zA-Z0-9~]+)\/(.+)\/?$/, { 'normalize_': fNormD }],
[/^([^/]*)$/, { 'normalize_': fNormS }]
];
}
}
export {MailBoxUserScreen, MailBoxUserScreen as default};
export { MailBoxUserScreen, MailBoxUserScreen as default };

View file

@ -1,135 +1,127 @@
import {Capa, KeyState} from 'Common/Enums';
import {keyScope, leftPanelType, leftPanelDisabled} from 'Common/Globals';
import {runSettingsViewModelHooks} from 'Common/Plugins';
import {initOnStartOrLangChange, i18n} from 'Common/Translator';
import { Capa, KeyState } from 'Common/Enums';
import { keyScope, leftPanelType, leftPanelDisabled } from 'Common/Globals';
import { runSettingsViewModelHooks } from 'Common/Plugins';
import { initOnStartOrLangChange, i18n } from 'Common/Translator';
import AppStore from 'Stores/User/App';
import AccountStore from 'Stores/User/Account';
import * as Settings from 'Storage/Settings';
import {addSettingsViewModel} from 'Knoin/Knoin';
import { addSettingsViewModel } from 'Knoin/Knoin';
import {AbstractSettingsScreen} from 'Screen/AbstractSettings';
import { AbstractSettingsScreen } from 'Screen/AbstractSettings';
import {GeneralUserSettings} from 'Settings/User/General';
import {ContactsUserSettings} from 'Settings/User/Contacts';
import {AccountsUserSettings} from 'Settings/User/Accounts';
import {FiltersUserSettings} from 'Settings/User/Filters';
import {SecurityUserSettings} from 'Settings/User/Security';
import {SocialUserSettings} from 'Settings/User/Social';
import {ChangePasswordUserSettings} from 'Settings/User/ChangePassword';
import {TemplatesUserSettings} from 'Settings/User/Templates';
import {FoldersUserSettings} from 'Settings/User/Folders';
import {ThemesUserSettings} from 'Settings/User/Themes';
import {OpenPgpUserSettings} from 'Settings/User/OpenPgp';
import { GeneralUserSettings } from 'Settings/User/General';
import { ContactsUserSettings } from 'Settings/User/Contacts';
import { AccountsUserSettings } from 'Settings/User/Accounts';
import { FiltersUserSettings } from 'Settings/User/Filters';
import { SecurityUserSettings } from 'Settings/User/Security';
import { SocialUserSettings } from 'Settings/User/Social';
import { ChangePasswordUserSettings } from 'Settings/User/ChangePassword';
import { TemplatesUserSettings } from 'Settings/User/Templates';
import { FoldersUserSettings } from 'Settings/User/Folders';
import { ThemesUserSettings } from 'Settings/User/Themes';
import { OpenPgpUserSettings } from 'Settings/User/OpenPgp';
import {SystemDropDownSettingsUserView} from 'View/User/Settings/SystemDropDown';
import {MenuSettingsUserView} from 'View/User/Settings/Menu';
import {PaneSettingsUserView} from 'View/User/Settings/Pane';
import { SystemDropDownSettingsUserView } from 'View/User/Settings/SystemDropDown';
import { MenuSettingsUserView } from 'View/User/Settings/Menu';
import { PaneSettingsUserView } from 'View/User/Settings/Pane';
import {getApp} from 'Helper/Apps/User';
import { getApp } from 'Helper/Apps/User';
class SettingsUserScreen extends AbstractSettingsScreen
{
class SettingsUserScreen extends AbstractSettingsScreen {
constructor() {
super([
SystemDropDownSettingsUserView,
MenuSettingsUserView,
PaneSettingsUserView
]);
super([SystemDropDownSettingsUserView, MenuSettingsUserView, PaneSettingsUserView]);
initOnStartOrLangChange(() => {
this.sSettingsTitle = i18n('TITLES/SETTINGS');
}, () => {
this.setSettingsTitle();
});
initOnStartOrLangChange(
() => {
this.sSettingsTitle = i18n('TITLES/SETTINGS');
},
() => {
this.setSettingsTitle();
}
);
}
/**
* @param {Function=} fCallback
*/
setupSettings(fCallback = null) {
if (!Settings.capa(Capa.Settings))
{
if (fCallback)
{
if (!Settings.capa(Capa.Settings)) {
if (fCallback) {
fCallback();
}
return false;
}
addSettingsViewModel(GeneralUserSettings,
'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
addSettingsViewModel(GeneralUserSettings, 'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
if (AppStore.contactsIsAllowed())
{
addSettingsViewModel(ContactsUserSettings,
'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
if (AppStore.contactsIsAllowed()) {
addSettingsViewModel(ContactsUserSettings, 'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
}
if (Settings.capa(Capa.AdditionalAccounts) || Settings.capa(Capa.Identities))
{
addSettingsViewModel(AccountsUserSettings, 'SettingsAccounts',
Settings.capa(Capa.AdditionalAccounts) ? 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME' : 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'accounts');
if (Settings.capa(Capa.AdditionalAccounts) || Settings.capa(Capa.Identities)) {
addSettingsViewModel(
AccountsUserSettings,
'SettingsAccounts',
Settings.capa(Capa.AdditionalAccounts)
? 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME'
: 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME',
'accounts'
);
}
if (Settings.capa(Capa.Sieve))
{
addSettingsViewModel(FiltersUserSettings,
'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
if (Settings.capa(Capa.Sieve)) {
addSettingsViewModel(FiltersUserSettings, 'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
}
if (Settings.capa(Capa.AutoLogout) || Settings.capa(Capa.TwoFactor))
{
addSettingsViewModel(SecurityUserSettings,
'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
if (Settings.capa(Capa.AutoLogout) || Settings.capa(Capa.TwoFactor)) {
addSettingsViewModel(SecurityUserSettings, 'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
}
if (AccountStore.isRootAccount() && (
(Settings.settingsGet('AllowGoogleSocial') && Settings.settingsGet('AllowGoogleSocialAuth')) ||
Settings.settingsGet('AllowFacebookSocial') ||
Settings.settingsGet('AllowTwitterSocial')))
{
addSettingsViewModel(SocialUserSettings,
'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
if (
AccountStore.isRootAccount() &&
((Settings.settingsGet('AllowGoogleSocial') && Settings.settingsGet('AllowGoogleSocialAuth')) ||
Settings.settingsGet('AllowFacebookSocial') ||
Settings.settingsGet('AllowTwitterSocial'))
) {
addSettingsViewModel(SocialUserSettings, 'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
}
if (Settings.settingsGet('ChangePasswordIsAllowed'))
{
addSettingsViewModel(ChangePasswordUserSettings,
'SettingsChangePassword', 'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME', 'change-password');
if (Settings.settingsGet('ChangePasswordIsAllowed')) {
addSettingsViewModel(
ChangePasswordUserSettings,
'SettingsChangePassword',
'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME',
'change-password'
);
}
if (Settings.capa(Capa.Templates))
{
addSettingsViewModel(TemplatesUserSettings,
'SettingsTemplates', 'SETTINGS_LABELS/LABEL_TEMPLATES_NAME', 'templates');
if (Settings.capa(Capa.Templates)) {
addSettingsViewModel(
TemplatesUserSettings,
'SettingsTemplates',
'SETTINGS_LABELS/LABEL_TEMPLATES_NAME',
'templates'
);
}
if (Settings.capa(Capa.Folders))
{
addSettingsViewModel(FoldersUserSettings,
'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
if (Settings.capa(Capa.Folders)) {
addSettingsViewModel(FoldersUserSettings, 'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
}
if (Settings.capa(Capa.Themes))
{
addSettingsViewModel(ThemesUserSettings,
'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
if (Settings.capa(Capa.Themes)) {
addSettingsViewModel(ThemesUserSettings, 'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
}
if (Settings.capa(Capa.OpenPGP))
{
addSettingsViewModel(OpenPgpUserSettings,
'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
if (Settings.capa(Capa.OpenPGP)) {
addSettingsViewModel(OpenPgpUserSettings, 'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
}
runSettingsViewModelHooks(false);
if (fCallback)
{
if (fCallback) {
fCallback();
}
@ -141,8 +133,7 @@ class SettingsUserScreen extends AbstractSettingsScreen
keyScope(KeyState.Settings);
leftPanelType('');
if (Settings.appSettingsGet('mobile'))
{
if (Settings.appSettingsGet('mobile')) {
leftPanelDisabled(true);
}
}
@ -153,4 +144,4 @@ class SettingsUserScreen extends AbstractSettingsScreen
}
}
export {SettingsUserScreen, SettingsUserScreen as default};
export { SettingsUserScreen, SettingsUserScreen as default };

View file

@ -1,15 +1,14 @@
import ko from 'ko';
import {i18n, trigger as translatorTrigger} from 'Common/Translator';
import {appSettingsGet, settingsGet} from 'Storage/Settings';
import { i18n, trigger as translatorTrigger } from 'Common/Translator';
import { appSettingsGet, settingsGet } from 'Storage/Settings';
import AppStore from 'Stores/Admin/App';
import CoreStore from 'Stores/Admin/Core';
import {getApp} from 'Helper/Apps/Admin';
import { getApp } from 'Helper/Apps/Admin';
class AboutAdminSettings
{
class AboutAdminSettings {
constructor() {
this.version = ko.observable(appSettingsGet('version'));
this.access = ko.observable(!!settingsGet('CoreAccess'));
@ -32,35 +31,25 @@ class AboutAdminSettings
this.coreRemoteVersionHtmlDesc = ko.computed(() => {
translatorTrigger();
return i18n('TAB_ABOUT/HTML_NEW_VERSION', {'VERSION': this.coreRemoteVersion()});
return i18n('TAB_ABOUT/HTML_NEW_VERSION', { 'VERSION': this.coreRemoteVersion() });
});
this.statusType = ko.computed(() => {
let type = '';
const
versionToCompare = this.coreVersionCompare(),
const versionToCompare = this.coreVersionCompare(),
isChecking = this.coreChecking(),
isUpdating = this.coreUpdating(),
isReal = this.coreReal();
if (isChecking)
{
if (isChecking) {
type = 'checking';
}
else if (isUpdating)
{
} else if (isUpdating) {
type = 'updating';
}
else if (isReal && 0 === versionToCompare)
{
} else if (isReal && 0 === versionToCompare) {
type = 'up-to-date';
}
else if (isReal && -1 === versionToCompare)
{
} else if (isReal && -1 === versionToCompare) {
type = 'available';
}
else if (!isReal)
{
} else if (!isReal) {
type = 'error';
this.errorDesc('Cannot access the repository at the moment.');
}
@ -70,18 +59,16 @@ class AboutAdminSettings
}
onBuild() {
if (this.access() && !this.community)
{
if (this.access() && !this.community) {
getApp().reloadCoreData();
}
}
updateCoreData() {
if (!this.coreUpdating() && !this.community)
{
if (!this.coreUpdating() && !this.community) {
getApp().updateCoreData();
}
}
}
export {AboutAdminSettings, AboutAdminSettings as default};
export { AboutAdminSettings, AboutAdminSettings as default };

View file

@ -1,18 +1,16 @@
import _ from '_';
import ko from 'ko';
import {Magics} from 'Common/Enums';
import {settingsSaveHelperSimpleFunction, trim} from 'Common/Utils';
import {i18n, trigger as translatorTrigger} from 'Common/Translator';
import { Magics } from 'Common/Enums';
import { settingsSaveHelperSimpleFunction, trim } from 'Common/Utils';
import { i18n, trigger as translatorTrigger } from 'Common/Translator';
import Remote from 'Remote/Admin/Ajax';
import AppStore from 'Stores/Admin/App';
import {settingsGet} from 'Storage/Settings';
import { settingsGet } from 'Storage/Settings';
class BrandingAdminSettings
{
class BrandingAdminSettings {
constructor() {
this.capa = AppStore.prem;
@ -33,9 +31,9 @@ class BrandingAdminSettings
this.welcomePageDisplay.options = ko.computed(() => {
translatorTrigger();
return [
{optValue: 'none', optText: i18n('TAB_BRANDING/OPTION_WELCOME_PAGE_DISPLAY_NONE')},
{optValue: 'once', optText: i18n('TAB_BRANDING/OPTION_WELCOME_PAGE_DISPLAY_ONCE')},
{optValue: 'always', optText: i18n('TAB_BRANDING/OPTION_WELCOME_PAGE_DISPLAY_ALWAYS')}
{ optValue: 'none', optText: i18n('TAB_BRANDING/OPTION_WELCOME_PAGE_DISPLAY_NONE') },
{ optValue: 'once', optText: i18n('TAB_BRANDING/OPTION_WELCOME_PAGE_DISPLAY_ONCE') },
{ optValue: 'always', optText: i18n('TAB_BRANDING/OPTION_WELCOME_PAGE_DISPLAY_ALWAYS') }
];
});
@ -45,8 +43,7 @@ class BrandingAdminSettings
onBuild() {
_.delay(() => {
const
f1 = settingsSaveHelperSimpleFunction(this.title.trigger, this),
const f1 = settingsSaveHelperSimpleFunction(this.title.trigger, this),
f2 = settingsSaveHelperSimpleFunction(this.loadingDesc.trigger, this),
f3 = settingsSaveHelperSimpleFunction(this.faviconUrl.trigger, this);
@ -71,4 +68,4 @@ class BrandingAdminSettings
}
}
export {BrandingAdminSettings, BrandingAdminSettings as default};
export { BrandingAdminSettings, BrandingAdminSettings as default };

View file

@ -1,32 +1,24 @@
import _ from '_';
import ko from 'ko';
import {
settingsSaveHelperSimpleFunction,
defautOptionsAfterRender,
inArray, trim, boolToAjax
} from 'Common/Utils';
import { settingsSaveHelperSimpleFunction, defautOptionsAfterRender, inArray, trim, boolToAjax } from 'Common/Utils';
import {SaveSettingsStep, StorageResultType, Magics} from 'Common/Enums';
import {i18n} from 'Common/Translator';
import {settingsGet} from 'Storage/Settings';
import { SaveSettingsStep, StorageResultType, Magics } from 'Common/Enums';
import { i18n } from 'Common/Translator';
import { settingsGet } from 'Storage/Settings';
import Remote from 'Remote/Admin/Ajax';
import {command} from 'Knoin/Knoin';
import { command } from 'Knoin/Knoin';
class ContactsAdminSettings
{
class ContactsAdminSettings {
constructor() {
this.defautOptionsAfterRender = defautOptionsAfterRender;
this.enableContacts = ko.observable(!!settingsGet('ContactsEnable'));
this.contactsSync = ko.observable(!!settingsGet('ContactsSync'));
const
supportedTypes = [],
const supportedTypes = [],
types = ['sqlite', 'mysql', 'pgsql'],
getTypeName = (name) => {
switch (name)
{
switch (name) {
case 'sqlite':
name = 'SQLite';
break;
@ -42,16 +34,13 @@ class ContactsAdminSettings
return name;
};
if (settingsGet('SQLiteIsSupported'))
{
if (settingsGet('SQLiteIsSupported')) {
supportedTypes.push('sqlite');
}
if (settingsGet('MySqlIsSupported'))
{
if (settingsGet('MySqlIsSupported')) {
supportedTypes.push('mysql');
}
if (settingsGet('PostgreSqlIsSupported'))
{
if (settingsGet('PostgreSqlIsSupported')) {
supportedTypes.push('pgsql');
}
@ -70,26 +59,22 @@ class ContactsAdminSettings
this.contactsTypes(types);
this.contactsType = ko.observable('');
this.mainContactsType = ko.computed({
read: this.contactsType,
write: (value) => {
if (value !== this.contactsType())
{
if (-1 < inArray(value, supportedTypes))
{
this.contactsType(value);
}
else if (0 < supportedTypes.length)
{
this.contactsType('');
this.mainContactsType = ko
.computed({
read: this.contactsType,
write: (value) => {
if (value !== this.contactsType()) {
if (-1 < inArray(value, supportedTypes)) {
this.contactsType(value);
} else if (0 < supportedTypes.length) {
this.contactsType('');
}
} else {
this.contactsType.valueHasMutated();
}
}
else
{
this.contactsType.valueHasMutated();
}
}
}).extend({notify: 'always'});
})
.extend({ notify: 'always' });
this.contactsType.subscribe(() => {
this.testContactsSuccess(false);
@ -136,19 +121,13 @@ class ContactsAdminSettings
this.testContactsError(false);
this.testContactsErrorMessage('');
if (StorageResultType.Success === result && data && data.Result && data.Result.Result)
{
if (StorageResultType.Success === result && data && data.Result && data.Result.Result) {
this.testContactsSuccess(true);
}
else
{
} else {
this.testContactsError(true);
if (data && data.Result)
{
if (data && data.Result) {
this.testContactsErrorMessage(data.Result.Message || '');
}
else
{
} else {
this.testContactsErrorMessage('');
}
}
@ -164,8 +143,7 @@ class ContactsAdminSettings
onBuild() {
_.delay(() => {
const
f1 = settingsSaveHelperSimpleFunction(this.pdoDsnTrigger, this),
const f1 = settingsSaveHelperSimpleFunction(this.pdoDsnTrigger, this),
f3 = settingsSaveHelperSimpleFunction(this.pdoUserTrigger, this),
f4 = settingsSaveHelperSimpleFunction(this.pdoPasswordTrigger, this),
f5 = settingsSaveHelperSimpleFunction(this.contactsTypeTrigger, this);
@ -211,4 +189,4 @@ class ContactsAdminSettings
}
}
export {ContactsAdminSettings, ContactsAdminSettings as default};
export { ContactsAdminSettings, ContactsAdminSettings as default };

View file

@ -1,17 +1,15 @@
import _ from '_';
import ko from 'ko';
import {StorageResultType} from 'Common/Enums';
import {showScreenPopup} from 'Knoin/Knoin';
import { StorageResultType } from 'Common/Enums';
import { showScreenPopup } from 'Knoin/Knoin';
import DomainStore from 'Stores/Admin/Domain';
import Remote from 'Remote/Admin/Ajax';
import {getApp} from 'Helper/Apps/Admin';
import { getApp } from 'Helper/Apps/Admin';
class DomainsAdminSettings
{
class DomainsAdminSettings {
constructor() {
this.domains = DomainStore.domains;
@ -43,21 +41,19 @@ class DomainsAdminSettings
onBuild(oDom) {
const self = this;
oDom
.on('click', '.b-admin-domains-list-table .e-item .e-action', function() { // eslint-disable-line prefer-arrow-callback
const domainItem = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (domainItem)
{
Remote.domain(self.onDomainLoadRequest, domainItem.name);
}
});
oDom.on('click', '.b-admin-domains-list-table .e-item .e-action', function() {
// eslint-disable-line prefer-arrow-callback
const domainItem = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (domainItem) {
Remote.domain(self.onDomainLoadRequest, domainItem.name);
}
});
getApp().reloadDomainList();
}
onDomainLoadRequest(sResult, oData) {
if (StorageResultType.Success === sResult && oData && oData.Result)
{
if (StorageResultType.Success === sResult && oData && oData.Result) {
showScreenPopup(require('View/Popup/Domain'), [oData.Result]);
}
}
@ -67,4 +63,4 @@ class DomainsAdminSettings
}
}
export {DomainsAdminSettings, DomainsAdminSettings as default};
export { DomainsAdminSettings, DomainsAdminSettings as default };

View file

@ -1,18 +1,22 @@
import _ from '_';
import ko from 'ko';
import {
trim, pInt, boolToAjax, settingsSaveHelperSimpleFunction,
changeTheme, convertThemeName, convertLangName
trim,
pInt,
boolToAjax,
settingsSaveHelperSimpleFunction,
changeTheme,
convertThemeName,
convertLangName
} from 'Common/Utils';
import {SaveSettingsStep, Magics} from 'Common/Enums';
import {reload as translatorReload} from 'Common/Translator';
import {phpInfo} from 'Common/Links';
import { SaveSettingsStep, Magics } from 'Common/Enums';
import { reload as translatorReload } from 'Common/Translator';
import { phpInfo } from 'Common/Links';
import {settingsGet} from 'Storage/Settings';
import {showScreenPopup} from 'Knoin/Knoin';
import { settingsGet } from 'Storage/Settings';
import { showScreenPopup } from 'Knoin/Knoin';
import Remote from 'Remote/Admin/Ajax';
@ -21,8 +25,7 @@ import LanguageStore from 'Stores/Language';
import AppAdminStore from 'Stores/Admin/App';
import CapaAdminStore from 'Stores/Admin/Capa';
class GeneralAdminSettings
{
class GeneralAdminSettings {
constructor() {
this.language = LanguageStore.language;
this.languages = LanguageStore.languages;
@ -46,29 +49,37 @@ class GeneralAdminSettings
this.dataFolderAccess = AppAdminStore.dataFolderAccess;
this.mainAttachmentLimit = ko.observable(pInt(settingsGet('AttachmentLimit')) / (Magics.BitLength1024 * Magics.BitLength1024)).extend({posInterer: 25});
this.mainAttachmentLimit = ko
.observable(pInt(settingsGet('AttachmentLimit')) / (Magics.BitLength1024 * Magics.BitLength1024))
.extend({ posInterer: 25 });
this.uploadData = settingsGet('PhpUploadSizes');
this.uploadDataDesc = this.uploadData && (this.uploadData.upload_max_filesize || this.uploadData.post_max_size) ? [
this.uploadData.upload_max_filesize ? 'upload_max_filesize = ' + this.uploadData.upload_max_filesize + '; ' : '',
this.uploadData.post_max_size ? 'post_max_size = ' + this.uploadData.post_max_size : ''
].join('') : '';
this.uploadDataDesc =
this.uploadData && (this.uploadData.upload_max_filesize || this.uploadData.post_max_size)
? [
this.uploadData.upload_max_filesize
? 'upload_max_filesize = ' + this.uploadData.upload_max_filesize + '; '
: '',
this.uploadData.post_max_size ? 'post_max_size = ' + this.uploadData.post_max_size : ''
].join('')
: '';
this.themesOptions = ko.computed(() => _.map(this.themes(), (theme) => ({optValue: theme, optText: convertThemeName(theme)})));
this.themesOptions = ko.computed(() =>
_.map(this.themes(), (theme) => ({ optValue: theme, optText: convertThemeName(theme) }))
);
this.languageFullName = ko.computed(() => convertLangName(this.language()));
this.languageAdminFullName = ko.computed(() => convertLangName(this.languageAdmin()));
this.attachmentLimitTrigger = ko.observable(SaveSettingsStep.Idle);
this.languageTrigger = ko.observable(SaveSettingsStep.Idle);
this.languageAdminTrigger = ko.observable(SaveSettingsStep.Idle).extend({throttle: Magics.Time100ms});
this.languageAdminTrigger = ko.observable(SaveSettingsStep.Idle).extend({ throttle: Magics.Time100ms });
this.themeTrigger = ko.observable(SaveSettingsStep.Idle);
}
onBuild() {
_.delay(() => {
const
f1 = settingsSaveHelperSimpleFunction(this.attachmentLimitTrigger, this),
const f1 = settingsSaveHelperSimpleFunction(this.attachmentLimitTrigger, this),
f2 = settingsSaveHelperSimpleFunction(this.languageTrigger, this),
f3 = settingsSaveHelperSimpleFunction(this.themeTrigger, this),
fReloadLanguageHelper = (saveSettingsStep) => () => {
@ -90,14 +101,13 @@ class GeneralAdminSettings
this.languageAdmin.subscribe((value) => {
this.languageAdminTrigger(SaveSettingsStep.Animate);
translatorReload(true, value).then(
fReloadLanguageHelper(SaveSettingsStep.TrueResult),
fReloadLanguageHelper(SaveSettingsStep.FalseResult)
).then(() => {
Remote.saveAdminConfig(null, {
'LanguageAdmin': trim(value)
translatorReload(true, value)
.then(fReloadLanguageHelper(SaveSettingsStep.TrueResult), fReloadLanguageHelper(SaveSettingsStep.FalseResult))
.then(() => {
Remote.saveAdminConfig(null, {
'LanguageAdmin': trim(value)
});
});
});
});
this.theme.subscribe((value) => {
@ -164,14 +174,14 @@ class GeneralAdminSettings
}
selectLanguage() {
showScreenPopup(require('View/Popup/Languages'), [
this.language, this.languages(), LanguageStore.userLanguage()
]);
showScreenPopup(require('View/Popup/Languages'), [this.language, this.languages(), LanguageStore.userLanguage()]);
}
selectLanguageAdmin() {
showScreenPopup(require('View/Popup/Languages'), [
this.languageAdmin, this.languagesAdmin(), LanguageStore.userLanguageAdmin()
this.languageAdmin,
this.languagesAdmin(),
LanguageStore.userLanguageAdmin()
]);
}
@ -183,4 +193,4 @@ class GeneralAdminSettings
}
}
export {GeneralAdminSettings, GeneralAdminSettings as default};
export { GeneralAdminSettings, GeneralAdminSettings as default };

View file

@ -1,16 +1,14 @@
import _ from '_';
import ko from 'ko';
import {settingsSaveHelperSimpleFunction, boolToAjax, trim} from 'Common/Utils';
import {settingsGet} from 'Storage/Settings';
import { settingsSaveHelperSimpleFunction, boolToAjax, trim } from 'Common/Utils';
import { settingsGet } from 'Storage/Settings';
import AppStore from 'Stores/Admin/App';
import Remote from 'Remote/Admin/Ajax';
class LoginAdminSettings
{
class LoginAdminSettings {
constructor() {
this.determineUserLanguage = AppStore.determineUserLanguage;
this.determineUserDomain = AppStore.determineUserDomain;
@ -52,4 +50,4 @@ class LoginAdminSettings
}
}
export {LoginAdminSettings, LoginAdminSettings as default};
export { LoginAdminSettings, LoginAdminSettings as default };

View file

@ -1,18 +1,16 @@
import window from 'window';
import _ from '_';
import ko from 'ko';
import {StorageResultType, Notification} from 'Common/Enums';
import {getNotification} from 'Common/Translator';
import { StorageResultType, Notification } from 'Common/Enums';
import { getNotification } from 'Common/Translator';
import PackageStore from 'Stores/Admin/Package';
import Remote from 'Remote/Admin/Ajax';
import {getApp} from 'Helper/Apps/Admin';
import { getApp } from 'Helper/Apps/Admin';
class PackagesAdminSettings
{
class PackagesAdminSettings {
constructor() {
this.packagesError = ko.observable('');
@ -37,54 +35,44 @@ class PackagesAdminSettings
requestHelper(packageToRequest, install) {
return (result, data) => {
if (StorageResultType.Success !== result || !data || !data.Result)
{
if (data && data.ErrorCode)
{
if (StorageResultType.Success !== result || !data || !data.Result) {
if (data && data.ErrorCode) {
this.packagesError(getNotification(data.ErrorCode));
}
else
{
this.packagesError(getNotification(
install ? Notification.CantInstallPackage : Notification.CantDeletePackage));
} else {
this.packagesError(
getNotification(install ? Notification.CantInstallPackage : Notification.CantDeletePackage)
);
}
}
_.each(this.packages(), (item) => {
if (item && packageToRequest && item.loading && item.loading() && packageToRequest.file === item.file)
{
if (item && packageToRequest && item.loading && item.loading() && packageToRequest.file === item.file) {
packageToRequest.loading(false);
item.loading(false);
}
});
if (StorageResultType.Success === result && data && data.Result && data.Result.Reload)
{
if (StorageResultType.Success === result && data && data.Result && data.Result.Reload) {
window.location.reload();
}
else
{
} else {
getApp().reloadPackagesList();
}
};
}
deletePackage(packageToDelete) {
if (packageToDelete)
{
if (packageToDelete) {
packageToDelete.loading(true);
Remote.packageDelete(this.requestHelper(packageToDelete, false), packageToDelete);
}
}
installPackage(packageToInstall) {
if (packageToInstall)
{
if (packageToInstall) {
packageToInstall.loading(true);
Remote.packageInstall(this.requestHelper(packageToInstall, true), packageToInstall);
}
}
}
export {PackagesAdminSettings, PackagesAdminSettings as default};
export { PackagesAdminSettings, PackagesAdminSettings as default };

View file

@ -1,22 +1,21 @@
import _ from '_';
import ko from 'ko';
import {StorageResultType, Notification} from 'Common/Enums';
import {getNotification} from 'Common/Translator';
import {boolToAjax} from 'Common/Utils';
import { StorageResultType, Notification } from 'Common/Enums';
import { getNotification } from 'Common/Translator';
import { boolToAjax } from 'Common/Utils';
import {settingsGet} from 'Storage/Settings';
import {showScreenPopup} from 'Knoin/Knoin';
import { settingsGet } from 'Storage/Settings';
import { showScreenPopup } from 'Knoin/Knoin';
import AppStore from 'Stores/Admin/App';
import PluginStore from 'Stores/Admin/Plugin';
import Remote from 'Remote/Admin/Ajax';
import {getApp} from 'Helper/Apps/Admin';
import { getApp } from 'Helper/Apps/Admin';
class PluginsAdminSettings
{
class PluginsAdminSettings {
constructor() {
this.enabledPlugins = ko.observable(!!settingsGet('EnabledPlugins'));
@ -41,21 +40,20 @@ class PluginsAdminSettings
}
onBuild(oDom) {
const self = this;
oDom
.on('click', '.e-item .configure-plugin-action', function() { // eslint-disable-line prefer-arrow-callback
.on('click', '.e-item .configure-plugin-action', function() {
// eslint-disable-line prefer-arrow-callback
const plugin = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (plugin)
{
if (plugin) {
self.configurePlugin(plugin);
}
})
.on('click', '.e-item .disabled-plugin', function() { // eslint-disable-line prefer-arrow-callback
.on('click', '.e-item .disabled-plugin', function() {
// eslint-disable-line prefer-arrow-callback
const plugin = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (plugin)
{
if (plugin) {
self.disablePlugin(plugin);
}
});
@ -73,23 +71,17 @@ class PluginsAdminSettings
}
onPluginLoadRequest(result, data) {
if (StorageResultType.Success === result && data && data.Result)
{
if (StorageResultType.Success === result && data && data.Result) {
showScreenPopup(require('View/Popup/Plugin'), [data.Result]);
}
}
onPluginDisableRequest(result, data) {
if (StorageResultType.Success === result && data)
{
if (!data.Result && data.ErrorCode)
{
if (Notification.UnsupportedPluginPackage === data.ErrorCode && data.ErrorMessage && '' !== data.ErrorMessage)
{
if (StorageResultType.Success === result && data) {
if (!data.Result && data.ErrorCode) {
if (Notification.UnsupportedPluginPackage === data.ErrorCode && data.ErrorMessage && '' !== data.ErrorMessage) {
PluginStore.plugins.error(data.ErrorMessage);
}
else
{
} else {
PluginStore.plugins.error(getNotification(data.ErrorCode));
}
}
@ -99,4 +91,4 @@ class PluginsAdminSettings
}
}
export {PluginsAdminSettings, PluginsAdminSettings as default};
export { PluginsAdminSettings, PluginsAdminSettings as default };

View file

@ -1,23 +1,18 @@
import _ from '_';
import {settingsSaveHelperSimpleFunction, trim, boolToAjax} from 'Common/Utils';
import {Magics} from 'Common/Enums';
import { settingsSaveHelperSimpleFunction, trim, boolToAjax } from 'Common/Utils';
import { Magics } from 'Common/Enums';
import Remote from 'Remote/Admin/Ajax';
import {BrandingAdminSettings} from 'Settings/Admin/Branding';
import { BrandingAdminSettings } from 'Settings/Admin/Branding';
class BrandingPremAdminSettings extends BrandingAdminSettings
{
class BrandingPremAdminSettings extends BrandingAdminSettings {
onBuild(dom) {
super.onBuild(dom);
if (this.capa && this.capa() && !this.community)
{
if (this.capa && this.capa() && !this.community) {
_.delay(() => {
const
f1 = settingsSaveHelperSimpleFunction(this.loginLogo.trigger, this),
const f1 = settingsSaveHelperSimpleFunction(this.loginLogo.trigger, this),
f2 = settingsSaveHelperSimpleFunction(this.loginDescription.trigger, this),
f3 = settingsSaveHelperSimpleFunction(this.loginCss.trigger, this),
f4 = settingsSaveHelperSimpleFunction(this.userLogo.trigger, this),
@ -100,10 +95,9 @@ class BrandingPremAdminSettings extends BrandingAdminSettings
'LoginPowered': boolToAjax(value)
});
});
}, Magics.Time50ms);
}
}
}
export {BrandingPremAdminSettings, BrandingPremAdminSettings as default};
export { BrandingPremAdminSettings, BrandingPremAdminSettings as default };

View file

@ -1,16 +1,14 @@
import ko from 'ko';
import moment from 'moment';
import {settingsGet} from 'Storage/Settings';
import {showScreenPopup} from 'Knoin/Knoin';
import { settingsGet } from 'Storage/Settings';
import { showScreenPopup } from 'Knoin/Knoin';
import LicenseStore from 'Stores/Admin/License';
import {getApp} from 'Helper/Apps/Admin';
import { getApp } from 'Helper/Apps/Admin';
class LicensingPremAdminSettings
{
class LicensingPremAdminSettings {
constructor() {
this.licensing = LicenseStore.licensing;
this.licensingProcess = LicenseStore.licensingProcess;
@ -23,16 +21,14 @@ class LicensingPremAdminSettings
this.subscriptionEnabled = ko.observable(!!settingsGet('SubscriptionEnabled'));
this.licenseTrigger.subscribe(() => {
if (this.subscriptionEnabled())
{
if (this.subscriptionEnabled()) {
getApp().reloadLicensing(true);
}
});
}
onBuild() {
if (this.subscriptionEnabled())
{
if (this.subscriptionEnabled()) {
getApp().reloadLicensing(false);
}
}
@ -60,12 +56,11 @@ class LicensingPremAdminSettings
* @returns {string}
*/
licenseExpiredMomentValue() {
const
time = this.licenseExpired(),
const time = this.licenseExpired(),
momentUnix = moment.unix(time);
return this.licenseIsUnlim() ? 'Never' : (time && (momentUnix.format('LL') + ' (' + momentUnix.from(moment()) + ')'));
return this.licenseIsUnlim() ? 'Never' : time && momentUnix.format('LL') + ' (' + momentUnix.from(moment()) + ')';
}
}
export {LicensingPremAdminSettings, LicensingPremAdminSettings as default};
export { LicensingPremAdminSettings, LicensingPremAdminSettings as default };

View file

@ -1,22 +1,20 @@
import _ from '_';
import ko from 'ko';
import {trim, boolToAjax} from 'Common/Utils';
import {phpInfo} from 'Common/Links';
import {StorageResultType, Magics} from 'Common/Enums';
import { trim, boolToAjax } from 'Common/Utils';
import { phpInfo } from 'Common/Links';
import { StorageResultType, Magics } from 'Common/Enums';
import {settingsGet} from 'Storage/Settings';
import { settingsGet } from 'Storage/Settings';
import AppAdminStore from 'Stores/Admin/App';
import CapaAdminStore from 'Stores/Admin/Capa';
import Remote from 'Remote/Admin/Ajax';
import {command} from 'Knoin/Knoin';
import { command } from 'Knoin/Knoin';
class SecurityAdminSettings
{
class SecurityAdminSettings {
constructor() {
this.useLocalProxyForExternalImages = AppAdminStore.useLocalProxyForExternalImages;
@ -28,8 +26,7 @@ class SecurityAdminSettings
this.capaTwoFactorAuthForce = CapaAdminStore.twoFactorAuthForce;
this.capaTwoFactorAuth.subscribe((value) => {
if (!value)
{
if (!value) {
this.capaTwoFactorAuthForce(false);
}
});
@ -38,8 +35,7 @@ class SecurityAdminSettings
this.allowSelfSigned = ko.observable(!!settingsGet('AllowSelfSigned'));
this.verifySslCertificate.subscribe((value) => {
if (!value)
{
if (!value) {
this.allowSelfSigned(true);
}
});
@ -84,15 +80,12 @@ class SecurityAdminSettings
@command((self) => '' !== trim(self.adminLogin()) && '' !== self.adminPassword())
saveNewAdminPasswordCommand() {
if ('' === trim(this.adminLogin()))
{
if ('' === trim(this.adminLogin())) {
this.adminLoginError(true);
return false;
}
if (this.adminPasswordNew() !== this.adminPasswordNew2())
{
if (this.adminPasswordNew() !== this.adminPasswordNew2()) {
this.adminPasswordNewError(true);
return false;
}
@ -119,8 +112,7 @@ class SecurityAdminSettings
}
onNewAdminPasswordResponse(result, data) {
if (StorageResultType.Success === result && data && data.Result)
{
if (StorageResultType.Success === result && data && data.Result) {
this.adminPassword('');
this.adminPasswordNew('');
this.adminPasswordNew2('');
@ -128,9 +120,7 @@ class SecurityAdminSettings
this.adminPasswordUpdateSuccess(true);
this.weakPassword(!!data.Result.Weak);
}
else
{
} else {
this.adminPasswordUpdateError(true);
}
}
@ -191,4 +181,4 @@ class SecurityAdminSettings
}
}
export {SecurityAdminSettings, SecurityAdminSettings as default};
export { SecurityAdminSettings, SecurityAdminSettings as default };

View file

@ -1,16 +1,14 @@
import _ from '_';
import ko from 'ko';
import {SaveSettingsStep, Magics} from 'Common/Enums';
import {settingsSaveHelperSimpleFunction, trim, boolToAjax} from 'Common/Utils';
import { SaveSettingsStep, Magics } from 'Common/Enums';
import { settingsSaveHelperSimpleFunction, trim, boolToAjax } from 'Common/Utils';
import SocialStore from 'Stores/Social';
import Remote from 'Remote/Admin/Ajax';
class SocialAdminSettings
{
class SocialAdminSettings {
constructor() {
this.googleEnable = SocialStore.google.enabled;
this.googleEnableAuth = SocialStore.google.capa.auth;
@ -52,8 +50,7 @@ class SocialAdminSettings
onBuild() {
_.delay(() => {
const
f1 = settingsSaveHelperSimpleFunction(this.facebookTrigger1, this),
const f1 = settingsSaveHelperSimpleFunction(this.facebookTrigger1, this),
f2 = settingsSaveHelperSimpleFunction(this.facebookTrigger2, this),
f3 = settingsSaveHelperSimpleFunction(this.twitterTrigger1, this),
f4 = settingsSaveHelperSimpleFunction(this.twitterTrigger2, this),
@ -63,8 +60,7 @@ class SocialAdminSettings
f8 = settingsSaveHelperSimpleFunction(this.dropboxTrigger1, this);
this.facebookEnable.subscribe((value) => {
if (this.facebookSupported())
{
if (this.facebookSupported()) {
Remote.saveAdminConfig(null, {
'FacebookEnable': boolToAjax(value)
});
@ -72,8 +68,7 @@ class SocialAdminSettings
});
this.facebookAppID.subscribe((value) => {
if (this.facebookSupported())
{
if (this.facebookSupported()) {
Remote.saveAdminConfig(f1, {
'FacebookAppID': trim(value)
});
@ -81,8 +76,7 @@ class SocialAdminSettings
});
this.facebookAppSecret.subscribe((value) => {
if (this.facebookSupported())
{
if (this.facebookSupported()) {
Remote.saveAdminConfig(f2, {
'FacebookAppSecret': trim(value)
});
@ -107,4 +101,4 @@ class SocialAdminSettings
}
}
export {SocialAdminSettings, SocialAdminSettings as default};
export { SocialAdminSettings, SocialAdminSettings as default };

View file

@ -1,23 +1,21 @@
import window from 'window';
import _ from '_';
import ko from 'ko';
import {Capa, StorageResultType} from 'Common/Enums';
import {root} from 'Common/Links';
import { Capa, StorageResultType } from 'Common/Enums';
import { root } from 'Common/Links';
import {capa} from 'Storage/Settings';
import { capa } from 'Storage/Settings';
import AccountStore from 'Stores/User/Account';
import IdentityStore from 'Stores/User/Identity';
import Remote from 'Remote/User/Ajax';
import {getApp} from 'Helper/Apps/User';
import { getApp } from 'Helper/Apps/User';
import {showScreenPopup, routeOff, setHash} from 'Knoin/Knoin';
import { showScreenPopup, routeOff, setHash } from 'Knoin/Knoin';
class AccountsUserSettings
{
class AccountsUserSettings {
constructor() {
this.allowAdditionalAccount = capa(Capa.AdditionalAccounts);
this.allowIdentities = capa(Capa.Identities);
@ -42,8 +40,7 @@ class AccountsUserSettings
}
editAccount(account) {
if (account && account.canBeEdit())
{
if (account && account.canBeEdit()) {
showScreenPopup(require('View/Popup/Account'), [account]);
}
}
@ -61,28 +58,21 @@ class AccountsUserSettings
* @returns {void}
*/
deleteAccount(accountToRemove) {
if (accountToRemove && accountToRemove.deleteAccess())
{
if (accountToRemove && accountToRemove.deleteAccess()) {
this.accountForDeletion(null);
if (accountToRemove)
{
if (accountToRemove) {
this.accounts.remove((account) => accountToRemove === account);
Remote.accountDelete((result, data) => {
if (StorageResultType.Success === result && data && data.Result && data.Reload)
{
if (StorageResultType.Success === result && data && data.Result && data.Reload) {
routeOff();
setHash(root(), true);
routeOff();
_.defer(() => window.location.reload());
}
else
{
} else {
getApp().accountsAndIdentities();
}
}, accountToRemove.email);
}
}
@ -93,12 +83,10 @@ class AccountsUserSettings
* @returns {void}
*/
deleteIdentity(identityToRemove) {
if (identityToRemove && identityToRemove.deleteAccess())
{
if (identityToRemove && identityToRemove.deleteAccess()) {
this.identityForDeletion(null);
if (identityToRemove)
{
if (identityToRemove) {
IdentityStore.identities.remove((oIdentity) => identityToRemove === oIdentity);
Remote.identityDelete(() => {
@ -109,30 +97,28 @@ class AccountsUserSettings
}
accountsAndIdentitiesAfterMove() {
Remote.accountsAndIdentitiesSortOrder(null,
AccountStore.accountsEmails.peek(), IdentityStore.identitiesIDS.peek());
Remote.accountsAndIdentitiesSortOrder(null, AccountStore.accountsEmails.peek(), IdentityStore.identitiesIDS.peek());
}
onBuild(oDom) {
const self = this;
oDom
.on('click', '.accounts-list .account-item .e-action', function() { // eslint-disable-line prefer-arrow-callback
.on('click', '.accounts-list .account-item .e-action', function() {
// eslint-disable-line prefer-arrow-callback
const account = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (account)
{
if (account) {
self.editAccount(account);
}
})
.on('click', '.identities-list .identity-item .e-action', function() { // eslint-disable-line prefer-arrow-callback
.on('click', '.identities-list .identity-item .e-action', function() {
// eslint-disable-line prefer-arrow-callback
const identity = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (identity)
{
if (identity) {
self.editIdentity(identity);
}
});
}
}
export {AccountsUserSettings, AccountsUserSettings as default};
export { AccountsUserSettings, AccountsUserSettings as default };

View file

@ -1,17 +1,15 @@
import _ from '_';
import ko from 'ko';
import {StorageResultType, Notification} from 'Common/Enums';
import {getNotificationFromResponse, i18n} from 'Common/Translator';
import { StorageResultType, Notification } from 'Common/Enums';
import { getNotificationFromResponse, i18n } from 'Common/Translator';
import Remote from 'Remote/User/Ajax';
import {getApp} from 'Helper/Apps/User';
import {command} from 'Knoin/Knoin';
import { getApp } from 'Helper/Apps/User';
import { command } from 'Knoin/Knoin';
class ChangePasswordUserSettings
{
class ChangePasswordUserSettings {
constructor() {
this.changeProcess = ko.observable(false);
@ -46,15 +44,15 @@ class ChangePasswordUserSettings
this.onChangePasswordResponse = _.bind(this.onChangePasswordResponse, this);
}
@command((self) => !self.changeProcess() && '' !== self.currentPassword() && '' !== self.newPassword() && '' !== self.newPassword2())
@command(
(self) =>
!self.changeProcess() && '' !== self.currentPassword() && '' !== self.newPassword() && '' !== self.newPassword2()
)
saveNewPasswordCommand() {
if (this.newPassword() !== this.newPassword2())
{
if (this.newPassword() !== this.newPassword2()) {
this.passwordMismatch(true);
this.errorDescription(i18n('SETTINGS_CHANGE_PASSWORD/ERROR_PASSWORD_MISMATCH'));
}
else
{
} else {
this.changeProcess(true);
this.passwordUpdateError(false);
@ -83,8 +81,7 @@ class ChangePasswordUserSettings
this.errorDescription('');
this.currentPassword.error(false);
if (StorageResultType.Success === result && data && data.Result)
{
if (StorageResultType.Success === result && data && data.Result) {
this.currentPassword('');
this.newPassword('');
this.newPassword2('');
@ -93,11 +90,8 @@ class ChangePasswordUserSettings
this.currentPassword.error(false);
getApp().setClientSideToken(data.Result);
}
else
{
if (data && Notification.CurrentPasswordIncorrect === data.ErrorCode)
{
} else {
if (data && Notification.CurrentPasswordIncorrect === data.ErrorCode) {
this.currentPassword.error(true);
}
@ -107,4 +101,4 @@ class ChangePasswordUserSettings
}
}
export {ChangePasswordUserSettings, ChangePasswordUserSettings as default};
export { ChangePasswordUserSettings, ChangePasswordUserSettings as default };

View file

@ -1,15 +1,13 @@
import ko from 'ko';
import {Magics} from 'Common/Enums';
import {boolToAjax} from 'Common/Utils';
import { Magics } from 'Common/Enums';
import { boolToAjax } from 'Common/Utils';
import AppStore from 'Stores/User/App';
import ContactStore from 'Stores/User/Contact';
import Remote from 'Remote/User/Ajax';
class ContactsUserSettings
{
class ContactsUserSettings {
constructor() {
this.contactsAutosave = AppStore.contactsAutosave;
@ -19,12 +17,16 @@ class ContactsUserSettings
this.contactsSyncUser = ContactStore.contactsSyncUser;
this.contactsSyncPass = ContactStore.contactsSyncPass;
this.saveTrigger = ko.computed(() => [
this.enableContactsSync() ? '1' : '0',
this.contactsSyncUrl(),
this.contactsSyncUser(),
this.contactsSyncPass()
].join('|')).extend({throttle: Magics.Time500ms});
this.saveTrigger = ko
.computed(() =>
[
this.enableContactsSync() ? '1' : '0',
this.contactsSyncUrl(),
this.contactsSyncUser(),
this.contactsSyncPass()
].join('|')
)
.extend({ throttle: Magics.Time500ms });
}
onBuild() {
@ -35,7 +37,8 @@ class ContactsUserSettings
});
this.saveTrigger.subscribe(() => {
Remote.saveContactsSyncData(null,
Remote.saveContactsSyncData(
null,
this.enableContactsSync(),
this.contactsSyncUrl(),
this.contactsSyncUser(),
@ -45,4 +48,4 @@ class ContactsUserSettings
}
}
export {ContactsUserSettings, ContactsUserSettings as default};
export { ContactsUserSettings, ContactsUserSettings as default };

View file

@ -1,20 +1,18 @@
import _ from '_';
import ko from 'ko';
import {windowResizeCallback, isArray, trim, delegateRunOnDestroy} from 'Common/Utils';
import {StorageResultType, Notification} from 'Common/Enums';
import {getNotification} from 'Common/Translator';
import { windowResizeCallback, isArray, trim, delegateRunOnDestroy } from 'Common/Utils';
import { StorageResultType, Notification } from 'Common/Enums';
import { getNotification } from 'Common/Translator';
import FilterStore from 'Stores/User/Filter';
import Remote from 'Remote/User/Ajax';
import {FilterModel} from 'Model/Filter';
import { FilterModel } from 'Model/Filter';
import {showScreenPopup, command} from 'Knoin/Knoin';
import { showScreenPopup, command } from 'Knoin/Knoin';
class FiltersUserSettings
{
class FiltersUserSettings {
constructor() {
this.modules = FilterStore.modules;
this.filters = FilterStore.filters;
@ -29,8 +27,7 @@ class FiltersUserSettings
this.filters.subscribe(windowResizeCallback);
this.serverError.subscribe((value) => {
if (!value)
{
if (!value) {
this.serverErrorDesc('');
}
}, this);
@ -64,10 +61,8 @@ class FiltersUserSettings
@command((self) => self.haveChanges())
saveChangesCommand() {
if (!this.filters.saving())
{
if (this.filterRaw.active() && '' === trim(this.filterRaw()))
{
if (!this.filters.saving()) {
if (this.filterRaw.active() && '' === trim(this.filterRaw())) {
this.filterRaw.error(true);
return false;
}
@ -75,24 +70,23 @@ class FiltersUserSettings
this.filters.saving(true);
this.saveErrorText('');
Remote.filtersSave((result, data) => {
this.filters.saving(false);
Remote.filtersSave(
(result, data) => {
this.filters.saving(false);
if (StorageResultType.Success === result && data && data.Result)
{
this.haveChanges(false);
this.updateList();
}
else if (data && data.ErrorCode)
{
this.saveErrorText(data.ErrorMessageAdditional || getNotification(data.ErrorCode));
}
else
{
this.saveErrorText(getNotification(Notification.CantSaveFilters));
}
}, this.filters(), this.filterRaw(), this.filterRaw.active());
if (StorageResultType.Success === result && data && data.Result) {
this.haveChanges(false);
this.updateList();
} else if (data && data.ErrorCode) {
this.saveErrorText(data.ErrorMessageAdditional || getNotification(data.ErrorCode));
} else {
this.saveErrorText(getNotification(Notification.CantSaveFilters));
}
},
this.filters(),
this.filterRaw(),
this.filterRaw.active()
);
}
return true;
@ -107,24 +101,25 @@ class FiltersUserSettings
}
updateList() {
if (!this.filters.loading())
{
if (!this.filters.loading()) {
this.filters.loading(true);
Remote.filtersGet((result, data) => {
this.filters.loading(false);
this.serverError(false);
if (StorageResultType.Success === result && data && data.Result && isArray(data.Result.Filters))
{
if (StorageResultType.Success === result && data && data.Result && isArray(data.Result.Filters)) {
this.inited(true);
this.serverError(false);
this.filters(_.compact(_.map(data.Result.Filters, (aItem) => {
const filter = new FilterModel();
return (filter && filter.parse(aItem)) ? filter : null;
})));
this.filters(
_.compact(
_.map(data.Result.Filters, (aItem) => {
const filter = new FilterModel();
return filter && filter.parse(aItem) ? filter : null;
})
)
);
this.modules(data.Result.Modules ? data.Result.Modules : {});
@ -132,16 +127,16 @@ class FiltersUserSettings
this.filterRaw.capa(isArray(data.Result.Capa) ? data.Result.Capa.join(' ') : '');
this.filterRaw.active(!!data.Result.RawIsActive);
this.filterRaw.allow(!!data.Result.RawIsAllow);
}
else
{
} else {
this.filters([]);
this.modules({});
this.filterRaw('');
this.filterRaw.capa({});
this.serverError(true);
this.serverErrorDesc(data && data.ErrorCode ? getNotification(data.ErrorCode) : getNotification(Notification.CantGetFilters));
this.serverErrorDesc(
data && data.ErrorCode ? getNotification(data.ErrorCode) : getNotification(Notification.CantGetFilters)
);
}
this.haveChanges(false);
@ -158,43 +153,47 @@ class FiltersUserSettings
const filter = new FilterModel();
filter.generateID();
showScreenPopup(require('View/Popup/Filter'), [filter, () => {
this.filters.push(filter);
this.filterRaw.active(false);
}, false]);
showScreenPopup(require('View/Popup/Filter'), [
filter,
() => {
this.filters.push(filter);
this.filterRaw.active(false);
},
false
]);
}
editFilter(filter) {
const clonedFilter = filter.cloneSelf();
showScreenPopup(require('View/Popup/Filter'), [clonedFilter, () => {
const
filters = this.filters(),
index = filters.indexOf(filter);
showScreenPopup(require('View/Popup/Filter'), [
clonedFilter,
() => {
const filters = this.filters(),
index = filters.indexOf(filter);
if (-1 < index && filters[index])
{
delegateRunOnDestroy(filters[index]);
filters[index] = clonedFilter;
if (-1 < index && filters[index]) {
delegateRunOnDestroy(filters[index]);
filters[index] = clonedFilter;
this.filters(filters);
this.haveChanges(true);
}
}, true]);
this.filters(filters);
this.haveChanges(true);
}
},
true
]);
}
onBuild(oDom) {
const self = this;
oDom
.on('click', '.filter-item .e-action', function() { // eslint-disable-line prefer-arrow-callback
const filter = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (filter)
{
self.editFilter(filter);
}
});
oDom.on('click', '.filter-item .e-action', function() {
// eslint-disable-line prefer-arrow-callback
const filter = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (filter) {
self.editFilter(filter);
}
});
}
onShow() {
@ -202,4 +201,4 @@ class FiltersUserSettings
}
}
export {FiltersUserSettings, FiltersUserSettings as default};
export { FiltersUserSettings, FiltersUserSettings as default };

View file

@ -1,13 +1,12 @@
import ko from 'ko';
import {ClientSideKeyName, Notification, Magics} from 'Common/Enums';
import {trim, noop} from 'Common/Utils';
import {getNotification, i18n} from 'Common/Translator';
import { ClientSideKeyName, Notification, Magics } from 'Common/Enums';
import { trim, noop } from 'Common/Utils';
import { getNotification, i18n } from 'Common/Translator';
import {removeFolderFromCacheList} from 'Common/Cache';
import { removeFolderFromCacheList } from 'Common/Cache';
import {appSettingsGet} from 'Storage/Settings';
import { appSettingsGet } from 'Storage/Settings';
import * as Local from 'Storage/Client';
import FolderStore from 'Stores/User/Folder';
@ -15,21 +14,19 @@ import FolderStore from 'Stores/User/Folder';
import Promises from 'Promises/User/Ajax';
import Remote from 'Remote/User/Ajax';
import {getApp} from 'Helper/Apps/User';
import { getApp } from 'Helper/Apps/User';
import {showScreenPopup} from 'Knoin/Knoin';
import { showScreenPopup } from 'Knoin/Knoin';
class FoldersUserSettings
{
class FoldersUserSettings {
constructor() {
this.displaySpecSetting = FolderStore.displaySpecSetting;
this.folderList = FolderStore.folderList;
this.folderListHelp = ko.observable('').extend({throttle: Magics.Time100ms});
this.folderListHelp = ko.observable('').extend({ throttle: Magics.Time100ms });
this.loading = ko.computed(() => {
const
loading = FolderStore.foldersLoading(),
const loading = FolderStore.foldersLoading(),
creating = FolderStore.foldersCreating(),
deleting = FolderStore.foldersDeleting(),
renaming = FolderStore.foldersRenaming();
@ -39,7 +36,7 @@ class FoldersUserSettings
this.folderForDeletion = ko.observable(null).deleteAccessHelper();
this.folderForEdit = ko.observable(null).extend({toggleSubscribeProperty: [this, 'edited']});
this.folderForEdit = ko.observable(null).extend({ toggleSubscribeProperty: [this, 'edited'] });
this.useImapSubscribe = !!appSettingsGet('useImapSubscribe');
}
@ -47,8 +44,7 @@ class FoldersUserSettings
folderEditOnEnter(folder) {
const nameToEdit = folder ? trim(folder.nameForEdit()) : '';
if ('' !== nameToEdit && folder.name() !== nameToEdit)
{
if ('' !== nameToEdit && folder.name() !== nameToEdit) {
Local.set(ClientSideKeyName.FoldersLashHash, '');
getApp().foldersPromisesActionHelper(
@ -65,8 +61,7 @@ class FoldersUserSettings
}
folderEditOnEsc(folder) {
if (folder)
{
if (folder) {
folder.edited(false);
}
}
@ -100,22 +95,22 @@ class FoldersUserSettings
}
deleteFolder(folderToRemove) {
if (folderToRemove && folderToRemove.canBeDeleted() && folderToRemove.deleteAccess() &&
0 === folderToRemove.privateMessageCountAll())
{
if (
folderToRemove &&
folderToRemove.canBeDeleted() &&
folderToRemove.deleteAccess() &&
0 === folderToRemove.privateMessageCountAll()
) {
this.folderForDeletion(null);
if (folderToRemove)
{
const
fRemoveFolder = function(folder) {
if (folderToRemove === folder)
{
return true;
}
folder.subFolders.remove(fRemoveFolder);
return false;
};
if (folderToRemove) {
const fRemoveFolder = function(folder) {
if (folderToRemove === folder) {
return true;
}
folder.subFolders.remove(fRemoveFolder);
return false;
};
Local.set(ClientSideKeyName.FoldersLashHash, '');
@ -128,9 +123,7 @@ class FoldersUserSettings
removeFolderFromCacheList(folderToRemove.fullNameRaw);
}
}
else if (0 < folderToRemove.privateMessageCountAll())
{
} else if (0 < folderToRemove.privateMessageCountAll()) {
FolderStore.folderList.error(getNotification(Notification.CantDeleteNonEmptyFolder));
}
}
@ -158,4 +151,4 @@ class FoldersUserSettings
}
}
export {FoldersUserSettings, FoldersUserSettings as default};
export { FoldersUserSettings, FoldersUserSettings as default };

View file

@ -1,20 +1,16 @@
import _ from '_';
import ko from 'ko';
import {MESSAGES_PER_PAGE_VALUES} from 'Common/Consts';
import {bAnimationSupported} from 'Common/Globals';
import { MESSAGES_PER_PAGE_VALUES } from 'Common/Consts';
import { bAnimationSupported } from 'Common/Globals';
import {SaveSettingsStep, Magics, EditorDefaultType, Layout} from 'Common/Enums';
import { SaveSettingsStep, Magics, EditorDefaultType, Layout } from 'Common/Enums';
import {
settingsSaveHelperSimpleFunction,
convertLangName, isArray, timeOutAction, boolToAjax
} from 'Common/Utils';
import { settingsSaveHelperSimpleFunction, convertLangName, isArray, timeOutAction, boolToAjax } from 'Common/Utils';
import {i18n, trigger as translatorTrigger, reload as translatorReload} from 'Common/Translator';
import { i18n, trigger as translatorTrigger, reload as translatorReload } from 'Common/Translator';
import {showScreenPopup} from 'Knoin/Knoin';
import { showScreenPopup } from 'Knoin/Knoin';
import AppStore from 'Stores/User/App';
import LanguageStore from 'Stores/Language';
@ -25,8 +21,7 @@ import MessageStore from 'Stores/User/Message';
import Remote from 'Remote/User/Ajax';
class GeneralUserSettings
{
class GeneralUserSettings {
constructor() {
this.language = LanguageStore.language;
this.languages = LanguageStore.languages;
@ -52,7 +47,7 @@ class GeneralUserSettings
this.allowLanguagesOnSettings = AppStore.allowLanguagesOnSettings;
this.languageFullName = ko.computed(() => convertLangName(this.language()));
this.languageTrigger = ko.observable(SaveSettingsStep.Idle).extend({throttle: Magics.Time100ms});
this.languageTrigger = ko.observable(SaveSettingsStep.Idle).extend({ throttle: Magics.Time100ms });
this.mppTrigger = ko.observable(SaveSettingsStep.Idle);
this.editorDefaultTypeTrigger = ko.observable(SaveSettingsStep.Idle);
@ -75,27 +70,26 @@ class GeneralUserSettings
this.editorDefaultTypes = ko.computed(() => {
translatorTrigger();
return [
{'id': EditorDefaultType.Html, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML')},
{'id': EditorDefaultType.Plain, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN')},
{'id': EditorDefaultType.HtmlForced, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_FORCED')},
{'id': EditorDefaultType.PlainForced, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_FORCED')}
{ 'id': EditorDefaultType.Html, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML') },
{ 'id': EditorDefaultType.Plain, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN') },
{ 'id': EditorDefaultType.HtmlForced, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_FORCED') },
{ 'id': EditorDefaultType.PlainForced, 'name': i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_FORCED') }
];
});
this.layoutTypes = ko.computed(() => {
translatorTrigger();
return [
{'id': Layout.NoPreview, 'name': i18n('SETTINGS_GENERAL/LABEL_LAYOUT_NO_SPLIT')},
{'id': Layout.SidePreview, 'name': i18n('SETTINGS_GENERAL/LABEL_LAYOUT_VERTICAL_SPLIT')},
{'id': Layout.BottomPreview, 'name': i18n('SETTINGS_GENERAL/LABEL_LAYOUT_HORIZONTAL_SPLIT')}
{ 'id': Layout.NoPreview, 'name': i18n('SETTINGS_GENERAL/LABEL_LAYOUT_NO_SPLIT') },
{ 'id': Layout.SidePreview, 'name': i18n('SETTINGS_GENERAL/LABEL_LAYOUT_VERTICAL_SPLIT') },
{ 'id': Layout.BottomPreview, 'name': i18n('SETTINGS_GENERAL/LABEL_LAYOUT_HORIZONTAL_SPLIT') }
];
});
}
editMainIdentity() {
const identity = this.identityMain();
if (identity)
{
if (identity) {
showScreenPopup(require('View/Popup/Identity'), [identity]);
}
}
@ -106,8 +100,7 @@ class GeneralUserSettings
onBuild() {
_.delay(() => {
const
f0 = settingsSaveHelperSimpleFunction(this.editorDefaultTypeTrigger, this),
const f0 = settingsSaveHelperSimpleFunction(this.editorDefaultTypeTrigger, this),
f1 = settingsSaveHelperSimpleFunction(this.mppTrigger, this),
f2 = settingsSaveHelperSimpleFunction(this.layoutTrigger, this),
fReloadLanguageHelper = (saveSettingsStep) => () => {
@ -117,15 +110,13 @@ class GeneralUserSettings
this.language.subscribe((value) => {
this.languageTrigger(SaveSettingsStep.Animate);
translatorReload(false, value).then(
fReloadLanguageHelper(SaveSettingsStep.TrueResult),
fReloadLanguageHelper(SaveSettingsStep.FalseResult)
).then(() => {
Remote.saveSettings(null, {
'Language': value
translatorReload(false, value)
.then(fReloadLanguageHelper(SaveSettingsStep.TrueResult), fReloadLanguageHelper(SaveSettingsStep.FalseResult))
.then(() => {
Remote.saveSettings(null, {
'Language': value
});
});
});
});
this.editorDefaultType.subscribe(Remote.saveSettingsHelper('EditorDefaultType', null, f0));
@ -135,27 +126,39 @@ class GeneralUserSettings
this.useCheckboxesInList.subscribe(Remote.saveSettingsHelper('UseCheckboxesInList', boolToAjax));
this.enableDesktopNotification.subscribe((value) => {
timeOutAction('SaveDesktopNotifications', () => {
Remote.saveSettings(null, {
'DesktopNotifications': boolToAjax(value)
});
}, Magics.Time3s);
timeOutAction(
'SaveDesktopNotifications',
() => {
Remote.saveSettings(null, {
'DesktopNotifications': boolToAjax(value)
});
},
Magics.Time3s
);
});
this.enableSoundNotification.subscribe((value) => {
timeOutAction('SaveSoundNotification', () => {
Remote.saveSettings(null, {
'SoundNotification': boolToAjax(value)
});
}, Magics.Time3s);
timeOutAction(
'SaveSoundNotification',
() => {
Remote.saveSettings(null, {
'SoundNotification': boolToAjax(value)
});
},
Magics.Time3s
);
});
this.replySameFolder.subscribe((value) => {
timeOutAction('SaveReplySameFolder', () => {
Remote.saveSettings(null, {
'ReplySameFolder': boolToAjax(value)
});
}, Magics.Time3s);
timeOutAction(
'SaveReplySameFolder',
() => {
Remote.saveSettings(null, {
'ReplySameFolder': boolToAjax(value)
});
},
Magics.Time3s
);
});
this.useThreads.subscribe((value) => {
@ -179,10 +182,8 @@ class GeneralUserSettings
}
selectLanguage() {
showScreenPopup(require('View/Popup/Languages'), [
this.language, this.languages(), LanguageStore.userLanguage()
]);
showScreenPopup(require('View/Popup/Languages'), [this.language, this.languages(), LanguageStore.userLanguage()]);
}
}
export {GeneralUserSettings, GeneralUserSettings as default};
export { GeneralUserSettings, GeneralUserSettings as default };

View file

@ -1,22 +1,20 @@
import _ from '_';
import ko from 'ko';
import {delegateRunOnDestroy, boolToAjax} from 'Common/Utils';
import {Magics} from 'Common/Enums';
import {bIsHttps} from 'Common/Globals';
import { delegateRunOnDestroy, boolToAjax } from 'Common/Utils';
import { Magics } from 'Common/Enums';
import { bIsHttps } from 'Common/Globals';
import PgpStore from 'Stores/User/Pgp';
import SettingsStore from 'Stores/User/Settings';
import Remote from 'Remote/User/Ajax';
import {getApp} from 'Helper/Apps/User';
import { getApp } from 'Helper/Apps/User';
import {showScreenPopup} from 'Knoin/Knoin';
import { showScreenPopup } from 'Knoin/Knoin';
class OpenPgpUserSettings
{
class OpenPgpUserSettings {
constructor() {
this.openpgpkeys = PgpStore.openpgpkeys;
this.openpgpkeysPublic = PgpStore.openpgpkeysPublic;
@ -38,8 +36,7 @@ class OpenPgpUserSettings
}
viewOpenPgpKey(openPgpKey) {
if (openPgpKey)
{
if (openPgpKey) {
showScreenPopup(require('View/Popup/ViewOpenPgpKey'), [openPgpKey]);
}
}
@ -49,21 +46,16 @@ class OpenPgpUserSettings
* @returns {void}
*/
deleteOpenPgpKey(openPgpKeyToRemove) {
if (openPgpKeyToRemove && openPgpKeyToRemove.deleteAccess())
{
if (openPgpKeyToRemove && openPgpKeyToRemove.deleteAccess()) {
this.openPgpKeyForDeletion(null);
if (openPgpKeyToRemove && PgpStore.openpgpKeyring)
{
if (openPgpKeyToRemove && PgpStore.openpgpKeyring) {
const findedItem = _.find(PgpStore.openpgpkeys(), (key) => openPgpKeyToRemove === key);
if (findedItem)
{
if (findedItem) {
PgpStore.openpgpkeys.remove(findedItem);
delegateRunOnDestroy(findedItem);
PgpStore
.openpgpKeyring[findedItem.isPrivate ? 'privateKeys' : 'publicKeys']
.removeForId(findedItem.guid);
PgpStore.openpgpKeyring[findedItem.isPrivate ? 'privateKeys' : 'publicKeys'].removeForId(findedItem.guid);
PgpStore.openpgpKeyring.store();
}
@ -75,13 +67,9 @@ class OpenPgpUserSettings
onBuild() {
_.delay(() => {
this.allowDraftAutosave.subscribe(
Remote.saveSettingsHelper('AllowDraftAutosave', boolToAjax)
);
this.allowDraftAutosave.subscribe(Remote.saveSettingsHelper('AllowDraftAutosave', boolToAjax));
}, Magics.Time50ms);
}
}
export {OpenPgpUserSettings, OpenPgpUserSettings as default};
export { OpenPgpUserSettings, OpenPgpUserSettings as default };

View file

@ -1,21 +1,19 @@
import _ from '_';
import ko from 'ko';
import {pInt, settingsSaveHelperSimpleFunction} from 'Common/Utils';
import {Capa, SaveSettingsStep} from 'Common/Enums';
import {i18n, trigger as translatorTrigger} from 'Common/Translator';
import { pInt, settingsSaveHelperSimpleFunction } from 'Common/Utils';
import { Capa, SaveSettingsStep } from 'Common/Enums';
import { i18n, trigger as translatorTrigger } from 'Common/Translator';
import {capa} from 'Storage/Settings';
import { capa } from 'Storage/Settings';
import {showScreenPopup} from 'Knoin/Knoin';
import { showScreenPopup } from 'Knoin/Knoin';
import SettinsStore from 'Stores/User/Settings';
import Remote from 'Remote/User/Ajax';
class SecurityUserSettings
{
class SecurityUserSettings {
constructor() {
this.capaAutoLogout = capa(Capa.AutoLogout);
this.capaTwoFactor = capa(Capa.TwoFactor);
@ -26,14 +24,14 @@ class SecurityUserSettings
this.autoLogoutOptions = ko.computed(() => {
translatorTrigger();
return [
{'id': 0, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_NEVER_OPTION_NAME')},
{'id': 5, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_MINUTES_OPTION_NAME', {'MINUTES': 5})},
{'id': 10, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_MINUTES_OPTION_NAME', {'MINUTES': 10})},
{'id': 30, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_MINUTES_OPTION_NAME', {'MINUTES': 30})},
{'id': 60, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_MINUTES_OPTION_NAME', {'MINUTES': 60})},
{'id': 60 * 2, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_HOURS_OPTION_NAME', {'HOURS': 2})},
{'id': 60 * 5, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_HOURS_OPTION_NAME', {'HOURS': 5})},
{'id': 60 * 10, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_HOURS_OPTION_NAME', {'HOURS': 10})}
{ 'id': 0, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_NEVER_OPTION_NAME') },
{ 'id': 5, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_MINUTES_OPTION_NAME', { 'MINUTES': 5 }) },
{ 'id': 10, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_MINUTES_OPTION_NAME', { 'MINUTES': 10 }) },
{ 'id': 30, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_MINUTES_OPTION_NAME', { 'MINUTES': 30 }) },
{ 'id': 60, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_MINUTES_OPTION_NAME', { 'MINUTES': 60 }) },
{ 'id': 60 * 2, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_HOURS_OPTION_NAME', { 'HOURS': 2 }) },
{ 'id': 60 * 5, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_HOURS_OPTION_NAME', { 'HOURS': 5 }) },
{ 'id': 60 * 10, 'name': i18n('SETTINGS_SECURITY/AUTOLOGIN_HOURS_OPTION_NAME', { 'HOURS': 10 }) }
];
});
}
@ -43,8 +41,7 @@ class SecurityUserSettings
}
onBuild() {
if (this.capaAutoLogout)
{
if (this.capaAutoLogout) {
_.delay(() => {
const f0 = settingsSaveHelperSimpleFunction(this.autoLogout.trigger, this);
@ -54,4 +51,4 @@ class SecurityUserSettings
}
}
export {SecurityUserSettings, SecurityUserSettings as default};
export { SecurityUserSettings, SecurityUserSettings as default };

View file

@ -1,12 +1,10 @@
import SocialStore from 'Stores/Social';
import {getApp} from 'Helper/Apps/User';
import { getApp } from 'Helper/Apps/User';
import {command} from 'Knoin/Knoin';
import { command } from 'Knoin/Knoin';
class SocialUserSettings
{
class SocialUserSettings {
constructor() {
this.googleEnable = SocialStore.google.enabled;
this.googleEnableAuth = SocialStore.google.capa.auth;
@ -33,8 +31,7 @@ class SocialUserSettings
@command((self) => !self.googleLoggined() && !self.googleActions())
connectGoogleCommand() {
if (!this.googleLoggined())
{
if (!this.googleLoggined()) {
getApp().googleConnect();
}
}
@ -46,8 +43,7 @@ class SocialUserSettings
@command((self) => !self.facebookLoggined() && !self.facebookActions())
connectFacebookCommand() {
if (!this.facebookLoggined())
{
if (!this.facebookLoggined()) {
getApp().facebookConnect();
}
}
@ -59,8 +55,7 @@ class SocialUserSettings
@command((self) => !self.twitterLoggined() && !self.twitterActions())
connectTwitterCommand() {
if (!this.twitterLoggined())
{
if (!this.twitterLoggined()) {
getApp().twitterConnect();
}
}
@ -71,4 +66,4 @@ class SocialUserSettings
}
}
export {SocialUserSettings, SocialUserSettings as default};
export { SocialUserSettings, SocialUserSettings as default };

View file

@ -1,21 +1,21 @@
import ko from 'ko';
import {i18n} from 'Common/Translator';
import { i18n } from 'Common/Translator';
import TemplateStore from 'Stores/User/Template';
import Remote from 'Remote/User/Ajax';
import {getApp} from 'Helper/Apps/User';
import { getApp } from 'Helper/Apps/User';
import {showScreenPopup} from 'Knoin/Knoin';
import { showScreenPopup } from 'Knoin/Knoin';
class TemplatesUserSettings
{
class TemplatesUserSettings {
constructor() {
this.templates = TemplateStore.templates;
this.processText = ko.computed(() => (TemplateStore.templates.loading() ? i18n('SETTINGS_TEMPLETS/LOADING_PROCESS') : ''));
this.processText = ko.computed(() =>
TemplateStore.templates.loading() ? i18n('SETTINGS_TEMPLETS/LOADING_PROCESS') : ''
);
this.visibility = ko.computed(() => ('' === this.processText() ? 'hidden' : 'visible'));
this.templateForDeletion = ko.observable(null).deleteAccessHelper();
@ -34,19 +34,16 @@ class TemplatesUserSettings
}
editTemplate(oTemplateItem) {
if (oTemplateItem)
{
if (oTemplateItem) {
showScreenPopup(require('View/Popup/Template'), [oTemplateItem]);
}
}
deleteTemplate(templateToRemove) {
if (templateToRemove && templateToRemove.deleteAccess())
{
if (templateToRemove && templateToRemove.deleteAccess()) {
this.templateForDeletion(null);
if (templateToRemove)
{
if (templateToRemove) {
this.templates.remove((template) => templateToRemove === template);
Remote.templateDelete(() => {
@ -61,20 +58,18 @@ class TemplatesUserSettings
}
onBuild(oDom) {
const self = this;
oDom
.on('click', '.templates-list .template-item .e-action', function() { // eslint-disable-line prefer-arrow-callback
const template = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (template)
{
self.editTemplate(template);
}
});
oDom.on('click', '.templates-list .template-item .e-action', function() {
// eslint-disable-line prefer-arrow-callback
const template = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (template) {
self.editTemplate(template);
}
});
this.reloadTemplates();
}
}
export {TemplatesUserSettings, TemplatesUserSettings as default};
export { TemplatesUserSettings, TemplatesUserSettings as default };

View file

@ -1,23 +1,21 @@
import _ from '_';
import $ from '$';
import ko from 'ko';
import Jua from 'Jua';
import {SaveSettingsStep, UploadErrorCode, Capa, Magics} from 'Common/Enums';
import {changeTheme, convertThemeName} from 'Common/Utils';
import {userBackground, themePreviewLink, uploadBackground} from 'Common/Links';
import {i18n} from 'Common/Translator';
import { SaveSettingsStep, UploadErrorCode, Capa, Magics } from 'Common/Enums';
import { changeTheme, convertThemeName } from 'Common/Utils';
import { userBackground, themePreviewLink, uploadBackground } from 'Common/Links';
import { i18n } from 'Common/Translator';
import {capa} from 'Storage/Settings';
import { capa } from 'Storage/Settings';
import ThemeStore from 'Stores/Theme';
import Remote from 'Remote/User/Ajax';
class ThemesUserSettings
{
class ThemesUserSettings {
constructor() {
this.theme = ThemeStore.theme;
this.themes = ThemeStore.themes;
@ -32,7 +30,7 @@ class ThemesUserSettings
this.capaUserBackground = ko.observable(capa(Capa.UserBackground));
this.themeTrigger = ko.observable(SaveSettingsStep.Idle).extend({throttle: Magics.Time100ms});
this.themeTrigger = ko.observable(SaveSettingsStep.Idle).extend({ throttle: Magics.Time100ms });
this.iTimer = 0;
this.oThemeAjaxRequest = null;
@ -51,18 +49,19 @@ class ThemesUserSettings
this.background.hash.subscribe((value) => {
const $bg = $('#rl-bg');
if (!value)
{
if ($bg.data('backstretch'))
{
if (!value) {
if ($bg.data('backstretch')) {
$bg.backstretch('destroy').attr('style', '');
}
}
else
{
$bg.attr('style', 'background-image: none !important;').backstretch(userBackground(value), {
fade: Magics.Time1s, centeredX: true, centeredY: true
}).removeAttr('style');
} else {
$bg
.attr('style', 'background-image: none !important;')
.backstretch(userBackground(value), {
fade: Magics.Time1s,
centeredX: true,
centeredY: true
})
.removeAttr('style');
}
});
}
@ -70,12 +69,14 @@ class ThemesUserSettings
onBuild() {
const currentTheme = this.theme();
this.themesObjects(_.map(this.themes(), (theme) => ({
name: theme,
nameDisplay: convertThemeName(theme),
selected: ko.observable(theme === currentTheme),
themePreviewSrc: themePreviewLink(theme)
})));
this.themesObjects(
_.map(this.themes(), (theme) => ({
name: theme,
nameDisplay: convertThemeName(theme),
selected: ko.observable(theme === currentTheme),
themePreviewSrc: themePreviewLink(theme)
}))
);
this.initUploader();
}
@ -85,8 +86,7 @@ class ThemesUserSettings
}
clearBackground() {
if (this.capaUserBackground())
{
if (this.capaUserBackground()) {
Remote.clearUserBackground(() => {
this.background.name('');
this.background.hash('');
@ -95,18 +95,16 @@ class ThemesUserSettings
}
initUploader() {
if (this.background.uploaderButton() && this.capaUserBackground())
{
const
oJua = new Jua({
'action': uploadBackground(),
'name': 'uploader',
'queueSize': 1,
'multipleSizeLimit': 1,
'disableDragAndDrop': true,
'disableMultiple': true,
'clickElement': this.background.uploaderButton()
});
if (this.background.uploaderButton() && this.capaUserBackground()) {
const oJua = new Jua({
'action': uploadBackground(),
'name': 'uploader',
'queueSize': 1,
'multipleSizeLimit': 1,
'disableDragAndDrop': true,
'disableMultiple': true,
'clickElement': this.background.uploaderButton()
});
oJua
.on('onStart', () => {
@ -117,21 +115,16 @@ class ThemesUserSettings
.on('onComplete', (id, result, data) => {
this.background.loading(false);
if (result && id && data && data.Result && data.Result.Name && data.Result.Hash)
{
if (result && id && data && data.Result && data.Result.Name && data.Result.Hash) {
this.background.name(data.Result.Name);
this.background.hash(data.Result.Hash);
}
else
{
} else {
this.background.name('');
this.background.hash('');
let errorMsg = '';
if (data.ErrorCode)
{
switch (data.ErrorCode)
{
if (data.ErrorCode) {
switch (data.ErrorCode) {
case UploadErrorCode.FileIsTooBig:
errorMsg = i18n('SETTINGS_THEMES/ERROR_FILE_IS_TOO_BIG');
break;
@ -142,8 +135,7 @@ class ThemesUserSettings
}
}
if (!errorMsg && data.ErrorMessage)
{
if (!errorMsg && data.ErrorMessage) {
errorMsg = data.ErrorMessage;
}
@ -156,4 +148,4 @@ class ThemesUserSettings
}
}
export {ThemesUserSettings, ThemesUserSettings as default};
export { ThemesUserSettings, ThemesUserSettings as default };

View file

@ -1,10 +1,10 @@
import _ from '_';
import {CookieDriver} from 'Common/ClientStorageDriver/Cookie';
import {LocalStorageDriver} from 'Common/ClientStorageDriver/LocalStorage';
import { CookieDriver } from 'Common/ClientStorageDriver/Cookie';
import { LocalStorageDriver } from 'Common/ClientStorageDriver/LocalStorage';
const SupportedStorageDriver = _.find(
[LocalStorageDriver, CookieDriver], (StorageDriver) => StorageDriver && StorageDriver.supported()
[LocalStorageDriver, CookieDriver],
(StorageDriver) => StorageDriver && StorageDriver.supported()
);
const driver = SupportedStorageDriver ? new SupportedStorageDriver() : null;
@ -14,8 +14,7 @@ const driver = SupportedStorageDriver ? new SupportedStorageDriver() : null;
* @param {*} data
* @returns {boolean}
*/
export function set(key, data)
{
export function set(key, data) {
return driver ? driver.set('p' + key, data) : false;
}
@ -23,7 +22,6 @@ export function set(key, data)
* @param {number} key
* @returns {*}
*/
export function get(key)
{
export function get(key) {
return driver ? driver.get('p' + key) : null;
}

View file

@ -1,4 +1,3 @@
import window from 'window';
const STORAGE_KEY = '__rlA';
@ -8,65 +7,55 @@ const TIME_KEY = '__rlT';
* @param {string} storageName
* @returns {boolean}
*/
export function isStorageSupported(storageName)
{
export function isStorageSupported(storageName) {
let storageIsAvailable = false;
try
{
try {
// at: window[storageName] firefox throws SecurityError: The operation is insecure. when in iframe
storageIsAvailable = storageName in window && window[storageName] && window[storageName].setItem;
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
if (storageIsAvailable)
{
const
s = window[storageName],
if (storageIsAvailable) {
const s = window[storageName],
key = 'testLocalStorage_' + window.Math.random();
try
{
try {
s.setItem(key, key);
if (key === s.getItem(key))
{
if (key === s.getItem(key)) {
s.removeItem(key);
return true;
}
}
catch (e) {} // eslint-disable-line no-empty
} catch (e) {} // eslint-disable-line no-empty
}
return false;
}
const SESS_STORAGE = isStorageSupported('sessionStorage') ? (window.sessionStorage || null) : null;
const SESS_STORAGE = isStorageSupported('sessionStorage') ? window.sessionStorage || null : null;
const WIN_STORAGE = window.top || window || null;
const __get = (key) => {
let result = null;
if (SESS_STORAGE)
{
if (SESS_STORAGE) {
result = SESS_STORAGE.getItem(key) || null;
}
else if (WIN_STORAGE && window.JSON)
{
const data = WIN_STORAGE.name && '{' === WIN_STORAGE.name.toString().substr(0, 1) ? window.JSON.parse(WIN_STORAGE.name.toString()) : null;
result = data ? (data[key] || null) : null;
} else if (WIN_STORAGE && window.JSON) {
const data =
WIN_STORAGE.name && '{' === WIN_STORAGE.name.toString().substr(0, 1)
? window.JSON.parse(WIN_STORAGE.name.toString())
: null;
result = data ? data[key] || null : null;
}
return result;
};
const __set = (key, value) => {
if (SESS_STORAGE)
{
if (SESS_STORAGE) {
SESS_STORAGE.setItem(key, value);
}
else if (WIN_STORAGE && window.JSON)
{
let data = WIN_STORAGE.name && '{' === WIN_STORAGE.name.toString().substr(0, 1) ? window.JSON.parse(WIN_STORAGE.name.toString()) : null;
} else if (WIN_STORAGE && window.JSON) {
let data =
WIN_STORAGE.name && '{' === WIN_STORAGE.name.toString().substr(0, 1)
? window.JSON.parse(WIN_STORAGE.name.toString())
: null;
data = data || {};
data[key] = value;
@ -74,30 +63,27 @@ const __set = (key, value) => {
}
};
const timestamp = () => window.Math.round((new window.Date()).getTime() / 1000);
const timestamp = () => window.Math.round(new window.Date().getTime() / 1000);
const setTimestamp = () => __set(TIME_KEY, timestamp());
const getTimestamp = () => {
const time = __get(TIME_KEY, 0);
return time ? (window.parseInt(time, 10) || 0) : 0;
return time ? window.parseInt(time, 10) || 0 : 0;
};
/**
* @returns {string}
*/
export function getHash()
{
export function getHash() {
return __get(STORAGE_KEY);
}
/**
* @returns {void}
*/
export function setHash()
{
const
key = 'AuthAccountHash',
export function setHash() {
const key = 'AuthAccountHash',
appData = window.__rlah_data();
__set(STORAGE_KEY, appData && appData[key] ? appData[key] : '');
@ -107,8 +93,7 @@ export function setHash()
/**
* @returns {void}
*/
export function clearHash()
{
export function clearHash() {
__set(STORAGE_KEY, '');
setTimestamp();
}
@ -116,10 +101,9 @@ export function clearHash()
/**
* @returns {boolean}
*/
export function checkTimestamp()
{
if (timestamp() > getTimestamp() + 1000 * 60 * 60) // 60m
{
export function checkTimestamp() {
if (timestamp() > getTimestamp() + 1000 * 60 * 60) {
// 60m
clearHash();
return true;
}

View file

@ -1,6 +1,5 @@
import window from 'window';
import {isUnd, isNormal, isArray, inArray} from 'Common/Utils';
import { isUnd, isNormal, isArray, inArray } from 'Common/Utils';
let SETTINGS = window.__rlah_data() || null;
SETTINGS = isNormal(SETTINGS) ? SETTINGS : {};
@ -12,8 +11,7 @@ APP_SETTINGS = isNormal(APP_SETTINGS) ? APP_SETTINGS : {};
* @param {string} name
* @returns {*}
*/
export function settingsGet(name)
{
export function settingsGet(name) {
return isUnd(SETTINGS[name]) ? null : SETTINGS[name];
}
@ -21,8 +19,7 @@ export function settingsGet(name)
* @param {string} name
* @param {*} value
*/
export function settingsSet(name, value)
{
export function settingsSet(name, value) {
SETTINGS[name] = value;
}
@ -30,8 +27,7 @@ export function settingsSet(name, value)
* @param {string} name
* @returns {*}
*/
export function appSettingsGet(name)
{
export function appSettingsGet(name) {
return isUnd(APP_SETTINGS[name]) ? null : APP_SETTINGS[name];
}
@ -39,8 +35,7 @@ export function appSettingsGet(name)
* @param {string} name
* @returns {boolean}
*/
export function capa(name)
{
export function capa(name) {
const values = settingsGet('Capa');
return isArray(values) && isNormal(name) && -1 < inArray(name, values);
}

View file

@ -1,10 +1,8 @@
import ko from 'ko';
import {$html, bMobileDevice} from 'Common/Globals';
import { $html, bMobileDevice } from 'Common/Globals';
import * as Settings from 'Storage/Settings';
class AbstractAppStore
{
class AbstractAppStore {
constructor() {
this.allowLanguagesOnSettings = ko.observable(true);
this.allowLanguagesOnLogin = ko.observable(true);
@ -35,4 +33,4 @@ class AbstractAppStore
}
}
export {AbstractAppStore, AbstractAppStore as default};
export { AbstractAppStore, AbstractAppStore as default };

View file

@ -1,12 +1,10 @@
import window from 'window';
import $ from '$';
import ko from 'ko';
import {settingsGet} from 'Storage/Settings';
import {AbstractAppStore} from 'Stores/AbstractApp';
import { settingsGet } from 'Storage/Settings';
import { AbstractAppStore } from 'Stores/AbstractApp';
class AppAdminStore extends AbstractAppStore
{
class AppAdminStore extends AbstractAppStore {
constructor() {
super();

Some files were not shown because too many files have changed in this diff Show more