From b4f416b6f879613c5683288352d2500a1f5f25cf Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Wed, 27 Aug 2014 19:59:44 +0400 Subject: [PATCH] Code refactoring --- dev/Admin.js | 2 +- dev/Apps/AbstractApp.js | 18 +- dev/Apps/AdminApp.js | 42 +- dev/Apps/RainLoopApp.js | 220 +- dev/Boot.js | 11 +- ...{NewHtmlEditorWrapper.js => HtmlEditor.js} | 38 +- dev/Common/LinkBuilder.js | 16 +- dev/Common/Plugins.js | 6 +- dev/Common/Utils.js | 6 +- dev/External/{$window.js => $win.js} | 0 dev/External/ko.js | 8 +- dev/Knoin/Knoin.js | 10 +- dev/Knoin/KnoinAbstractViewModel.js | 4 +- dev/Models/FilterModel.js | 2 +- dev/Models/FolderModel.js | 11 +- dev/Models/MessageModel.js | 22 +- dev/RainLoop.js | 2 +- dev/Screens/AboutScreen.js | 32 + dev/Screens/AbstractSettings.js | 4 +- dev/Screens/AdminLoginScreen.js | 10 +- dev/Screens/AdminSettingsScreen.js | 14 +- dev/Screens/LoginScreen.js | 10 +- dev/Screens/MailBoxScreen.js | 42 +- dev/Screens/SettingsScreen.js | 27 +- dev/Settings/Admin/AdminSettingsAbout.js | 12 +- dev/Settings/Admin/AdminSettingsBranding.js | 14 +- dev/Settings/Admin/AdminSettingsContacts.js | 28 +- dev/Settings/Admin/AdminSettingsDomains.js | 14 +- dev/Settings/Admin/AdminSettingsGeneral.js | 16 +- dev/Settings/Admin/AdminSettingsLicensing.js | 16 +- dev/Settings/Admin/AdminSettingsLogin.js | 8 +- dev/Settings/Admin/AdminSettingsPackages.js | 8 +- dev/Settings/Admin/AdminSettingsPlugins.js | 16 +- dev/Settings/Admin/AdminSettingsSecurity.js | 14 +- dev/Settings/Admin/AdminSettingsSocial.js | 4 +- dev/Settings/App/SettingsAccounts.js | 13 +- dev/Settings/App/SettingsChangePassword.js | 2 +- dev/Settings/App/SettingsContacts.js | 4 +- dev/Settings/App/SettingsFilters.js | 7 +- dev/Settings/App/SettingsFolders.js | 27 +- dev/Settings/App/SettingsGeneral.js | 9 +- dev/Settings/App/SettingsIdentities.js | 18 +- dev/Settings/App/SettingsIdentity.js | 8 +- dev/Settings/App/SettingsOpenPGP.js | 19 +- dev/Settings/App/SettingsSecurity.js | 7 +- dev/Settings/App/SettingsSocial.js | 15 +- dev/Settings/App/SettingsThemes.js | 4 +- dev/Storages/AbstractData.js | 76 +- ...oteStorage.js => AbstractRemoteStorage.js} | 27 +- dev/Storages/AdminDataStorage.js | 2 +- ...RemoteStorage.js => AdminRemoteStorage.js} | 58 +- ...WebMailCacheStorage.js => CacheStorage.js} | 74 +- .../{WebMailDataStorage.js => DataStorage.js} | 78 +- dev/Storages/LocalStorage.js | 14 +- ...lAjaxRemoteStorage.js => RemoteStorage.js} | 136 +- .../{AppSettings.js => SettingsStorage.js} | 26 +- dev/Styles/Login.less | 8 - dev/Styles/_End.less | 8 + dev/ViewModels/AboutViewModel.js | 33 + .../AbstractSystemDropDownViewModel.js | 26 +- dev/ViewModels/AdminLoginViewModel.js | 9 +- ...Model.js => AdminSettingsMenuViewModel.js} | 4 +- ...Model.js => AdminSettingsPaneViewModel.js} | 17 +- dev/ViewModels/LoginViewModel.js | 41 +- dev/ViewModels/MailBoxFolderListViewModel.js | 37 +- dev/ViewModels/MailBoxMessageListViewModel.js | 70 +- dev/ViewModels/MailBoxMessageViewViewModel.js | 42 +- .../MailBoxSystemDropDownViewModel.js | 4 +- .../Popups/PopupsActivateViewModel.js | 12 +- .../Popups/PopupsAddAccountViewModel.js | 10 +- .../Popups/PopupsAddOpenPgpKeyViewModel.js | 10 +- .../Popups/PopupsAdvancedSearchViewModel.js | 6 +- dev/ViewModels/Popups/PopupsAskViewModel.js | 4 +- .../Popups/PopupsComposeOpenPgpViewModel.js | 8 +- .../Popups/PopupsComposeViewModel.js | 72 +- .../Popups/PopupsContactsViewModel.js | 39 +- .../Popups/PopupsDomainViewModel.js | 10 +- .../Popups/PopupsFilterViewModel.js | 6 +- .../Popups/PopupsFolderClearViewModel.js | 14 +- .../Popups/PopupsFolderCreateViewModel.js | 11 +- .../Popups/PopupsFolderSystemViewModel.js | 30 +- .../Popups/PopupsIdentityViewModel.js | 12 +- .../PopupsKeyboardShortcutsHelpViewModel.js | 4 +- .../Popups/PopupsLanguagesViewModel.js | 6 +- ...del.js => PopupsNewOpenPgpKeyViewModel.js} | 24 +- .../Popups/PopupsPluginViewModel.js | 14 +- .../Popups/PopupsTwoFactorTestViewModel.js | 6 +- .../Popups/PopupsViewOpenPgpKeyViewModel.js | 4 +- dev/ViewModels/SettingsMenuViewModel.js | 4 +- dev/ViewModels/SettingsPaneViewModel.js | 6 +- .../SettingsSystemDropDownViewModel.js | 4 +- package.json | 119 +- .../0.0.0/app/templates/Views/App/About.html | 8 + ...enPgpKey.html => PopupsNewOpenPgpKey.html} | 0 rainloop/v/0.0.0/langs/en.ini | 6 +- rainloop/v/0.0.0/langs/hu.ini | 6 +- rainloop/v/0.0.0/langs/ja-jp.ini | 6 +- rainloop/v/0.0.0/langs/sk.ini | 6 +- rainloop/v/0.0.0/langs/zh-cn.ini | 6 +- rainloop/v/0.0.0/static/css/app.css | 15 +- rainloop/v/0.0.0/static/css/app.min.css | 2 +- rainloop/v/0.0.0/static/js/admin.js | 1926 ++++--- rainloop/v/0.0.0/static/js/admin.min.js | 12 +- rainloop/v/0.0.0/static/js/app.js | 4592 ++++++++--------- rainloop/v/0.0.0/static/js/app.min.js | 20 +- 105 files changed, 4331 insertions(+), 4339 deletions(-) rename dev/Common/{NewHtmlEditorWrapper.js => HtmlEditor.js} (79%) rename dev/External/{$window.js => $win.js} (100%) create mode 100644 dev/Screens/AboutScreen.js rename dev/Storages/{AbstractAjaxRemoteStorage.js => AbstractRemoteStorage.js} (86%) rename dev/Storages/{AdminAjaxRemoteStorage.js => AdminRemoteStorage.js} (67%) rename dev/Storages/{WebMailCacheStorage.js => CacheStorage.js} (69%) rename dev/Storages/{WebMailDataStorage.js => DataStorage.js} (90%) rename dev/Storages/{WebMailAjaxRemoteStorage.js => RemoteStorage.js} (73%) rename dev/Storages/{AppSettings.js => SettingsStorage.js} (55%) create mode 100644 dev/ViewModels/AboutViewModel.js rename dev/ViewModels/{AdminMenuViewModel.js => AdminSettingsMenuViewModel.js} (88%) rename dev/ViewModels/{AdminPaneViewModel.js => AdminSettingsPaneViewModel.js} (57%) rename dev/ViewModels/Popups/{PopupsGenerateNewOpenPgpKeyViewModel.js => PopupsNewOpenPgpKeyViewModel.js} (73%) create mode 100644 rainloop/v/0.0.0/app/templates/Views/App/About.html rename rainloop/v/0.0.0/app/templates/Views/App/{PopupsGenerateNewOpenPgpKey.html => PopupsNewOpenPgpKey.html} (100%) diff --git a/dev/Admin.js b/dev/Admin.js index b377e12d3..c93c2d143 100644 --- a/dev/Admin.js +++ b/dev/Admin.js @@ -2,5 +2,5 @@ (function (require) { 'use strict'; - require('./Boot.js')(require('./Apps/AdminApp.js')); + require('App:Boot')(require('App:Admin')); }(require)); \ No newline at end of file diff --git a/dev/Apps/AbstractApp.js b/dev/Apps/AbstractApp.js index a7babf9bc..37b26e91e 100644 --- a/dev/Apps/AbstractApp.js +++ b/dev/Apps/AbstractApp.js @@ -9,7 +9,7 @@ _ = require('_'), window = require('window'), $html = require('$html'), - $window = require('$window'), + $win = require('$win'), $doc = require('$doc'), Globals = require('Globals'), @@ -17,9 +17,9 @@ LinkBuilder = require('LinkBuilder'), Events = require('Events'), - AppSettings = require('../Storages/AppSettings.js'), + Settings = require('Storage:Settings'), - KnoinAbstractBoot = require('KnoinAbstractBoot') + KnoinAbstractBoot = require('Knoin:AbstractBoot') ; /** @@ -35,7 +35,7 @@ this.iframe = $('