CommonJS (research/6)

This commit is contained in:
RainLoop Team 2014-08-26 10:31:20 +04:00
parent e600e32ddb
commit 9c52fdd028
11 changed files with 91 additions and 190 deletions

View file

@ -1,7 +1,7 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
@ -48,54 +48,40 @@
AdminApp.prototype.setupSettings = function ()
{
var
AdminSettingsGeneral = require('../Admin/AdminSettingsGeneral.js'),
AdminSettingsLogin = require('../Admin/AdminSettingsLogin.js'),
AdminSettingsBranding = require('../Admin/AdminSettingsBranding.js'),
AdminSettingsContacts = require('../Admin/AdminSettingsContacts.js'),
AdminSettingsDomains = require('../Admin/AdminSettingsDomains.js'),
AdminSettingsSecurity = require('../Admin/AdminSettingsSecurity.js'),
AdminSettingsSocial = require('../Admin/AdminSettingsSocial.js'),
AdminSettingsPlugins = require('../Admin/AdminSettingsPlugins.js'),
AdminSettingsPackages = require('../Admin/AdminSettingsPackages.js'),
AdminSettingsLicensing = require('../Admin/AdminSettingsLicensing.js'),
AdminSettingsAbout = require('../Admin/AdminSettingsAbout.js')
;
kn.addSettingsViewModel(AdminSettingsGeneral,
kn.addSettingsViewModel(require('../Admin/AdminSettingsGeneral.js'),
'AdminSettingsGeneral', 'General', 'general', true);
kn.addSettingsViewModel(AdminSettingsLogin,
kn.addSettingsViewModel(require('../Admin/AdminSettingsLogin.js'),
'AdminSettingsLogin', 'Login', 'login');
if (AppSettings.capa(Enums.Capa.Prem))
{
kn.addSettingsViewModel(AdminSettingsBranding,
kn.addSettingsViewModel(require('../Admin/AdminSettingsBranding.js'),
'AdminSettingsBranding', 'Branding', 'branding');
}
kn.addSettingsViewModel(AdminSettingsContacts,
kn.addSettingsViewModel(require('../Admin/AdminSettingsContacts.js'),
'AdminSettingsContacts', 'Contacts', 'contacts');
kn.addSettingsViewModel(AdminSettingsDomains,
kn.addSettingsViewModel(require('../Admin/AdminSettingsDomains.js'),
'AdminSettingsDomains', 'Domains', 'domains');
kn.addSettingsViewModel(AdminSettingsSecurity,
kn.addSettingsViewModel(require('../Admin/AdminSettingsSecurity.js'),
'AdminSettingsSecurity', 'Security', 'security');
kn.addSettingsViewModel(AdminSettingsSocial,
kn.addSettingsViewModel(require('../Admin/AdminSettingsSocial.js'),
'AdminSettingsSocial', 'Social', 'social');
kn.addSettingsViewModel(AdminSettingsPlugins,
kn.addSettingsViewModel(require('../Admin/AdminSettingsPlugins.js'),
'AdminSettingsPlugins', 'Plugins', 'plugins');
kn.addSettingsViewModel(AdminSettingsPackages,
kn.addSettingsViewModel(require('../Admin/AdminSettingsPackages.js'),
'AdminSettingsPackages', 'Packages', 'packages');
kn.addSettingsViewModel(AdminSettingsLicensing,
kn.addSettingsViewModel(require('../Admin/AdminSettingsLicensing.js'),
'AdminSettingsLicensing', 'Licensing', 'licensing');
kn.addSettingsViewModel(AdminSettingsAbout,
kn.addSettingsViewModel(require('../Admin/AdminSettingsAbout.js'),
'AdminSettingsAbout', 'About', 'about');
return true;

View file

@ -1,7 +1,7 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
@ -59,8 +59,6 @@
this.messagesMoveTrigger = _.debounce(this.messagesMoveTrigger, 500);
var self = this;
window.setInterval(function () {
Events.pub('interval.30s');
}, 30000);
@ -96,7 +94,7 @@
Remote.jsVersion(function (sResult, oData) {
if (Enums.StorageResultType.Success === sResult && oData && !oData.Result)
{
if (window.parent && !!self.settingsGet('InIframe'))
if (window.parent && !!AppSettings.settingsGet('InIframe'))
{
window.parent.location.reload();
}
@ -105,7 +103,7 @@
window.location.reload();
}
}
}, self.settingsGet('Version'));
}, AppSettings.settingsGet('Version'));
}, {}, 60 * 60 * 1000);
@ -127,56 +125,41 @@
RainLoopApp.prototype.setupSettings = function ()
{
var
SettingsGeneral = require('../Settings/SettingsGeneral.js'),
SettingsContacts = require('../Settings/SettingsContacts.js'),
SettingsAccounts = require('../Settings/SettingsAccounts.js'),
SettingsIdentity = require('../Settings/SettingsIdentity.js'),
SettingsIdentities = require('../Settings/SettingsIdentities.js'),
SettingsFilters = require('../Settings/SettingsFilters.js'),
SettingsSecurity = require('../Settings/SettingsSecurity.js'),
SettingsSocial = require('../Settings/SettingsSocial.js'),
SettingsChangePassword = require('../Settings/SettingsChangePassword.js'),
SettingsFolders = require('../Settings/SettingsFolders.js'),
SettingsThemes = require('../Settings/SettingsThemes.js'),
SettingsOpenPGP = require('../Settings/SettingsOpenPGP.js')
;
kn.addSettingsViewModel(SettingsGeneral,
kn.addSettingsViewModel(require('../Settings/SettingsGeneral.js'),
'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
if (AppSettings.settingsGet('ContactsIsAllowed'))
{
kn.addSettingsViewModel(SettingsContacts,
kn.addSettingsViewModel(require('../Settings/SettingsContacts.js'),
'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
}
if (AppSettings.capa(Enums.Capa.AdditionalAccounts))
{
kn.addSettingsViewModel(SettingsAccounts,
kn.addSettingsViewModel(require('../Settings/SettingsAccounts.js'),
'SettingsAccounts', 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME', 'accounts');
}
if (AppSettings.capa(Enums.Capa.AdditionalIdentities))
{
kn.addSettingsViewModel(SettingsIdentities,
kn.addSettingsViewModel(require('../Settings/SettingsIdentities.js'),
'SettingsIdentities', 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'identities');
}
else
{
kn.addSettingsViewModel(SettingsIdentity,
kn.addSettingsViewModel(require('../Settings/SettingsIdentity.js'),
'SettingsIdentity', 'SETTINGS_LABELS/LABEL_IDENTITY_NAME', 'identity');
}
if (AppSettings.capa(Enums.Capa.Filters))
{
kn.addSettingsViewModel(SettingsFilters,
kn.addSettingsViewModel(require('../Settings/SettingsFilters.js'),
'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
}
if (AppSettings.capa(Enums.Capa.TwoFactor))
{
kn.addSettingsViewModel(SettingsSecurity,
kn.addSettingsViewModel(require('../Settings/SettingsSecurity.js'),
'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
}
@ -184,28 +167,28 @@
AppSettings.settingsGet('AllowFacebookSocial') ||
AppSettings.settingsGet('AllowTwitterSocial'))
{
kn.addSettingsViewModel(SettingsSocial,
kn.addSettingsViewModel(require('../Settings/SettingsSocial.js'),
'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
}
if (AppSettings.settingsGet('ChangePasswordIsAllowed'))
{
kn.addSettingsViewModel(SettingsChangePassword,
kn.addSettingsViewModel(require('../Settings/SettingsChangePassword.js'),
'SettingsChangePassword', 'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME', 'change-password');
}
kn.addSettingsViewModel(SettingsFolders,
kn.addSettingsViewModel(require('../Settings/SettingsFolders.js'),
'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
if (AppSettings.capa(Enums.Capa.Themes))
{
kn.addSettingsViewModel(SettingsThemes,
kn.addSettingsViewModel(require('../Settings/SettingsThemes.js'),
'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
}
if (AppSettings.capa(Enums.Capa.OpenPGP))
{
kn.addSettingsViewModel(SettingsOpenPGP,
kn.addSettingsViewModel(require('../Settings/SettingsOpenPGP.js'),
'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
}

View file

@ -11,7 +11,8 @@
__data: null
},
_ = require('_'),
Utils = require('Utils')
Utils = require('Utils'),
AppSettings = require('../Storages/AppSettings.js')
;
/**
@ -75,12 +76,7 @@
*/
Plugins.mainSettingsGet = function (sName)
{
if (Plugins.__boot)
{
return Plugins.__boot.settingsGet(sName);
}
return null;
return AppSettings.settingsGet(sName);
};
/**
@ -106,8 +102,8 @@
*/
Plugins.settingsGet = function (sPluginSection, sName)
{
var oPlugin = Plugins.mainSettingsGet('Plugins');
oPlugin = oPlugin && Utils.isUnd(oPlugin[sPluginSection]) ? null : oPlugin[sPluginSection];
var oPlugin = AppSettings.settingsGet('Plugins');
oPlugin = oPlugin && !Utils.isUnd(oPlugin[sPluginSection]) ? oPlugin[sPluginSection] : null;
return oPlugin ? (Utils.isUnd(oPlugin[sName]) ? null : oPlugin[sName]) : null;
};

View file

@ -1 +1 @@
Plugin which allows you to set up custom username by email address
Plugin which allows you to set up custom username (login) by email address

View file

@ -637,7 +637,7 @@
border-radius: 8px;
}
/*! normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */
/* =============================================================================
@ -1142,7 +1142,7 @@ table {
border-collapse: collapse;
border-spacing: 0;
}
@charset "UTF-8";
@font-face {
@ -1513,7 +1513,7 @@ table {
.icon-resize-out:before {
content: "\e06d";
}
/** initial setup **/
.nano {
/*
@ -1630,7 +1630,7 @@ table {
.nano > .pane2:hover > .slider2, .nano > .pane2.active > .slider2 {
background-color: rgba(0, 0, 0, 0.4);
}
/* Magnific Popup CSS */
.mfp-bg {
top: 0;
@ -1995,7 +1995,7 @@ img.mfp-img {
right: 0;
padding-top: 0; }
/* overlay at start */
.mfp-fade.mfp-bg {
@ -2041,7 +2041,7 @@ img.mfp-img {
-moz-transform: translateX(50px);
transform: translateX(50px);
}
.simple-pace {
-webkit-pointer-events: none;
pointer-events: none;
@ -2112,7 +2112,7 @@ img.mfp-img {
@keyframes simple-pace-stripe-animation {
0% { transform: none; transform: none; }
100% { transform: translate(-32px, 0); transform: translate(-32px, 0); }
}
}
.inputosaurus-container {
background-color:#fff;
border:1px solid #bcbec0;
@ -2180,7 +2180,7 @@ img.mfp-img {
box-shadow:none;
}
.inputosaurus-input-hidden { display:none; }
.flag-wrapper {
width: 24px;
height: 16px;
@ -2226,7 +2226,7 @@ img.mfp-img {
.flag.flag-pt-br {background-position: -192px -11px}
.flag.flag-cn, .flag.flag-zh-tw, .flag.flag-zh-cn, .flag.flag-zh-hk {background-position: -208px -22px}
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
.clearfix {
*zoom: 1;

File diff suppressed because one or more lines are too long

View file

@ -1641,7 +1641,7 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
@ -1688,54 +1688,40 @@
AdminApp.prototype.setupSettings = function ()
{
var
AdminSettingsGeneral = require('../Admin/AdminSettingsGeneral.js'),
AdminSettingsLogin = require('../Admin/AdminSettingsLogin.js'),
AdminSettingsBranding = require('../Admin/AdminSettingsBranding.js'),
AdminSettingsContacts = require('../Admin/AdminSettingsContacts.js'),
AdminSettingsDomains = require('../Admin/AdminSettingsDomains.js'),
AdminSettingsSecurity = require('../Admin/AdminSettingsSecurity.js'),
AdminSettingsSocial = require('../Admin/AdminSettingsSocial.js'),
AdminSettingsPlugins = require('../Admin/AdminSettingsPlugins.js'),
AdminSettingsPackages = require('../Admin/AdminSettingsPackages.js'),
AdminSettingsLicensing = require('../Admin/AdminSettingsLicensing.js'),
AdminSettingsAbout = require('../Admin/AdminSettingsAbout.js')
;
kn.addSettingsViewModel(AdminSettingsGeneral,
kn.addSettingsViewModel(require('../Admin/AdminSettingsGeneral.js'),
'AdminSettingsGeneral', 'General', 'general', true);
kn.addSettingsViewModel(AdminSettingsLogin,
kn.addSettingsViewModel(require('../Admin/AdminSettingsLogin.js'),
'AdminSettingsLogin', 'Login', 'login');
if (AppSettings.capa(Enums.Capa.Prem))
{
kn.addSettingsViewModel(AdminSettingsBranding,
kn.addSettingsViewModel(require('../Admin/AdminSettingsBranding.js'),
'AdminSettingsBranding', 'Branding', 'branding');
}
kn.addSettingsViewModel(AdminSettingsContacts,
kn.addSettingsViewModel(require('../Admin/AdminSettingsContacts.js'),
'AdminSettingsContacts', 'Contacts', 'contacts');
kn.addSettingsViewModel(AdminSettingsDomains,
kn.addSettingsViewModel(require('../Admin/AdminSettingsDomains.js'),
'AdminSettingsDomains', 'Domains', 'domains');
kn.addSettingsViewModel(AdminSettingsSecurity,
kn.addSettingsViewModel(require('../Admin/AdminSettingsSecurity.js'),
'AdminSettingsSecurity', 'Security', 'security');
kn.addSettingsViewModel(AdminSettingsSocial,
kn.addSettingsViewModel(require('../Admin/AdminSettingsSocial.js'),
'AdminSettingsSocial', 'Social', 'social');
kn.addSettingsViewModel(AdminSettingsPlugins,
kn.addSettingsViewModel(require('../Admin/AdminSettingsPlugins.js'),
'AdminSettingsPlugins', 'Plugins', 'plugins');
kn.addSettingsViewModel(AdminSettingsPackages,
kn.addSettingsViewModel(require('../Admin/AdminSettingsPackages.js'),
'AdminSettingsPackages', 'Packages', 'packages');
kn.addSettingsViewModel(AdminSettingsLicensing,
kn.addSettingsViewModel(require('../Admin/AdminSettingsLicensing.js'),
'AdminSettingsLicensing', 'Licensing', 'licensing');
kn.addSettingsViewModel(AdminSettingsAbout,
kn.addSettingsViewModel(require('../Admin/AdminSettingsAbout.js'),
'AdminSettingsAbout', 'About', 'about');
return true;
@ -3307,7 +3293,8 @@
__data: null
},
_ = require('_'),
Utils = require('Utils')
Utils = require('Utils'),
AppSettings = require('../Storages/AppSettings.js')
;
/**
@ -3371,12 +3358,7 @@
*/
Plugins.mainSettingsGet = function (sName)
{
if (Plugins.__boot)
{
return Plugins.__boot.settingsGet(sName);
}
return null;
return AppSettings.settingsGet(sName);
};
/**
@ -3402,15 +3384,15 @@
*/
Plugins.settingsGet = function (sPluginSection, sName)
{
var oPlugin = Plugins.mainSettingsGet('Plugins');
oPlugin = oPlugin && Utils.isUnd(oPlugin[sPluginSection]) ? null : oPlugin[sPluginSection];
var oPlugin = AppSettings.settingsGet('Plugins');
oPlugin = oPlugin && !Utils.isUnd(oPlugin[sPluginSection]) ? oPlugin[sPluginSection] : null;
return oPlugin ? (Utils.isUnd(oPlugin[sName]) ? null : oPlugin[sName]) : null;
};
module.exports = Plugins;
}(module, require));
},{"Utils":22,"_":37}],22:[function(require,module,exports){
},{"../Storages/AppSettings.js":54,"Utils":22,"_":37}],22:[function(require,module,exports){
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {

File diff suppressed because one or more lines are too long

View file

@ -363,7 +363,7 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
@ -421,8 +421,6 @@
this.messagesMoveTrigger = _.debounce(this.messagesMoveTrigger, 500);
var self = this;
window.setInterval(function () {
Events.pub('interval.30s');
}, 30000);
@ -458,7 +456,7 @@
Remote.jsVersion(function (sResult, oData) {
if (Enums.StorageResultType.Success === sResult && oData && !oData.Result)
{
if (window.parent && !!self.settingsGet('InIframe'))
if (window.parent && !!AppSettings.settingsGet('InIframe'))
{
window.parent.location.reload();
}
@ -467,7 +465,7 @@
window.location.reload();
}
}
}, self.settingsGet('Version'));
}, AppSettings.settingsGet('Version'));
}, {}, 60 * 60 * 1000);
@ -489,56 +487,41 @@
RainLoopApp.prototype.setupSettings = function ()
{
var
SettingsGeneral = require('../Settings/SettingsGeneral.js'),
SettingsContacts = require('../Settings/SettingsContacts.js'),
SettingsAccounts = require('../Settings/SettingsAccounts.js'),
SettingsIdentity = require('../Settings/SettingsIdentity.js'),
SettingsIdentities = require('../Settings/SettingsIdentities.js'),
SettingsFilters = require('../Settings/SettingsFilters.js'),
SettingsSecurity = require('../Settings/SettingsSecurity.js'),
SettingsSocial = require('../Settings/SettingsSocial.js'),
SettingsChangePassword = require('../Settings/SettingsChangePassword.js'),
SettingsFolders = require('../Settings/SettingsFolders.js'),
SettingsThemes = require('../Settings/SettingsThemes.js'),
SettingsOpenPGP = require('../Settings/SettingsOpenPGP.js')
;
kn.addSettingsViewModel(SettingsGeneral,
kn.addSettingsViewModel(require('../Settings/SettingsGeneral.js'),
'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
if (AppSettings.settingsGet('ContactsIsAllowed'))
{
kn.addSettingsViewModel(SettingsContacts,
kn.addSettingsViewModel(require('../Settings/SettingsContacts.js'),
'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
}
if (AppSettings.capa(Enums.Capa.AdditionalAccounts))
{
kn.addSettingsViewModel(SettingsAccounts,
kn.addSettingsViewModel(require('../Settings/SettingsAccounts.js'),
'SettingsAccounts', 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME', 'accounts');
}
if (AppSettings.capa(Enums.Capa.AdditionalIdentities))
{
kn.addSettingsViewModel(SettingsIdentities,
kn.addSettingsViewModel(require('../Settings/SettingsIdentities.js'),
'SettingsIdentities', 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'identities');
}
else
{
kn.addSettingsViewModel(SettingsIdentity,
kn.addSettingsViewModel(require('../Settings/SettingsIdentity.js'),
'SettingsIdentity', 'SETTINGS_LABELS/LABEL_IDENTITY_NAME', 'identity');
}
if (AppSettings.capa(Enums.Capa.Filters))
{
kn.addSettingsViewModel(SettingsFilters,
kn.addSettingsViewModel(require('../Settings/SettingsFilters.js'),
'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
}
if (AppSettings.capa(Enums.Capa.TwoFactor))
{
kn.addSettingsViewModel(SettingsSecurity,
kn.addSettingsViewModel(require('../Settings/SettingsSecurity.js'),
'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
}
@ -546,28 +529,28 @@
AppSettings.settingsGet('AllowFacebookSocial') ||
AppSettings.settingsGet('AllowTwitterSocial'))
{
kn.addSettingsViewModel(SettingsSocial,
kn.addSettingsViewModel(require('../Settings/SettingsSocial.js'),
'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
}
if (AppSettings.settingsGet('ChangePasswordIsAllowed'))
{
kn.addSettingsViewModel(SettingsChangePassword,
kn.addSettingsViewModel(require('../Settings/SettingsChangePassword.js'),
'SettingsChangePassword', 'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME', 'change-password');
}
kn.addSettingsViewModel(SettingsFolders,
kn.addSettingsViewModel(require('../Settings/SettingsFolders.js'),
'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
if (AppSettings.capa(Enums.Capa.Themes))
{
kn.addSettingsViewModel(SettingsThemes,
kn.addSettingsViewModel(require('../Settings/SettingsThemes.js'),
'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
}
if (AppSettings.capa(Enums.Capa.OpenPGP))
{
kn.addSettingsViewModel(SettingsOpenPGP,
kn.addSettingsViewModel(require('../Settings/SettingsOpenPGP.js'),
'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
}
@ -3651,7 +3634,8 @@
__data: null
},
_ = require('_'),
Utils = require('Utils')
Utils = require('Utils'),
AppSettings = require('../Storages/AppSettings.js')
;
/**
@ -3715,12 +3699,7 @@
*/
Plugins.mainSettingsGet = function (sName)
{
if (Plugins.__boot)
{
return Plugins.__boot.settingsGet(sName);
}
return null;
return AppSettings.settingsGet(sName);
};
/**
@ -3746,15 +3725,15 @@
*/
Plugins.settingsGet = function (sPluginSection, sName)
{
var oPlugin = Plugins.mainSettingsGet('Plugins');
oPlugin = oPlugin && Utils.isUnd(oPlugin[sPluginSection]) ? null : oPlugin[sPluginSection];
var oPlugin = AppSettings.settingsGet('Plugins');
oPlugin = oPlugin && !Utils.isUnd(oPlugin[sPluginSection]) ? oPlugin[sPluginSection] : null;
return oPlugin ? (Utils.isUnd(oPlugin[sName]) ? null : oPlugin[sName]) : null;
};
module.exports = Plugins;
}(module, require));
},{"Utils":14,"_":31}],13:[function(require,module,exports){
},{"../Storages/AppSettings.js":68,"Utils":14,"_":31}],13:[function(require,module,exports){
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long