diff --git a/dev/App/Abstract.jsx b/dev/App/Abstract.jsx
index de52c9667..6f26f78d5 100644
--- a/dev/App/Abstract.jsx
+++ b/dev/App/Abstract.jsx
@@ -1,8 +1,14 @@
import {window, _, $, key} from 'common';
-import Globals from 'Common/Globals';
-import * as Enums from 'Common/Enums';
-import Utils from 'Common/Utils';
+
+import {
+ $win, $html, $doc,
+ startMicrotime, leftPanelDisabled, leftPanelType,
+ sUserAgent, bMobileDevice, bAnimationSupported
+} from 'Common/Globals';
+
+import {KeyState} from 'Common/Enums';
+import {noop, isNormal, pString, inArray, microtime, timestamp, detectDropdownVisibility, windowResizeCallback} from 'Common/Utils';
import Links from 'Common/Links';
import Events from 'Common/Events';
import Translator from 'Common/Translator';
@@ -15,6 +21,7 @@ class AbstractApp extends AbstractBoot
googlePreviewSupportedCache = null;
isLocalAutocomplete = true;
iframe = null;
+ lastErrorTime = 0;
/**
* @param {RemoteStorage|AdminRemoteStorage} Remote
@@ -25,39 +32,47 @@ class AbstractApp extends AbstractBoot
this.iframe = $('').appendTo('body');
- Globals.$win.on('error', function (oEvent) {
- if (oEvent && oEvent.originalEvent && oEvent.originalEvent.message &&
- -1 === Utils.inArray(oEvent.originalEvent.message, [
+ $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.'
]))
{
+ const time = timestamp();
+ if (this.lastErrorTime >= time)
+ {
+ return;
+ }
+
+ this.lastErrorTime = time;
+
Remote.jsError(
- Utils.emptyFunction,
- oEvent.originalEvent.message,
- oEvent.originalEvent.filename,
- oEvent.originalEvent.lineno,
+ noop,
+ event.originalEvent.message,
+ event.originalEvent.filename,
+ event.originalEvent.lineno,
window.location && window.location.toString ? window.location.toString() : '',
- Globals.$html.attr('class'),
- Utils.microtime() - Globals.startMicrotime
+ $html.attr('class'),
+ microtime() - startMicrotime
);
}
});
- Globals.$win.on('resize', function () {
+ $win.on('resize', function () {
Events.pub('window.resize');
});
Events.sub('window.resize', _.throttle(function () {
var
- iH = Globals.$win.height(),
- iW = Globals.$win.height()
+ iH = $win.height(),
+ iW = $win.height()
;
- if (Globals.$win.__sizes[0] !== iH || Globals.$win.__sizes[1] !== iW)
+ if ($win.__sizes[0] !== iH || $win.__sizes[1] !== iW)
{
- Globals.$win.__sizes[0] = iH;
- Globals.$win.__sizes[1] = iW;
+ $win.__sizes[0] = iH;
+ $win.__sizes[1] = iW;
Events.pub('window.resize.real');
}
@@ -74,24 +89,24 @@ class AbstractApp extends AbstractBoot
// }
// });
- Globals.$doc.on('keydown', function (oEvent) {
+ $doc.on('keydown', function (oEvent) {
if (oEvent && oEvent.ctrlKey)
{
- Globals.$html.addClass('rl-ctrl-key-pressed');
+ $html.addClass('rl-ctrl-key-pressed');
}
}).on('keyup', function (oEvent) {
if (oEvent && !oEvent.ctrlKey)
{
- Globals.$html.removeClass('rl-ctrl-key-pressed');
+ $html.removeClass('rl-ctrl-key-pressed');
}
});
- Globals.$doc.on('mousemove keypress click', _.debounce(function () {
+ $doc.on('mousemove keypress click', _.debounce(function () {
Events.pub('rl.auto-logout-refresh');
}, 5000));
- key('esc, enter', Enums.KeyState.All, _.bind(function () {
- Utils.detectDropdownVisibility();
+ key('esc, enter', KeyState.All, _.bind(function () {
+ detectDropdownVisibility();
}, this));
}
@@ -113,7 +128,7 @@ class AbstractApp extends AbstractBoot
*/
download(link) {
- if (Globals.sUserAgent && (Globals.sUserAgent.indexOf('chrome') > -1 || Globals.sUserAgent.indexOf('chrome') > -1))
+ if (sUserAgent && (sUserAgent.indexOf('chrome') > -1 || sUserAgent.indexOf('chrome') > -1))
{
const oLink = window.document.createElement('a');
oLink.href = link;
@@ -130,7 +145,7 @@ class AbstractApp extends AbstractBoot
}
}
- if (Globals.bMobileDevice)
+ if (bMobileDevice)
{
window.open(link, '_self');
window.focus();
@@ -161,7 +176,7 @@ class AbstractApp extends AbstractBoot
* @param {string} title
*/
setWindowTitle(title) {
- title = ((Utils.isNormal(title) && 0 < title.length) ? '' + title : '');
+ title = ((isNormal(title) && 0 < title.length) ? '' + title : '');
if (Settings.settingsGet('Title'))
{
title += (title ? ' - ' : '') + Settings.settingsGet('Title');
@@ -208,7 +223,7 @@ class AbstractApp extends AbstractBoot
inIframe = !!Settings.appSettingsGet('inIframe')
;
- let customLogoutLink = Utils.pString(Settings.appSettingsGet('customLogoutLink'));
+ let customLogoutLink = pString(Settings.appSettingsGet('customLogoutLink'));
if (logout)
{
@@ -260,7 +275,7 @@ class AbstractApp extends AbstractBoot
bootstart() {
- // Utils.log('Ps' + 'ss, hac' + 'kers! The' + 're\'s not' + 'hing inte' + 'resting :' + ')');
+ // log('Ps' + 'ss, hac' + 'kers! The' + 're\'s not' + 'hing inte' + 'resting :' + ')');
Events.pub('rl.bootstart');
@@ -279,7 +294,7 @@ class AbstractApp extends AbstractBoot
ko.components.register('x-script', require('Component/Script'));
// ko.components.register('svg-icon', require('Component/SvgIcon'));
- if (Settings.appSettingsGet('materialDesign') && Globals.bAnimationSupported)
+ if (Settings.appSettingsGet('materialDesign') && bAnimationSupported)
{
ko.components.register('Checkbox', require('Component/MaterialDesign/Checkbox'));
ko.components.register('CheckboxSimple', require('Component/Checkbox'));
@@ -294,14 +309,14 @@ class AbstractApp extends AbstractBoot
Translator.initOnStartOrLangChange(Translator.initNotificationLanguage, Translator);
- _.delay(Utils.windowResizeCallback, 1000);
+ _.delay(windowResizeCallback, 1000);
Events.sub('ssm.mobile-enter', () => {
- Globals.leftPanelDisabled(true);
+ leftPanelDisabled(true);
});
Events.sub('ssm.mobile-leave', () => {
- Globals.leftPanelDisabled(false);
+ leftPanelDisabled(false);
});
if (!mobile)
@@ -310,11 +325,11 @@ class AbstractApp extends AbstractBoot
id: 'mobile',
maxWidth: 767,
onEnter: () => {
- Globals.$html.addClass('ssm-state-mobile');
+ $html.addClass('ssm-state-mobile');
Events.pub('ssm.mobile-enter');
},
onLeave: () => {
- Globals.$html.removeClass('ssm-state-mobile');
+ $html.removeClass('ssm-state-mobile');
Events.pub('ssm.mobile-leave');
}
});
@@ -324,10 +339,10 @@ class AbstractApp extends AbstractBoot
minWidth: 768,
maxWidth: 999,
onEnter: function() {
- Globals.$html.addClass('ssm-state-tablet');
+ $html.addClass('ssm-state-tablet');
},
onLeave: function() {
- Globals.$html.removeClass('ssm-state-tablet');
+ $html.removeClass('ssm-state-tablet');
}
});
@@ -336,10 +351,10 @@ class AbstractApp extends AbstractBoot
minWidth: 1000,
maxWidth: 1400,
onEnter: () => {
- Globals.$html.addClass('ssm-state-desktop');
+ $html.addClass('ssm-state-desktop');
},
onLeave: () => {
- Globals.$html.removeClass('ssm-state-desktop');
+ $html.removeClass('ssm-state-desktop');
}
});
@@ -347,30 +362,30 @@ class AbstractApp extends AbstractBoot
id: 'desktop-large',
minWidth: 1400,
onEnter: () => {
- Globals.$html.addClass('ssm-state-desktop-large');
+ $html.addClass('ssm-state-desktop-large');
},
onLeave: () => {
- Globals.$html.removeClass('ssm-state-desktop-large');
+ $html.removeClass('ssm-state-desktop-large');
}
});
}
else
{
- Globals.$html.addClass('ssm-state-mobile').addClass('rl-mobile');
+ $html.addClass('ssm-state-mobile').addClass('rl-mobile');
Events.pub('ssm.mobile-enter');
}
- Globals.leftPanelDisabled.subscribe((bValue) => {
- Globals.$html.toggleClass('rl-left-panel-disabled', bValue);
- Globals.$html.toggleClass('rl-left-panel-enabled', !bValue);
+ leftPanelDisabled.subscribe((bValue) => {
+ $html.toggleClass('rl-left-panel-disabled', bValue);
+ $html.toggleClass('rl-left-panel-enabled', !bValue);
});
- Globals.leftPanelType.subscribe((sValue) => {
- Globals.$html.toggleClass('rl-left-panel-none', 'none' === sValue);
- Globals.$html.toggleClass('rl-left-panel-short', 'short' === sValue);
+ leftPanelType.subscribe((sValue) => {
+ $html.toggleClass('rl-left-panel-none', 'none' === sValue);
+ $html.toggleClass('rl-left-panel-short', 'short' === sValue);
});
- Globals.leftPanelDisabled.valueHasMutated();
+ leftPanelDisabled.valueHasMutated();
ssm.ready();
diff --git a/dev/App/Admin.jsx b/dev/App/Admin.jsx
index 4be270f11..283d99dbf 100644
--- a/dev/App/Admin.jsx
+++ b/dev/App/Admin.jsx
@@ -3,10 +3,10 @@ import {window, _} from 'common';
import ko from 'ko';
import progressJs from 'progressJs';
-import * as Enums from 'Common/Enums';
-import Utils from 'Common/Utils';
import Links from 'Common/Links';
import Translator from 'Common/Translator';
+import {StorageResultType, Notification} from 'Common/Enums';
+import {pInt, isNormal, isArray, inArray, isUnd} from 'Common/Utils';
import Settings from 'Storage/Settings';
@@ -37,7 +37,7 @@ class AdminApp extends AbstractApp
DomainStore.domains.loading(true);
Remote.domainList((result, data) => {
DomainStore.domains.loading(false);
- if (Enums.StorageResultType.Success === result && data && data.Result)
+ if (StorageResultType.Success === result && data && data.Result)
{
DomainStore.domains(_.map(data.Result, (enabled, name) => {
return {
@@ -54,7 +54,7 @@ class AdminApp extends AbstractApp
PluginStore.plugins.loading(true);
Remote.pluginList((result, data) => {
PluginStore.plugins.loading(false);
- if (Enums.StorageResultType.Success === result && data && data.Result)
+ if (StorageResultType.Success === result && data && data.Result)
{
PluginStore.plugins(_.map(data.Result, (item) => {
return {
@@ -72,7 +72,7 @@ class AdminApp extends AbstractApp
PackageStore.packagesReal(true);
Remote.packagesList((result, data) => {
PackageStore.packages.loading(false);
- if (Enums.StorageResultType.Success === result && data && data.Result)
+ if (StorageResultType.Success === result && data && data.Result)
{
PackageStore.packagesReal(!!data.Result.Real);
PackageStore.packagesMainUpdatable(!!data.Result.MainUpdatable);
@@ -89,12 +89,12 @@ class AdminApp extends AbstractApp
}
});
- if (Utils.isArray(data.Result.List))
+ if (isArray(data.Result.List))
{
list = _.compact(_.map(data.Result.List, (item) => {
if (item)
{
- item.loading = ko.observable(!Utils.isUnd(loading[item.file]));
+ item.loading = ko.observable(!isUnd(loading[item.file]));
return 'core' === item.type && !item.canBeInstalled ? null : item;
}
return null;
@@ -118,7 +118,7 @@ class AdminApp extends AbstractApp
CoreStore.coreRemoteVersion('');
CoreStore.coreRemoteRelease('');
CoreStore.coreVersionCompare(-2);
- if (Enums.StorageResultType.Success === result && data && data.Result)
+ if (StorageResultType.Success === result && data && data.Result)
{
CoreStore.coreReal(true);
window.location.reload();
@@ -135,7 +135,7 @@ class AdminApp extends AbstractApp
CoreStore.coreReal(true);
Remote.coreData((result, data) => {
CoreStore.coreChecking(false);
- if (Enums.StorageResultType.Success === result && data && data.Result)
+ if (StorageResultType.Success === result && data && data.Result)
{
CoreStore.coreReal(!!data.Result.Real);
CoreStore.coreChannel(data.Result.Channel || 'stable');
@@ -146,7 +146,7 @@ class AdminApp extends AbstractApp
CoreStore.coreVersion(data.Result.Version || '');
CoreStore.coreRemoteVersion(data.Result.RemoteVersion || '');
CoreStore.coreRemoteRelease(data.Result.RemoteRelease || '');
- CoreStore.coreVersionCompare(Utils.pInt(data.Result.VersionCompare));
+ CoreStore.coreVersionCompare(pInt(data.Result.VersionCompare));
}
else
{
@@ -170,29 +170,29 @@ class AdminApp extends AbstractApp
LicenseStore.licenseError('');
Remote.licensing((result, data) => {
LicenseStore.licensingProcess(false);
- if (Enums.StorageResultType.Success === result && data && data.Result && Utils.isNormal(data.Result.Expired))
+ if (StorageResultType.Success === result && data && data.Result && isNormal(data.Result.Expired))
{
LicenseStore.licenseValid(true);
- LicenseStore.licenseExpired(Utils.pInt(data.Result.Expired));
+ LicenseStore.licenseExpired(pInt(data.Result.Expired));
LicenseStore.licenseError('');
LicenseStore.licensing(true);
AppStore.prem(true);
}
else
{
- if (data && data.ErrorCode && -1 < Utils.inArray(Utils.pInt(data.ErrorCode), [
- Enums.Notification.LicensingServerIsUnavailable,
- Enums.Notification.LicensingExpired
+ if (data && data.ErrorCode && -1 < inArray(pInt(data.ErrorCode), [
+ Notification.LicensingServerIsUnavailable,
+ Notification.LicensingExpired
]))
{
- LicenseStore.licenseError(Translator.getNotification(Utils.pInt(data.ErrorCode)));
+ LicenseStore.licenseError(Translator.getNotification(pInt(data.ErrorCode)));
LicenseStore.licensing(true);
}
else
{
- if (Enums.StorageResultType.Abort === result)
+ if (StorageResultType.Abort === result)
{
- LicenseStore.licenseError(Translator.getNotification(Enums.Notification.LicensingServerIsUnavailable));
+ LicenseStore.licenseError(Translator.getNotification(Notification.LicensingServerIsUnavailable));
LicenseStore.licensing(true);
}
else
diff --git a/dev/App/User.jsx b/dev/App/User.jsx
index 6d466f514..4813943f0 100644
--- a/dev/App/User.jsx
+++ b/dev/App/User.jsx
@@ -3,11 +3,24 @@ import {window, _, $} from 'common';
import progressJs from 'progressJs';
import Tinycon from 'Tinycon';
-import * as Enums from 'Common/Enums';
-import * as Consts from 'Common/Consts';
-import Globals from 'Common/Globals';
+import {
+ noop, trim, log, isArray, inArray, isUnd, isNormal, isPosNumeric, isNonEmptyArray,
+ pInt, pString, delegateRunOnDestroy, mailToHelper, windowResize
+} from 'Common/Utils';
+
+import {
+ Layout, Capa, StorageResultType, Notification, FolderType,
+ SetSystemFoldersNotification, MessageSetAction, ClientSideKeyName
+} from 'Common/Enums';
+
+import {
+ $html,
+ leftPanelWidth, leftPanelDisabled,
+ bAnimationSupported, bMobileDevice
+} from 'Common/Globals';
+
+import {UNUSED_OPTION_VALUE} from 'Common/Consts';
import Plugins from 'Common/Plugins';
-import Utils from 'Common/Utils';
import Links from 'Common/Links';
import Events from 'Common/Events';
import Translator from 'Common/Translator';
@@ -74,7 +87,7 @@ class AppUser extends AbstractApp
}
Remote.jsVersion((sResult, oData) => {
- if (Enums.StorageResultType.Success === sResult && oData && !oData.Result)
+ if (StorageResultType.Success === sResult && oData && !oData.Result)
{
this.reload();
}
@@ -93,7 +106,7 @@ class AppUser extends AbstractApp
$('#rl-bg')
.attr('style', 'background-image: none !important;')
.backstretch(Links.userBackground(Settings.settingsGet('UserBackgroundHash')), {
- fade: Globals.bAnimationSupported ? 1000 : 0,
+ fade: bAnimationSupported ? 1000 : 0,
centeredX: true,
centeredY: true
})
@@ -159,19 +172,19 @@ class AppUser extends AbstractApp
MessageStore.messageListLoading(true);
Remote.messageList((sResult, oData, bCached) => {
- if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
+ if (StorageResultType.Success === sResult && oData && oData.Result)
{
MessageStore.messageListError('');
MessageStore.messageListLoading(false);
MessageStore.setMessageList(oData, bCached);
}
- else if (Enums.StorageResultType.Unload === sResult)
+ else if (StorageResultType.Unload === sResult)
{
MessageStore.messageListError('');
MessageStore.messageListLoading(false);
}
- else if (Enums.StorageResultType.Abort !== sResult)
+ else if (StorageResultType.Abort !== sResult)
{
MessageStore.messageList([]);
MessageStore.messageListLoading(false);
@@ -185,7 +198,7 @@ class AppUser extends AbstractApp
}
recacheInboxMessageList() {
- Remote.messageList(Utils.emptyFunction, Cache.getFolderInboxName(), 0, SettingsStore.messagesPerPage(), '', '', true);
+ Remote.messageList(noop, Cache.getFolderInboxName(), 0, SettingsStore.messagesPerPage(), '', '', true);
}
/**
@@ -272,9 +285,9 @@ class AppUser extends AbstractApp
moveOrDeleteResponseHelper(sResult, oData) {
- if (Enums.StorageResultType.Success === sResult && FolderStore.currentFolder())
+ if (StorageResultType.Success === sResult && FolderStore.currentFolder())
{
- if (oData && Utils.isArray(oData.Result) && 2 === oData.Result.length)
+ if (oData && isArray(oData.Result) && 2 === oData.Result.length)
{
Cache.setFolderHash(oData.Result[0], oData.Result[1]);
}
@@ -282,8 +295,8 @@ class AppUser extends AbstractApp
{
Cache.setFolderHash(FolderStore.currentFolderFullNameRaw(), '');
- if (oData && -1 < Utils.inArray(oData.ErrorCode,
- [Enums.Notification.CantMoveMessage, Enums.Notification.CantCopyMessage]))
+ if (oData && -1 < inArray(oData.ErrorCode,
+ [Notification.CantMoveMessage, Notification.CantCopyMessage]))
{
window.alert(Translator.getNotification(oData.ErrorCode));
}
@@ -318,29 +331,29 @@ class AppUser extends AbstractApp
switch (iDeleteType)
{
- case Enums.FolderType.Spam:
+ case FolderType.Spam:
oMoveFolder = Cache.getFolderFromCacheList(FolderStore.spamFolder());
- nSetSystemFoldersNotification = Enums.SetSystemFoldersNotification.Spam;
+ nSetSystemFoldersNotification = SetSystemFoldersNotification.Spam;
break;
- case Enums.FolderType.NotSpam:
+ case FolderType.NotSpam:
oMoveFolder = Cache.getFolderFromCacheList(Cache.getFolderInboxName());
break;
- case Enums.FolderType.Trash:
+ case FolderType.Trash:
oMoveFolder = Cache.getFolderFromCacheList(FolderStore.trashFolder());
- nSetSystemFoldersNotification = Enums.SetSystemFoldersNotification.Trash;
+ nSetSystemFoldersNotification = SetSystemFoldersNotification.Trash;
break;
- case Enums.FolderType.Archive:
+ case FolderType.Archive:
oMoveFolder = Cache.getFolderFromCacheList(FolderStore.archiveFolder());
- nSetSystemFoldersNotification = Enums.SetSystemFoldersNotification.Archive;
+ nSetSystemFoldersNotification = SetSystemFoldersNotification.Archive;
break;
}
- bUseFolder = Utils.isUnd(bUseFolder) ? true : !!bUseFolder;
+ bUseFolder = isUnd(bUseFolder) ? true : !!bUseFolder;
if (bUseFolder)
{
- if ((Enums.FolderType.Spam === iDeleteType && Consts.UNUSED_OPTION_VALUE === FolderStore.spamFolder()) ||
- (Enums.FolderType.Trash === iDeleteType && Consts.UNUSED_OPTION_VALUE === FolderStore.trashFolder()) ||
- (Enums.FolderType.Archive === iDeleteType && Consts.UNUSED_OPTION_VALUE === FolderStore.archiveFolder()))
+ if ((FolderType.Spam === iDeleteType && UNUSED_OPTION_VALUE === FolderStore.spamFolder()) ||
+ (FolderType.Trash === iDeleteType && UNUSED_OPTION_VALUE === FolderStore.trashFolder()) ||
+ (FolderType.Archive === iDeleteType && UNUSED_OPTION_VALUE === FolderStore.archiveFolder()))
{
bUseFolder = false;
}
@@ -350,7 +363,7 @@ class AppUser extends AbstractApp
{
kn.showScreenPopup(require('View/Popup/FolderSystem'), [nSetSystemFoldersNotification]);
}
- else if (!bUseFolder || (Enums.FolderType.Trash === iDeleteType &&
+ else if (!bUseFolder || (FolderType.Trash === iDeleteType &&
(sFromFolderFullNameRaw === FolderStore.spamFolder() || sFromFolderFullNameRaw === FolderStore.trashFolder())))
{
kn.showScreenPopup(require('View/Popup/Ask'), [Translator.i18n('POPUPS_ASK/DESC_WANT_DELETE_MESSAGES'), () => {
@@ -373,7 +386,7 @@ class AppUser extends AbstractApp
*/
moveMessagesToFolder(sFromFolderFullNameRaw, aUidForMove, sToFolderFullNameRaw, bCopy) {
- if (sFromFolderFullNameRaw !== sToFolderFullNameRaw && Utils.isArray(aUidForMove) && 0 < aUidForMove.length)
+ if (sFromFolderFullNameRaw !== sToFolderFullNameRaw && isArray(aUidForMove) && 0 < aUidForMove.length)
{
const
oFromFolder = Cache.getFolderFromCacheList(sFromFolderFullNameRaw),
@@ -382,7 +395,7 @@ class AppUser extends AbstractApp
if (oFromFolder && oToFolder)
{
- if (Utils.isUnd(bCopy) ? false : !!bCopy)
+ if (isUnd(bCopy) ? false : !!bCopy)
{
this.messagesCopyHelper(oFromFolder.fullNameRaw, oToFolder.fullNameRaw, aUidForMove);
}
@@ -486,7 +499,7 @@ class AppUser extends AbstractApp
}
});
- Utils.delegateRunOnDestroy(PgpStore.openpgpkeys());
+ delegateRunOnDestroy(PgpStore.openpgpkeys());
PgpStore.openpgpkeys(aKeys);
}
}
@@ -499,7 +512,7 @@ class AppUser extends AbstractApp
//
// AccountStore.accounts.loading(false);
//
-// if (Enums.StorageResultType.Success === sResult && oData.Result && oData.Result['Counts'])
+// if (StorageResultType.Success === sResult && oData.Result && oData.Result['Counts'])
// {
// var
// sEmail = AccountStore.email(),
@@ -514,7 +527,7 @@ class AppUser extends AbstractApp
//
// if (oAccount)
// {
-// oAccount.count(Utils.pInt(oItem[1]));
+// oAccount.count(pInt(oItem[1]));
// }
// });
// }
@@ -531,7 +544,7 @@ class AppUser extends AbstractApp
AccountStore.accounts.loading(false);
IdentityStore.identities.loading(false);
- if (Enums.StorageResultType.Success === sResult && oData.Result)
+ if (StorageResultType.Success === sResult && oData.Result)
{
var
aCounts = {},
@@ -541,40 +554,40 @@ class AppUser extends AbstractApp
sParentEmail = '' === sParentEmail ? sAccountEmail : sParentEmail;
- if (Utils.isArray(oData.Result.Accounts))
+ if (isArray(oData.Result.Accounts))
{
_.each(AccountStore.accounts(), (oAccount) => {
aCounts[oAccount.email] = oAccount.count();
});
- Utils.delegateRunOnDestroy(AccountStore.accounts());
+ delegateRunOnDestroy(AccountStore.accounts());
AccountStore.accounts(_.map(oData.Result.Accounts,
(sValue) => new AccountModel(sValue, sValue !== sParentEmail, aCounts[sValue] || 0)));
}
- if (Utils.isUnd(bBoot) ? false : !!bBoot)
+ if (isUnd(bBoot) ? false : !!bBoot)
{
_.delay(() => this.accountsCounts(), 1000 * 5);
Events.sub('interval.10m-after5m', () => this.accountsCounts());
}
- if (Utils.isArray(oData.Result.Identities))
+ if (isArray(oData.Result.Identities))
{
- Utils.delegateRunOnDestroy(IdentityStore.identities());
+ delegateRunOnDestroy(IdentityStore.identities());
IdentityStore.identities(_.map(oData.Result.Identities, (oIdentityData) => {
const
- sId = Utils.pString(oIdentityData.Id),
- sEmail = Utils.pString(oIdentityData.Email),
+ sId = pString(oIdentityData.Id),
+ sEmail = pString(oIdentityData.Email),
oIdentity = new IdentityModel(sId, sEmail)
;
- oIdentity.name(Utils.pString(oIdentityData.Name));
- oIdentity.replyTo(Utils.pString(oIdentityData.ReplyTo));
- oIdentity.bcc(Utils.pString(oIdentityData.Bcc));
- oIdentity.signature(Utils.pString(oIdentityData.Signature));
+ oIdentity.name(pString(oIdentityData.Name));
+ oIdentity.replyTo(pString(oIdentityData.ReplyTo));
+ oIdentity.bcc(pString(oIdentityData.Bcc));
+ oIdentity.signature(pString(oIdentityData.Signature));
oIdentity.signatureInsertBefore(!!oIdentityData.SignatureInsertBefore);
return oIdentity;
@@ -592,10 +605,10 @@ class AppUser extends AbstractApp
TemplateStore.templates.loading(false);
- if (Enums.StorageResultType.Success === result && data.Result &&
- Utils.isArray(data.Result.Templates))
+ if (StorageResultType.Success === result && data.Result &&
+ isArray(data.Result.Templates))
{
- Utils.delegateRunOnDestroy(TemplateStore.templates());
+ delegateRunOnDestroy(TemplateStore.templates());
TemplateStore.templates(_.compact(_.map(data.Result.Templates, (templateData) => {
const template = new TemplateModel();
@@ -607,12 +620,12 @@ class AppUser extends AbstractApp
quota() {
Remote.quota((result, data) => {
- if (Enums.StorageResultType.Success === result && data && data.Result &&
- Utils.isArray(data.Result) && 1 < data.Result.length &&
- Utils.isPosNumeric(data.Result[0], true) && Utils.isPosNumeric(data.Result[1], true))
+ if (StorageResultType.Success === result && data && data.Result &&
+ isArray(data.Result) && 1 < data.Result.length &&
+ isPosNumeric(data.Result[0], true) && isPosNumeric(data.Result[1], true))
{
require('Stores/User/Quota').populateData(
- Utils.pInt(data.Result[1]), Utils.pInt(data.Result[0]));
+ pInt(data.Result[1]), pInt(data.Result[0]));
}
});
}
@@ -622,10 +635,10 @@ class AppUser extends AbstractApp
* @param {Array=} list = []
*/
folderInformation(folder, list) {
- if ('' !== Utils.trim(folder))
+ if ('' !== trim(folder))
{
Remote.folderInformation((result, data) => {
- if (Enums.StorageResultType.Success === result)
+ if (StorageResultType.Success === result)
{
if (data && data.Result && data.Result.Hash && data.Result.Folder)
{
@@ -645,14 +658,14 @@ class AppUser extends AbstractApp
Cache.setFolderHash(data.Result.Folder, data.Result.Hash);
}
- if (Utils.isNormal(data.Result.MessageCount))
+ if (isNormal(data.Result.MessageCount))
{
folderFromCache.messageCountAll(data.Result.MessageCount);
}
- if (Utils.isNormal(data.Result.MessageUnseenCount))
+ if (isNormal(data.Result.MessageUnseenCount))
{
- if (Utils.pInt(folderFromCache.messageCountUnread()) !== Utils.pInt(data.Result.MessageUnseenCount))
+ if (pInt(folderFromCache.messageCountUnread()) !== pInt(data.Result.MessageUnseenCount))
{
unreadCountChange = true;
}
@@ -712,12 +725,12 @@ class AppUser extends AbstractApp
folderInformationMultiply(boot = false) {
const folders = FolderStore.getNextFolderNames();
- if (Utils.isNonEmptyArray(folders))
+ if (isNonEmptyArray(folders))
{
Remote.folderInformationMultiply((sResult, oData) => {
- if (Enums.StorageResultType.Success === sResult)
+ if (StorageResultType.Success === sResult)
{
- if (oData && oData.Result && oData.Result.List && Utils.isNonEmptyArray(oData.Result.List))
+ if (oData && oData.Result && oData.Result.List && isNonEmptyArray(oData.Result.List))
{
const utc = Momentor.momentNowUnix();
_.each(oData.Result.List, (oItem) => {
@@ -737,14 +750,14 @@ class AppUser extends AbstractApp
Cache.setFolderHash(oItem.Folder, oItem.Hash);
}
- if (Utils.isNormal(oItem.MessageCount))
+ if (isNormal(oItem.MessageCount))
{
oFolder.messageCountAll(oItem.MessageCount);
}
- if (Utils.isNormal(oItem.MessageUnseenCount))
+ if (isNormal(oItem.MessageUnseenCount))
{
- if (Utils.pInt(oFolder.messageCountUnread()) !== Utils.pInt(oItem.MessageUnseenCount))
+ if (pInt(oFolder.messageCountUnread()) !== pInt(oItem.MessageUnseenCount))
{
bUnreadCountChange = true;
}
@@ -769,7 +782,7 @@ class AppUser extends AbstractApp
if (oFolder.fullNameRaw === FolderStore.currentFolderFullNameRaw())
{
const aList = MessageStore.messageList();
- if (Utils.isNonEmptyArray(aList))
+ if (isNonEmptyArray(aList))
{
this.folderInformation(oFolder.fullNameRaw, aList);
}
@@ -802,7 +815,7 @@ class AppUser extends AbstractApp
iAlreadyUnread = 0
;
- if (Utils.isUnd(aMessages))
+ if (isUnd(aMessages))
{
aMessages = MessageStore.messageListChecked();
}
@@ -812,7 +825,7 @@ class AppUser extends AbstractApp
if ('' !== sFolderFullNameRaw && 0 < aRootUids.length)
{
switch (iSetAction) {
- case Enums.MessageSetAction.SetSeen:
+ case MessageSetAction.SetSeen:
_.each(aRootUids, (sSubUid) => {
iAlreadyUnread += Cache.storeMessageFlagsToCacheBySetAction(
@@ -825,10 +838,10 @@ class AppUser extends AbstractApp
oFolder.messageCountUnread(oFolder.messageCountUnread() - iAlreadyUnread);
}
- Remote.messageSetSeen(Utils.emptyFunction, sFolderFullNameRaw, aRootUids, true);
+ Remote.messageSetSeen(noop, sFolderFullNameRaw, aRootUids, true);
break;
- case Enums.MessageSetAction.UnsetSeen:
+ case MessageSetAction.UnsetSeen:
_.each(aRootUids, (sSubUid) => {
iAlreadyUnread += Cache.storeMessageFlagsToCacheBySetAction(
@@ -841,27 +854,27 @@ class AppUser extends AbstractApp
oFolder.messageCountUnread(oFolder.messageCountUnread() - iAlreadyUnread + aRootUids.length);
}
- Remote.messageSetSeen(Utils.emptyFunction, sFolderFullNameRaw, aRootUids, false);
+ Remote.messageSetSeen(noop, sFolderFullNameRaw, aRootUids, false);
break;
- case Enums.MessageSetAction.SetFlag:
+ case MessageSetAction.SetFlag:
_.each(aRootUids, (sSubUid) => {
Cache.storeMessageFlagsToCacheBySetAction(
sFolderFullNameRaw, sSubUid, iSetAction);
});
- Remote.messageSetFlagged(Utils.emptyFunction, sFolderFullNameRaw, aRootUids, true);
+ Remote.messageSetFlagged(noop, sFolderFullNameRaw, aRootUids, true);
break;
- case Enums.MessageSetAction.UnsetFlag:
+ case MessageSetAction.UnsetFlag:
_.each(aRootUids, (sSubUid) => {
Cache.storeMessageFlagsToCacheBySetAction(
sFolderFullNameRaw, sSubUid, iSetAction);
});
- Remote.messageSetFlagged(Utils.emptyFunction, sFolderFullNameRaw, aRootUids, false);
+ Remote.messageSetFlagged(noop, sFolderFullNameRaw, aRootUids, false);
break;
}
@@ -895,7 +908,7 @@ class AppUser extends AbstractApp
Remote.socialUsers((result, data) => {
- if (Enums.StorageResultType.Success === result && data && data.Result)
+ if (StorageResultType.Success === result && data && data.Result)
{
SocialStore.google.userName(data.Result.Google || '');
SocialStore.facebook.userName(data.Result.Facebook || '');
@@ -935,12 +948,12 @@ class AppUser extends AbstractApp
*/
getAutocomplete(query, callback) {
Remote.suggestions((result, data) => {
- if (Enums.StorageResultType.Success === result && data && Utils.isArray(data.Result))
+ if (StorageResultType.Success === result && data && isArray(data.Result))
{
callback(_.compact(_.map(data.Result,
(item) => item && item[0] ? new EmailModel(item[0], item[1]) : null)));
}
- else if (Enums.StorageResultType.Abort !== result)
+ else if (StorageResultType.Abort !== result)
{
callback([]);
}
@@ -952,8 +965,8 @@ class AppUser extends AbstractApp
* @param {boolean} bExpanded
*/
setExpandedFolder(sFullNameHash, bExpanded) {
- let aExpandedList = Local.get(Enums.ClientSideKeyName.ExpandedFolders);
- if (!Utils.isArray(aExpandedList))
+ let aExpandedList = Local.get(ClientSideKeyName.ExpandedFolders);
+ if (!isArray(aExpandedList))
{
aExpandedList = [];
}
@@ -968,7 +981,7 @@ class AppUser extends AbstractApp
aExpandedList = _.without(aExpandedList, sFullNameHash);
}
- Local.set(Enums.ClientSideKeyName.ExpandedFolders, aExpandedList);
+ Local.set(ClientSideKeyName.ExpandedFolders, aExpandedList);
}
initHorizontalLayoutResizer(sClientSideKeyName) {
@@ -1001,32 +1014,32 @@ class AppUser extends AbstractApp
oResizableHandle
.on('mousedown', () => {
- Globals.$html.addClass('rl-resizer');
+ $html.addClass('rl-resizer');
})
.on('mouseup', () => {
- Globals.$html.removeClass('rl-resizer');
+ $html.removeClass('rl-resizer');
})
;
}
},
fResizeStartFunction = () => {
- Globals.$html.addClass('rl-resizer');
+ $html.addClass('rl-resizer');
},
fResizeResizeFunction = _.debounce(() => {
- Globals.$html.addClass('rl-resizer');
+ $html.addClass('rl-resizer');
}, 500, true),
fResizeStopFunction = (oEvent, oObject) => {
- Globals.$html.removeClass('rl-resizer');
+ $html.removeClass('rl-resizer');
if (oObject && oObject.size && oObject.size.height)
{
Local.set(sClientSideKeyName, oObject.size.height);
fSetHeight(oObject.size.height);
- Utils.windowResize();
+ windowResize();
}
},
@@ -1057,7 +1070,7 @@ class AppUser extends AbstractApp
oBottom.removeAttr('style');
}
}
- else if (Globals.$html.hasClass('rl-bottom-preview-pane'))
+ else if ($html.hasClass('rl-bottom-preview-pane'))
{
oTop = $('.b-message-list-wrapper');
oBottom = $('.b-message-view-wrapper');
@@ -1067,7 +1080,7 @@ class AppUser extends AbstractApp
oTop.resizable(oOptions);
}
- const iHeight = Utils.pInt(Local.get(sClientSideKeyName)) || 300;
+ const iHeight = pInt(Local.get(sClientSideKeyName)) || 300;
fSetHeight(iHeight > iMinHeight ? iHeight : iMinHeight);
}
}
@@ -1076,7 +1089,7 @@ class AppUser extends AbstractApp
fDisable(false);
Events.sub('layout', (layout) => {
- fDisable(Enums.Layout.BottomPreview !== layout);
+ fDisable(Layout.BottomPreview !== layout);
});
}
@@ -1093,9 +1106,9 @@ class AppUser extends AbstractApp
fSetWidth = (iWidth) => {
if (iWidth)
{
- Globals.leftPanelWidth(iWidth);
+ leftPanelWidth(iWidth);
- Globals.$html.removeClass('rl-resizer');
+ $html.removeClass('rl-resizer');
oLeft.css({
width: '' + iWidth + 'px'
@@ -1116,7 +1129,7 @@ class AppUser extends AbstractApp
else
{
oLeft.resizable('enable');
- var iWidth = Utils.pInt(Local.get(sClientSideKeyName)) || iMinWidth;
+ var iWidth = pInt(Local.get(sClientSideKeyName)) || iMinWidth;
fSetWidth(iWidth > iMinWidth ? iWidth : iMinWidth);
}
},
@@ -1126,27 +1139,27 @@ class AppUser extends AbstractApp
{
$(oEvent.target).find('.ui-resizable-handle')
.on('mousedown', () => {
- Globals.$html.addClass('rl-resizer');
+ $html.addClass('rl-resizer');
})
.on('mouseup', () => {
- Globals.$html.removeClass('rl-resizer');
+ $html.removeClass('rl-resizer');
})
;
}
},
fResizeResizeFunction = _.debounce(() => {
- Globals.$html.addClass('rl-resizer');
+ $html.addClass('rl-resizer');
}, 500, true),
fResizeStartFunction = () => {
- Globals.$html.addClass('rl-resizer');
+ $html.addClass('rl-resizer');
},
fResizeStopFunction = (oEvent, oObject) => {
- Globals.$html.removeClass('rl-resizer');
+ $html.removeClass('rl-resizer');
if (oObject && oObject.size && oObject.size.width)
{
Local.set(sClientSideKeyName, oObject.size.width);
- Globals.leftPanelWidth(oObject.size.width);
+ leftPanelWidth(oObject.size.width);
oRight.css({
left: '' + oObject.size.width + 'px'
@@ -1204,9 +1217,9 @@ class AppUser extends AbstractApp
bootstartLoginScreen() {
- Globals.$html.removeClass('rl-user-auth').addClass('rl-user-no-auth');
+ $html.removeClass('rl-user-auth').addClass('rl-user-no-auth');
- const customLoginLink = Utils.pString(Settings.appSettingsGet('customLoginLink'));
+ const customLoginLink = pString(Settings.appSettingsGet('customLoginLink'));
if (!customLoginLink)
{
kn.startScreens([
@@ -1253,8 +1266,8 @@ class AppUser extends AbstractApp
var
sJsHash = Settings.appSettingsGet('jsHash'),
- sStartupUrl = Utils.pString(Settings.settingsGet('StartupUrl')),
- iContactsSyncInterval = Utils.pInt(Settings.settingsGet('ContactsSyncInterval')),
+ sStartupUrl = pString(Settings.settingsGet('StartupUrl')),
+ iContactsSyncInterval = pInt(Settings.settingsGet('ContactsSyncInterval')),
bGoogle = Settings.settingsGet('AllowGoogleSocial'),
bFacebook = Settings.settingsGet('AllowFacebookSocial'),
bTwitter = Settings.settingsGet('AllowTwitterSocial')
@@ -1265,17 +1278,17 @@ class AppUser extends AbstractApp
progressJs.set(90);
}
- Globals.leftPanelDisabled.subscribe((value) => {
+ leftPanelDisabled.subscribe((value) => {
Events.pub('left-panel.' + (value ? 'off' : 'on'));
});
this.setWindowTitle('');
if (Settings.settingsGet('Auth'))
{
- Globals.$html.addClass('rl-user-auth');
+ $html.addClass('rl-user-auth');
- if (Settings.capa(Enums.Capa.TwoFactor) &&
- Settings.capa(Enums.Capa.TwoFactorForce) &&
+ if (Settings.capa(Capa.TwoFactor) &&
+ Settings.capa(Capa.TwoFactorForce) &&
Settings.settingsGet('RequireTwoFactor'))
{
this.bootend();
@@ -1300,7 +1313,7 @@ class AppUser extends AbstractApp
kn.routeOn();
}
- if (window.jassl && window.crypto && window.crypto.getRandomValues && Settings.capa(Enums.Capa.OpenPGP))
+ if (window.jassl && window.crypto && window.crypto.getRandomValues && Settings.capa(Capa.OpenPGP))
{
const openpgpCallback = (openpgp) => {
@@ -1314,7 +1327,7 @@ class AppUser extends AbstractApp
}
catch (e)
{
- Utils.log(e);
+ log(e);
}
}
@@ -1347,7 +1360,7 @@ class AppUser extends AbstractApp
kn.startScreens([
require('Screen/User/MailBox'),
- Settings.capa(Enums.Capa.Settings) ? require('Screen/User/Settings') : null
+ Settings.capa(Capa.Settings) ? require('Screen/User/Settings') : null
// false ? require('Screen/User/About') : null
]);
@@ -1388,7 +1401,7 @@ class AppUser extends AbstractApp
}, 1000);
_.delay(() => this.quota(), 5000);
- _.delay(() => Remote.appDelayStart(Utils.emptyFunction), 35000);
+ _.delay(() => Remote.appDelayStart(noop), 35000);
Events.sub('rl.auto-logout', () => this.logout());
@@ -1402,7 +1415,7 @@ class AppUser extends AbstractApp
if (!!Settings.settingsGet('AccountSignMe') &&
window.navigator.registerProtocolHandler &&
- Settings.capa(Enums.Capa.Composer))
+ Settings.capa(Capa.Composer))
{
_.delay(() => {
try {
@@ -1413,14 +1426,14 @@ class AppUser extends AbstractApp
if (Settings.settingsGet('MailToEmail'))
{
- Utils.mailToHelper(Settings.settingsGet('MailToEmail'), require('View/Popup/Compose'));
+ mailToHelper(Settings.settingsGet('MailToEmail'), require('View/Popup/Compose'));
}
}, 500);
}
- if (!Globals.bMobileDevice)
+ if (!bMobileDevice)
{
- _.defer(() => this.initVerticalLayoutResizer(Enums.ClientSideKeyName.FolderListSize));
+ _.defer(() => this.initVerticalLayoutResizer(ClientSideKeyName.FolderListSize));
if (Tinycon && Settings.appSettingsGet('faviconStatus') && !Settings.appSettingsGet('listPermanentFiltered'))
{
diff --git a/dev/Common/Audio.jsx b/dev/Common/Audio.jsx
index 7a0ae10d1..bcf8d82c3 100644
--- a/dev/Common/Audio.jsx
+++ b/dev/Common/Audio.jsx
@@ -1,9 +1,9 @@
import {window, $} from 'common';
-import Globals from 'Common/Globals';
-import Utils from 'Common/Utils';
+import {bMobileDevice, bSafari} from 'Common/Globals';
import Links from 'Common/Links';
import Events from 'Common/Events';
+import {trim} from 'Common/Utils';
class Audio
{
@@ -20,7 +20,7 @@ class Audio
{
this.player = this.createNewObject();
- this.supported = !Globals.bMobileDevice && !Globals.bSafari && !!this.player && !!this.player.play;
+ this.supported = !bMobileDevice && !bSafari && !!this.player && !!this.player.play;
if (this.supported && this.player.canPlayType)
{
this.supportedMp3 = '' !== this.player.canPlayType('audio/mpeg;').replace(/no/, '');
@@ -78,10 +78,10 @@ class Audio
clearName(name = '', ext = '') {
- name = Utils.trim(name);
+ name = trim(name);
if (ext && '.' + ext === name.toLowerCase().substr((ext.length + 1) * -1))
{
- name = Utils.trim(name.substr(0, name.length - 4));
+ name = trim(name.substr(0, name.length - 4));
}
return '' === name ? 'audio' : name;
diff --git a/dev/Common/Booter.jsx b/dev/Common/Booter.jsx
index d07ddf7d2..ab72aa09a 100644
--- a/dev/Common/Booter.jsx
+++ b/dev/Common/Booter.jsx
@@ -146,11 +146,8 @@ function runMainBoot(withError, additionalError)
{
if (window.__APP_BOOT && !withError)
{
- window.__APP_BOOT(function (bV) {
- if (!bV)
- {
- showError(additionalError);
- }
+ window.__APP_BOOT(() => {
+ showError(additionalError);
});
}
else
diff --git a/dev/Common/Cache.jsx b/dev/Common/Cache.jsx
index 77ed2e054..870eee9ab 100644
--- a/dev/Common/Cache.jsx
+++ b/dev/Common/Cache.jsx
@@ -1,7 +1,7 @@
import {_} from 'common';
import {Capa, MessageSetAction} from 'Common/Enums';
-import Utils from 'Common/Utils';
+import {trim, pInt, isArray} from 'Common/Utils';
import Links from 'Common/Links';
import Settings from 'Storage/Settings';
@@ -38,7 +38,7 @@ class CacheUserStorage
* @return {string}
*/
getUserPic(email, callback) {
- email = Utils.trim(email);
+ email = trim(email);
callback(this.bCapaGravatar && '' !== email ? Links.avatarLink(email) : '', email);
}
@@ -253,8 +253,8 @@ class CacheUserStorage
return false;
});
- message.hasUnseenSubMessage(unseenSubUid && 0 < Utils.pInt(unseenSubUid));
- message.hasFlaggedSubMessage(flaggedSubUid && 0 < Utils.pInt(flaggedSubUid));
+ message.hasUnseenSubMessage(unseenSubUid && 0 < pInt(unseenSubUid));
+ message.hasFlaggedSubMessage(flaggedSubUid && 0 < pInt(flaggedSubUid));
}
}
}
@@ -279,7 +279,7 @@ class CacheUserStorage
* @param {Array} flags
*/
storeMessageFlagsToCacheByFolderAndUid(folder, uid, flags) {
- if (Utils.isArray(flags) && 0 < flags.length)
+ if (isArray(flags) && 0 < flags.length)
{
this.setMessageFlagsToCache(folder, uid, flags);
}
@@ -295,7 +295,7 @@ class CacheUserStorage
let unread = 0;
const flags = this.getMessageFlagsFromCache(folder, uid);
- if (Utils.isArray(flags) && 0 < flags.length)
+ if (isArray(flags) && 0 < flags.length)
{
if (flags[0])
{
diff --git a/dev/Common/ClientStorageDriver/Cookie.jsx b/dev/Common/ClientStorageDriver/Cookie.jsx
index d7c493ede..d69cbb380 100644
--- a/dev/Common/ClientStorageDriver/Cookie.jsx
+++ b/dev/Common/ClientStorageDriver/Cookie.jsx
@@ -1,6 +1,6 @@
import {window, JSON, $} from 'common';
-import Utils from 'Common/Utils';
+import {isUnd} from 'Common/Utils';
import {CLIENT_SIDE_STORAGE_INDEX_NAME} from 'Common/Consts';
class CookieDriver
@@ -60,7 +60,7 @@ class CookieDriver
storageResult = null === storageValue ? null : JSON.parse(storageValue)
;
- result = (storageResult && !Utils.isUnd(storageResult[key])) ? storageResult[key] : null;
+ result = (storageResult && !isUnd(storageResult[key])) ? storageResult[key] : null;
}
catch (e)
{
diff --git a/dev/Common/ClientStorageDriver/LocalStorage.jsx b/dev/Common/ClientStorageDriver/LocalStorage.jsx
index b71799644..8ba2f2519 100644
--- a/dev/Common/ClientStorageDriver/LocalStorage.jsx
+++ b/dev/Common/ClientStorageDriver/LocalStorage.jsx
@@ -1,6 +1,6 @@
import {window, JSON} from 'common';
-import Utils from 'Common/Utils';
+import {isUnd} from 'Common/Utils';
import {CLIENT_SIDE_STORAGE_INDEX_NAME} from 'Common/Consts';
class LocalStorageDriver
@@ -57,7 +57,7 @@ class LocalStorageDriver
storageResult = null === storageValue ? null : JSON.parse(storageValue)
;
- result = (storageResult && !Utils.isUnd(storageResult[key])) ? storageResult[key] : null;
+ result = (storageResult && !isUnd(storageResult[key])) ? storageResult[key] : null;
}
catch (e)
{
diff --git a/dev/Common/Events.jsx b/dev/Common/Events.jsx
index 08997fbdc..2d03f1deb 100644
--- a/dev/Common/Events.jsx
+++ b/dev/Common/Events.jsx
@@ -1,6 +1,6 @@
import {_} from 'common';
-import Utils from 'Common/Utils';
+import {isObject, isUnd} from 'Common/Utils';
import Plugins from 'Common/Plugins';
class Events
@@ -17,7 +17,7 @@ class Events
*/
sub(name, func, context) {
- if (Utils.isObject(name))
+ if (isObject(name))
{
context = func || null;
func = null;
@@ -28,7 +28,7 @@ class Events
}
else
{
- if (Utils.isUnd(this.subs[name]))
+ if (isUnd(this.subs[name]))
{
this.subs[name] = [];
}
@@ -48,7 +48,7 @@ class Events
Plugins.runHook('rl-pub', [name, args]);
- if (!Utils.isUnd(this.subs[name]))
+ if (!isUnd(this.subs[name]))
{
_.each(this.subs[name], (items) => {
if (items[0])
diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js
deleted file mode 100644
index 4f4be8add..000000000
--- a/dev/Common/Globals.js
+++ /dev/null
@@ -1,303 +0,0 @@
-
-/* global RL_COMMUNITY */
-
-(function () {
-
- 'use strict';
-
- var
- Globals = {},
-
- window = require('window'),
- _ = require('_'),
- $ = require('$'),
- ko = require('ko'),
- key = require('key'),
-
- Enums = require('Common/Enums')
- ;
-
- Globals.$win = $(window);
- Globals.$doc = $(window.document);
- Globals.$html = $('html');
- Globals.$body = $('body');
- Globals.$div = $('');
-
- Globals.$win.__sizes = [0, 0];
-
- /**
- * @type {?}
- */
- Globals.startMicrotime = (new window.Date()).getTime();
-
- /**
- * @type {boolean}
- */
- Globals.community = RL_COMMUNITY;
-
- /**
- * @type {?}
- */
- Globals.dropdownVisibility = ko.observable(false).extend({'rateLimit': 0});
-
- /**
- * @type {boolean}
- */
- Globals.useKeyboardShortcuts = ko.observable(true);
-
- /**
- * @type {number}
- */
- Globals.iAjaxErrorCount = 0;
-
- /**
- * @type {number}
- */
- Globals.iTokenErrorCount = 0;
-
- /**
- * @type {number}
- */
- Globals.iMessageBodyCacheCount = 0;
-
- /**
- * @type {boolean}
- */
- Globals.bUnload = false;
-
- /**
- * @type {string}
- */
- Globals.sUserAgent = 'navigator' in window && 'userAgent' in window.navigator &&
- window.navigator.userAgent.toLowerCase() || '';
-
- /**
- * @type {boolean}
- */
- Globals.bIE = Globals.sUserAgent.indexOf('msie') > -1;
-
- /**
- * @type {boolean}
- */
- Globals.bChrome = Globals.sUserAgent.indexOf('chrome') > -1;
-
- /**
- * @type {boolean}
- */
- Globals.bSafari = !Globals.bChrome && Globals.sUserAgent.indexOf('safari') > -1;
-
- /**
- * @type {boolean}
- */
- Globals.bMobileDevice =
- /android/i.test(Globals.sUserAgent) ||
- /iphone/i.test(Globals.sUserAgent) ||
- /ipod/i.test(Globals.sUserAgent) ||
- /ipad/i.test(Globals.sUserAgent) ||
- /blackberry/i.test(Globals.sUserAgent)
- ;
-
- /**
- * @type {boolean}
- */
- Globals.bDisableNanoScroll = Globals.bMobileDevice;
-
- /**
- * @type {boolean}
- */
- Globals.bAllowPdfPreview = !Globals.bMobileDevice;
-
- /**
- * @type {boolean}
- */
- Globals.bAnimationSupported = !Globals.bMobileDevice &&
- Globals.$html.hasClass('csstransitions') &&
- Globals.$html.hasClass('cssanimations');
-
- /**
- * @type {boolean}
- */
- Globals.bXMLHttpRequestSupported = !!window.XMLHttpRequest;
-
- /**
- * @type {*}
- */
- Globals.__APP__ = null;
-
- /**
- * @type {Object}
- */
- Globals.oHtmlEditorDefaultConfig = {
- 'title': false,
- 'stylesSet': false,
- 'customConfig': '',
- 'contentsCss': '',
- 'toolbarGroups': [
- {name: 'spec'},
- {name: 'styles'},
- {name: 'basicstyles', groups: ['basicstyles', 'cleanup', 'bidi']},
- {name: 'colors'},
- Globals.bMobileDevice ? {} : {name: 'paragraph', groups: ['list', 'indent', 'blocks', 'align']},
- {name: 'links'},
- {name: 'insert'},
- {name: 'document', groups: ['mode', 'document', 'doctools']},
- {name: 'others'}
- ],
-
- 'removePlugins': 'liststyle',
- 'removeButtons': 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,SelectAll,Source',
- 'removeDialogTabs': 'link:advanced;link:target;image:advanced;images:advanced',
-
- 'extraPlugins': 'plain,signature',
-
- 'allowedContent': true,
- 'extraAllowedContent': true,
-
- 'fillEmptyBlocks': false,
- 'ignoreEmptyParagraph': true,
- 'disableNativeSpellChecker': false,
-
- 'font_defaultLabel': 'Arial',
- 'fontSize_defaultLabel': '13',
- 'fontSize_sizes': '10/10px;12/12px;13/13px;14/14px;16/16px;18/18px;20/20px;24/24px;28/28px;36/36px;48/48px'
- };
-
- /**
- * @type {Object}
- */
- Globals.oHtmlEditorLangsMap = {
- 'bg_bg': 'bg',
- 'de_de': 'de',
- 'el_gr': 'el',
- 'es_es': 'es',
- 'fr_fr': 'fr',
- 'hu_hu': 'hu',
- 'is_is': 'is',
- 'it_it': 'it',
- 'ja_jp': 'ja',
- 'ko_kr': 'ko',
- 'lt_lt': 'lt',
- 'lv_lv': 'lv',
- 'nl_nl': 'nl',
- 'bg_no': 'no',
- 'pl_pl': 'pl',
- 'pt_pt': 'pt',
- 'pt_br': 'pt-br',
- 'ro_ro': 'ro',
- 'ru_ru': 'ru',
- 'sk_sk': 'sk',
- 'sl_si': 'sl',
- 'sv_se': 'sv',
- 'tr_tr': 'tr',
- 'uk_ua': 'ru',
- 'zh_tw': 'zh',
- 'zh_cn': 'zh-cn'
- };
-
- if (Globals.bAllowPdfPreview && window.navigator && window.navigator.mimeTypes)
- {
- Globals.bAllowPdfPreview = !!_.find(window.navigator.mimeTypes, function (oType) {
- return oType && 'application/pdf' === oType.type;
- });
-
- if (!Globals.bAllowPdfPreview)
- {
- Globals.bAllowPdfPreview = (typeof window.navigator.mimeTypes['application/pdf'] !== 'undefined');
- }
- }
-
- Globals.aBootstrapDropdowns = [];
-
- Globals.aViewModels = {
- 'settings': [],
- 'settings-removed': [],
- 'settings-disabled': []
- };
-
- Globals.leftPanelDisabled = ko.observable(false);
- Globals.leftPanelType = ko.observable('');
- Globals.leftPanelWidth = ko.observable(0);
-
- // popups
- Globals.popupVisibilityNames = ko.observableArray([]);
-
- Globals.popupVisibility = ko.computed(function () {
- return 0 < Globals.popupVisibilityNames().length;
- }, this);
-
- Globals.popupVisibility.subscribe(function (bValue) {
- Globals.$html.toggleClass('rl-modal', bValue);
- });
-
- // keys
- Globals.keyScopeReal = ko.observable(Enums.KeyState.All);
- Globals.keyScopeFake = ko.observable(Enums.KeyState.All);
-
- Globals.keyScope = ko.computed({
- 'owner': this,
- 'read': function () {
- return Globals.keyScopeFake();
- },
- 'write': function (sValue) {
-
- if (Enums.KeyState.Menu !== sValue)
- {
- if (Enums.KeyState.Compose === sValue)
- {
- // disableKeyFilter
- key.filter = function () {
- return Globals.useKeyboardShortcuts();
- };
- }
- else
- {
- // restoreKeyFilter
- key.filter = function (event) {
-
- if (Globals.useKeyboardShortcuts())
- {
- var
- oElement = event.target || event.srcElement,
- sTagName = oElement ? oElement.tagName : ''
- ;
-
- sTagName = sTagName.toUpperCase();
- return !(sTagName === 'INPUT' || sTagName === 'SELECT' || sTagName === 'TEXTAREA' ||
- (oElement && sTagName === 'DIV' && ('editorHtmlArea' === oElement.className || 'true' === '' + oElement.contentEditable))
- );
- }
-
- return false;
- };
- }
-
- Globals.keyScopeFake(sValue);
- if (Globals.dropdownVisibility())
- {
- sValue = Enums.KeyState.Menu;
- }
- }
-
- Globals.keyScopeReal(sValue);
- }
- });
-
- Globals.keyScopeReal.subscribe(function (sValue) {
-// window.console.log('keyScope=' + sValue); // DEBUG
- key.setScope(sValue);
- });
-
- Globals.dropdownVisibility.subscribe(function (bValue) {
- if (bValue)
- {
- Globals.keyScope(Enums.KeyState.Menu);
- }
- else if (Enums.KeyState.Menu === key.getScope())
- {
- Globals.keyScope(Globals.keyScopeFake());
- }
- });
-
- module.exports = Globals;
-
-}());
\ No newline at end of file
diff --git a/dev/Common/Globals.jsx b/dev/Common/Globals.jsx
new file mode 100644
index 000000000..26ea5e45f
--- /dev/null
+++ b/dev/Common/Globals.jsx
@@ -0,0 +1,276 @@
+
+/* global RL_COMMUNITY */
+import {window, _, $, key} from 'common';
+import ko from 'ko';
+import {KeyState} from 'Common/Enums';
+
+const $win = $(window);
+$win.__sizes = [0, 0];
+
+export {$win};
+
+export const $doc = $(window.document);
+
+export const $html = $('html');
+
+export const $body = $('body');
+
+export const $div = $('');
+
+export const startMicrotime = (new window.Date()).getTime();
+
+/**
+ * @type {boolean}
+ */
+export const community = RL_COMMUNITY;
+
+/**
+ * @type {?}
+ */
+export const dropdownVisibility = ko.observable(false).extend({rateLimit: 0});
+
+/**
+ * @type {boolean}
+ */
+export const useKeyboardShortcuts = ko.observable(true);
+
+/**
+ * @type {string}
+ */
+export const sUserAgent = 'navigator' in window && 'userAgent' in window.navigator &&
+ window.navigator.userAgent.toLowerCase() || '';
+
+/**
+ * @type {boolean}
+ */
+export const bIE = sUserAgent.indexOf('msie') > -1;
+
+/**
+ * @type {boolean}
+ */
+export const bChrome = sUserAgent.indexOf('chrome') > -1;
+
+/**
+ * @type {boolean}
+ */
+export const bSafari = !bChrome && sUserAgent.indexOf('safari') > -1;
+
+/**
+ * @type {boolean}
+ */
+export const bMobileDevice =
+ /android/i.test(sUserAgent) ||
+ /iphone/i.test(sUserAgent) ||
+ /ipod/i.test(sUserAgent) ||
+ /ipad/i.test(sUserAgent) ||
+ /blackberry/i.test(sUserAgent)
+;
+
+/**
+ * @type {boolean}
+ */
+export let bDisableNanoScroll = bMobileDevice;
+
+/**
+ * @type {boolean}
+ */
+export let bAnimationSupported = !bMobileDevice &&
+ $html.hasClass('csstransitions') &&
+ $html.hasClass('cssanimations')
+;
+
+/**
+ * @type {boolean}
+ */
+export const bXMLHttpRequestSupported = !!window.XMLHttpRequest;
+
+/**
+ * @type {Object}
+ */
+export const oHtmlEditorDefaultConfig = {
+ title: false,
+ stylesSet: false,
+ 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'}
+ ],
+
+ removePlugins: 'liststyle',
+ removeButtons: 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,SelectAll,Source',
+ removeDialogTabs: 'link:advanced;link:target;image:advanced;images:advanced',
+
+ extraPlugins: 'plain,signature',
+
+ allowedContent: true,
+ extraAllowedContent: true,
+
+ fillEmptyBlocks: false,
+ ignoreEmptyParagraph: true,
+ disableNativeSpellChecker: false,
+
+ font_defaultLabel: 'Arial',
+ fontSize_defaultLabel: '13',
+ fontSize_sizes: '10/10px;12/12px;13/13px;14/14px;16/16px;18/18px;20/20px;24/24px;28/28px;36/36px;48/48px'
+};
+
+/**
+ * @type {Object}
+ */
+export const oHtmlEditorLangsMap = {
+ bg_bg: 'bg',
+ de_de: 'de',
+ el_gr: 'el',
+ es_es: 'es',
+ fr_fr: 'fr',
+ hu_hu: 'hu',
+ is_is: 'is',
+ it_it: 'it',
+ ja_jp: 'ja',
+ ko_kr: 'ko',
+ lt_lt: 'lt',
+ lv_lv: 'lv',
+ nl_nl: 'nl',
+ bg_no: 'no',
+ pl_pl: 'pl',
+ pt_pt: 'pt',
+ pt_br: 'pt-br',
+ ro_ro: 'ro',
+ ru_ru: 'ru',
+ sk_sk: 'sk',
+ sl_si: 'sl',
+ sv_se: 'sv',
+ tr_tr: 'tr',
+ uk_ua: 'ru',
+ zh_tw: 'zh',
+ zh_cn: 'zh-cn'
+};
+
+/**
+ * @type {boolean}
+ */
+let bAllowPdfPreview = !bMobileDevice;
+
+if (bAllowPdfPreview && window.navigator && window.navigator.mimeTypes)
+{
+ bAllowPdfPreview = !!_.find(window.navigator.mimeTypes, function (oType) {
+ return oType && 'application/pdf' === oType.type;
+ });
+
+ if (!bAllowPdfPreview)
+ {
+ bAllowPdfPreview = (typeof window.navigator.mimeTypes['application/pdf'] !== 'undefined');
+ }
+}
+
+export {bAllowPdfPreview};
+
+export const aViewModels = {
+ settings: [],
+ 'settings-removed': [],
+ 'settings-disabled': []
+};
+
+export const leftPanelDisabled = ko.observable(false);
+export const leftPanelType = ko.observable('');
+export const leftPanelWidth = ko.observable(0);
+
+// popups
+export const popupVisibilityNames = ko.observableArray([]);
+
+export const popupVisibility = ko.computed(() => {
+ return 0 < popupVisibilityNames().length;
+});
+
+popupVisibility.subscribe((bValue) => {
+ $html.toggleClass('rl-modal', bValue);
+});
+
+// keys
+export const keyScopeReal = ko.observable(KeyState.All);
+export const keyScopeFake = ko.observable(KeyState.All);
+
+export const keyScope = ko.computed({
+ owner: this,
+ read: () => {
+ return keyScopeFake();
+ },
+ write: function (sValue) {
+
+ if (KeyState.Menu !== sValue)
+ {
+ if (KeyState.Compose === sValue)
+ {
+ // disableKeyFilter
+ key.filter = function () {
+ return useKeyboardShortcuts();
+ };
+ }
+ else
+ {
+ // restoreKeyFilter
+ key.filter = function (event) {
+
+ if (useKeyboardShortcuts())
+ {
+ var
+ oElement = event.target || event.srcElement,
+ sTagName = oElement ? oElement.tagName : ''
+ ;
+
+ sTagName = sTagName.toUpperCase();
+ return !(sTagName === 'INPUT' || sTagName === 'SELECT' || sTagName === 'TEXTAREA' ||
+ (oElement && sTagName === 'DIV' && ('editorHtmlArea' === oElement.className || 'true' === '' + oElement.contentEditable))
+ );
+ }
+
+ return false;
+ };
+ }
+
+ keyScopeFake(sValue);
+ if (dropdownVisibility())
+ {
+ sValue = KeyState.Menu;
+ }
+ }
+
+ keyScopeReal(sValue);
+ }
+});
+
+keyScopeReal.subscribe(function (sValue) {
+// window.console.log('keyScope=' + sValue); // DEBUG
+ key.setScope(sValue);
+});
+
+dropdownVisibility.subscribe(function (bValue) {
+ if (bValue)
+ {
+ keyScope(KeyState.Menu);
+ }
+ else if (KeyState.Menu === key.getScope())
+ {
+ keyScope(keyScopeFake());
+ }
+});
+
+/**
+ * @type {*}
+ */
+export const data = {
+ __APP__: null,
+ iAjaxErrorCount: 0,
+ iTokenErrorCount: 0,
+ aBootstrapDropdowns: [],
+ iMessageBodyCacheCount: 0,
+ bUnload: false
+};
diff --git a/dev/Common/HtmlEditor.jsx b/dev/Common/HtmlEditor.jsx
index e98dd506e..e79f3d5b8 100644
--- a/dev/Common/HtmlEditor.jsx
+++ b/dev/Common/HtmlEditor.jsx
@@ -1,6 +1,6 @@
import {window, _, $} from 'common';
-import Globals from 'Common/Globals';
+import {oHtmlEditorDefaultConfig, oHtmlEditorLangsMap} from 'Common/Globals';
import Settings from 'Storage/Settings';
class HtmlEditor
@@ -236,7 +236,7 @@ class HtmlEditor
initFunc = () => {
const
- config = Globals.oHtmlEditorDefaultConfig,
+ config = oHtmlEditorDefaultConfig,
language = Settings.settingsGet('Language'),
allowSource = !!Settings.appSettingsGet('allowHtmlEditorSourceButton'),
biti = !!Settings.appSettingsGet('allowHtmlEditorBitiButtons')
@@ -260,7 +260,7 @@ class HtmlEditor
config.enterMode = window.CKEDITOR.ENTER_BR;
config.shiftEnterMode = window.CKEDITOR.ENTER_P;
- config.language = Globals.oHtmlEditorLangsMap[language] || 'en';
+ config.language = oHtmlEditorLangsMap[language] || 'en';
if (window.CKEDITOR.env)
{
window.CKEDITOR.env.isCompatible = true;
diff --git a/dev/Common/Links.jsx b/dev/Common/Links.jsx
index 3bb2ada7d..2c6f5bb89 100644
--- a/dev/Common/Links.jsx
+++ b/dev/Common/Links.jsx
@@ -1,18 +1,19 @@
import {window} from 'common';
-import Utils from 'Common/Utils';
+import {pString, pInt, isUnd, isNormal, trim, encodeURIComponent} from 'Common/Utils';
import Settings from 'Storage/Settings';
class Links
{
constructor() {
- this.sBase = '#/';
- this.sServer = './?';
+ this.sHashPrefix = '#/';
+ this.sServerPrefix = './?';
this.sVersion = Settings.appSettingsGet('version');
this.sWebPrefix = Settings.appSettingsGet('webPath') || '';
this.sVersionPrefix = Settings.appSettingsGet('webVersionPath') || 'rainloop/v/' + this.sVersion + '/';
+ this.bAminHostUse = !!Settings.appSettingsGet('adminHostUse');
this.sAdminPath = Settings.appSettingsGet('adminPath') || 'admin';
this.sAuthSuffix = Settings.settingsGet('AuthAccountHash') || '0';
@@ -36,14 +37,14 @@ class Links
* @return {string}
*/
root(startupUrl = '') {
- return this.sBase + Utils.pString(startupUrl);
+ return this.sHashPrefix + pString(startupUrl);
}
/**
* @return {string}
*/
rootAdmin() {
- return this.sServer + this.sAdminPath;
+ return this.bAminHostUse ? './' : this.sServerPrefix + this.sAdminPath;
}
/**
@@ -60,8 +61,8 @@ class Links
* @return {string}
*/
attachmentRaw(type, download, customSpecSuffix) {
- customSpecSuffix = Utils.isUnd(customSpecSuffix) ? this.sAuthSuffix : customSpecSuffix;
- return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + customSpecSuffix + '/' + type + '/' +
+ customSpecSuffix = isUnd(customSpecSuffix) ? this.sAuthSuffix : customSpecSuffix;
+ return this.sServerPrefix + '/Raw/' + this.subQueryPrefix() + '/' + customSpecSuffix + '/' + type + '/' +
this.subQueryPrefix() + '/' + download;
}
@@ -114,28 +115,28 @@ class Links
* @return {string}
*/
upload() {
- return this.sServer + '/Upload/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/';
+ return this.sServerPrefix + '/Upload/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/';
}
/**
* @return {string}
*/
uploadContacts() {
- return this.sServer + '/UploadContacts/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/';
+ return this.sServerPrefix + '/UploadContacts/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/';
}
/**
* @return {string}
*/
uploadBackground() {
- return this.sServer + '/UploadBackground/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/';
+ return this.sServerPrefix + '/UploadBackground/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/';
}
/**
* @return {string}
*/
append() {
- return this.sServer + '/Append/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/';
+ return this.sServerPrefix + '/Append/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/';
}
/**
@@ -143,7 +144,7 @@ class Links
* @return {string}
*/
change(email) {
- return this.sServer + '/Change/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' + Utils.encodeURIComponent(email) + '/';
+ return this.sServerPrefix + '/Change/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' + encodeURIComponent(email) + '/';
}
/**
@@ -151,7 +152,7 @@ class Links
* @return {string}
*/
ajax(add) {
- return this.sServer + '/Ajax/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' + add;
+ return this.sServerPrefix + '/Ajax/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' + add;
}
/**
@@ -159,7 +160,7 @@ class Links
* @return {string}
*/
messageViewLink(requestHash) {
- return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/ViewAsPlain/' + this.subQueryPrefix() + '/' + requestHash;
+ return this.sServerPrefix + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/ViewAsPlain/' + this.subQueryPrefix() + '/' + requestHash;
}
/**
@@ -167,7 +168,7 @@ class Links
* @return {string}
*/
messageDownloadLink(requestHash) {
- return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/Download/' + this.subQueryPrefix() + '/' + requestHash;
+ return this.sServerPrefix + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/Download/' + this.subQueryPrefix() + '/' + requestHash;
}
/**
@@ -175,7 +176,7 @@ class Links
* @return {string}
*/
avatarLink(email) {
- return this.sServer + '/Raw/0/Avatar/' + Utils.encodeURIComponent(email) + '/';
+ return this.sServerPrefix + '/Raw/0/Avatar/' + encodeURIComponent(email) + '/';
}
/**
@@ -183,7 +184,7 @@ class Links
* @return {string}
*/
publicLink(hash) {
- return this.sServer + '/Raw/0/Public/' + hash + '/';
+ return this.sServerPrefix + '/Raw/0/Public/' + hash + '/';
}
/**
@@ -191,7 +192,7 @@ class Links
* @return {string}
*/
userBackground(hash) {
- return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix +
+ return this.sServerPrefix + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix +
'/UserBackground/' + this.subQueryPrefix() + '/' + hash;
}
@@ -200,7 +201,7 @@ class Links
* @return {string}
*/
inbox(inboxFolderName = 'INBOX') {
- return this.sBase + 'mailbox/' + inboxFolderName;
+ return this.sHashPrefix + 'mailbox/' + inboxFolderName;
}
/**
@@ -208,14 +209,14 @@ class Links
* @return {string}
*/
settings(screenName = '') {
- return this.sBase + 'settings' + (screenName ? '/' + screenName : '');
+ return this.sHashPrefix + 'settings' + (screenName ? '/' + screenName : '');
}
/**
* @return {string}
*/
about() {
- return this.sBase + 'about';
+ return this.sHashPrefix + 'about';
}
/**
@@ -223,7 +224,7 @@ class Links
* @return {string}
*/
admin (screenName) {
- let result = this.sBase;
+ let result = this.sHashPrefix;
switch (screenName) {
case 'AdminDomains':
result += 'domains';
@@ -248,14 +249,14 @@ class Links
*/
mailBox(folder, page = 1, search = '', threadUid = '') {
- page = Utils.isNormal(page) ? Utils.pInt(page) : 1;
- search = Utils.pString(search);
+ page = isNormal(page) ? pInt(page) : 1;
+ search = pString(search);
- let result = this.sBase + 'mailbox/';
+ let result = this.sHashPrefix + 'mailbox/';
if ('' !== folder)
{
- const resultThreadUid = Utils.pInt(threadUid);
+ const resultThreadUid = pInt(threadUid);
result += window.encodeURI(folder) + (0 < resultThreadUid ? '~' + resultThreadUid : '');
}
@@ -278,7 +279,7 @@ class Links
* @return {string}
*/
phpInfo() {
- return this.sServer + 'Info';
+ return this.sServerPrefix + 'Info';
}
/**
@@ -287,21 +288,21 @@ class Links
* @return {string}
*/
langLink(lang, admin) {
- return this.sServer + '/Lang/0/' + (admin ? 'Admin' : 'App') + '/' + window.encodeURI(lang) + '/' + this.sVersion + '/';
+ return this.sServerPrefix + '/Lang/0/' + (admin ? 'Admin' : 'App') + '/' + window.encodeURI(lang) + '/' + this.sVersion + '/';
}
/**
* @return {string}
*/
exportContactsVcf() {
- return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/ContactsVcf/';
+ return this.sServerPrefix + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/ContactsVcf/';
}
/**
* @return {string}
*/
exportContactsCsv() {
- return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/ContactsCsv/';
+ return this.sServerPrefix + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/ContactsCsv/';
}
/**
@@ -327,7 +328,7 @@ class Links
let prefix = this.sVersionPrefix;
if ('@custom' === theme.substr(-7))
{
- theme = Utils.trim(theme.substring(0, theme.length - 7));
+ theme = trim(theme.substring(0, theme.length - 7));
prefix = this.sWebPrefix;
}
@@ -367,7 +368,7 @@ class Links
* @return {string}
*/
socialGoogle(xauth = false) {
- return this.sServer + 'SocialGoogle' + ('' !== this.sAuthSuffix ? '/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' : '') +
+ return this.sServerPrefix + 'SocialGoogle' + ('' !== this.sAuthSuffix ? '/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' : '') +
(xauth ? '&xauth=1' : '');
}
@@ -375,14 +376,14 @@ class Links
* @return {string}
*/
socialTwitter() {
- return this.sServer + 'SocialTwitter' + ('' !== this.sAuthSuffix ? '/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' : '');
+ return this.sServerPrefix + 'SocialTwitter' + ('' !== this.sAuthSuffix ? '/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' : '');
}
/**
* @return {string}
*/
socialFacebook() {
- return this.sServer + 'SocialFacebook' + ('' !== this.sAuthSuffix ? '/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' : '');
+ return this.sServerPrefix + 'SocialFacebook' + ('' !== this.sAuthSuffix ? '/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' : '');
}
}
diff --git a/dev/Common/Plugins.jsx b/dev/Common/Plugins.jsx
index 89f891656..ee0719025 100644
--- a/dev/Common/Plugins.jsx
+++ b/dev/Common/Plugins.jsx
@@ -1,7 +1,7 @@
import {_} from 'common';
-import Utils from 'Common/Utils';
-import Globals from 'Common/Globals';
+import {isFunc, isArray, isUnd} from 'Common/Utils';
+import {data as GlobalsData} from 'Common/Globals';
import Settings from 'Storage/Settings';
class Plugins
@@ -17,9 +17,9 @@ class Plugins
* @param {Function} callback
*/
addHook(name, callback) {
- if (Utils.isFunc(callback))
+ if (isFunc(callback))
{
- if (!Utils.isArray(this.oSimpleHooks[name]))
+ if (!isArray(this.oSimpleHooks[name]))
{
this.oSimpleHooks[name] = [];
}
@@ -33,7 +33,7 @@ class Plugins
* @param {Array=} args
*/
runHook(name, args = []) {
- if (Utils.isArray(this.oSimpleHooks[name]))
+ if (isArray(this.oSimpleHooks[name]))
{
_.each(this.oSimpleHooks[name], (callback) => {
callback.apply(null, args);
@@ -56,9 +56,9 @@ class Plugins
* @param {?number=} timeout
*/
remoteRequest(callback, action, parameters, timeout) {
- if (Globals.__APP__)
+ if (GlobalsData.__APP__)
{
- Globals.__APP__.remote().defaultRequest(callback, 'Plugin' + action, parameters, timeout);
+ GlobalsData.__APP__.remote().defaultRequest(callback, 'Plugin' + action, parameters, timeout);
}
}
@@ -99,8 +99,8 @@ class Plugins
*/
settingsGet(pluginSection, name) {
let plugins = Settings.settingsGet('Plugins');
- plugins = plugins && !Utils.isUnd(plugins[pluginSection]) ? plugins[pluginSection] : null;
- return plugins ? (Utils.isUnd(plugins[name]) ? null : plugins[name]) : null;
+ plugins = plugins && !isUnd(plugins[pluginSection]) ? plugins[pluginSection] : null;
+ return plugins ? (isUnd(plugins[name]) ? null : plugins[name]) : null;
}
}
diff --git a/dev/Common/Selector.jsx b/dev/Common/Selector.jsx
index d23caead1..23c7766c1 100644
--- a/dev/Common/Selector.jsx
+++ b/dev/Common/Selector.jsx
@@ -2,7 +2,7 @@
import {$, _, key} from 'common';
import ko from 'ko';
import {EventKeyCode} from 'Common/Enums';
-import Utils from 'Common/Utils';
+import {isArray, inArray} from 'Common/Utils';
class Selector
{
@@ -137,7 +137,7 @@ class Selector
this.list.subscribe((items) => {
- if (Utils.isArray(items))
+ if (isArray(items))
{
_.each(items, (item) => {
if (item)
@@ -179,7 +179,7 @@ class Selector
this.focusedItem(null);
this.selectedItem(null);
- if (Utils.isArray(aItems))
+ if (isArray(aItems))
{
iLen = aCheckedCache.length;
@@ -194,7 +194,7 @@ class Selector
mFocused = null;
}
- if (0 < iLen && -1 < Utils.inArray(sUid, aCheckedCache))
+ if (0 < iLen && -1 < inArray(sUid, aCheckedCache))
{
bChecked = true;
oItem.checked(true);
@@ -223,7 +223,7 @@ class Selector
{
bGetNext = false;
mNextFocused = _.find(aCache, (sUid) => {
- if (bGetNext && -1 < Utils.inArray(sUid, aUids))
+ if (bGetNext && -1 < inArray(sUid, aUids))
{
return sUid;
}
diff --git a/dev/Common/Translator.jsx b/dev/Common/Translator.jsx
index 4efa11c26..1da021564 100644
--- a/dev/Common/Translator.jsx
+++ b/dev/Common/Translator.jsx
@@ -2,8 +2,8 @@
import {window, $, _} from 'common';
import ko from 'ko';
import {Notification, UploadErrorCode} from 'Common/Enums';
-import Utils from 'Common/Utils';
-import Globals from 'Common/Globals';
+import {pInt, microtime, noop, inArray} from 'Common/Utils';
+import {$html, bAnimationSupported} from 'Common/Globals';
class Translator
{
@@ -94,7 +94,7 @@ class Translator
this.i18nToNode(item);
});
- if (animate && Globals.bAnimationSupported)
+ if (animate && bAnimationSupported)
{
$('.i18n-animation[data-i18n]', elements).letterfx({
fx: 'fall fade',
@@ -256,7 +256,7 @@ class Translator
*/
getNotificationFromResponse(response, defCode = Notification.UnknownNotification) {
return response && response.ErrorCode ?
- this.getNotification(Utils.pInt(response.ErrorCode), response.ErrorMessage || '') :
+ this.getNotification(pInt(response.ErrorCode), response.ErrorMessage || '') :
this.getNotification(defCode);
}
@@ -303,40 +303,40 @@ class Translator
const
self = this,
- start = Utils.microtime()
+ start = microtime()
;
- Globals.$html.addClass('rl-changing-language');
+ $html.addClass('rl-changing-language');
$.ajax({
url: require('Common/Links').langLink(language, admin),
dataType: 'script',
cache: true
})
- .fail(fail || Utils.emptyFunction)
+ .fail(fail || noop)
.done(function () {
_.delay(function () {
self.reloadData();
- (done || Utils.emptyFunction)();
+ (done || noop)();
- const isRtl = -1 < Utils.inArray(language, ['ar', 'ar_sa', 'he', 'he_he', 'ur', 'ur_ir']);
+ const isRtl = -1 < inArray(language, ['ar', 'ar_sa', 'he', 'he_he', 'ur', 'ur_ir']);
- Globals.$html
+ $html
.removeClass('rl-changing-language')
.removeClass('rl-rtl rl-ltr')
.addClass(isRtl ? 'rl-rtl' : 'rl-ltr')
// .attr('dir', isRtl ? 'rtl' : 'ltr')
;
- }, 500 < Utils.microtime() - start ? 1 : 500);
+ }, 500 < microtime() - start ? 1 : 500);
})
;
}
init() {
- Globals.$html.addClass('rl-' + (Globals.$html.attr('dir') || 'ltr'));
+ $html.addClass('rl-' + ($html.attr('dir') || 'ltr'));
}
}
diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js
deleted file mode 100644
index be006dba6..000000000
--- a/dev/Common/Utils.js
+++ /dev/null
@@ -1,1641 +0,0 @@
-
-(function () {
-
- 'use strict';
-
- var
- oEncryptObject = null,
-
- Utils = {},
-
- window = require('window'),
- _ = require('_'),
- $ = require('$'),
- ko = require('ko'),
- Autolinker = require('Autolinker'),
- JSON = require('JSON'),
- JSEncrypt = require('JSEncrypt'),
-
- Mime = require('Common/Mime'),
-
- Enums = require('Common/Enums'),
- Globals = require('Common/Globals')
- ;
-
- Utils.trim = $.trim;
- Utils.inArray = $.inArray;
- Utils.isArray = _.isArray;
- Utils.isObject = _.isObject;
- Utils.isFunc = _.isFunction;
- Utils.isUnd = _.isUndefined;
- Utils.isNull = _.isNull;
- Utils.emptyFunction = Utils.noop = function () {};
-
- /**
- * @param {Function} callback
- */
- Utils.silentTryCatch = function (callback)
- {
- try
- {
- callback();
- }
- catch (e)
- {
- // eslint-disable-line no-empty
- }
- };
-
- /**
- * @param {*} oValue
- * @return {boolean}
- */
- Utils.isNormal = function (oValue)
- {
- return !Utils.isUnd(oValue) && !Utils.isNull(oValue);
- };
-
- Utils.windowResize = _.debounce(function (iTimeout) {
- if (Utils.isUnd(iTimeout))
- {
- Globals.$win.resize();
- }
- else
- {
- window.setTimeout(function () {
- Globals.$win.resize();
- }, iTimeout);
- }
- }, 50);
-
- Utils.windowResizeCallback = function () {
- Utils.windowResize();
- };
-
- /**
- * @param {(string|number)} mValue
- * @param {boolean=} bIncludeZero
- * @return {boolean}
- */
- Utils.isPosNumeric = function (mValue, bIncludeZero)
- {
- return Utils.isNormal(mValue) ?
- ((Utils.isUnd(bIncludeZero) ? true : !!bIncludeZero) ?
- (/^[0-9]*$/).test(mValue.toString()) :
- (/^[1-9]+[0-9]*$/).test(mValue.toString())) :
- false;
- };
-
- /**
- * @param {*} iValue
- * @param {number=} iDefault = 0
- * @return {number}
- */
- Utils.pInt = function (iValue, iDefault)
- {
- var iResult = Utils.isNormal(iValue) && '' !== iValue ? window.parseInt(iValue, 10) : (iDefault || 0);
- return window.isNaN(iResult) ? (iDefault || 0) : iResult;
- };
-
- /**
- * @param {*} mValue
- * @return {string}
- */
- Utils.pString = function (mValue)
- {
- return Utils.isNormal(mValue) ? '' + mValue : '';
- };
-
- /**
- * @param {*} mValue
- * @return {boolean}
- */
- Utils.pBool = function (mValue)
- {
- return !!mValue;
- };
-
- /**
- * @param {string} sComponent
- * @return {string}
- */
- Utils.encodeURIComponent = function (sComponent)
- {
- return window.encodeURIComponent(sComponent);
- };
-
- /**
- * @param {*} aValue
- * @return {boolean}
- */
- Utils.isNonEmptyArray = function (aValue)
- {
- return Utils.isArray(aValue) && 0 < aValue.length;
- };
-
- /**
- * @param {string} sQueryString
- * @return {Object}
- */
- Utils.simpleQueryParser = function (sQueryString)
- {
- var
- oParams = {},
- aQueries = [],
- aTemp = [],
- iIndex = 0,
- iLen = 0
- ;
-
- aQueries = sQueryString.split('&');
- for (iIndex = 0, iLen = aQueries.length; iIndex < iLen; iIndex++)
- {
- aTemp = aQueries[iIndex].split('=');
- oParams[window.decodeURIComponent(aTemp[0])] = window.decodeURIComponent(aTemp[1]);
- }
-
- return oParams;
- };
-
- /**
- * @param {string} sMailToUrl
- * @param {Function} PopupComposeVoreModel
- * @return {boolean}
- */
- Utils.mailToHelper = function (sMailToUrl, PopupComposeVoreModel)
- {
- if (sMailToUrl && 'mailto:' === sMailToUrl.toString().substr(0, 7).toLowerCase())
- {
- if (!PopupComposeVoreModel)
- {
- return true;
- }
-
- sMailToUrl = sMailToUrl.toString().substr(7);
-
- var
- aTo = [],
- aCc = null,
- aBcc = null,
- oParams = {},
- EmailModel = require('Model/Email'),
- sEmail = sMailToUrl.replace(/\?.+$/, ''),
- sQueryString = sMailToUrl.replace(/^[^\?]*\?/, ''),
- fParseEmailLine = function (sLine) {
- return sLine ? _.compact(_.map(window.decodeURIComponent(sLine).split(/[,]/), function (sItem) {
- var oEmailModel = new EmailModel();
- oEmailModel.mailsoParse(sItem);
- return '' !== oEmailModel.email ? oEmailModel : null;
- })) : null;
- }
- ;
-
- aTo = fParseEmailLine(sEmail);
-
- oParams = Utils.simpleQueryParser(sQueryString);
-
- if (!Utils.isUnd(oParams.cc))
- {
- aCc = fParseEmailLine(window.decodeURIComponent(oParams.cc));
- }
-
- if (!Utils.isUnd(oParams.bcc))
- {
- aBcc = fParseEmailLine(window.decodeURIComponent(oParams.bcc));
- }
-
- require('Knoin/Knoin').showScreenPopup(PopupComposeVoreModel, [Enums.ComposeType.Empty, null,
- aTo, aCc, aBcc,
- Utils.isUnd(oParams.subject) ? null :
- Utils.pString(window.decodeURIComponent(oParams.subject)),
- Utils.isUnd(oParams.body) ? null :
- Utils.plainToHtml(Utils.pString(window.decodeURIComponent(oParams.body)))
- ]);
-
- return true;
- }
-
- return false;
- };
-
- /**
- * @param {string} sPublicKey
- * @return {JSEncrypt}
- */
- Utils.rsaObject = function (sPublicKey)
- {
- if (JSEncrypt && sPublicKey && (null === oEncryptObject || (oEncryptObject && oEncryptObject.__sPublicKey !== sPublicKey)) &&
- window.crypto && window.crypto.getRandomValues)
- {
- oEncryptObject = new JSEncrypt();
- oEncryptObject.setPublicKey(sPublicKey);
- oEncryptObject.__sPublicKey = sPublicKey;
- }
- else
- {
- oEncryptObject = false;
- }
-
- return oEncryptObject;
- };
-
- /**
- * @param {string} sValue
- * @param {string} sPublicKey
- * @return {string}
- */
- Utils.rsaEncode = function (sValue, sPublicKey)
- {
- if (window.crypto && window.crypto.getRandomValues && sPublicKey)
- {
- var
- sResultValue = false,
- oEncrypt = Utils.rsaObject(sPublicKey)
- ;
-
- if (oEncrypt)
- {
- sResultValue = oEncrypt.encrypt(Utils.fakeMd5() + ':' + sValue + ':' + Utils.fakeMd5());
- if (false !== sResultValue && Utils.isNormal(sResultValue))
- {
- return 'rsa:xxx:' + sResultValue;
- }
- }
- }
-
- return sValue;
- };
-
- Utils.rsaEncode.supported = !!(window.crypto && window.crypto.getRandomValues && false && JSEncrypt);
-
- /**
- * @param {string} sText
- * @return {string}
- */
- Utils.encodeHtml = function (sText)
- {
- return Utils.isNormal(sText) ? _.escape(sText.toString()) : '';
- };
-
- /**
- * @param {string} sText
- * @param {number=} iLen
- * @return {string}
- */
- Utils.splitPlainText = function (sText, iLen)
- {
- var
- sPrefix = '',
- sSubText = '',
- sResult = sText,
- iSpacePos = 0,
- iNewLinePos = 0
- ;
-
- iLen = Utils.isUnd(iLen) ? 100 : iLen;
-
- while (sResult.length > iLen)
- {
- sSubText = sResult.substring(0, iLen);
- iSpacePos = sSubText.lastIndexOf(' ');
- iNewLinePos = sSubText.lastIndexOf('\n');
-
- if (-1 !== iNewLinePos)
- {
- iSpacePos = iNewLinePos;
- }
-
- if (-1 === iSpacePos)
- {
- iSpacePos = iLen;
- }
-
- sPrefix += sSubText.substring(0, iSpacePos) + '\n';
- sResult = sResult.substring(iSpacePos + 1);
- }
-
- return sPrefix + sResult;
- };
-
- Utils.timeOutAction = (function () {
-
- var
- oTimeOuts = {}
- ;
-
- return function (sAction, fFunction, iTimeOut)
- {
- if (Utils.isUnd(oTimeOuts[sAction]))
- {
- oTimeOuts[sAction] = 0;
- }
-
- window.clearTimeout(oTimeOuts[sAction]);
- oTimeOuts[sAction] = window.setTimeout(fFunction, iTimeOut);
- };
- }());
-
- Utils.timeOutActionSecond = (function () {
-
- var
- oTimeOuts = {}
- ;
-
- return function (sAction, fFunction, iTimeOut)
- {
- if (!oTimeOuts[sAction])
- {
- oTimeOuts[sAction] = window.setTimeout(function () {
- fFunction();
- oTimeOuts[sAction] = 0;
- }, iTimeOut);
- }
- };
- }());
-
- /**
- * @param {(Object|null|undefined)} oObject
- * @param {string} sProp
- * @return {boolean}
- */
- Utils.hos = function (oObject, sProp)
- {
- return oObject && window.Object && window.Object.hasOwnProperty ? window.Object.hasOwnProperty.call(oObject, sProp) : false;
- };
-
- /**
- * @return {boolean}
- */
- Utils.inFocus = function ()
- {
- if (window.document.activeElement)
- {
- if (Utils.isUnd(window.document.activeElement.__inFocusCache))
- {
- window.document.activeElement.__inFocusCache = $(window.document.activeElement).is('input,textarea,iframe,.cke_editable');
- }
-
- return !!window.document.activeElement.__inFocusCache;
- }
-
- return false;
- };
-
- Utils.removeInFocus = function (force)
- {
- if (window.document && window.document.activeElement && window.document.activeElement.blur)
- {
- var oA = $(window.document.activeElement);
- if (oA.is('input,textarea'))
- {
- window.document.activeElement.blur();
- }
- else if (force)
- {
- try {
- window.document.activeElement.blur();
- } catch (e) {}
- }
- }
- };
-
- Utils.removeSelection = function ()
- {
- if (window && window.getSelection)
- {
- var oSel = window.getSelection();
- if (oSel && oSel.removeAllRanges)
- {
- oSel.removeAllRanges();
- }
- }
- else if (window.document && window.document.selection && window.document.selection.empty)
- {
- window.document.selection.empty();
- }
- };
-
- /**
- * @param {string} sPrefix
- * @param {string} sSubject
- * @return {string}
- */
- Utils.replySubjectAdd = function (sPrefix, sSubject)
- {
- sPrefix = Utils.trim(sPrefix.toUpperCase());
- sSubject = Utils.trim(sSubject.replace(/[\s]+/g, ' '));
-
- var
- bDrop = false,
- aSubject = [],
- bRe = 'RE' === sPrefix,
- bFwd = 'FWD' === sPrefix,
- bPrefixIsRe = !bFwd
- ;
-
- if ('' !== sSubject)
- {
- _.each(sSubject.split(':'), function (sPart) {
- var sTrimmedPart = Utils.trim(sPart);
- if (!bDrop && (/^(RE|FWD)$/i.test(sTrimmedPart) || /^(RE|FWD)[\[\(][\d]+[\]\)]$/i.test(sTrimmedPart)))
- {
- if (!bRe)
- {
- bRe = !!(/^RE/i.test(sTrimmedPart));
- }
-
- if (!bFwd)
- {
- bFwd = !!(/^FWD/i.test(sTrimmedPart));
- }
- }
- else
- {
- aSubject.push(sPart);
- bDrop = true;
- }
- });
- }
-
- if (bPrefixIsRe)
- {
- bRe = false;
- }
- else
- {
- bFwd = false;
- }
-
- return Utils.trim(
- (bPrefixIsRe ? 'Re: ' : 'Fwd: ') +
- (bRe ? 'Re: ' : '') +
- (bFwd ? 'Fwd: ' : '') +
- Utils.trim(aSubject.join(':'))
- );
- };
-
- /**
- * @param {number} iNum
- * @param {number} iDec
- * @return {number}
- */
- Utils.roundNumber = function (iNum, iDec)
- {
- return window.Math.round(iNum * window.Math.pow(10, iDec)) / window.Math.pow(10, iDec);
- };
-
- /**
- * @param {(number|string)} iSizeInBytes
- * @return {string}
- */
- Utils.friendlySize = function (iSizeInBytes)
- {
- iSizeInBytes = Utils.pInt(iSizeInBytes);
-
- if (iSizeInBytes >= 1073741824)
- {
- return Utils.roundNumber(iSizeInBytes / 1073741824, 1) + 'GB';
- }
- else if (iSizeInBytes >= 1048576)
- {
- return Utils.roundNumber(iSizeInBytes / 1048576, 1) + 'MB';
- }
- else if (iSizeInBytes >= 1024)
- {
- return Utils.roundNumber(iSizeInBytes / 1024, 0) + 'KB';
- }
-
- return iSizeInBytes + 'B';
- };
-
- /**
- * @param {string} sDesc
- */
- Utils.log = function (sDesc)
- {
- if (window.console && window.console.log)
- {
- window.console.log(sDesc);
- }
- };
-
- /**
- * @param {?} oObject
- * @param {string} sMethodName
- * @param {Array=} aParameters
- * @param {number=} nDelay
- */
- Utils.delegateRun = function (oObject, sMethodName, aParameters, nDelay)
- {
- if (oObject && oObject[sMethodName])
- {
- nDelay = Utils.pInt(nDelay);
- if (0 >= nDelay)
- {
- oObject[sMethodName].apply(oObject, Utils.isArray(aParameters) ? aParameters : []);
- }
- else
- {
- _.delay(function () {
- oObject[sMethodName].apply(oObject, Utils.isArray(aParameters) ? aParameters : []);
- }, nDelay);
- }
- }
- };
-
- /**
- * @param {?} oEvent
- */
- Utils.kill_CtrlA_CtrlS = function (oEvent)
- {
- oEvent = oEvent || window.event;
- if (oEvent && oEvent.ctrlKey && !oEvent.shiftKey && !oEvent.altKey)
- {
- var
- oSender = oEvent.target || oEvent.srcElement,
- iKey = oEvent.keyCode || oEvent.which
- ;
-
- if (iKey === Enums.EventKeyCode.S)
- {
- oEvent.preventDefault();
- return;
- }
- else if (iKey === Enums.EventKeyCode.A)
- {
- if (oSender && ('true' === '' + oSender.contentEditable ||
- (oSender.tagName && oSender.tagName.match(/INPUT|TEXTAREA/i))))
- {
- return;
- }
-
- if (window.getSelection)
- {
- window.getSelection().removeAllRanges();
- }
- else if (window.document.selection && window.document.selection.clear)
- {
- window.document.selection.clear();
- }
-
- oEvent.preventDefault();
- }
- }
- };
-
- /**
- * @param {(Object|null|undefined)} oContext
- * @param {Function} fExecute
- * @param {(Function|boolean|null)=} fCanExecute
- * @return {Function}
- */
- Utils.createCommand = function (oContext, fExecute, fCanExecute)
- {
- var
- fResult = Utils.emptyFunction,
- fNonEmpty = function () {
- if (fResult && fResult.canExecute && fResult.canExecute())
- {
- fExecute.apply(oContext, Array.prototype.slice.call(arguments));
- }
- return false;
- }
- ;
-
- fResult = fExecute ? fNonEmpty : Utils.emptyFunction;
- fResult.enabled = ko.observable(true);
-
- fCanExecute = Utils.isUnd(fCanExecute) ? true : fCanExecute;
- if (Utils.isFunc(fCanExecute))
- {
- fResult.canExecute = ko.computed(function () {
- return fResult.enabled() && fCanExecute.call(oContext);
- });
- }
- else
- {
- fResult.canExecute = ko.computed(function () {
- return fResult.enabled() && !!fCanExecute;
- });
- }
-
- return fResult;
- };
-
- /**
- * @param {string} sTheme
- * @return {string}
- */
- Utils.convertThemeName = _.memoize(function (sTheme)
- {
- if ('@custom' === sTheme.substr(-7))
- {
- sTheme = Utils.trim(sTheme.substring(0, sTheme.length - 7));
- }
-
- return Utils.trim(sTheme.replace(/[^a-zA-Z0-9]+/g, ' ').replace(/([A-Z])/g, ' $1').replace(/[\s]+/g, ' '));
- });
-
- /**
- * @param {string} sName
- * @return {string}
- */
- Utils.quoteName = function (sName)
- {
- return sName.replace(/["]/g, '\\"');
- };
-
- /**
- * @return {number}
- */
- Utils.microtime = function ()
- {
- return (new window.Date()).getTime();
- };
-
- /**
- * @return {number}
- */
- Utils.timestamp = function ()
- {
- return window.Math.round(Utils.microtime() / 1000);
- };
-
- /**
- *
- * @param {string} sLanguage
- * @param {boolean=} bEng = false
- * @return {string}
- */
- Utils.convertLangName = function (sLanguage, bEng)
- {
- return require('Common/Translator').i18n('LANGS_NAMES' + (true === bEng ? '_EN' : '') + '/LANG_' +
- sLanguage.toUpperCase().replace(/[^a-zA-Z0-9]+/g, '_'), null, sLanguage);
- };
-
- /**
- * @param {number=} iLen
- * @return {string}
- */
- Utils.fakeMd5 = function(iLen)
- {
- var
- sResult = '',
- sLine = '0123456789abcdefghijklmnopqrstuvwxyz'
- ;
-
- iLen = Utils.isUnd(iLen) ? 32 : Utils.pInt(iLen);
-
- while (sResult.length < iLen)
- {
- sResult += sLine.substr(window.Math.round(window.Math.random() * sLine.length), 1);
- }
-
- return sResult;
- };
-
- Utils.draggablePlace = function ()
- {
- return $('' +
- ' ' +
- '
').appendTo('#rl-hidden');
- };
-
- Utils.defautOptionsAfterRender = function (oDomOption, oItem)
- {
- if (oItem && !Utils.isUnd(oItem.disabled) && oDomOption)
- {
- $(oDomOption)
- .toggleClass('disabled', oItem.disabled)
- .prop('disabled', oItem.disabled)
- ;
- }
- };
-
- /**
- * @param {Object} oViewModel
- * @param {string} sTemplateID
- * @param {string} sTitle
- * @param {Function=} fCallback
- */
- Utils.windowPopupKnockout = function (oViewModel, sTemplateID, sTitle, fCallback)
- {
- var
- oScript = null,
- oWin = window.open(''),
- sFunc = '__OpenerApplyBindingsUid' + Utils.fakeMd5() + '__',
- oTemplate = $('#' + sTemplateID)
- ;
-
- window[sFunc] = function () {
-
- if (oWin && oWin.document.body && oTemplate && oTemplate[0])
- {
- var oBody = $(oWin.document.body);
-
- $('#rl-content', oBody).html(oTemplate.html());
- $('html', oWin.document).addClass('external ' + $('html').attr('class'));
-
- require('Common/Translator').i18nToNodes(oBody);
-
- if (oViewModel && $('#rl-content', oBody)[0])
- {
- ko.applyBindings(oViewModel, $('#rl-content', oBody)[0]);
- }
-
- window[sFunc] = null;
-
- fCallback(oWin);
- }
- };
-
- oWin.document.open();
- oWin.document.write('' +
-'' +
-'' +
-'' +
-'' +
-'' +
-'' + Utils.encodeHtml(sTitle) + '' +
-'');
- oWin.document.close();
-
- oScript = oWin.document.createElement('script');
- oScript.type = 'text/javascript';
- oScript.innerHTML = 'if(window&&window.opener&&window.opener[\'' + sFunc + '\']){window.opener[\'' + sFunc + '\']();window.opener[\'' + sFunc + '\']=null}';
- oWin.document.getElementsByTagName('head')[0].appendChild(oScript);
- };
-
- /**
- * @param {Function} fCallback
- * @param {?} koTrigger
- * @param {?} oContext = null
- * @param {number=} iTimer = 1000
- * @return {Function}
- */
- Utils.settingsSaveHelperFunction = function (fCallback, koTrigger, oContext, iTimer)
- {
- oContext = oContext || null;
- iTimer = Utils.isUnd(iTimer) ? 1000 : Utils.pInt(iTimer);
-
- return function (sType, mData, bCached, sRequestAction, oRequestParameters) {
- koTrigger.call(oContext, mData && mData['Result'] ? Enums.SaveSettingsStep.TrueResult : Enums.SaveSettingsStep.FalseResult);
- if (fCallback)
- {
- fCallback.call(oContext, sType, mData, bCached, sRequestAction, oRequestParameters);
- }
- _.delay(function () {
- koTrigger.call(oContext, Enums.SaveSettingsStep.Idle);
- }, iTimer);
- };
- };
-
- Utils.settingsSaveHelperSimpleFunction = function (koTrigger, oContext)
- {
- return Utils.settingsSaveHelperFunction(null, koTrigger, oContext, 1000);
- };
-
- Utils.settingsSaveHelperSubscribeFunction = function (oRemote, sSettingName, sType, fTriggerFunction)
- {
- return function (mValue) {
-
- if (oRemote)
- {
- switch (sType)
- {
- default:
- mValue = Utils.pString(mValue);
- break;
- case 'bool':
- case 'boolean':
- mValue = mValue ? '1' : '0';
- break;
- case 'int':
- case 'integer':
- case 'number':
- mValue = Utils.pInt(mValue);
- break;
- case 'trim':
- mValue = Utils.trim(mValue);
- break;
- }
-
- var oData = {};
- oData[sSettingName] = mValue;
-
- if (oRemote.saveAdminConfig)
- {
- oRemote.saveAdminConfig(fTriggerFunction || null, oData);
- }
- else if (oRemote.saveSettings)
- {
- oRemote.saveSettings(fTriggerFunction || null, oData);
- }
- }
- };
- };
-
- /**
- * @param {string} sHtml
- * @return {string}
- */
- Utils.htmlToPlain = function (sHtml)
- {
- var
- iPos = 0,
- iP1 = 0,
- iP2 = 0,
- iP3 = 0,
- iLimit = 0,
-
- sText = '',
-
- convertBlockquote = function (sText) {
- sText = Utils.trim(sText);
- sText = '> ' + sText.replace(/\n/gm, '\n> ');
- return sText.replace(/(^|\n)([> ]+)/gm, function () {
- return (arguments && 2 < arguments.length) ? arguments[1] + $.trim(arguments[2].replace(/[\s]/g, '')) + ' ' : '';
- });
- },
-
- convertDivs = function () {
- if (arguments && 1 < arguments.length)
- {
- var sText = $.trim(arguments[1]);
- if (0 < sText.length)
- {
- sText = sText.replace(/]*>([\s\S\r\n]*)<\/div>/gmi, convertDivs);
- sText = '\n' + $.trim(sText) + '\n';
- }
-
- return sText;
- }
-
- return '';
- },
-
- convertPre = function () {
- return (arguments && 1 < arguments.length) ?
- arguments[1].toString()
- .replace(/[\n]/gm, '
')
- .replace(/[\r]/gm, '')
- : '';
- },
-
- fixAttibuteValue = function () {
- return (arguments && 1 < arguments.length) ?
- '' + arguments[1] + _.escape(arguments[2]) : '';
- },
-
- convertLinks = function () {
- return (arguments && 1 < arguments.length) ? $.trim(arguments[1]) : '';
- }
- ;
-
- sText = sHtml
- .replace(/\u0002([\s\S]*)\u0002/gm, '\u200C$1\u200C')
- .replace(/]*><\/p>/gi, '')
- .replace(/]*>([\s\S\r\n\t]*)<\/pre>/gmi, convertPre)
- .replace(/[\s]+/gm, ' ')
- .replace(/((?:href|data)\s?=\s?)("[^"]+?"|'[^']+?')/gmi, fixAttibuteValue)
- .replace(/]*>/gmi, '\n')
- .replace(/<\/h[\d]>/gi, '\n')
- .replace(/<\/p>/gi, '\n\n')
- .replace(/]*>/gmi, '\n')
- .replace(/<\/ul>/gi, '\n')
- .replace(/]*>/gmi, ' * ')
- .replace(/<\/li>/gi, '\n')
- .replace(/<\/td>/gi, '\n')
- .replace(/<\/tr>/gi, '\n')
- .replace(/]*>/gmi, '\n_______________________________\n\n')
- .replace(/]*>([\s\S\r\n]*)<\/div>/gmi, convertDivs)
- .replace(/]*>/gmi, '\n__bq__start__\n')
- .replace(/<\/blockquote>/gmi, '\n__bq__end__\n')
- .replace(/]*>([\s\S\r\n]*?)<\/a>/gmi, convertLinks)
- .replace(/<\/div>/gi, '\n')
- .replace(/ /gi, ' ')
- .replace(/"/gi, '"')
- .replace(/<[^>]*>/gm, '')
- ;
-
- sText = Globals.$div.html(sText).text();
-
- sText = sText
- .replace(/\n[ \t]+/gm, '\n')
- .replace(/[\n]{3,}/gm, '\n\n')
- .replace(/>/gi, '>')
- .replace(/</gi, '<')
- .replace(/&/gi, '&')
- ;
-
- sText = Utils.splitPlainText(Utils.trim(sText));
-
- iPos = 0;
- iLimit = 800;
-
- while (0 < iLimit)
- {
- iLimit--;
- iP1 = sText.indexOf('__bq__start__', iPos);
- if (-1 < iP1)
- {
- iP2 = sText.indexOf('__bq__start__', iP1 + 5);
- iP3 = sText.indexOf('__bq__end__', iP1 + 5);
-
- if ((-1 === iP2 || iP3 < iP2) && iP1 < iP3)
- {
- sText = sText.substring(0, iP1) +
- convertBlockquote(sText.substring(iP1 + 13, iP3)) +
- sText.substring(iP3 + 11);
-
- iPos = 0;
- }
- else if (-1 < iP2 && iP2 < iP3)
- {
- iPos = iP2 - 1;
- }
- else
- {
- iPos = 0;
- }
- }
- else
- {
- break;
- }
- }
-
- sText = sText
- .replace(/__bq__start__/gm, '')
- .replace(/__bq__end__/gm, '')
- ;
-
- return sText;
- };
-
- /**
- * @param {string} sPlain
- * @param {boolean} bFindEmailAndLinks = false
- * @return {string}
- */
- Utils.plainToHtml = function (sPlain, bFindEmailAndLinks)
- {
- sPlain = sPlain.toString().replace(/\r/g, '');
-
- bFindEmailAndLinks = Utils.isUnd(bFindEmailAndLinks) ? false : !!bFindEmailAndLinks;
-
- var
- bIn = false,
- bDo = true,
- bStart = true,
- aNextText = [],
- sLine = '',
- iIndex = 0,
- aText = sPlain.split("\n")
- ;
-
- do
- {
- bDo = false;
- aNextText = [];
- for (iIndex = 0; iIndex < aText.length; iIndex++)
- {
- sLine = aText[iIndex];
- bStart = '>' === sLine.substr(0, 1);
- if (bStart && !bIn)
- {
- bDo = true;
- bIn = true;
- aNextText.push('~~~blockquote~~~');
- aNextText.push(sLine.substr(1));
- }
- else if (!bStart && bIn)
- {
- if ('' !== sLine)
- {
- bIn = false;
- aNextText.push('~~~/blockquote~~~');
- aNextText.push(sLine);
- }
- else
- {
- aNextText.push(sLine);
- }
- }
- else if (bStart && bIn)
- {
- aNextText.push(sLine.substr(1));
- }
- else
- {
- aNextText.push(sLine);
- }
- }
-
- if (bIn)
- {
- bIn = false;
- aNextText.push('~~~/blockquote~~~');
- }
-
- aText = aNextText;
- }
- while (bDo);
-
- sPlain = aText.join("\n");
-
- sPlain = sPlain
-// .replace(/~~~\/blockquote~~~\n~~~blockquote~~~/g, '\n')
- .replace(/&/g, '&')
- .replace(/>/g, '>').replace(/')
- .replace(/[\s]*~~~\/blockquote~~~/g, '')
- .replace(/\u200C([\s\S]*)\u200C/g, '\u0002$1\u0002')
- .replace(/\n/g, '
')
- ;
-
- return bFindEmailAndLinks ? Utils.findEmailAndLinks(sPlain) : sPlain;
- };
-
- window.rainloop_Utils_htmlToPlain = Utils.htmlToPlain;
- window.rainloop_Utils_plainToHtml = Utils.plainToHtml;
-
- /**
- * @param {string} sHtml
- * @return {string}
- */
- Utils.findEmailAndLinks = function (sHtml)
- {
-// return sHtml;
- sHtml = Autolinker.link(sHtml, {
- 'newWindow': true,
- 'stripPrefix': false,
- 'urls': true,
- 'email': true,
- 'twitter': false,
- 'replaceFn': function (autolinker, match) {
- return !(autolinker && match && 'url' === match.getType() && match.matchedText && 0 !== match.matchedText.indexOf('http'));
- }
- });
-
- return sHtml;
- };
-
- /**
- * @param {string} sUrl
- * @param {number} iValue
- * @param {Function} fCallback
- */
- Utils.resizeAndCrop = function (sUrl, iValue, fCallback)
- {
- var oTempImg = new window.Image();
- oTempImg.onload = function() {
-
- var
- aDiff = [0, 0],
- oCanvas = window.document.createElement('canvas'),
- oCtx = oCanvas.getContext('2d')
- ;
-
- oCanvas.width = iValue;
- oCanvas.height = iValue;
-
- if (this.width > this.height)
- {
- aDiff = [this.width - this.height, 0];
- }
- else
- {
- aDiff = [0, this.height - this.width];
- }
-
- oCtx.fillStyle = '#fff';
- oCtx.fillRect(0, 0, iValue, iValue);
- oCtx.drawImage(this, aDiff[0] / 2, aDiff[1] / 2, this.width - aDiff[0], this.height - aDiff[1], 0, 0, iValue, iValue);
-
- fCallback(oCanvas.toDataURL('image/jpeg'));
- };
-
- oTempImg.src = sUrl;
- };
-
- /**
- * @param {Array} aSystem
- * @param {Array} aList
- * @param {Array=} aDisabled
- * @param {Array=} aHeaderLines
- * @param {?number=} iUnDeep
- * @param {Function=} fDisableCallback
- * @param {Function=} fVisibleCallback
- * @param {Function=} fRenameCallback
- * @param {boolean=} bSystem
- * @param {boolean=} bBuildUnvisible
- * @return {Array}
- */
- Utils.folderListOptionsBuilder = function (aSystem, aList, aDisabled, aHeaderLines,
- iUnDeep, fDisableCallback, fVisibleCallback, fRenameCallback, bSystem, bBuildUnvisible)
- {
- var
- /**
- * @type {?FolderModel}
- */
- oItem = null,
- bSep = false,
- iIndex = 0,
- iLen = 0,
- sDeepPrefix = '\u00A0\u00A0\u00A0',
- aResult = []
- ;
-
- bBuildUnvisible = Utils.isUnd(bBuildUnvisible) ? false : !!bBuildUnvisible;
- bSystem = !Utils.isNormal(bSystem) ? 0 < aSystem.length : bSystem;
- iUnDeep = !Utils.isNormal(iUnDeep) ? 0 : iUnDeep;
- fDisableCallback = Utils.isNormal(fDisableCallback) ? fDisableCallback : null;
- fVisibleCallback = Utils.isNormal(fVisibleCallback) ? fVisibleCallback : null;
- fRenameCallback = Utils.isNormal(fRenameCallback) ? fRenameCallback : null;
-
- if (!Utils.isArray(aDisabled))
- {
- aDisabled = [];
- }
-
- if (!Utils.isArray(aHeaderLines))
- {
- aHeaderLines = [];
- }
-
- for (iIndex = 0, iLen = aHeaderLines.length; iIndex < iLen; iIndex++)
- {
- aResult.push({
- 'id': aHeaderLines[iIndex][0],
- 'name': aHeaderLines[iIndex][1],
- 'system': false,
- 'seporator': false,
- 'disabled': false
- });
- }
-
- bSep = true;
- for (iIndex = 0, iLen = aSystem.length; iIndex < iLen; iIndex++)
- {
- oItem = aSystem[iIndex];
- if (fVisibleCallback ? fVisibleCallback.call(null, oItem) : true)
- {
- if (bSep && 0 < aResult.length)
- {
- aResult.push({
- 'id': '---',
- 'name': '---',
- 'system': false,
- 'seporator': true,
- 'disabled': true
- });
- }
-
- bSep = false;
- aResult.push({
- 'id': oItem.fullNameRaw,
- 'name': fRenameCallback ? fRenameCallback.call(null, oItem) : oItem.name(),
- 'system': true,
- 'seporator': false,
- 'disabled': !oItem.selectable || -1 < Utils.inArray(oItem.fullNameRaw, aDisabled) ||
- (fDisableCallback ? fDisableCallback.call(null, oItem) : false)
- });
- }
- }
-
- bSep = true;
- for (iIndex = 0, iLen = aList.length; iIndex < iLen; iIndex++)
- {
- oItem = aList[iIndex];
-// if (oItem.subScribed() || !oItem.existen || bBuildUnvisible)
- if ((oItem.subScribed() || !oItem.existen || bBuildUnvisible) && (oItem.selectable || oItem.hasSubScribedSubfolders()))
- {
- if (fVisibleCallback ? fVisibleCallback.call(null, oItem) : true)
- {
- if (Enums.FolderType.User === oItem.type() || !bSystem || oItem.hasSubScribedSubfolders())
- {
- if (bSep && 0 < aResult.length)
- {
- aResult.push({
- 'id': '---',
- 'name': '---',
- 'system': false,
- 'seporator': true,
- 'disabled': true
- });
- }
-
- bSep = false;
- aResult.push({
- 'id': oItem.fullNameRaw,
- 'name': (new window.Array(oItem.deep + 1 - iUnDeep)).join(sDeepPrefix) +
- (fRenameCallback ? fRenameCallback.call(null, oItem) : oItem.name()),
- 'system': false,
- 'seporator': false,
- 'disabled': !oItem.selectable || -1 < Utils.inArray(oItem.fullNameRaw, aDisabled) ||
- (fDisableCallback ? fDisableCallback.call(null, oItem) : false)
- });
- }
- }
- }
-
- if (oItem.subScribed() && 0 < oItem.subFolders().length)
- {
- aResult = aResult.concat(Utils.folderListOptionsBuilder([], oItem.subFolders(), aDisabled, [],
- iUnDeep, fDisableCallback, fVisibleCallback, fRenameCallback, bSystem, bBuildUnvisible));
- }
- }
-
- return aResult;
- };
-
- Utils.computedPagenatorHelper = function (koCurrentPage, koPageCount)
- {
- return function() {
-
- var
- iPrev = 0,
- iNext = 0,
- iLimit = 2,
- aResult = [],
- iCurrentPage = koCurrentPage(),
- iPageCount = koPageCount(),
-
- /**
- * @param {number} iIndex
- * @param {boolean=} bPush = true
- * @param {string=} sCustomName = ''
- */
- fAdd = function (iIndex, bPush, sCustomName) {
-
- var oData = {
- 'current': iIndex === iCurrentPage,
- 'name': Utils.isUnd(sCustomName) ? iIndex.toString() : sCustomName.toString(),
- 'custom': Utils.isUnd(sCustomName) ? false : true,
- 'title': Utils.isUnd(sCustomName) ? '' : iIndex.toString(),
- 'value': iIndex.toString()
- };
-
- if (Utils.isUnd(bPush) ? true : !!bPush)
- {
- aResult.push(oData);
- }
- else
- {
- aResult.unshift(oData);
- }
- }
- ;
-
- if (1 < iPageCount || (0 < iPageCount && iPageCount < iCurrentPage))
- // if (0 < iPageCount && 0 < iCurrentPage)
- {
- if (iPageCount < iCurrentPage)
- {
- fAdd(iPageCount);
- iPrev = iPageCount;
- iNext = iPageCount;
- }
- else
- {
- if (3 >= iCurrentPage || iPageCount - 2 <= iCurrentPage)
- {
- iLimit += 2;
- }
-
- fAdd(iCurrentPage);
- iPrev = iCurrentPage;
- iNext = iCurrentPage;
- }
-
- while (0 < iLimit) {
-
- iPrev -= 1;
- iNext += 1;
-
- if (0 < iPrev)
- {
- fAdd(iPrev, false);
- iLimit--;
- }
-
- if (iPageCount >= iNext)
- {
- fAdd(iNext, true);
- iLimit--;
- }
- else if (0 >= iPrev)
- {
- break;
- }
- }
-
- if (3 === iPrev)
- {
- fAdd(2, false);
- }
- else if (3 < iPrev)
- {
- fAdd(window.Math.round((iPrev - 1) / 2), false, '...');
- }
-
- if (iPageCount - 2 === iNext)
- {
- fAdd(iPageCount - 1, true);
- }
- else if (iPageCount - 2 > iNext)
- {
- fAdd(window.Math.round((iPageCount + iNext) / 2), true, '...');
- }
-
- // first and last
- if (1 < iPrev)
- {
- fAdd(1, false);
- }
-
- if (iPageCount > iNext)
- {
- fAdd(iPageCount, true);
- }
- }
-
- return aResult;
- };
- };
-
- Utils.selectElement = function (element)
- {
- var sel, range;
- if (window.getSelection)
- {
- sel = window.getSelection();
- sel.removeAllRanges();
- range = window.document.createRange();
- range.selectNodeContents(element);
- sel.addRange(range);
- }
- else if (window.document.selection)
- {
- range = window.document.body.createTextRange();
- range.moveToElementText(element);
- range.select();
- }
- };
-
- Utils.detectDropdownVisibility = _.debounce(function () {
- Globals.dropdownVisibility(!!_.find(Globals.aBootstrapDropdowns, function (oItem) {
- return oItem.hasClass('open');
- }));
- }, 50);
-
- /**
- * @param {boolean=} bDelay = false
- */
- Utils.triggerAutocompleteInputChange = function (bDelay) {
-
- var fFunc = function () {
- $('.checkAutocomplete').trigger('change');
- };
-
- if (Utils.isUnd(bDelay) ? false : !!bDelay)
- {
- _.delay(fFunc, 100);
- }
- else
- {
- fFunc();
- }
- };
-
- /**
- * @param {Object} oParams
- */
- Utils.setHeadViewport = function (oParams)
- {
- var aContent = [];
- _.each(oParams, function (sKey, sValue) {
- aContent.push('' + sKey + '=' + sValue);
- });
-
- $('#app-head-viewport').attr('content', aContent.join(', '));
- };
-
- /**
- * @param {string} sFileName
- * @return {string}
- */
- Utils.getFileExtension = function (sFileName)
- {
- sFileName = Utils.trim(sFileName).toLowerCase();
-
- var sResult = sFileName.split('.').pop();
- return (sResult === sFileName) ? '' : sResult;
- };
-
- Utils.configurationScriptTagCache = {};
-
- /**
- * @param {string} sConfiguration
- * @return {object}
- */
- Utils.getConfigurationFromScriptTag = function (sConfiguration)
- {
- var oResult = {};
-
- if (!Utils.configurationScriptTagCache[sConfiguration])
- {
- Utils.configurationScriptTagCache[sConfiguration] = $('script[type="application/json"][data-configuration="' + sConfiguration + '"]');
- }
-
- try {
- oResult = JSON.parse(Utils.configurationScriptTagCache[sConfiguration].text());
- } catch (e) {/* eslint-disable-line no-empty */}
-
- return oResult;
- };
-
- /**
- * @param {string} sFileName
- * @return {string}
- */
- Utils.mimeContentType = function (sFileName)
- {
- var
- sExt = '',
- sResult = 'application/octet-stream'
- ;
-
- sFileName = Utils.trim(sFileName).toLowerCase();
-
- if ('winmail.dat' === sFileName)
- {
- return 'application/ms-tnef';
- }
-
- sExt = Utils.getFileExtension(sFileName);
- if (sExt && 0 < sExt.length && !Utils.isUnd(Mime[sExt]))
- {
- sResult = Mime[sExt];
- }
-
- return sResult;
- };
-
- /**
- * @param {mixed} mPropOrValue
- * @param {mixed} mValue
- */
- Utils.disposeOne = function (mPropOrValue, mValue)
- {
- var mDisposable = mValue || mPropOrValue;
- if (mDisposable && typeof mDisposable.dispose === 'function')
- {
- mDisposable.dispose();
- }
- };
-
- /**
- * @param {Object} oObject
- */
- Utils.disposeObject = function (oObject)
- {
- if (oObject)
- {
- if (Utils.isArray(oObject.disposables))
- {
- _.each(oObject.disposables, Utils.disposeOne);
- }
-
- ko.utils.objectForEach(oObject, Utils.disposeOne);
- }
- };
-
- /**
- * @param {Object|Array} mObjectOrObjects
- */
- Utils.delegateRunOnDestroy = function (mObjectOrObjects)
- {
- if (mObjectOrObjects)
- {
- if (Utils.isArray(mObjectOrObjects))
- {
- _.each(mObjectOrObjects, function (oItem) {
- Utils.delegateRunOnDestroy(oItem);
- });
- }
- else if (mObjectOrObjects && mObjectOrObjects.onDestroy)
- {
- mObjectOrObjects.onDestroy();
- }
- }
- };
-
- Utils.appendStyles = function ($styleTag, css)
- {
- if ($styleTag && $styleTag[0])
- {
- if ($styleTag[0].styleSheet && !Utils.isUnd($styleTag[0].styleSheet.cssText))
- {
- $styleTag[0].styleSheet.cssText = css;
- }
- else
- {
- $styleTag.text(css);
- }
-
- return true;
- }
-
- return false;
- };
-
- Utils.__themeTimer = 0;
- Utils.__themeAjax = null;
-
- Utils.changeTheme = function (sValue, themeTrigger)
- {
- var
- oThemeLink = $('#app-theme-link'),
- oThemeStyle = $('#app-theme-style'),
- sUrl = oThemeLink.attr('href')
- ;
-
- if (!sUrl)
- {
- sUrl = oThemeStyle.attr('data-href');
- }
-
- if (sUrl)
- {
- sUrl = sUrl.toString().replace(/\/-\/[^\/]+\/\-\//, '/-/' + sValue + '/-/');
- sUrl = sUrl.toString().replace(/\/Css\/[^\/]+\/User\//, '/Css/0/User/');
- sUrl = sUrl.toString().replace(/\/Hash\/[^\/]+\//, '/Hash/-/');
-
- if ('Json/' !== sUrl.substring(sUrl.length - 5, sUrl.length))
- {
- sUrl += 'Json/';
- }
-
- window.clearTimeout(Utils.__themeTimer);
- themeTrigger(Enums.SaveSettingsStep.Animate);
-
- if (Utils.__themeAjax && Utils.__themeAjax.abort)
- {
- Utils.__themeAjax.abort();
- }
-
- Utils.__themeAjax = $.ajax({
- 'url': sUrl,
- 'dataType': 'json'
- }).done(function(aData) {
-
- if (aData && Utils.isArray(aData) && 2 === aData.length)
- {
- if (oThemeLink && oThemeLink[0] && (!oThemeStyle || !oThemeStyle[0]))
- {
- oThemeStyle = $('');
- oThemeLink.after(oThemeStyle);
- oThemeLink.remove();
- }
-
- if (oThemeStyle && oThemeStyle[0])
- {
- if (Utils.appendStyles(oThemeStyle, aData[1]))
- {
- oThemeStyle.attr('data-href', sUrl).attr('data-theme', aData[0]);
- }
- }
-
- themeTrigger(Enums.SaveSettingsStep.TrueResult);
- }
-
- }).always(function() {
-
- Utils.__themeTimer = window.setTimeout(function () {
- themeTrigger(Enums.SaveSettingsStep.Idle);
- }, 1000);
-
- Utils.__themeAjax = null;
- });
- }
- };
-
- Utils.substr = window.String.substr;
- if ('ab'.substr(-1) !== 'b')
- {
- Utils.substr = function(sStr, iStart, iLength)
- {
- if (iStart < 0)
- {
- iStart = sStr.length + iStart;
- }
-
- return sStr.substr(iStart, iLength);
- };
- }
-
- module.exports = Utils;
-
-}());
\ No newline at end of file
diff --git a/dev/Common/Utils.jsx b/dev/Common/Utils.jsx
new file mode 100644
index 000000000..982f97006
--- /dev/null
+++ b/dev/Common/Utils.jsx
@@ -0,0 +1,1623 @@
+
+import window from 'window';
+import $ from '$';
+import _ from '_';
+import ko from 'ko';
+import {$win, $div, dropdownVisibility, data as GlobalsData} from 'Common/Globals';
+import {ComposeType, EventKeyCode, SaveSettingsStep, FolderType} from 'Common/Enums';
+
+const JSEncrypt = require('JSEncrypt');
+const Autolinker = require('Autolinker');
+const Mime = require('Common/Mime');
+
+const trim = $.trim;
+const inArray = $.inArray;
+const isArray = _.isArray;
+const isObject = _.isObject;
+const isFunc = _.isFunction;
+const isUnd = _.isUndefined;
+const isNull = _.isNull;
+const noop = () => {};
+
+export {trim, inArray, isArray, isObject, isFunc, isUnd, isNull, noop, noop as emptyFunction};
+
+/**
+ * @param {Function} callback
+ */
+export function silentTryCatch(callback)
+{
+ try
+ {
+ callback();
+ }
+ catch (e)
+ {
+ // eslint-disable-line no-empty
+ }
+}
+
+/**
+ * @param {*} value
+ * @return {boolean}
+ */
+export function isNormal(value)
+{
+ return !isUnd(value) && !isNull(value);
+}
+
+/**
+ * @param {(string|number)} value
+ * @param {boolean=} includeZero = true
+ * @return {boolean}
+ */
+export function isPosNumeric(value, includeZero = true)
+{
+ return !isNormal(value) ? false :
+ (includeZero ? (/^[0-9]*$/).test(value.toString()) : (/^[1-9]+[0-9]*$/).test(value.toString()));
+}
+
+/**
+ * @param {*} value
+ * @param {number=} defaultValur = 0
+ * @return {number}
+ */
+export function pInt(value, defaultValur = 0)
+{
+ const result = isNormal(value) && '' !== value ? window.parseInt(value, 10) : defaultValur;
+ return window.isNaN(result) ? defaultValur : result;
+}
+
+/**
+ * @param {*} value
+ * @return {string}
+ */
+export function pString(value)
+{
+ return isNormal(value) ? '' + value : '';
+}
+
+/**
+ * @param {*} value
+ * @return {boolean}
+ */
+export function pBool(value)
+{
+ return !!value;
+}
+
+/**
+ * @param {*} values
+ * @return {boolean}
+ */
+export function isNonEmptyArray(values)
+{
+ return isArray(values) && 0 < values.length;
+}
+
+/**
+ * @param {string} component
+ * @return {string}
+ */
+export function encodeURIComponent(component)
+{
+ return window.encodeURIComponent(component);
+}
+
+/**
+ * @param {string} component
+ * @return {string}
+ */
+export function decodeURIComponent(component)
+{
+ return window.decodeURIComponent(component);
+}
+
+/**
+ * @param {string} queryString
+ * @return {Object}
+ */
+export function simpleQueryParser(queryString)
+{
+ let
+ params = {},
+ queries = [],
+ temp = [],
+ index = 0,
+ len = 0
+ ;
+
+ queries = queryString.split('&');
+ for (index = 0, len = queries.length; index < len; index++)
+ {
+ temp = queries[index].split('=');
+ params[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
+ }
+
+ return params;
+}
+
+/**
+ * @param {number=} len = 32
+ * @return {string}
+ */
+export function fakeMd5(len = 32)
+{
+ const
+ line = '0123456789abcdefghijklmnopqrstuvwxyz',
+ lineLen = line.length
+ ;
+
+ len = pInt(len);
+
+ let result = '';
+ while (result.length < len)
+ {
+ result += line.substr(window.Math.round(window.Math.random() * lineLen), 1);
+ }
+
+ return result;
+}
+
+let encryptObject = null;
+
+/**
+ * @param {constructor} JSEncryptClass
+ * @param {string} publicKey
+ * @return {JSEncrypt|boolean}
+ */
+const rsaObject = (JSEncryptClass, publicKey) => {
+
+ if (JSEncryptClass && publicKey && (null === encryptObject || (encryptObject && encryptObject.__publicKey !== publicKey)) &&
+ window.crypto && window.crypto.getRandomValues)
+ {
+ encryptObject = new JSEncryptClass();
+ encryptObject.setPublicKey(publicKey);
+ encryptObject.__publicKey = publicKey;
+ }
+ else
+ {
+ encryptObject = false;
+ }
+
+ return encryptObject;
+};
+
+/**
+ * @param {string} value
+ * @param {string} publicKey
+ * @return {string}
+ */
+const rsaEncode = (value, publicKey) => {
+
+ if (window.crypto && window.crypto.getRandomValues && publicKey)
+ {
+ let
+ resultValue = false,
+ encrypt = rsaObject(JSEncrypt, publicKey)
+ ;
+
+ if (encrypt)
+ {
+ resultValue = encrypt.encrypt(fakeMd5() + ':' + value + ':' + fakeMd5());
+ if (false !== resultValue && isNormal(resultValue))
+ {
+ return 'rsa:xxx:' + resultValue;
+ }
+ }
+ }
+
+ return value;
+};
+
+rsaEncode.supported = !!(window.crypto && window.crypto.getRandomValues && false && JSEncrypt);
+
+export {rsaEncode};
+
+/**
+ * @param {string} text
+ * @return {string}
+ */
+export function encodeHtml(text)
+{
+ return isNormal(text) ? _.escape(text.toString()) : '';
+}
+
+/**
+ * @param {string} text
+ * @param {number=} iLen = 100
+ * @return {string}
+ */
+export function splitPlainText(text, len = 100)
+{
+ let
+ prefix = '',
+ subText = '',
+ result = text,
+ spacePos = 0,
+ newLinePos = 0
+ ;
+
+ while (result.length > len)
+ {
+ subText = result.substring(0, len);
+ spacePos = subText.lastIndexOf(' ');
+ newLinePos = subText.lastIndexOf('\n');
+
+ if (-1 !== newLinePos)
+ {
+ spacePos = newLinePos;
+ }
+
+ if (-1 === spacePos)
+ {
+ spacePos = len;
+ }
+
+ prefix += subText.substring(0, spacePos) + '\n';
+ result = result.substring(spacePos + 1);
+ }
+
+ return prefix + result;
+}
+
+const timeOutAction = (function () {
+ let timeOuts = {};
+ return (action, fFunction, timeOut) => {
+ timeOuts[action] = isUnd(timeOuts[action]) ? 0 : timeOuts[action];
+ window.clearTimeout(timeOuts[action]);
+ timeOuts[action] = window.setTimeout(fFunction, timeOut);
+ };
+}());
+
+const timeOutActionSecond = (function () {
+ let timeOuts = {};
+ return (action, fFunction, timeOut) => {
+ if (!timeOuts[action])
+ {
+ timeOuts[action] = window.setTimeout(() => {
+ fFunction();
+ timeOuts[action] = 0;
+ }, timeOut);
+ }
+ };
+}());
+
+export {timeOutAction, timeOutActionSecond};
+
+/**
+ * @param {(Object|null|undefined)} item
+ * @param {string} prop
+ * @return {boolean}
+ */
+export function hos(item, prop)
+{
+ return item && window.Object && window.Object.hasOwnProperty ? window.Object.hasOwnProperty.call(item, prop) : false;
+}
+
+/**
+ * @return {boolean}
+ */
+export function inFocus()
+{
+ if (window.document.activeElement)
+ {
+ if (isUnd(window.document.activeElement.__inFocusCache))
+ {
+ window.document.activeElement.__inFocusCache = $(window.document.activeElement).is('input,textarea,iframe,.cke_editable');
+ }
+
+ return !!window.document.activeElement.__inFocusCache;
+ }
+
+ return false;
+}
+
+export function removeInFocus(force)
+{
+ if (window.document && window.document.activeElement && window.document.activeElement.blur)
+ {
+ try {
+ const activeEl = $(window.document.activeElement);
+ if (activeEl && activeEl.is('input,textarea'))
+ {
+ window.document.activeElement.blur();
+ }
+ else if (force)
+ {
+ window.document.activeElement.blur();
+ }
+ } catch (e) {
+ // eslint-disable-line no-empty
+ }
+ }
+}
+
+export function removeSelection()
+{
+ try {
+ if (window && window.getSelection)
+ {
+ const sel = window.getSelection();
+ if (sel && sel.removeAllRanges)
+ {
+ sel.removeAllRanges();
+ }
+ }
+ else if (window.document && window.document.selection && window.document.selection.empty)
+ {
+ window.document.selection.empty();
+ }
+ } catch (e) {
+ // eslint-disable-line no-empty
+ }
+}
+
+/**
+ * @param {string} prefix
+ * @param {string} subject
+ * @return {string}
+ */
+export function replySubjectAdd(prefix, subject)
+{
+ prefix = trim(prefix.toUpperCase());
+ subject = trim(subject.replace(/[\s]+/g, ' '));
+
+ let
+ drop = false,
+ parts = [],
+ re = 'RE' === prefix,
+ fwd = 'FWD' === prefix,
+ prefixIsRe = !fwd
+ ;
+
+ if ('' !== subject)
+ {
+ _.each(subject.split(':'), (part) => {
+ const trimmedPart = trim(part);
+ if (!drop && (/^(RE|FWD)$/i.test(trimmedPart) || /^(RE|FWD)[\[\(][\d]+[\]\)]$/i.test(trimmedPart)))
+ {
+ if (!re)
+ {
+ re = !!(/^RE/i.test(trimmedPart));
+ }
+
+ if (!fwd)
+ {
+ fwd = !!(/^FWD/i.test(trimmedPart));
+ }
+ }
+ else
+ {
+ parts.push(part);
+ drop = true;
+ }
+ });
+ }
+
+ if (prefixIsRe)
+ {
+ re = false;
+ }
+ else
+ {
+ fwd = false;
+ }
+
+ return trim(
+ (prefixIsRe ? 'Re: ' : 'Fwd: ') +
+ (re ? 'Re: ' : '') +
+ (fwd ? 'Fwd: ' : '') +
+ trim(parts.join(':'))
+ );
+}
+
+/**
+ * @param {number} num
+ * @param {number} dec
+ * @return {number}
+ */
+export function roundNumber(num, dec)
+{
+ return window.Math.round(num * window.Math.pow(10, dec)) / window.Math.pow(10, dec);
+}
+
+/**
+ * @param {(number|string)} sizeInBytes
+ * @return {string}
+ */
+export function friendlySize(sizeInBytes)
+{
+ sizeInBytes = pInt(sizeInBytes);
+
+ if (sizeInBytes >= 1073741824)
+ {
+ return roundNumber(sizeInBytes / 1073741824, 1) + 'GB';
+ }
+ else if (sizeInBytes >= 1048576)
+ {
+ return roundNumber(sizeInBytes / 1048576, 1) + 'MB';
+ }
+ else if (sizeInBytes >= 1024)
+ {
+ return roundNumber(sizeInBytes / 1024, 0) + 'KB';
+ }
+
+ return sizeInBytes + 'B';
+}
+
+/**
+ * @param {string} desc
+ */
+export function log(desc)
+{
+ if (window.console && window.console.log)
+ {
+ window.console.log(desc);
+ }
+}
+
+/**
+ * @param {?} object
+ * @param {string} methodName
+ * @param {Array=} params
+ * @param {number=} delay = 0
+ */
+export function delegateRun(object, methodName, params, delay = 0)
+{
+ if (object && object[methodName])
+ {
+ delay = pInt(delay);
+ if (0 >= delay)
+ {
+ object[methodName].apply(object, isArray(params) ? params : []);
+ }
+ else
+ {
+ _.delay(() => {
+ object[methodName].apply(object, isArray(params) ? params : []);
+ }, delay);
+ }
+ }
+}
+
+/**
+ * @param {?} event
+ */
+export function kill_CtrlA_CtrlS(event)
+{
+ event = event || window.event;
+ if (event && event.ctrlKey && !event.shiftKey && !event.altKey)
+ {
+ const key = event.keyCode || event.which;
+ if (key === EventKeyCode.S)
+ {
+ event.preventDefault();
+ return;
+ }
+ else if (key === EventKeyCode.A)
+ {
+ const sender = event.target || event.srcElement;
+ if (sender && ('true' === '' + sender.contentEditable ||
+ (sender.tagName && sender.tagName.match(/INPUT|TEXTAREA/i))))
+ {
+ return;
+ }
+
+ if (window.getSelection)
+ {
+ window.getSelection().removeAllRanges();
+ }
+ else if (window.document.selection && window.document.selection.clear)
+ {
+ window.document.selection.clear();
+ }
+
+ event.preventDefault();
+ }
+ }
+}
+
+/**
+ * @param {(Object|null|undefined)} context
+ * @param {Function} fExecute
+ * @param {(Function|boolean|null)=} fCanExecute = true
+ * @return {Function}
+ */
+export function createCommand(context, fExecute, fCanExecute = true)
+{
+
+ let
+ fResult = null,
+ fNonEmpty = () => {
+ if (fResult && fResult.canExecute && fResult.canExecute())
+ {
+ fExecute.apply(context, Array.prototype.slice.call(arguments));
+ }
+ return false;
+ }
+ ;
+
+ fResult = fExecute ? fNonEmpty : noop;
+ fResult.enabled = ko.observable(true);
+
+ if (isFunc(fCanExecute))
+ {
+ fResult.canExecute = ko.computed(() => {
+ return fResult.enabled() && fCanExecute.call(context);
+ });
+ }
+ else
+ {
+ fResult.canExecute = ko.computed(() => {
+ return fResult.enabled() && !!fCanExecute;
+ });
+ }
+
+ return fResult;
+}
+
+/**
+ * @param {string} theme
+ * @return {string}
+ */
+export const convertThemeName = _.memoize((theme) => {
+
+ if ('@custom' === theme.substr(-7))
+ {
+ theme = trim(theme.substring(0, theme.length - 7));
+ }
+
+ return trim(theme.replace(/[^a-zA-Z0-9]+/g, ' ').replace(/([A-Z])/g, ' $1').replace(/[\s]+/g, ' '));
+});
+
+/**
+ * @param {string} name
+ * @return {string}
+ */
+export function quoteName(name)
+{
+ return name.replace(/["]/g, '\\"');
+}
+
+/**
+ * @return {number}
+ */
+export function microtime()
+{
+ return (new window.Date()).getTime();
+}
+
+/**
+ * @return {number}
+ */
+export function timestamp()
+{
+ return window.Math.round(microtime() / 1000);
+}
+
+/**
+ *
+ * @param {string} language
+ * @param {boolean=} isEng = false
+ * @return {string}
+ */
+export function convertLangName(language, isEng = false)
+{
+ return require('Common/Translator').i18n('LANGS_NAMES' + (true === isEng ? '_EN' : '') + '/LANG_' +
+ language.toUpperCase().replace(/[^a-zA-Z0-9]+/g, '_'), null, language);
+}
+
+export function draggablePlace()
+{
+ return $('' +
+ ' ' +
+ '' +
+ '
').appendTo('#rl-hidden');
+}
+
+export function defautOptionsAfterRender(domOption, item)
+{
+ if (item && !isUnd(item.disabled) && domOption)
+ {
+ $(domOption)
+ .toggleClass('disabled', item.disabled)
+ .prop('disabled', item.disabled)
+ ;
+ }
+}
+
+/**
+ * @param {Object} viewModel
+ * @param {string} templateID
+ * @param {string} title
+ * @param {Function=} fCallback = null
+ */
+export function windowPopupKnockout(viewModel, templateID, title, fCallback = null)
+{
+ const
+ win = window.open(''),
+ func = '__OpenerApplyBindingsUid' + fakeMd5() + '__',
+ template = $('#' + templateID)
+ ;
+
+ window[func] = () => {
+
+ if (win && win.document.body && template && template[0])
+ {
+ const body = $(win.document.body);
+
+ $('#rl-content', body).html(template.html());
+ $('html', win.document).addClass('external ' + $('html').attr('class'));
+
+ require('Common/Translator').i18nToNodes(body);
+
+ if (viewModel && $('#rl-content', body)[0])
+ {
+ ko.applyBindings(viewModel, $('#rl-content', body)[0]);
+ }
+
+ window[func] = null;
+
+ if (fCallback)
+ {
+ fCallback(win);
+ }
+ }
+ };
+
+ win.document.open();
+ win.document.write('' +
+'' +
+'' +
+'' +
+'' +
+'' +
+'' + encodeHtml(title) + '' +
+'');
+ win.document.close();
+
+ const script = win.document.createElement('script');
+ script.type = 'text/javascript';
+ script.innerHTML = `if(window&&window.opener&&window.opener['${func}]'){window.opener['${func}']();window.opener['${func}']=null}`;
+
+ win.document.getElementsByTagName('head')[0].appendChild(script);
+}
+
+/**
+ * @param {Function} fCallback
+ * @param {?} koTrigger
+ * @param {?} context = null
+ * @param {number=} timer = 1000
+ * @return {Function}
+ */
+export function settingsSaveHelperFunction(fCallback, koTrigger, context = null, timer = 1000)
+{
+ timer = pInt(timer);
+ return (type, data, cached, requestAction, requestParameters) => {
+ koTrigger.call(context, data && data.Result ? SaveSettingsStep.TrueResult : SaveSettingsStep.FalseResult);
+ if (fCallback)
+ {
+ fCallback.call(context, type, data, cached, requestAction, requestParameters);
+ }
+ _.delay(() => {
+ koTrigger.call(context, SaveSettingsStep.Idle);
+ }, timer);
+ };
+}
+
+export function settingsSaveHelperSimpleFunction(koTrigger, context)
+{
+ return settingsSaveHelperFunction(null, koTrigger, context, 1000);
+}
+
+export function settingsSaveHelperSubscribeFunction(remote, settingName, type, fTriggerFunction)
+{
+ return (value) => {
+
+ if (remote)
+ {
+ switch (type)
+ {
+ default:
+ value = pString(value);
+ break;
+ case 'bool':
+ case 'boolean':
+ value = value ? '1' : '0';
+ break;
+ case 'int':
+ case 'integer':
+ case 'number':
+ value = pInt(value);
+ break;
+ case 'trim':
+ value = trim(value);
+ break;
+ }
+
+ let data = {};
+ data[settingName] = value;
+
+ if (remote.saveAdminConfig)
+ {
+ remote.saveAdminConfig(fTriggerFunction || null, data);
+ }
+ else if (remote.saveSettings)
+ {
+ remote.saveSettings(fTriggerFunction || null, data);
+ }
+ }
+ };
+}
+
+/**
+ * @param {string} html
+ * @return {string}
+ */
+export function findEmailAndLinks(html)
+{
+// return html;
+ return Autolinker.link(html, {
+ newWindow: true,
+ stripPrefix: false,
+ urls: true,
+ email: true,
+ twitter: false,
+ replaceFn: function (autolinker, match) {
+ return !(autolinker && match && 'url' === match.getType() && match.matchedText && 0 !== match.matchedText.indexOf('http'));
+ }
+ });
+}
+
+/**
+ * @param {string} html
+ * @return {string}
+ */
+export function htmlToPlain(html)
+{
+ let
+ iPos = 0,
+ iP1 = 0,
+ iP2 = 0,
+ iP3 = 0,
+ iLimit = 0,
+
+ text = '',
+
+ convertBlockquote = (blockquoteText) => {
+ blockquoteText = '> ' + trim(blockquoteText).replace(/\n/gm, '\n> ');
+ return blockquoteText.replace(/(^|\n)([> ]+)/gm, function () {
+ return (arguments && 2 < arguments.length) ? arguments[1] + $.trim(arguments[2].replace(/[\s]/g, '')) + ' ' : '';
+ });
+ },
+
+ convertDivs = () => {
+ if (arguments && 1 < arguments.length)
+ {
+ let divText = trim(arguments[1]);
+ if (0 < divText.length)
+ {
+ divText = divText.replace(/]*>([\s\S\r\n]*)<\/div>/gmi, convertDivs);
+ divText = '\n' + trim(divText) + '\n';
+ }
+
+ return divText;
+ }
+
+ return '';
+ },
+
+ convertPre = () => {
+ return (arguments && 1 < arguments.length) ?
+ arguments[1].toString()
+ .replace(/[\n]/gm, '
')
+ .replace(/[\r]/gm, '')
+ : '';
+ },
+
+ fixAttibuteValue = () => {
+ return (arguments && 1 < arguments.length) ? '' + arguments[1] + _.escape(arguments[2]) : '';
+ },
+
+ convertLinks = () => {
+ return (arguments && 1 < arguments.length) ? trim(arguments[1]) : '';
+ }
+ ;
+
+ text = html
+ .replace(/\u0002([\s\S]*)\u0002/gm, '\u200C$1\u200C')
+ .replace(/]*><\/p>/gi, '')
+ .replace(/]*>([\s\S\r\n\t]*)<\/pre>/gmi, convertPre)
+ .replace(/[\s]+/gm, ' ')
+ .replace(/((?:href|data)\s?=\s?)("[^"]+?"|'[^']+?')/gmi, fixAttibuteValue)
+ .replace(/]*>/gmi, '\n')
+ .replace(/<\/h[\d]>/gi, '\n')
+ .replace(/<\/p>/gi, '\n\n')
+ .replace(/]*>/gmi, '\n')
+ .replace(/<\/ul>/gi, '\n')
+ .replace(/]*>/gmi, ' * ')
+ .replace(/<\/li>/gi, '\n')
+ .replace(/<\/td>/gi, '\n')
+ .replace(/<\/tr>/gi, '\n')
+ .replace(/]*>/gmi, '\n_______________________________\n\n')
+ .replace(/]*>([\s\S\r\n]*)<\/div>/gmi, convertDivs)
+ .replace(/]*>/gmi, '\n__bq__start__\n')
+ .replace(/<\/blockquote>/gmi, '\n__bq__end__\n')
+ .replace(/]*>([\s\S\r\n]*?)<\/a>/gmi, convertLinks)
+ .replace(/<\/div>/gi, '\n')
+ .replace(/ /gi, ' ')
+ .replace(/"/gi, '"')
+ .replace(/<[^>]*>/gm, '')
+ ;
+
+ text = $div.html(text).text();
+
+ text = text
+ .replace(/\n[ \t]+/gm, '\n')
+ .replace(/[\n]{3,}/gm, '\n\n')
+ .replace(/>/gi, '>')
+ .replace(/</gi, '<')
+ .replace(/&/gi, '&')
+ ;
+
+ text = splitPlainText(trim(text));
+
+ iPos = 0;
+ iLimit = 800;
+
+ while (0 < iLimit)
+ {
+ iLimit--;
+ iP1 = text.indexOf('__bq__start__', iPos);
+ if (-1 < iP1)
+ {
+ iP2 = text.indexOf('__bq__start__', iP1 + 5);
+ iP3 = text.indexOf('__bq__end__', iP1 + 5);
+
+ if ((-1 === iP2 || iP3 < iP2) && iP1 < iP3)
+ {
+ text = text.substring(0, iP1) +
+ convertBlockquote(text.substring(iP1 + 13, iP3)) +
+ text.substring(iP3 + 11);
+
+ iPos = 0;
+ }
+ else if (-1 < iP2 && iP2 < iP3)
+ {
+ iPos = iP2 - 1;
+ }
+ else
+ {
+ iPos = 0;
+ }
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ text = text
+ .replace(/__bq__start__/gm, '')
+ .replace(/__bq__end__/gm, '')
+ ;
+
+ return text;
+}
+
+/**
+ * @param {string} plain
+ * @param {boolean} findEmailAndLinksInText = false
+ * @return {string}
+ */
+export function plainToHtml(plain, findEmailAndLinksInText = false)
+{
+ plain = plain.toString().replace(/\r/g, '');
+
+ let
+ bIn = false,
+ bDo = true,
+ bStart = true,
+ aNextText = [],
+ sLine = '',
+ iIndex = 0,
+ aText = plain.split('\n')
+ ;
+
+ do
+ {
+ bDo = false;
+ aNextText = [];
+ for (iIndex = 0; iIndex < aText.length; iIndex++)
+ {
+ sLine = aText[iIndex];
+ bStart = '>' === sLine.substr(0, 1);
+ if (bStart && !bIn)
+ {
+ bDo = true;
+ bIn = true;
+ aNextText.push('~~~blockquote~~~');
+ aNextText.push(sLine.substr(1));
+ }
+ else if (!bStart && bIn)
+ {
+ if ('' !== sLine)
+ {
+ bIn = false;
+ aNextText.push('~~~/blockquote~~~');
+ aNextText.push(sLine);
+ }
+ else
+ {
+ aNextText.push(sLine);
+ }
+ }
+ else if (bStart && bIn)
+ {
+ aNextText.push(sLine.substr(1));
+ }
+ else
+ {
+ aNextText.push(sLine);
+ }
+ }
+
+ if (bIn)
+ {
+ bIn = false;
+ aNextText.push('~~~/blockquote~~~');
+ }
+
+ aText = aNextText;
+ }
+ while (bDo);
+
+ plain = aText.join('\n');
+
+ plain = plain
+// .replace(/~~~\/blockquote~~~\n~~~blockquote~~~/g, '\n')
+ .replace(/&/g, '&')
+ .replace(/>/g, '>').replace(/')
+ .replace(/[\s]*~~~\/blockquote~~~/g, '')
+ .replace(/\u200C([\s\S]*)\u200C/g, '\u0002$1\u0002')
+ .replace(/\n/g, '
')
+ ;
+
+ return findEmailAndLinksInText ? findEmailAndLinks(plain) : plain;
+}
+
+window.rainloop_Utils_htmlToPlain = htmlToPlain;
+window.rainloop_Utils_plainToHtml = plainToHtml;
+
+
+/**
+ * @param {string} url
+ * @param {number} value
+ * @param {Function} fCallback
+ */
+export function resizeAndCrop(url, value, fCallback)
+{
+ const img = new window.Image();
+ img.onload = function() {
+
+ let
+ diff = [0, 0],
+ canvas = window.document.createElement('canvas'),
+ ctx = canvas.getContext('2d')
+ ;
+
+ canvas.width = value;
+ canvas.height = value;
+
+ if (this.width > this.height)
+ {
+ diff = [this.width - this.height, 0];
+ }
+ else
+ {
+ diff = [0, this.height - this.width];
+ }
+
+ ctx.fillStyle = '#fff';
+ ctx.fillRect(0, 0, value, value);
+ ctx.drawImage(this, diff[0] / 2, diff[1] / 2, this.width - diff[0], this.height - diff[1], 0, 0, value, value);
+
+ fCallback(canvas.toDataURL('image/jpeg'));
+ };
+
+ img.src = url;
+}
+
+/**
+ * @param {Array} aSystem
+ * @param {Array} aList
+ * @param {Array=} aDisabled
+ * @param {Array=} aHeaderLines
+ * @param {?number=} iUnDeep
+ * @param {Function=} fDisableCallback
+ * @param {Function=} fVisibleCallback
+ * @param {Function=} fRenameCallback
+ * @param {boolean=} bSystem
+ * @param {boolean=} bBuildUnvisible
+ * @return {Array}
+ */
+export function folderListOptionsBuilder(aSystem, aList, aDisabled, aHeaderLines,
+ iUnDeep, fDisableCallback, fVisibleCallback, fRenameCallback, bSystem, bBuildUnvisible)
+{
+ let
+ /**
+ * @type {?FolderModel}
+ */
+ oItem = null,
+ bSep = false,
+ iIndex = 0,
+ iLen = 0,
+ sDeepPrefix = '\u00A0\u00A0\u00A0',
+ aResult = []
+ ;
+
+ bBuildUnvisible = isUnd(bBuildUnvisible) ? false : !!bBuildUnvisible;
+ bSystem = !isNormal(bSystem) ? 0 < aSystem.length : bSystem;
+ iUnDeep = !isNormal(iUnDeep) ? 0 : iUnDeep;
+ fDisableCallback = isNormal(fDisableCallback) ? fDisableCallback : null;
+ fVisibleCallback = isNormal(fVisibleCallback) ? fVisibleCallback : null;
+ fRenameCallback = isNormal(fRenameCallback) ? fRenameCallback : null;
+
+ if (!isArray(aDisabled))
+ {
+ aDisabled = [];
+ }
+
+ if (!isArray(aHeaderLines))
+ {
+ aHeaderLines = [];
+ }
+
+ for (iIndex = 0, iLen = aHeaderLines.length; iIndex < iLen; iIndex++)
+ {
+ aResult.push({
+ id: aHeaderLines[iIndex][0],
+ name: aHeaderLines[iIndex][1],
+ system: false,
+ seporator: false,
+ disabled: false
+ });
+ }
+
+ bSep = true;
+ for (iIndex = 0, iLen = aSystem.length; iIndex < iLen; iIndex++)
+ {
+ oItem = aSystem[iIndex];
+ if (fVisibleCallback ? fVisibleCallback.call(null, oItem) : true)
+ {
+ if (bSep && 0 < aResult.length)
+ {
+ aResult.push({
+ id: '---',
+ name: '---',
+ system: false,
+ seporator: true,
+ disabled: true
+ });
+ }
+
+ bSep = false;
+ aResult.push({
+ id: oItem.fullNameRaw,
+ name: fRenameCallback ? fRenameCallback.call(null, oItem) : oItem.name(),
+ system: true,
+ seporator: false,
+ disabled: !oItem.selectable || -1 < inArray(oItem.fullNameRaw, aDisabled) ||
+ (fDisableCallback ? fDisableCallback.call(null, oItem) : false)
+ });
+ }
+ }
+
+ bSep = true;
+ for (iIndex = 0, iLen = aList.length; iIndex < iLen; iIndex++)
+ {
+ oItem = aList[iIndex];
+// if (oItem.subScribed() || !oItem.existen || bBuildUnvisible)
+ if ((oItem.subScribed() || !oItem.existen || bBuildUnvisible) && (oItem.selectable || oItem.hasSubScribedSubfolders()))
+ {
+ if (fVisibleCallback ? fVisibleCallback.call(null, oItem) : true)
+ {
+ if (FolderType.User === oItem.type() || !bSystem || oItem.hasSubScribedSubfolders())
+ {
+ if (bSep && 0 < aResult.length)
+ {
+ aResult.push({
+ id: '---',
+ name: '---',
+ system: false,
+ seporator: true,
+ disabled: true
+ });
+ }
+
+ bSep = false;
+ aResult.push({
+ id: oItem.fullNameRaw,
+ name: (new window.Array(oItem.deep + 1 - iUnDeep)).join(sDeepPrefix) +
+ (fRenameCallback ? fRenameCallback.call(null, oItem) : oItem.name()),
+ system: false,
+ seporator: false,
+ disabled: !oItem.selectable || -1 < inArray(oItem.fullNameRaw, aDisabled) ||
+ (fDisableCallback ? fDisableCallback.call(null, oItem) : false)
+ });
+ }
+ }
+ }
+
+ if (oItem.subScribed() && 0 < oItem.subFolders().length)
+ {
+ aResult = aResult.concat(folderListOptionsBuilder([], oItem.subFolders(), aDisabled, [],
+ iUnDeep, fDisableCallback, fVisibleCallback, fRenameCallback, bSystem, bBuildUnvisible));
+ }
+ }
+
+ return aResult;
+}
+
+export function computedPagenatorHelper(koCurrentPage, koPageCount)
+{
+ return () => {
+
+ let
+ iPrev = 0,
+ iNext = 0,
+ iLimit = 2,
+ result = [],
+ iCurrentPage = koCurrentPage(),
+ iPageCount = koPageCount(),
+
+ /**
+ * @param {number} index
+ * @param {boolean=} push = true
+ * @param {string=} customName = ''
+ */
+ fAdd = (index, push = true, customName = '') => {
+
+ const data = {
+ current: index === iCurrentPage,
+ name: isUnd(customName) || '' === customName ? index.toString() : customName.toString(),
+ custom: isUnd(customName) || '' === customName ? false : true,
+ title: isUnd(customName) || '' === customName ? '' : index.toString(),
+ value: index.toString()
+ };
+
+ if (push)
+ {
+ result.push(data);
+ }
+ else
+ {
+ result.unshift(data);
+ }
+ }
+ ;
+
+ if (1 < iPageCount || (0 < iPageCount && iPageCount < iCurrentPage))
+// if (0 < iPageCount && 0 < iCurrentPage)
+ {
+ if (iPageCount < iCurrentPage)
+ {
+ fAdd(iPageCount);
+ iPrev = iPageCount;
+ iNext = iPageCount;
+ }
+ else
+ {
+ if (3 >= iCurrentPage || iPageCount - 2 <= iCurrentPage)
+ {
+ iLimit += 2;
+ }
+
+ fAdd(iCurrentPage);
+ iPrev = iCurrentPage;
+ iNext = iCurrentPage;
+ }
+
+ while (0 < iLimit) {
+
+ iPrev -= 1;
+ iNext += 1;
+
+ if (0 < iPrev)
+ {
+ fAdd(iPrev, false);
+ iLimit--;
+ }
+
+ if (iPageCount >= iNext)
+ {
+ fAdd(iNext, true);
+ iLimit--;
+ }
+ else if (0 >= iPrev)
+ {
+ break;
+ }
+ }
+
+ if (3 === iPrev)
+ {
+ fAdd(2, false);
+ }
+ else if (3 < iPrev)
+ {
+ fAdd(window.Math.round((iPrev - 1) / 2), false, '...');
+ }
+
+ if (iPageCount - 2 === iNext)
+ {
+ fAdd(iPageCount - 1, true);
+ }
+ else if (iPageCount - 2 > iNext)
+ {
+ fAdd(window.Math.round((iPageCount + iNext) / 2), true, '...');
+ }
+
+ // first and last
+ if (1 < iPrev)
+ {
+ fAdd(1, false);
+ }
+
+ if (iPageCount > iNext)
+ {
+ fAdd(iPageCount, true);
+ }
+ }
+
+ return result;
+ };
+}
+
+export function selectElement(element)
+{
+ let sel, range;
+ if (window.getSelection)
+ {
+ sel = window.getSelection();
+ sel.removeAllRanges();
+ range = window.document.createRange();
+ range.selectNodeContents(element);
+ sel.addRange(range);
+ }
+ else if (window.document.selection)
+ {
+ range = window.document.body.createTextRange();
+ range.moveToElementText(element);
+ range.select();
+ }
+}
+
+export const detectDropdownVisibility = _.debounce(() => {
+ dropdownVisibility(!!_.find(GlobalsData.aBootstrapDropdowns, (item) => {
+ return item.hasClass('open');
+ }));
+}, 50);
+
+/**
+ * @param {boolean=} delay = false
+ */
+export function triggerAutocompleteInputChange(delay = false) {
+
+ const fFunc = () => {
+ $('.checkAutocomplete').trigger('change');
+ };
+
+ if (delay)
+ {
+ _.delay(fFunc, 100);
+ }
+ else
+ {
+ fFunc();
+ }
+}
+
+/**
+ * @param {Object} params
+ */
+export function setHeadViewport(params)
+{
+ let content = [];
+ _.each(params, (key, value) => {
+ content.push('' + key + '=' + value);
+ });
+
+ $('#app-head-viewport').attr('content', content.join(', '));
+}
+
+/**
+ * @param {string} fileName
+ * @return {string}
+ */
+export function getFileExtension(fileName)
+{
+ fileName = trim(fileName).toLowerCase();
+
+ const result = fileName.split('.').pop();
+ return (result === fileName) ? '' : result;
+}
+
+let configurationScriptTagCache = {};
+
+/**
+ * @param {string} configuration
+ * @return {object}
+ */
+export function getConfigurationFromScriptTag(configuration)
+{
+ let result = {};
+
+ if (!configurationScriptTagCache[configuration])
+ {
+ configurationScriptTagCache[configuration] = $('script[type="application/json"][data-configuration="' + configuration + '"]');
+ }
+
+ try {
+ result = JSON.parse(configurationScriptTagCache[configuration].text());
+ } catch (e) {/* eslint-disable-line no-empty */}
+
+ return result;
+}
+
+/**
+ * @param {string} fileName
+ * @return {string}
+ */
+export function mimeContentType(fileName)
+{
+ let
+ ext = '',
+ result = 'application/octet-stream'
+ ;
+
+ fileName = trim(fileName).toLowerCase();
+
+ if ('winmail.dat' === fileName)
+ {
+ return 'application/ms-tnef';
+ }
+
+ ext = getFileExtension(fileName);
+ if (ext && 0 < ext.length && !isUnd(Mime[ext]))
+ {
+ result = Mime[ext];
+ }
+
+ return result;
+}
+
+/**
+ * @param {mixed} mPropOrValue
+ * @param {mixed} value
+ */
+export function disposeOne(propOrValue, value)
+{
+ const disposable = value || propOrValue;
+ if (disposable && typeof disposable.dispose === 'function')
+ {
+ disposable.dispose();
+ }
+}
+
+/**
+ * @param {Object} object
+ */
+export function disposeObject(object)
+{
+ if (object)
+ {
+ if (isArray(object.disposables))
+ {
+ _.each(object.disposables, disposeOne);
+ }
+
+ ko.utils.objectForEach(object, disposeOne);
+ }
+}
+
+/**
+ * @param {Object|Array} objectOrObjects
+ */
+export function delegateRunOnDestroy(objectOrObjects)
+{
+ if (objectOrObjects)
+ {
+ if (isArray(objectOrObjects))
+ {
+ _.each(objectOrObjects, function (item) {
+ delegateRunOnDestroy(item);
+ });
+ }
+ else if (objectOrObjects && objectOrObjects.onDestroy)
+ {
+ objectOrObjects.onDestroy();
+ }
+ }
+}
+
+export function appendStyles($styleTag, css)
+{
+ if ($styleTag && $styleTag[0])
+ {
+ if ($styleTag[0].styleSheet && !isUnd($styleTag[0].styleSheet.cssText))
+ {
+ $styleTag[0].styleSheet.cssText = css;
+ }
+ else
+ {
+ $styleTag.text(css);
+ }
+
+ return true;
+ }
+
+ return false;
+}
+
+let
+ __themeTimer = 0,
+ __themeAjax = null
+;
+
+export function changeTheme(value, themeTrigger)
+{
+ let
+ themeLink = $('#app-theme-link'),
+ themeStyle = $('#app-theme-style'),
+ url = themeLink.attr('href')
+ ;
+
+ if (!url)
+ {
+ url = themeStyle.attr('data-href');
+ }
+
+ if (url)
+ {
+ url = url.toString().replace(/\/-\/[^\/]+\/\-\//, '/-/' + value + '/-/');
+ url = url.toString().replace(/\/Css\/[^\/]+\/User\//, '/Css/0/User/');
+ url = url.toString().replace(/\/Hash\/[^\/]+\//, '/Hash/-/');
+
+ if ('Json/' !== url.substring(url.length - 5, url.length))
+ {
+ url += 'Json/';
+ }
+
+ window.clearTimeout(__themeTimer);
+ themeTrigger(SaveSettingsStep.Animate);
+
+ if (__themeAjax && __themeAjax.abort)
+ {
+ __themeAjax.abort();
+ }
+
+ __themeAjax = $.ajax({
+ url: url,
+ dataType: 'json'
+ }).done((data) => {
+
+ if (data && isArray(data) && 2 === data.length)
+ {
+ if (themeLink && themeLink[0] && (!themeStyle || !themeStyle[0]))
+ {
+ themeStyle = $('');
+ themeLink.after(themeStyle);
+ themeLink.remove();
+ }
+
+ if (themeStyle && themeStyle[0])
+ {
+ if (appendStyles(themeStyle, data[1]))
+ {
+ themeStyle.attr('data-href', url).attr('data-theme', data[0]);
+ }
+ }
+
+ themeTrigger(SaveSettingsStep.TrueResult);
+ }
+
+ }).always(() => {
+
+ __themeTimer = window.setTimeout(() => {
+ themeTrigger(SaveSettingsStep.Idle);
+ }, 1000);
+
+ __themeAjax = null;
+ });
+ }
+}
+
+let substr = window.String.substr;
+if ('ab'.substr(-1) !== 'b')
+{
+ substr = (str, start, length) => {
+ start = start < 0 ? str.length + start : start;
+ return str.substr(start, length);
+ };
+}
+
+export {substr};
+
+/**
+ * @param {string} mailToUrl
+ * @param {Function} PopupComposeVoreModel
+ * @return {boolean}
+ */
+export function mailToHelper(mailToUrl, PopupComposeVoreModel)
+{
+ if (mailToUrl && 'mailto:' === mailToUrl.toString().substr(0, 7).toLowerCase())
+ {
+ if (!PopupComposeVoreModel)
+ {
+ return true;
+ }
+
+ mailToUrl = mailToUrl.toString().substr(7);
+
+ let
+ to = [],
+ cc = null,
+ bcc = null,
+ params = {},
+ EmailModel = require('Model/Email'),
+ email = mailToUrl.replace(/\?.+$/, ''),
+ queryString = mailToUrl.replace(/^[^\?]*\?/, ''),
+ fParseEmailLine = (line) => {
+ return line ? _.compact(_.map(decodeURIComponent(line).split(/[,]/), (item) => {
+ const emailObj = new EmailModel();
+ emailObj.mailsoParse(item);
+ return '' !== emailObj.email ? emailObj : null;
+ })) : null;
+ }
+ ;
+
+ to = fParseEmailLine(email);
+
+ params = simpleQueryParser(queryString);
+
+ if (!isUnd(params.cc))
+ {
+ cc = fParseEmailLine(decodeURIComponent(params.cc));
+ }
+
+ if (!isUnd(params.bcc))
+ {
+ bcc = fParseEmailLine(decodeURIComponent(params.bcc));
+ }
+
+ require('Knoin/Knoin').showScreenPopup(PopupComposeVoreModel, [
+ ComposeType.Empty, null, to, cc, bcc,
+ isUnd(params.subject) ? null : pString(decodeURIComponent(params.subject)),
+ isUnd(params.body) ? null : plainToHtml(pString(decodeURIComponent(params.body)))
+ ]);
+
+ return true;
+ }
+
+ return false;
+}
+
+export const windowResize = _.debounce((timeout) => {
+ if (isUnd(timeout) || isNull(timeout))
+ {
+ $win.resize();
+ }
+ else
+ {
+ window.setTimeout(function () {
+ $win.resize();
+ }, timeout);
+ }
+}, 50);
+
+export function windowResizeCallback()
+{
+ windowResize();
+}
diff --git a/dev/Component/AbstracCheckbox.jsx b/dev/Component/AbstracCheckbox.jsx
index de08377ff..bc853c37a 100644
--- a/dev/Component/AbstracCheckbox.jsx
+++ b/dev/Component/AbstracCheckbox.jsx
@@ -1,6 +1,6 @@
import ko from 'ko';
-import Utils from 'Common/Utils';
+import {isUnd} from 'Common/Utils';
import {AbstractComponent} from 'Component/Abstract';
class AbstracCheckbox extends AbstractComponent
@@ -13,30 +13,30 @@ class AbstracCheckbox extends AbstractComponent
super();
this.value = params.value;
- if (Utils.isUnd(this.value) || !this.value.subscribe)
+ if (isUnd(this.value) || !this.value.subscribe)
{
- this.value = ko.observable(Utils.isUnd(this.value) ? false : !!this.value);
+ this.value = ko.observable(isUnd(this.value) ? false : !!this.value);
}
this.enable = params.enable;
- if (Utils.isUnd(this.enable) || !this.enable.subscribe)
+ if (isUnd(this.enable) || !this.enable.subscribe)
{
- this.enable = ko.observable(Utils.isUnd(this.enable) ? true : !!this.enable);
+ this.enable = ko.observable(isUnd(this.enable) ? true : !!this.enable);
}
this.disable = params.disable;
- if (Utils.isUnd(this.disable) || !this.disable.subscribe)
+ if (isUnd(this.disable) || !this.disable.subscribe)
{
- this.disable = ko.observable(Utils.isUnd(this.disable) ? false : !!this.disable);
+ this.disable = ko.observable(isUnd(this.disable) ? false : !!this.disable);
}
this.label = params.label || '';
- this.inline = Utils.isUnd(params.inline) ? false : params.inline;
+ this.inline = isUnd(params.inline) ? false : params.inline;
- this.readOnly = Utils.isUnd(params.readOnly) ? false : !!params.readOnly;
- this.inverted = Utils.isUnd(params.inverted) ? false : !!params.inverted;
+ this.readOnly = isUnd(params.readOnly) ? false : !!params.readOnly;
+ this.inverted = isUnd(params.inverted) ? false : !!params.inverted;
- this.labeled = !Utils.isUnd(params.label);
+ this.labeled = !isUnd(params.label);
this.labelAnimated = !!params.labelAnimated;
}
diff --git a/dev/Component/AbstracRadio.jsx b/dev/Component/AbstracRadio.jsx
index a44d168da..9a290ba4f 100644
--- a/dev/Component/AbstracRadio.jsx
+++ b/dev/Component/AbstracRadio.jsx
@@ -1,7 +1,7 @@
import {_} from 'common';
import ko from 'ko';
-import Utils from 'Common/Utils';
+import {isUnd} from 'Common/Utils';
import {AbstractComponent} from 'Component/Abstract';
class AbstracRadio extends AbstractComponent
@@ -16,13 +16,13 @@ class AbstracRadio extends AbstractComponent
this.values = ko.observableArray([]);
this.value = params.value;
- if (Utils.isUnd(this.value) || !this.value.subscribe)
+ if (isUnd(this.value) || !this.value.subscribe)
{
this.value = ko.observable('');
}
- this.inline = Utils.isUnd(params.inline) ? false : params.inline;
- this.readOnly = Utils.isUnd(params.readOnly) ? false : !!params.readOnly;
+ this.inline = isUnd(params.inline) ? false : params.inline;
+ this.readOnly = isUnd(params.readOnly) ? false : !!params.readOnly;
if (params.values)
{
diff --git a/dev/Component/Abstract.jsx b/dev/Component/Abstract.jsx
index a6fd5bbb0..a07acf657 100644
--- a/dev/Component/Abstract.jsx
+++ b/dev/Component/Abstract.jsx
@@ -1,7 +1,7 @@
import {$} from 'common';
+import {isUnd} from 'Common/Utils';
import ko from 'ko';
-import Utils from 'Common/Utils';
class AbstractComponent
{
@@ -40,7 +40,7 @@ const componentExportHelper = (ClassObject, templateID = '') => {
require('Common/Translator').i18nToNodes(params.element);
- if (!Utils.isUnd(params.inline) && ko.unwrap(params.inline))
+ if (!isUnd(params.inline) && ko.unwrap(params.inline))
{
params.element.css('display', 'inline-block');
}
diff --git a/dev/Component/AbstractInput.jsx b/dev/Component/AbstractInput.jsx
index 487dcca86..45db0f54e 100644
--- a/dev/Component/AbstractInput.jsx
+++ b/dev/Component/AbstractInput.jsx
@@ -1,6 +1,6 @@
import ko from 'ko';
-import Utils from 'Common/Utils';
+import {isUnd, trim, pInt} from 'Common/Utils';
import {SaveSettingsStep} from 'Common/Enums';
import {AbstractComponent} from 'Component/Abstract';
@@ -17,13 +17,13 @@ class AbstractInput extends AbstractComponent
this.size = params.size || 0;
this.label = params.label || '';
this.preLabel = params.preLabel || '';
- this.enable = Utils.isUnd(params.enable) ? true : params.enable;
+ this.enable = isUnd(params.enable) ? true : params.enable;
this.trigger = params.trigger && params.trigger.subscribe ? params.trigger : null;
this.placeholder = params.placeholder || '';
- this.labeled = !Utils.isUnd(params.label);
- this.preLabeled = !Utils.isUnd(params.preLabel);
- this.triggered = !Utils.isUnd(params.trigger) && !!this.trigger;
+ this.labeled = !isUnd(params.label);
+ this.preLabeled = !isUnd(params.preLabel);
+ this.triggered = !isUnd(params.trigger) && !!this.trigger;
this.classForTrigger = ko.observable('');
@@ -32,14 +32,14 @@ class AbstractInput extends AbstractComponent
var
size = ko.unwrap(this.size),
suffixValue = this.trigger ?
- ' ' + Utils.trim('settings-saved-trigger-input ' + this.classForTrigger()) : ''
+ ' ' + trim('settings-saved-trigger-input ' + this.classForTrigger()) : ''
;
return (size > 0 ? 'span' + size : '') + suffixValue;
}, this);
- if (!Utils.isUnd(params.width) && params.element)
+ if (!isUnd(params.width) && params.element)
{
params.element.find('input,select,textarea').css('width', params.width);
}
@@ -57,7 +57,7 @@ class AbstractInput extends AbstractComponent
}
setTriggerState(value) {
- switch (Utils.pInt(value))
+ switch (pInt(value))
{
case SaveSettingsStep.TrueResult:
this.classForTrigger('success');
diff --git a/dev/Component/SaveTrigger.jsx b/dev/Component/SaveTrigger.jsx
index f967533a4..5bb241626 100644
--- a/dev/Component/SaveTrigger.jsx
+++ b/dev/Component/SaveTrigger.jsx
@@ -1,5 +1,5 @@
-import Utils from 'Common/Utils';
+import {pInt} from 'Common/Utils';
import {SaveSettingsStep} from 'Common/Enums';
import {AbstractComponent, componentExportHelper} from 'Component/Abstract';
@@ -41,7 +41,7 @@ class SaveTriggerComponent extends AbstractComponent
setState(value) {
- switch (Utils.pInt(value))
+ switch (pInt(value))
{
case SaveSettingsStep.TrueResult:
this.element
diff --git a/dev/Component/Select.jsx b/dev/Component/Select.jsx
index d0e275e3d..93893ed5e 100644
--- a/dev/Component/Select.jsx
+++ b/dev/Component/Select.jsx
@@ -1,6 +1,6 @@
-import Utils from 'Common/Utils';
import Translator from 'Common/Translator';
+import {defautOptionsAfterRender} from 'Common/Utils';
import {componentExportHelper} from 'Component/Abstract';
import {AbstractInput} from 'Component/AbstractInput';
@@ -24,7 +24,7 @@ class SelectComponent extends AbstractInput
this.optionsCaption = Translator.i18n(this.optionsCaption);
}
- this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
+ this.defautOptionsAfterRender = defautOptionsAfterRender;
}
}
diff --git a/dev/Component/TextArea.jsx b/dev/Component/TextArea.jsx
index d76d24303..45922b6b5 100644
--- a/dev/Component/TextArea.jsx
+++ b/dev/Component/TextArea.jsx
@@ -1,5 +1,5 @@
-import Utils from 'Common/Utils';
+import {isUnd} from 'Common/Utils';
import {componentExportHelper} from 'Component/Abstract';
import {AbstractInput} from 'Component/AbstractInput';
@@ -13,7 +13,7 @@ class TextAreaComponent extends AbstractInput
super(params);
this.rows = params.rows || 5;
- this.spellcheck = Utils.isUnd(params.spellcheck) ? false : !!params.spellcheck;
+ this.spellcheck = isUnd(params.spellcheck) ? false : !!params.spellcheck;
}
}
diff --git a/dev/External/ko.js b/dev/External/ko.js
index 5790b3aeb..5c79347b8 100644
--- a/dev/External/ko.js
+++ b/dev/External/ko.js
@@ -284,9 +284,9 @@
ko.bindingHandlers.registrateBootstrapDropdown = {
'init': function (oElement) {
var Globals = require('Common/Globals');
- if (Globals && Globals.aBootstrapDropdowns)
+ if (Globals && Globals.data.aBootstrapDropdowns)
{
- Globals.aBootstrapDropdowns.push($(oElement));
+ Globals.data.aBootstrapDropdowns.push($(oElement));
$(oElement).click(function () {
require('Common/Utils').detectDropdownVisibility();
diff --git a/dev/Helper/Message.jsx b/dev/Helper/Message.jsx
index 74790e3e9..91d9978d2 100644
--- a/dev/Helper/Message.jsx
+++ b/dev/Helper/Message.jsx
@@ -1,5 +1,5 @@
-import Utils from 'Common/Utils';
+import {isNonEmptyArray, isUnd} from 'Common/Utils';
import EmailModel from 'Model/Email';
class MessageHelper
@@ -20,7 +20,7 @@ class MessageHelper
len = 0
;
- if (Utils.isNonEmptyArray(emails))
+ if (isNonEmptyArray(emails))
{
for (index = 0, len = emails.length; index < len; index++)
{
@@ -43,7 +43,7 @@ class MessageHelper
len = 0
;
- if (Utils.isNonEmptyArray(emails))
+ if (isNonEmptyArray(emails))
{
for (index = 0, len = emails.length; index < len; index++)
{
@@ -70,7 +70,7 @@ class MessageHelper
result = []
;
- if (Utils.isNonEmptyArray(json))
+ if (isNonEmptyArray(json))
{
for (index = 0, len = json.length; index < len; index++)
{
@@ -99,7 +99,7 @@ class MessageHelper
for (; index < len; index++)
{
- if (Utils.isUnd(unic[inputEmails[index].email]))
+ if (isUnd(unic[inputEmails[index].email]))
{
unic[inputEmails[index].email] = true;
localEmails.push(inputEmails[index]);
diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js
index 0534494c1..05d6b96f8 100644
--- a/dev/Model/Attachment.js
+++ b/dev/Model/Attachment.js
@@ -180,7 +180,7 @@
*/
AttachmentModel.prototype.isFramed = function ()
{
- return this.framed && (Globals.__APP__ && Globals.__APP__.googlePreviewSupported()) &&
+ return this.framed && (Globals.data.__APP__ && Globals.data.__APP__.googlePreviewSupported()) &&
!(this.isPdf() && Globals.bAllowPdfPreview) && !this.isText() && !this.isImage();
};
diff --git a/dev/Promises/AbstractAjax.js b/dev/Promises/AbstractAjax.js
index efc6b28ee..b66042e94 100644
--- a/dev/Promises/AbstractAjax.js
+++ b/dev/Promises/AbstractAjax.js
@@ -160,32 +160,32 @@
Enums.Notification.MailServerError, Enums.Notification.UnknownNotification, Enums.Notification.UnknownError
]))
{
- Globals.iAjaxErrorCount++;
+ Globals.data.iAjaxErrorCount++;
}
if (Enums.Notification.InvalidToken === oErrorData.ErrorCode)
{
- Globals.iTokenErrorCount++;
+ Globals.data.iTokenErrorCount++;
}
- if (Consts.TOKEN_ERROR_LIMIT < Globals.iTokenErrorCount)
+ if (Consts.TOKEN_ERROR_LIMIT < Globals.data.iTokenErrorCount)
{
- if (Globals.__APP__ && Globals.__APP__.loginAndLogoutReload)
+ if (Globals.data.__APP__ && Globals.data.__APP__.loginAndLogoutReload)
{
- Globals.__APP__.loginAndLogoutReload(false, true);
+ Globals.data.__APP__.loginAndLogoutReload(false, true);
}
}
- if (oErrorData.ClearAuth || oErrorData.Logout || Consts.AJAX_ERROR_LIMIT < Globals.iAjaxErrorCount)
+ if (oErrorData.ClearAuth || oErrorData.Logout || Consts.AJAX_ERROR_LIMIT < Globals.data.iAjaxErrorCount)
{
- if (Globals.__APP__ && Globals.__APP__.clearClientSideToken)
+ if (Globals.data.__APP__ && Globals.data.__APP__.clearClientSideToken)
{
- Globals.__APP__.clearClientSideToken();
+ Globals.data.__APP__.clearClientSideToken();
}
- if (Globals.__APP__ && !oErrorData.ClearAuth && Globals.__APP__.loginAndLogoutReload)
+ if (Globals.data.__APP__ && !oErrorData.ClearAuth && Globals.data.__APP__.loginAndLogoutReload)
{
- Globals.__APP__.loginAndLogoutReload(false, true);
+ Globals.data.__APP__.loginAndLogoutReload(false, true);
}
}
}
diff --git a/dev/Remote/AbstractAjax.js b/dev/Remote/AbstractAjax.js
index 3f7c3d134..f35481f14 100644
--- a/dev/Remote/AbstractAjax.js
+++ b/dev/Remote/AbstractAjax.js
@@ -40,7 +40,7 @@
{
var
fCall = function () {
- if (Enums.StorageResultType.Success !== sType && Globals.bUnload)
+ if (Enums.StorageResultType.Success !== sType && Globals.data.bUnload)
{
sType = Enums.StorageResultType.Unload;
}
@@ -53,39 +53,39 @@
Enums.Notification.MailServerError, Enums.Notification.UnknownNotification, Enums.Notification.UnknownError
]))
{
- Globals.iAjaxErrorCount++;
+ Globals.data.iAjaxErrorCount++;
}
if (oData && Enums.Notification.InvalidToken === oData.ErrorCode)
{
- Globals.iTokenErrorCount++;
+ Globals.data.iTokenErrorCount++;
}
- if (Consts.TOKEN_ERROR_LIMIT < Globals.iTokenErrorCount)
+ if (Consts.TOKEN_ERROR_LIMIT < Globals.data.iTokenErrorCount)
{
- if (Globals.__APP__ && Globals.__APP__.loginAndLogoutReload)
+ if (Globals.data.__APP__ && Globals.data.__APP__.loginAndLogoutReload)
{
- Globals.__APP__.loginAndLogoutReload(false, true);
+ Globals.data.__APP__.loginAndLogoutReload(false, true);
}
}
- if (oData.ClearAuth || oData.Logout || Consts.AJAX_ERROR_LIMIT < Globals.iAjaxErrorCount)
+ if (oData.ClearAuth || oData.Logout || Consts.AJAX_ERROR_LIMIT < Globals.data.iAjaxErrorCount)
{
- if (Globals.__APP__ && Globals.__APP__.clearClientSideToken)
+ if (Globals.data.__APP__ && Globals.data.__APP__.clearClientSideToken)
{
- Globals.__APP__.clearClientSideToken();
+ Globals.data.__APP__.clearClientSideToken();
- if (!oData.ClearAuth && Globals.__APP__.loginAndLogoutReload)
+ if (!oData.ClearAuth && Globals.data.__APP__.loginAndLogoutReload)
{
- Globals.__APP__.loginAndLogoutReload(false, true);
+ Globals.data.__APP__.loginAndLogoutReload(false, true);
}
}
}
}
else if (Enums.StorageResultType.Success === sType && oData && oData.Result)
{
- Globals.iAjaxErrorCount = 0;
- Globals.iTokenErrorCount = 0;
+ Globals.data.iAjaxErrorCount = 0;
+ Globals.data.iTokenErrorCount = 0;
}
if (fCallback)
diff --git a/dev/Screen/Admin/Settings.js b/dev/Screen/Admin/Settings.js
index 4388208d2..4fa07c4ad 100644
--- a/dev/Screen/Admin/Settings.js
+++ b/dev/Screen/Admin/Settings.js
@@ -1,4 +1,6 @@
+/* global RL_COMMUNITY */
+
(function () {
'use strict';
diff --git a/dev/Settings/Admin/About.js b/dev/Settings/Admin/About.js
index d5dc0c875..9ba1da65f 100644
--- a/dev/Settings/Admin/About.js
+++ b/dev/Settings/Admin/About.js
@@ -1,4 +1,6 @@
+/* global RL_COMMUNITY */
+
(function () {
'use strict';
diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js
index 496c68253..135bc3963 100644
--- a/dev/Settings/Admin/Branding.js
+++ b/dev/Settings/Admin/Branding.js
@@ -1,4 +1,6 @@
+/* global RL_COMMUNITY */
+
(function () {
'use strict';
diff --git a/dev/Settings/Admin/Plugins.js b/dev/Settings/Admin/Plugins.js
index f7c2f4c48..d09bd70a7 100644
--- a/dev/Settings/Admin/Plugins.js
+++ b/dev/Settings/Admin/Plugins.js
@@ -1,4 +1,6 @@
+/* global RL_COMMUNITY */
+
(function () {
'use strict';
diff --git a/dev/Storage/Settings.jsx b/dev/Storage/Settings.jsx
index 48d9e526c..acb39c8a1 100644
--- a/dev/Storage/Settings.jsx
+++ b/dev/Storage/Settings.jsx
@@ -1,6 +1,6 @@
import {window} from 'common';
-import Utils from 'Common/Utils';
+import {isUnd, isNormal, isArray, inArray} from 'Common/Utils';
class SettingsStorage
{
@@ -9,10 +9,10 @@ class SettingsStorage
constructor() {
this.settings = window.__rlah_data() || {};
- this.settings = Utils.isNormal(this.settings) ? this.settings : {};
+ this.settings = isNormal(this.settings) ? this.settings : {};
this.appSettings = this.settings.System || null;
- this.appSettings = Utils.isNormal(this.appSettings) ? this.appSettings : {};
+ this.appSettings = isNormal(this.appSettings) ? this.appSettings : {};
}
/**
@@ -20,7 +20,7 @@ class SettingsStorage
* @return {*}
*/
settingsGet(name) {
- return Utils.isUnd(this.settings[name]) ? null : this.settings[name];
+ return isUnd(this.settings[name]) ? null : this.settings[name];
}
/**
@@ -36,7 +36,7 @@ class SettingsStorage
* @return {*}
*/
appSettingsGet(name) {
- return Utils.isUnd(this.appSettings[name]) ? null : this.appSettings[name];
+ return isUnd(this.appSettings[name]) ? null : this.appSettings[name];
}
/**
@@ -45,7 +45,7 @@ class SettingsStorage
*/
capa(name) {
const values = this.settingsGet('Capa');
- return Utils.isArray(values) && Utils.isNormal(name) && -1 < Utils.inArray(name, values);
+ return isArray(values) && isNormal(name) && -1 < inArray(name, values);
}
}
diff --git a/dev/Stores/AbstractApp.jsx b/dev/Stores/AbstractApp.jsx
index d5d1172b9..ca62b7cbf 100644
--- a/dev/Stores/AbstractApp.jsx
+++ b/dev/Stores/AbstractApp.jsx
@@ -1,6 +1,6 @@
import ko from 'ko';
-import Globals from 'Common/Globals';
+import {$html, bMobileDevice} from 'Common/Globals';
import Settings from 'Storage/Settings';
class AbstractAppStore
@@ -13,8 +13,8 @@ class AbstractAppStore
this.interfaceAnimation = ko.observable(true);
this.interfaceAnimation.subscribe(function (bValue) {
- const bAnim = Globals.bMobileDevice || !bValue;
- Globals.$html.toggleClass('rl-anim', !bAnim).toggleClass('no-rl-anim', bAnim);
+ const bAnim = bMobileDevice || !bValue;
+ $html.toggleClass('rl-anim', !bAnim).toggleClass('no-rl-anim', bAnim);
});
this.interfaceAnimation.valueHasMutated();
diff --git a/dev/Stores/User/App.jsx b/dev/Stores/User/App.jsx
index 5cb322ff8..6889234c9 100644
--- a/dev/Stores/User/App.jsx
+++ b/dev/Stores/User/App.jsx
@@ -1,9 +1,9 @@
import ko from 'ko';
import {Focused, KeyState} from 'Common/Enums';
-import Globals from 'Common/Globals';
-import Utils from 'Common/Utils';
+import {keyScope} from 'Common/Globals';
import Settings from 'Storage/Settings';
+import {isNonEmptyArray} from 'Common/Utils';
import {AbstractAppStore} from 'Stores/AbstractApp';
@@ -24,13 +24,13 @@ class AppUserStore extends AbstractAppStore
default:
break;
case Focused.MessageList:
- Globals.keyScope(KeyState.MessageList);
+ keyScope(KeyState.MessageList);
break;
case Focused.MessageView:
- Globals.keyScope(KeyState.MessageView);
+ keyScope(KeyState.MessageView);
break;
case Focused.FolderList:
- Globals.keyScope(KeyState.FolderList);
+ keyScope(KeyState.FolderList);
break;
}
@@ -64,7 +64,7 @@ class AppUserStore extends AbstractAppStore
this.contactsIsAllowed(!!Settings.settingsGet('ContactsIsAllowed'));
const attachmentsActions = Settings.appSettingsGet('attachmentsActions');
- this.attachmentsActions(Utils.isNonEmptyArray(attachmentsActions) ? attachmentsActions : []);
+ this.attachmentsActions(isNonEmptyArray(attachmentsActions) ? attachmentsActions : []);
this.devEmail = Settings.settingsGet('DevEmail');
this.devPassword = Settings.settingsGet('DevPassword');
diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index 937dcc0c0..021efcb53 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -227,7 +227,7 @@
var
iCount = 0,
oMessagesDom = null,
- iEnd = Globals.iMessageBodyCacheCount - Consts.MESSAGE_BODY_CACHE_LIMIT
+ iEnd = Globals.data.iMessageBodyCacheCount - Consts.MESSAGE_BODY_CACHE_LIMIT
;
if (0 < iEnd)
@@ -642,7 +642,7 @@
}
oBody = $('').hide().addClass('rl-cache-class');
- oBody.data('rl-cache-count', ++Globals.iMessageBodyCacheCount);
+ oBody.data('rl-cache-count', ++Globals.data.iMessageBodyCacheCount);
oBody
.html(Utils.findEmailAndLinks(sResultHtml))
@@ -677,7 +677,7 @@
oMessage.body = oTextBody;
if (oMessage.body)
{
- oMessage.body.data('rl-cache-count', ++Globals.iMessageBodyCacheCount);
+ oMessage.body.data('rl-cache-count', ++Globals.data.iMessageBodyCacheCount);
oMessage.fetchDataFromDom();
}
}
diff --git a/dev/View/Admin/Settings/Pane.js b/dev/View/Admin/Settings/Pane.js
index 4e71f2cdd..d70471eeb 100644
--- a/dev/View/Admin/Settings/Pane.js
+++ b/dev/View/Admin/Settings/Pane.js
@@ -1,4 +1,6 @@
+/* global RL_COMMUNITY */
+
(function () {
'use strict';
diff --git a/dev/bootstrap.jsx b/dev/bootstrap.jsx
index 7aae09cd2..23b9bd30a 100644
--- a/dev/bootstrap.jsx
+++ b/dev/bootstrap.jsx
@@ -1,79 +1,81 @@
+import window from 'window';
+import _ from '_';
+import $ from '$';
+import {kill_CtrlA_CtrlS, detectDropdownVisibility, createCommand} from 'Common/Utils';
+import {$win, $html, data as GlobalsData, bMobileDevice} from 'Common/Globals';
+import Plugins from 'Common/Plugins';
+import Translator from 'Common/Translator';
+import EmailModel from 'Model/Email';
+import * as Enums from 'Common/Enums';
+
export default (App) => {
- const
- window = require('window'),
- _ = require('_'),
- $ = require('$'),
+ GlobalsData.__APP__ = App;
- Globals = require('Common/Globals'),
- Plugins = require('Common/Plugins'),
- Utils = require('Common/Utils'),
- Enums = require('Common/Enums'),
- Translator = require('Common/Translator'),
-
- EmailModel = require('Model/Email')
- ;
-
- Globals.__APP__ = App;
-
- Globals.$win.on('keydown', Utils.kill_CtrlA_CtrlS);
-
- Globals.$win.on('unload', function () {
- Globals.bUnload = true;
- });
-
- Globals.$html
- .addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile')
- .on('click.dropdown.data-api', function () {
- Utils.detectDropdownVisibility();
+ $win
+ .on('keydown', kill_CtrlA_CtrlS)
+ .on('unload', () => {
+ GlobalsData.bUnload = true;
})
;
- // export
- /* eslint dot-notation: 0 */
- window['rl'] = window['rl'] || {};
- window['rl']['i18n'] = _.bind(Translator.i18n, Translator);
+ $html
+ .addClass(bMobileDevice ? 'mobile' : 'no-mobile')
+ .on('click.dropdown.data-api', () => {
+ detectDropdownVisibility();
+ })
+ ;
- window['rl']['addHook'] = _.bind(Plugins.addHook, Plugins);
- window['rl']['settingsGet'] = _.bind(Plugins.mainSettingsGet, Plugins);
- window['rl']['createCommand'] = Utils.createCommand;
+ const rl = window.rl || {};
- window['rl']['addSettingsViewModel'] = _.bind(Plugins.addSettingsViewModel, Plugins);
- window['rl']['addSettingsViewModelForAdmin'] = _.bind(Plugins.addSettingsViewModelForAdmin, Plugins);
+ rl.i18n = _.bind(Translator.i18n, Translator);
- window['rl']['pluginRemoteRequest'] = _.bind(Plugins.remoteRequest, Plugins);
- window['rl']['pluginSettingsGet'] = _.bind(Plugins.settingsGet, Plugins);
+ rl.addHook = _.bind(Plugins.addHook, Plugins);
+ rl.settingsGet = _.bind(Plugins.mainSettingsGet, Plugins);
+ rl.createCommand = createCommand;
- window['rl']['EmailModel'] = EmailModel;
- window['rl']['Enums'] = Enums;
+ rl.addSettingsViewModel = _.bind(Plugins.addSettingsViewModel, Plugins);
+ rl.addSettingsViewModelForAdmin = _.bind(Plugins.addSettingsViewModelForAdmin, Plugins);
- window.__APP_BOOT = function (fCall) {
+ rl.pluginRemoteRequest = _.bind(Plugins.remoteRequest, Plugins);
+ rl.pluginSettingsGet = _.bind(Plugins.settingsGet, Plugins);
- $(_.delay(function () {
+ rl.EmailModel = EmailModel;
+ rl.Enums = Enums;
- if (window['rainloopTEMPLATES'] && window['rainloopTEMPLATES'][0])
- {
- $('#rl-templates').html(window['rainloopTEMPLATES'][0]);
+ window.rl = rl;
- _.delay(function () {
+ window.__APP_BOOT = (fErrorCallback) => {
- App.bootstart();
+ $(() => {
- Globals.$html
- .removeClass('no-js rl-booted-trigger')
- .addClass('rl-booted')
- ;
+ _.delay(() => {
- }, 10);
- }
- else
- {
- fCall(false);
- }
+ if (window.rainloopTEMPLATES && window.rainloopTEMPLATES[0])
+ {
+ $('#rl-templates').html(window.rainloopTEMPLATES[0]);
- window.__APP_BOOT = null;
+ _.delay(() => {
- }, 10));
+ App.bootstart();
+
+ $html
+ .removeClass('no-js rl-booted-trigger')
+ .addClass('rl-booted')
+ ;
+
+ }, 10);
+ }
+ else
+ {
+ fErrorCallback();
+ }
+
+ window.__APP_BOOT = null;
+
+ }, 10);
+
+ });
};
};
diff --git a/gulpfile.js b/gulpfile.js
index bd7106453..4899b026d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -705,6 +705,7 @@ gulp.task('build', ['rainloop']);
gulp.task('build+', ['rainloop+']);
gulp.task('js:v', ['js:validate']);
+gulp.task('v', ['js:v']);
gulp.task('w', ['watch']);
gulp.task('w+', ['watch+']);
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 44b76964b..d13b296a7 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1481,6 +1481,7 @@ class Actions
'rsaPublicKey' => $sRsaPublicKey,
'openpgpPublicKeyServer' => $oConfig->Get('security', 'openpgp_public_key_server', '')
), $bAdmin ? array(
+ 'adminHostUse' => '' !== $oConfig->Get('security', 'admin_panel_host', ''),
'adminPath' => \strtolower($oConfig->Get('security', 'admin_panel_key', 'admin')),
'allowAdminPanel' => (bool) $oConfig->Get('security', 'allow_admin_panel', true),
) : array());
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
index b5fb4b9de..55915997a 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -72,7 +72,7 @@