From 06bb124379121b133c52d578035e74cffc095581 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Fri, 22 Aug 2014 19:08:56 +0400 Subject: [PATCH] CommonJS (research/3) --- dev/Admin/AdminSettingsAbout.js | 10 +- dev/Admin/AdminSettingsBranding.js | 16 +- dev/Admin/AdminSettingsContacts.js | 27 +- dev/Admin/AdminSettingsDomains.js | 4 +- dev/Admin/AdminSettingsGeneral.js | 9 +- dev/Admin/AdminSettingsLicensing.js | 9 +- dev/Admin/AdminSettingsLogin.js | 5 +- dev/Admin/AdminSettingsPackages.js | 4 +- dev/Admin/AdminSettingsPlugins.js | 7 +- dev/Admin/AdminSettingsSecurity.js | 9 +- dev/Admin/AdminSettingsSocial.js | 2 - dev/AdminBoot.js | 11 - dev/Boots/AbstractApp.js | 146 +- dev/Boots/AdminApp.js | 115 +- dev/Boots/Boot.js | 77 + dev/Boots/RainLoopApp.js | 843 +- dev/Common/Events.js | 66 + dev/Common/Globals.js | 100 +- dev/Common/LinkBuilder.js | 9 +- dev/Common/NewHtmlEditorWrapper.js | 7 +- dev/Common/Plugins.js | 22 +- dev/Common/Utils.js | 311 +- dev/External/NotificationClass.js | 5 +- dev/External/ko.js | 156 +- dev/External/underscore.js | 2 +- dev/Knoin/Knoin.js | 129 +- dev/Knoin/KnoinAbstractViewModel.js | 15 +- dev/Models/AttachmentModel.js | 4 +- dev/Models/FolderModel.js | 43 +- dev/Models/MessageModel.js | 40 +- dev/RainLoopBoot.js | 11 - dev/Screens/AbstractSettings.js | 3 +- .../{AdminLogin.js => AdminLoginScreen.js} | 7 +- ...dminSettings.js => AdminSettingsScreen.js} | 12 +- dev/Screens/{Login.js => LoginScreen.js} | 7 +- dev/Screens/{MailBox.js => MailBoxScreen.js} | 71 +- .../{Settings.js => SettingsScreen.js} | 24 +- dev/Settings/SettingsAccounts.js | 10 +- dev/Settings/SettingsChangePassword.js | 2 - dev/Settings/SettingsContacts.js | 22 +- dev/Settings/SettingsFilters.js | 3 +- dev/Settings/SettingsFolders.js | 45 +- dev/Settings/SettingsGeneral.js | 65 +- dev/Settings/SettingsIdentities.js | 39 +- dev/Settings/SettingsIdentity.js | 27 +- dev/Settings/SettingsOpenPGP.js | 21 +- dev/Settings/SettingsSecurity.js | 4 +- dev/Settings/SettingsSocial.js | 34 +- dev/Settings/SettingsThemes.js | 18 +- dev/Storages/AbstractAjaxRemoteStorage.js | 14 +- dev/Storages/AbstractData.js | 137 +- dev/Storages/AdminAjaxRemoteStorage.js | 1 + dev/Storages/AppSettings.js | 64 + dev/Storages/LocalStorage.js | 1 + dev/Storages/WebMailAjaxRemoteStorage.js | 39 +- dev/Storages/WebMailCacheStorage.js | 4 +- dev/Storages/WebMailDataStorage.js | 370 +- .../AbstractSystemDropDownViewModel.js | 23 +- dev/ViewModels/AdminLoginViewModel.js | 4 +- dev/ViewModels/AdminMenuViewModel.js | 7 +- dev/ViewModels/AdminPaneViewModel.js | 12 +- dev/ViewModels/LoginViewModel.js | 55 +- dev/ViewModels/MailBoxFolderListViewModel.js | 38 +- dev/ViewModels/MailBoxMessageListViewModel.js | 197 +- dev/ViewModels/MailBoxMessageViewViewModel.js | 100 +- .../Popups/PopupsActivateViewModel.js | 5 +- .../Popups/PopupsAddAccountViewModel.js | 4 +- .../Popups/PopupsAddOpenPgpKeyViewModel.js | 4 +- .../Popups/PopupsAdvancedSearchViewModel.js | 2 +- dev/ViewModels/Popups/PopupsAskViewModel.js | 2 +- .../Popups/PopupsComposeOpenPgpViewModel.js | 2 +- .../Popups/PopupsComposeViewModel.js | 46 +- .../Popups/PopupsContactsViewModel.js | 18 +- .../Popups/PopupsDomainViewModel.js | 4 +- ...rViewModel.js => PopupsFilterViewModel.js} | 7 +- .../Popups/PopupsFolderClearViewModel.js | 4 +- .../Popups/PopupsFolderCreateViewModel.js | 6 +- .../Popups/PopupsFolderSystemViewModel.js | 27 +- .../PopupsGenerateNewOpenPgpKeyViewModel.js | 4 +- .../Popups/PopupsIdentityViewModel.js | 4 +- .../PopupsKeyboardShortcutsHelpViewModel.js | 2 +- .../Popups/PopupsLanguagesViewModel.js | 2 +- .../Popups/PopupsPluginViewModel.js | 2 +- .../Popups/PopupsTwoFactorTestViewModel.js | 2 +- .../Popups/PopupsViewOpenPgpKeyViewModel.js | 2 +- dev/ViewModels/SettingsMenuViewModel.js | 5 +- .../SettingsSystemDropDownViewModel.js | 2 +- dev/{RL.js => _AdminBoot.js} | 13 +- dev/{Remote.js => _RainLoopBoot.js} | 13 +- gulpfile.js | 11 +- package.json | 1 + .../templates/Views/App/PopupsCompose.html | 8 +- .../templates/Views/App/PopupsContacts.html | 2 +- rainloop/v/0.0.0/static/js/_app.js | 21415 ++++++++ rainloop/v/0.0.0/static/js/_app.min.js | 11 + rainloop/v/0.0.0/static/js/admin.js | 15112 +++--- rainloop/v/0.0.0/static/js/app.js | 41757 ++++++++-------- rainloop/v/0.0.0/static/js/app.min.js | 21 +- rainloop/v/0.0.0/static/js/bro.js | 11784 ----- 99 files changed, 51037 insertions(+), 42961 deletions(-) delete mode 100644 dev/AdminBoot.js create mode 100644 dev/Boots/Boot.js create mode 100644 dev/Common/Events.js delete mode 100644 dev/RainLoopBoot.js rename dev/Screens/{AdminLogin.js => AdminLoginScreen.js} (79%) rename dev/Screens/{AdminSettings.js => AdminSettingsScreen.js} (65%) rename dev/Screens/{Login.js => LoginScreen.js} (79%) rename dev/Screens/{MailBox.js => MailBoxScreen.js} (64%) rename dev/Screens/{Settings.js => SettingsScreen.js} (56%) create mode 100644 dev/Storages/AppSettings.js rename dev/ViewModels/Popups/{PopupsFiterViewModel.js => PopupsFilterViewModel.js} (90%) rename dev/{RL.js => _AdminBoot.js} (52%) rename dev/{Remote.js => _RainLoopBoot.js} (51%) create mode 100644 rainloop/v/0.0.0/static/js/_app.js create mode 100644 rainloop/v/0.0.0/static/js/_app.min.js delete mode 100644 rainloop/v/0.0.0/static/js/bro.js diff --git a/dev/Admin/AdminSettingsAbout.js b/dev/Admin/AdminSettingsAbout.js index fbb267840..8a4311508 100644 --- a/dev/Admin/AdminSettingsAbout.js +++ b/dev/Admin/AdminSettingsAbout.js @@ -6,7 +6,9 @@ var ko = require('../External/ko.js'), - Data = require('../Storages/AdminDataStorage.js') + AppSettings = require('../Storages/AppSettings.js'), + Data = require('../Storages/AdminDataStorage.js'), + RL = require('../Boots/AdminApp.js') ; /** @@ -14,8 +16,8 @@ */ function AdminSettingsAbout() { - this.version = ko.observable(RL.settingsGet('Version')); - this.access = ko.observable(!!RL.settingsGet('CoreAccess')); + this.version = ko.observable(AppSettings.settingsGet('Version')); + this.access = ko.observable(!!AppSettings.settingsGet('CoreAccess')); this.errorDesc = ko.observable(''); this.coreReal = Data.coreReal; @@ -64,8 +66,6 @@ }, this); } - kn.addSettingsViewModel(AdminSettingsAbout, 'AdminSettingsAbout', 'About', 'about'); - AdminSettingsAbout.prototype.onBuild = function () { if (this.access()) diff --git a/dev/Admin/AdminSettingsBranding.js b/dev/Admin/AdminSettingsBranding.js index 7c9c76c92..21bb254e4 100644 --- a/dev/Admin/AdminSettingsBranding.js +++ b/dev/Admin/AdminSettingsBranding.js @@ -7,9 +7,11 @@ var _ = require('../External/underscore.js'), ko = require('../External/ko.js'), + Enums = require('../Common/Enums.js'), Utils = require('../Common/Utils.js'), - kn = require('../Knoin/Knoin.js'), + + AppSettings = require('..Storages/AppSettings.js'), Remote = require('../Storages/AdminAjaxRemoteStorage.js') ; @@ -18,24 +20,22 @@ */ function AdminSettingsBranding() { - this.title = ko.observable(RL.settingsGet('Title')); + this.title = ko.observable(AppSettings.settingsGet('Title')); this.title.trigger = ko.observable(Enums.SaveSettingsStep.Idle); - this.loadingDesc = ko.observable(RL.settingsGet('LoadingDescription')); + this.loadingDesc = ko.observable(AppSettings.settingsGet('LoadingDescription')); this.loadingDesc.trigger = ko.observable(Enums.SaveSettingsStep.Idle); - this.loginLogo = ko.observable(RL.settingsGet('LoginLogo')); + this.loginLogo = ko.observable(AppSettings.settingsGet('LoginLogo')); this.loginLogo.trigger = ko.observable(Enums.SaveSettingsStep.Idle); - this.loginDescription = ko.observable(RL.settingsGet('LoginDescription')); + this.loginDescription = ko.observable(AppSettings.settingsGet('LoginDescription')); this.loginDescription.trigger = ko.observable(Enums.SaveSettingsStep.Idle); - this.loginCss = ko.observable(RL.settingsGet('LoginCss')); + this.loginCss = ko.observable(AppSettings.settingsGet('LoginCss')); this.loginCss.trigger = ko.observable(Enums.SaveSettingsStep.Idle); } - kn.addSettingsViewModel(AdminSettingsBranding, 'AdminSettingsBranding', 'Branding', 'branding'); - AdminSettingsBranding.prototype.onBuild = function () { var self = this; diff --git a/dev/Admin/AdminSettingsContacts.js b/dev/Admin/AdminSettingsContacts.js index e7fe3db41..ad75f4434 100644 --- a/dev/Admin/AdminSettingsContacts.js +++ b/dev/Admin/AdminSettingsContacts.js @@ -7,8 +7,11 @@ var _ = require('../External/underscore.js'), ko = require('../External/ko.js'), + Enums = require('../Common/Enums.js'), Utils = require('../Common/Utils.js'), + + AppSettings = require('../Storages/AppSettings.js'), Remote = require('../Storages/AdminAjaxRemoteStorage.js') ; @@ -18,9 +21,9 @@ function AdminSettingsContacts() { this.defautOptionsAfterRender = Utils.defautOptionsAfterRender; - this.enableContacts = ko.observable(!!RL.settingsGet('ContactsEnable')); - this.contactsSharing = ko.observable(!!RL.settingsGet('ContactsSharing')); - this.contactsSync = ko.observable(!!RL.settingsGet('ContactsSync')); + this.enableContacts = ko.observable(!!AppSettings.settingsGet('ContactsEnable')); + this.contactsSharing = ko.observable(!!AppSettings.settingsGet('ContactsSharing')); + this.contactsSync = ko.observable(!!AppSettings.settingsGet('ContactsSync')); var aTypes = ['sqlite', 'mysql', 'pgsql'], @@ -43,15 +46,15 @@ } ; - if (!!RL.settingsGet('SQLiteIsSupported')) + if (!!AppSettings.settingsGet('SQLiteIsSupported')) { aSupportedTypes.push('sqlite'); } - if (!!RL.settingsGet('MySqlIsSupported')) + if (!!AppSettings.settingsGet('MySqlIsSupported')) { aSupportedTypes.push('mysql'); } - if (!!RL.settingsGet('PostgreSqlIsSupported')) + if (!!AppSettings.settingsGet('PostgreSqlIsSupported')) { aSupportedTypes.push('pgsql'); } @@ -99,9 +102,9 @@ this.testContactsErrorMessage(''); }, this); - this.pdoDsn = ko.observable(RL.settingsGet('ContactsPdoDsn')); - this.pdoUser = ko.observable(RL.settingsGet('ContactsPdoUser')); - this.pdoPassword = ko.observable(RL.settingsGet('ContactsPdoPassword')); + this.pdoDsn = ko.observable(AppSettings.settingsGet('ContactsPdoDsn')); + this.pdoUser = ko.observable(AppSettings.settingsGet('ContactsPdoUser')); + this.pdoPassword = ko.observable(AppSettings.settingsGet('ContactsPdoPassword')); this.pdoDsnTrigger = ko.observable(Enums.SaveSettingsStep.Idle); this.pdoUserTrigger = ko.observable(Enums.SaveSettingsStep.Idle); @@ -131,13 +134,11 @@ return '' !== this.pdoDsn() && '' !== this.pdoUser(); }); - this.contactsType(RL.settingsGet('ContactsPdoType')); + this.contactsType(AppSettings.settingsGet('ContactsPdoType')); this.onTestContactsResponse = _.bind(this.onTestContactsResponse, this); } - kn.addSettingsViewModel(AdminSettingsContacts, 'AdminSettingsContacts', 'Contacts', 'contacts'); - AdminSettingsContacts.prototype.onTestContactsResponse = function (sResult, oData) { this.testContactsSuccess(false); @@ -225,7 +226,7 @@ }); }); - self.contactsType(RL.settingsGet('ContactsPdoType')); + self.contactsType(AppSettings.settingsGet('ContactsPdoType')); }, 50); }; diff --git a/dev/Admin/AdminSettingsDomains.js b/dev/Admin/AdminSettingsDomains.js index c087b78fe..454f3f4f8 100644 --- a/dev/Admin/AdminSettingsDomains.js +++ b/dev/Admin/AdminSettingsDomains.js @@ -11,6 +11,8 @@ Enums = require('../Common/Enums.js'), + RL = require('../Boots/AdminApp.js'), + Data = require('../Storages/AdminDataStorage.js'), Remote = require('../Storages/AdminAjaxRemoteStorage.js') ; @@ -45,8 +47,6 @@ ]}); } - kn.addSettingsViewModel(AdminSettingsDomains, 'AdminSettingsDomains', 'Domains', 'domains'); - AdminSettingsDomains.prototype.startDomainForDeletionTimeout = function () { var self = this; diff --git a/dev/Admin/AdminSettingsGeneral.js b/dev/Admin/AdminSettingsGeneral.js index c8f4d08c7..a310674b0 100644 --- a/dev/Admin/AdminSettingsGeneral.js +++ b/dev/Admin/AdminSettingsGeneral.js @@ -14,6 +14,7 @@ kn = require('../Knoin/Knoin.js'), + AppSettings = require('../Storages/AppSettings.js'), Data = require('../Storages/AdminDataStorage.js'), Remote = require('../Storages/AdminAjaxRemoteStorage.js'), @@ -37,8 +38,8 @@ this.capaAdditionalAccounts = Data.capaAdditionalAccounts; this.capaAdditionalIdentities = Data.capaAdditionalIdentities; - this.mainAttachmentLimit = ko.observable(Utils.pInt(RL.settingsGet('AttachmentLimit')) / (1024 * 1024)).extend({'posInterer': 25}); - this.uploadData = RL.settingsGet('PhpUploadSizes'); + this.mainAttachmentLimit = ko.observable(Utils.pInt(AppSettings.settingsGet('AttachmentLimit')) / (1024 * 1024)).extend({'posInterer': 25}); + this.uploadData = AppSettings.settingsGet('PhpUploadSizes'); this.uploadDataDesc = this.uploadData && (this.uploadData['upload_max_filesize'] || this.uploadData['post_max_size']) ? [ this.uploadData['upload_max_filesize'] ? 'upload_max_filesize = ' + this.uploadData['upload_max_filesize'] + '; ' : '', @@ -59,15 +60,13 @@ return Utils.convertLangName(this.mainLanguage()); }, this); - this.weakPassword = !!RL.settingsGet('WeakPassword'); + this.weakPassword = !!AppSettings.settingsGet('WeakPassword'); this.attachmentLimitTrigger = ko.observable(Enums.SaveSettingsStep.Idle); this.languageTrigger = ko.observable(Enums.SaveSettingsStep.Idle); this.themeTrigger = ko.observable(Enums.SaveSettingsStep.Idle); } - kn.addSettingsViewModel(AdminSettingsGeneral, 'AdminSettingsGeneral', 'General', 'general', true); - AdminSettingsGeneral.prototype.onBuild = function () { var self = this; diff --git a/dev/Admin/AdminSettingsLicensing.js b/dev/Admin/AdminSettingsLicensing.js index 8d6e5ba6b..7fb256cc7 100644 --- a/dev/Admin/AdminSettingsLicensing.js +++ b/dev/Admin/AdminSettingsLicensing.js @@ -8,7 +8,10 @@ ko = require('../External/ko.js'), moment = require('../External/moment.js'), + AppSettings = require('../Storages/AppSettings.js'), Data = require('../Storages/AdminDataStorage.js'), + + RL = require('../Boots/AdminApp.js'), kn = require('../Knoin/Knoin.js'), PopupsActivateViewModel = require('../ViewModels/Popups/PopupsActivateViewModel.js') @@ -27,7 +30,7 @@ this.licenseTrigger = Data.licenseTrigger; this.adminDomain = ko.observable(''); - this.subscriptionEnabled = ko.observable(!!RL.settingsGet('SubscriptionEnabled')); + this.subscriptionEnabled = ko.observable(!!AppSettings.settingsGet('SubscriptionEnabled')); this.licenseTrigger.subscribe(function () { if (this.subscriptionEnabled()) @@ -37,8 +40,6 @@ }, this); } - kn.addSettingsViewModel(AdminSettingsLicensing, 'AdminSettingsLicensing', 'Licensing', 'licensing'); - AdminSettingsLicensing.prototype.onBuild = function () { if (this.subscriptionEnabled()) @@ -49,7 +50,7 @@ AdminSettingsLicensing.prototype.onShow = function () { - this.adminDomain(RL.settingsGet('AdminDomain')); + this.adminDomain(AppSettings.settingsGet('AdminDomain')); }; AdminSettingsLicensing.prototype.showActivationForm = function () diff --git a/dev/Admin/AdminSettingsLogin.js b/dev/Admin/AdminSettingsLogin.js index 9c5791f49..692844a42 100644 --- a/dev/Admin/AdminSettingsLogin.js +++ b/dev/Admin/AdminSettingsLogin.js @@ -10,6 +10,7 @@ Enums = require('../Common/Enums.js'), Utils = require('../Common/Utils.js'), + AppSettings = require('../Storages/AppSettings.js'), Data = require('../Storages/AdminDataStorage.js'), Remote = require('../Storages/AdminAjaxRemoteStorage.js') ; @@ -22,14 +23,12 @@ this.determineUserLanguage = Data.determineUserLanguage; this.determineUserDomain = Data.determineUserDomain; - this.defaultDomain = ko.observable(RL.settingsGet('LoginDefaultDomain')); + this.defaultDomain = ko.observable(AppSettings.settingsGet('LoginDefaultDomain')); this.allowLanguagesOnLogin = Data.allowLanguagesOnLogin; this.defaultDomainTrigger = ko.observable(Enums.SaveSettingsStep.Idle); } - kn.addSettingsViewModel(AdminSettingsLogin, 'AdminSettingsLogin', 'Login', 'login'); - AdminSettingsLogin.prototype.onBuild = function () { var self = this; diff --git a/dev/Admin/AdminSettingsPackages.js b/dev/Admin/AdminSettingsPackages.js index 2460d618d..f7129cb62 100644 --- a/dev/Admin/AdminSettingsPackages.js +++ b/dev/Admin/AdminSettingsPackages.js @@ -11,6 +11,8 @@ Enums = require('../Common/Enums.js'), Utils = require('../Common/Utils.js'), + RL = require('../Boots/AdminApp.js'), + Data = require('../Storages/AdminDataStorage.js'), Remote = require('../Storages/AdminAjaxRemoteStorage.js') ; @@ -44,8 +46,6 @@ }, this); } - kn.addSettingsViewModel(AdminSettingsPackages, 'AdminSettingsPackages', 'Packages', 'packages'); - AdminSettingsPackages.prototype.onShow = function () { this.packagesError(''); diff --git a/dev/Admin/AdminSettingsPlugins.js b/dev/Admin/AdminSettingsPlugins.js index a6ce8c39f..62fcca9ab 100644 --- a/dev/Admin/AdminSettingsPlugins.js +++ b/dev/Admin/AdminSettingsPlugins.js @@ -11,9 +11,12 @@ Enums = require('../Common/Enums.js'), Utils = require('../Common/Utils.js'), + AppSettings = require('../Storages/AppSettings.js'), Data = require('../Storages/AdminDataStorage.js'), Remote = require('../Storages/AdminAjaxRemoteStorage.js'), + RL = require('../Boots/AdminApp.js'), + PopupsPluginViewModel = require('../ViewModels/Popups/PopupsPluginViewModel.js') ; @@ -22,7 +25,7 @@ */ function AdminSettingsPlugins() { - this.enabledPlugins = ko.observable(!!RL.settingsGet('EnabledPlugins')); + this.enabledPlugins = ko.observable(!!AppSettings.settingsGet('EnabledPlugins')); this.pluginsError = ko.observable(''); @@ -37,8 +40,6 @@ this.onPluginDisableRequest = _.bind(this.onPluginDisableRequest, this); } - kn.addSettingsViewModel(AdminSettingsPlugins, 'AdminSettingsPlugins', 'Plugins', 'plugins'); - AdminSettingsPlugins.prototype.disablePlugin = function (oPlugin) { oPlugin.disabled(!oPlugin.disabled()); diff --git a/dev/Admin/AdminSettingsSecurity.js b/dev/Admin/AdminSettingsSecurity.js index 5ddc27106..28dcf956c 100644 --- a/dev/Admin/AdminSettingsSecurity.js +++ b/dev/Admin/AdminSettingsSecurity.js @@ -12,6 +12,7 @@ Utils = require('../Common/Utils.js'), LinkBuilder = require('../Common/LinkBuilder.js'), + AppSettings = require('../Storages/AppSettings.js'), Data = require('../Storages/AdminDataStorage.js'), Remote = require('../Storages/AdminAjaxRemoteStorage.js') ; @@ -23,10 +24,10 @@ { this.useLocalProxyForExternalImages = Data.useLocalProxyForExternalImages; - this.capaOpenPGP = ko.observable(RL.capa(Enums.Capa.OpenPGP)); - this.capaTwoFactorAuth = ko.observable(RL.capa(Enums.Capa.TwoFactor)); + this.capaOpenPGP = ko.observable(AppSettings.capa(Enums.Capa.OpenPGP)); + this.capaTwoFactorAuth = ko.observable(AppSettings.capa(Enums.Capa.TwoFactor)); - this.adminLogin = ko.observable(RL.settingsGet('AdminLogin')); + this.adminLogin = ko.observable(AppSettings.settingsGet('AdminLogin')); this.adminPassword = ko.observable(''); this.adminPasswordNew = ko.observable(''); this.adminPasswordNew2 = ko.observable(''); @@ -75,8 +76,6 @@ this.onNewAdminPasswordResponse = _.bind(this.onNewAdminPasswordResponse, this); } - kn.addSettingsViewModel(AdminSettingsSecurity, 'AdminSettingsSecurity', 'Security', 'security'); - AdminSettingsSecurity.prototype.onNewAdminPasswordResponse = function (sResult, oData) { if (Enums.StorageResultType.Success === sResult && oData && oData.Result) diff --git a/dev/Admin/AdminSettingsSocial.js b/dev/Admin/AdminSettingsSocial.js index 764519bbf..548b81c9d 100644 --- a/dev/Admin/AdminSettingsSocial.js +++ b/dev/Admin/AdminSettingsSocial.js @@ -46,8 +46,6 @@ this.dropboxTrigger1 = ko.observable(Enums.SaveSettingsStep.Idle); } - kn.addSettingsViewModel(AdminSettingsSocial, 'AdminSettingsSocial', 'Social', 'social'); - AdminSettingsSocial.prototype.onBuild = function () { var self = this; diff --git a/dev/AdminBoot.js b/dev/AdminBoot.js deleted file mode 100644 index 3ead2b25f..000000000 --- a/dev/AdminBoot.js +++ /dev/null @@ -1,11 +0,0 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */ - -'use strict'; - -var - kn = require('./Knoin/Knoin.js'), - RL = require('./Boots/AdminApp.js'), - Remote = require('./Storages/AdminAjaxRemoteStorage.js') -; - -kn.bootstart(RL, Remote); \ No newline at end of file diff --git a/dev/Boots/AbstractApp.js b/dev/Boots/AbstractApp.js index 9824d1f36..4bf32ce70 100644 --- a/dev/Boots/AbstractApp.js +++ b/dev/Boots/AbstractApp.js @@ -7,46 +7,33 @@ var $ = require('../External/jquery.js'), _ = require('../External/underscore.js'), - ko = require('../External/ko.js'), window = require('../External/window.js'), $html = require('../External/$html.js'), $window = require('../External/$window.js'), $doc = require('../External/$doc.js'), - AppData = require('../External/AppData.js'), Globals = require('../Common/Globals.js'), Utils = require('../Common/Utils.js'), - Plugins = require('../Common/Plugins.js'), LinkBuilder = require('../Common/LinkBuilder.js'), + Events = require('../Common/Events.js'), - Remote = require('../Remote.js'), + AppSettings = require('../Storages/AppSettings.js'), kn = require('../Knoin/Knoin.js'), KnoinAbstractBoot = require('../Knoin/KnoinAbstractBoot.js') ; /** + * @param {*} Remote * @constructor * @extends KnoinAbstractBoot */ - function AbstractApp() + function AbstractApp(Remote) { KnoinAbstractBoot.call(this); - this.oSettings = null; - this.oPlugins = null; - this.oLocal = null; - this.oLink = null; - this.oSubs = {}; - this.isLocalAutocomplete = true; - this.popupVisibilityNames = ko.observableArray([]); - - this.popupVisibility = ko.computed(function () { - return 0 < this.popupVisibilityNames().length; - }, this); - this.iframe = $('