Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 04:29:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop bootstrap modal.less by using <dialog> <header> and <footer>

Browse source 
https://snappymail.eu/demo/ updated for testing
This commit is contained in:
djmaze 2021-11-07 17:06:08 +01:00
parent 880d4a05e9
commit 6170de5aee
70 changed files with 1521 additions and 1709 deletions
Download patch file Download diff file Expand all files Collapse all files

23
dev/Knoin/AbstractViews.js
View file

@ -2,7 +2,7 @@ import ko from 'ko';
import { inFocus, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'Common/Utils';
import { Scope } from 'Common/Enums';
import { keyScope } from 'Common/Globals';
import { keyScope, Settings } from 'Common/Globals';
import { ViewType } from 'Knoin/Knoin';
class AbstractView {
@ -12,6 +12,7 @@ class AbstractView {
this.viewModelTemplateID = templateID;
this.viewType = type;
this.viewModelDom = null;
this.viewNoUserSelect = false;
this.keyScope = {
scope: Scope.None,
@ -122,3 +123,23 @@ export class AbstractViewSettings
viewModelDom
}
*/
export class AbstractViewLogin extends AbstractViewCenter {
constructor(templateID) {
super(templateID);
this.hideSubmitButton = Settings.app('hideSubmitButton');
this.formError = ko.observable(false).extend({ falseTimeout: 500 });
}
onBuild(dom) {
dom.classList.add('LoginView');
}
onShow() {
rl.route.off();
}
submitForm() {
// return false;
}
}

44
dev/Knoin/Knoin.js
View file

@ -32,21 +32,48 @@ const
let vmDom = null;
const vm = new ViewModelClass(vmScreen),
position = vm.viewType || '',
dialog = ViewType.Popup === position,
vmPlace = position ? doc.getElementById('rl-' + position.toLowerCase()) : null;
ViewModelClass.__builded = true;
ViewModelClass.__vm = vm;
if (vmPlace) {
vmDom = Element.fromHTML('<div class="rl-view-model RL-' + vm.viewModelTemplateID + '" hidden=""></div>');
vmDom = dialog
? Element.fromHTML('<dialog id="V-'+ vm.viewModelTemplateID + '"></dialog>')
: Element.fromHTML('<div id="V-'+ vm.viewModelTemplateID + '" hidden=""></div>');
vmPlace.append(vmDom);
vm.viewModelDom = vmDom;
ViewModelClass.__dom = vmDom;
if (vm.viewNoUserSelect) {
vmDom.classList.add('g-ui-user-select-none');
}
if (ViewType.Popup === position) {
vm.cancelCommand = vm.closeCommand = createCommand(() => hideScreenPopup(ViewModelClass));
// Firefox / Safari HTMLDialogElement not defined
if (!vmDom.showModal) {
vmDom.classList.add('polyfill');
vmDom.showModal = () => {
if (!vmDom.backdrop) {
vmDom.before(vmDom.backdrop = Element.fromHTML('<div class="dialog-backdrop"></div>'));
}
vmDom.setAttribute('open','');
vmDom.open = true;
vmDom.returnValue = null;
vmDom.backdrop.hidden = false;
};
vmDom.close = v => {
vmDom.backdrop.hidden = true;
vmDom.returnValue = v;
vmDom.removeAttribute('open', null);
vmDom.open = false;
};
}
// show/hide popup/modal
const endShowHide = e => {
if (e.target === vmDom) {
@ -54,7 +81,7 @@ const
autofocus(vmDom);
vm.onShowWithDelay && vm.onShowWithDelay();
} else {
vmDom.hidden = true;
vmDom.close();
vm.onHideWithDelay && vm.onHideWithDelay();
}
}
@ -63,10 +90,12 @@ const
vm.modalVisibility.subscribe(value => {
if (value) {
visiblePopups.add(vm);
vmDom.style.zIndex = 3000 + visiblePopups.size + 10;
vmDom.hidden = false;
vmDom.style.zIndex = 3000 + (visiblePopups.size * 2);
vmDom.showModal();
if (vmDom.backdrop) {
vmDom.backdrop.style.zIndex = 3000 + visiblePopups.size;
}
vm.keyScope.set();
arePopupsVisible(true);
requestAnimationFrame(() => { // wait just before the next paint
vmDom.offsetHeight; // force a reflow
vmDom.classList.add('show'); // trigger the transitions
@ -74,11 +103,10 @@ const
} else {
visiblePopups.delete(vm);
vm.onHide && vm.onHide();
vmDom.classList.remove('show');
vm.keyScope.unset();
arePopupsVisible(0 < visiblePopups.size);
vmDom.classList.remove('show'); // trigger the transitions
}
vmDom.setAttribute('aria-hidden', !value);
arePopupsVisible(0 < visiblePopups.size);
/*
// the old ko.bindingHandlers.modal
const close = vmDom.querySelector('.close'),

6
dev/Screen/User/MailBox.js
View file

@ -1,6 +1,6 @@
import { Scope } from 'Common/Enums';
import { Layout, ClientSideKeyName } from 'Common/EnumsUser';
import { doc, leftPanelDisabled, moveAction, Settings } from 'Common/Globals';
import { doc, leftPanelDisabled, moveAction, Settings, elementById } from 'Common/Globals';
import { pString, pInt } from 'Common/Utils';
import { setLayoutResizer } from 'Common/UtilsUser';
import { getFolderFromCacheList, getFolderFullNameRaw, getFolderInboxName } from 'Common/Cache';
@ -104,8 +104,8 @@ export class MailBoxUserScreen extends AbstractScreen {
onBuild() {
setTimeout(() => {
// initMailboxLayoutResizer
const top = doc.querySelector('.RL-MailMessageList'),
bottom = doc.querySelector('.RL-MailMessageView'),
const top = elementById('V-MailMessageList'),
bottom = elementById('V-MailMessageView'),
fToggle = () => {
let layout = SettingsUserStore.layout();
setLayoutResizer(top, bottom, ClientSideKeyName.MessageListSize,

4
dev/Stores/User/App.js
View file

@ -1,5 +1,5 @@
import { Scope } from 'Common/Enums';
import { doc, keyScope, leftPanelDisabled, SettingsGet } from 'Common/Globals';
import { keyScope, leftPanelDisabled, SettingsGet, elementById } from 'Common/Globals';
import { addObservablesTo } from 'Common/Utils';
import { ThemeStore } from 'Stores/Theme';
@ -25,7 +25,7 @@ AppUserStore.focusedState.subscribe(value => {
break;
}
['FolderList','MessageList','MessageView'].forEach(name => {
let dom = doc.querySelector('.RL-Mail'+name);
let dom = elementById('V-Mail'+name);
dom && dom.classList.toggle('focused', name === value);
});
});

1
dev/Styles/@Admin.less
View file

@ -14,7 +14,6 @@
@import "../../vendors/bootstrap/less/buttons.less";
@import "../../vendors/bootstrap/less/button-groups.less";
@import "../../vendors/bootstrap/less/alerts.less";
@import "../../vendors/bootstrap/less/modals.less";
@import "../../vendors/bootstrap/less/utilities.less";
@import "../../vendors/bootstrap/less/wells.less";

1
dev/Styles/@Main.less
View file

@ -14,7 +14,6 @@
@import "../../vendors/bootstrap/less/buttons.less";
@import "../../vendors/bootstrap/less/button-groups.less";
@import "../../vendors/bootstrap/less/alerts.less";
@import "../../vendors/bootstrap/less/modals.less";
@import "../../vendors/bootstrap/less/utilities.less";
@import "../../vendors/bootstrap/less/navs.less";

12
dev/Styles/Admin/Domain.less
View file

@ -1,18 +1,14 @@
.b-domain-alias-content {
&.modal {
max-width: 330px;
}
#V-PopupsDomainAlias {
max-width: 330px;
.error-desc {
color: red;
}
}
.b-domain-content {
#V-PopupsDomain {
&.modal {
max-width: 810px;
}
max-width: 810px;
.domain-desc {
color: #666;

11
dev/Styles/Admin/Layout.less
View file

@ -91,17 +91,6 @@
padding-right: 12px;
}
#rl-popups > .rl-view-model {
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
z-index: 1100;
overflow: auto;
background-color: rgba(0,0,0,0.3);
}
#rl-settings-subscreen {
padding: 20px;
}

6
dev/Styles/Admin/Plugin.less
View file

@ -1,8 +1,6 @@
.b-plugin-content {
#V-PopupsPlugin {
&.modal {
max-width: 660px;
}
max-width: 660px;
.modal-body {
overflow: auto;

27
dev/Styles/Animations.less
View file

@ -18,22 +18,22 @@
@media screen and (min-width: 1000px) {
html.rl-started-trigger .b-login-content {
html.rl-started-trigger .LoginView {
/*transform: scale(1.1);*/
transform: translateY(-20px);
opacity: 0.5;
}
.b-login-content .errorAnimated {
.LoginView .errorAnimated {
animation: login-form-shake 400ms ease-in-out;
}
.b-login-content .errorAnimated .buttonLogin {
.LoginView .errorAnimated .buttonLogin {
color: #b94a48;
font-weight: bold;
}
.b-login-content {
.LoginView {
transition: all 0.3s ease-out;
}
@ -41,23 +41,4 @@
transition: all 0.2s linear;
}
#rl-popups > .rl-view-model .modal {
transition: all .2s ease-out;
}
#rl-popups > .rl-view-model:not(.show) .modal {
top: -25%;
}
#rl-popups > .rl-view-model .modal.fade {
opacity: 1;
}
#rl-popups > .rl-view-model:not(.show) .modal.fade {
opacity: 0;
}
}
#rl-popups > .rl-view-model {
transition: background-color 0.2s linear;
}
#rl-popups > .rl-view-model:not(.show) {
background-color: rgba(0,0,0,0);
}

2
dev/Styles/Ask.less
View file

@ -1,4 +1,4 @@
.b-ask-content {
#V-PopupsAsk {
.modal-body {
font-size: 18px;

8
dev/Styles/Languages.less
View file

@ -1,8 +1,6 @@
.b-languages-content {
#V-PopupsLanguages {
&.modal {
max-width: 700px;
}
max-width: 710px;
label {
display: inline-block;
@ -37,7 +35,7 @@
}
@media screen and (max-width: 999px) {
.b-languages-content label {
#V-PopupsLanguages label {
width: calc(100% - 40px);
}
}

6
dev/Styles/Login.less
View file

@ -1,4 +1,4 @@
.RL-Login, .RL-AdminLogin {
#V-Login, #V-AdminLogin {
position: fixed;
left: 50%;
top: 50%;
@ -13,7 +13,7 @@
@glass-error-color: #f76260;
@glass-m-color: rgba(255, 255, 255, .8);
.b-login-content {
.LoginView {
position: relative;
@ -163,7 +163,7 @@
}
@media screen and (max-width: 480px) {
.b-login-content {
.LoginView {
form {
padding: 30px 4vw 10px;
}

93
dev/Styles/Ui.less
View file

@ -124,3 +124,96 @@ textarea + .settings-save-trigger {
.tabs [id^="tab"]:checked + label + .tab-content {
visibility: visible;
}
.dialog-backdrop {
background: rgba(0,0,0,0.5);
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1;
/*
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: rgba(0,0,0,0.5);
z-index: 1000000000;
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
z-index: 1100;
overflow: auto;
background-color: rgba(0,0,0,0.3);
*/
}
dialog {
border: 0;
background-color: @white;
border: 1px solid rgba(0,0,0,.3);
border-radius: 6px;
box-shadow: 0 5px 80px rgba(0,0,0,0.3);
margin: 10px auto;
max-height: calc(100vh - 20px);
max-width: 560px;
overflow: auto;
padding: 0;
transition: all .2s ease-out;
top: 0;
width: calc(100% - 20px);
}
dialog:not([open]) {
display: none !important;
}
dialog.show {
opacity: 1;
}
dialog:not(.show) {
background-color: rgba(0,0,0,0);
opacity: 0;
top: -25%;
}
dialog header {
padding: 9px 15px;
border-bottom: 1px solid #eee;
// Close icon
.close { margin-top: 2px; }
// Heading
h3 {
margin: 0;
line-height: 30px;
}
}
// Body (where all modal content resides)
dialog .modal-body {
overflow-y: auto;
padding: 15px;
}
// Footer (for actions)
dialog footer {
padding: 14px 15px 15px;
margin-bottom: 0;
text-align: right; // right align buttons
border-top: 1px solid #ddd;
border-radius: 0 0 6px 6px;
.clearfix(); // clear it in case folks use .pull-* classes on buttons
// Properly space out buttons
.btn + .btn {
margin-left: 5px;
margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
}
// but override that for button groups
.btn-group .btn + .btn {
margin-left: -1px;
}
}

8
dev/Styles/User/AdvancedSearch.less
View file

@ -1,7 +1,7 @@
.b-advanced-search-content {
&.modal {
max-width: 780px;
}
#V-PopupsAdvancedSearch {
max-width: 780px;
.control-label {
width: 110px;
}

2
dev/Styles/User/Animations.less
View file

@ -34,7 +34,7 @@
}
}
.b-compose.loading .b-header-toolbar {
#V-PopupsCompose header.loading {
background-size: 60px 60px;
background-image: linear-gradient(135deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%,
transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%,

46
dev/Styles/User/Compose.less
View file

@ -1,13 +1,10 @@
.b-compose {
&.modal {
display: flex;
flex-direction: column;
height: calc(100% - 52px);
max-width: 1000px;
width: 98%;
}
#V-PopupsCompose {
display: flex;
flex-direction: column;
height: calc(100% - 52px);
max-width: 1000px;
width: 98%;
.modal-body {
padding: 0;
@ -32,22 +29,23 @@
border-top: 1px solid #ccc;
overflow-y: auto;
padding: 10px;
.no-attachments-desc {
padding-top: 50px;
text-align: center;
font-size: 24px;
color: #666;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
}
.attachmentList {
margin: 0;
padding: 10px;
}
}
.b-header-toolbar {
.attachmentName {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.no-attachments-desc {
padding-top: 50px;
text-align: center;
font-size: 24px;
color: #666;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
}
header {
background-color: rgba(0,0,0,0.8);
@ -160,7 +158,7 @@
}
@media screen and (max-width: 999px) {
.b-compose.modal {
#V-PopupsCompose {
border: 0;
width: 100%;
}

18
dev/Styles/User/Contacts.less
View file

@ -1,7 +1,14 @@
@contacts-popup-left-width: 25%;
.RL-PopupsContacts {
#V-PopupsContacts {
bottom: 0;
width: auto;
min-width: 550px;
max-width: 900px;
min-height: 300px;
max-height: 700px;
.control-group {
.control-label {
@ -10,15 +17,6 @@
}
}
.modal {
bottom: 0;
width: auto;
min-width: 550px;
max-width: 900px;
min-height: 300px;
max-height: 700px;
}
.modal-body {
height: calc(100% - 49px);
padding: 0;

2
dev/Styles/User/Filter.less
View file

@ -1,4 +1,4 @@
.b-filter-content {
#V-PopupsFilter {
max-width: 750px;

6
dev/Styles/User/Identity.less
View file

@ -1,8 +1,6 @@
.b-identity-content {
#V-PopupsIdentity {
&.modal {
max-width: 770px;
}
max-width: 770px;
.modal-body {
overflow: hidden;

45
dev/Styles/User/Layout.less
View file

@ -75,7 +75,7 @@ html:not(.rl-left-panel-disabled) #rl-left {
}
#rl-left > .resizer,
.rl-side-preview-pane .RL-MailMessageList > .resizer {
.rl-side-preview-pane #V-MailMessageList > .resizer {
cursor: ew-resize;
height: 100%;
right: 0;
@ -83,17 +83,17 @@ html:not(.rl-left-panel-disabled) #rl-left {
width: 5px;
}
.rl-side-preview-pane .RL-MailMessageList {
.rl-side-preview-pane #V-MailMessageList {
resize: horizontal;
min-width: 320px;
max-width: 60%;
}
.rl-bottom-preview-pane .RL-MailMessageList {
.rl-bottom-preview-pane #V-MailMessageList {
resize: vertical;
min-height: 200px;
max-height: 60%;
}
.rl-bottom-preview-pane .RL-MailMessageList > .resizer {
.rl-bottom-preview-pane #V-MailMessageList > .resizer {
cursor: ns-resize;
height: 5px;
left: 0;
@ -102,11 +102,11 @@ html:not(.rl-left-panel-disabled) #rl-left {
}
html:not(.rl-left-panel-disabled) #rl-left > .resizer,
.RL-MailMessageList > .resizer {
#V-MailMessageList > .resizer {
display: block;
}
.RL-MailMessageList {
#V-MailMessageList {
position: absolute;
top: 0;
bottom: @rlBottomMargin;
@ -114,7 +114,7 @@ html:not(.rl-left-panel-disabled) #rl-left > .resizer,
width: 50%;
}
.RL-MailMessageView {
#V-MailMessageView {
position: absolute;
top: 50px + @rlLowMargin;
bottom: 13px;
@ -148,30 +148,11 @@ html:not(.rl-left-panel-disabled) #rl-left > .resizer,
}
html.rl-side-preview-pane {
.RL-MailMessageView {
#V-MailMessageView {
left: 50%;
}
}
/*
#rl-popups > dialog {
top: 0;
margin: 10px auto;
padding: 0;
border: 0;
}
*/
#rl-popups > .rl-view-model {
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
z-index: 1100;
overflow: auto;
background-color: rgba(0,0,0,0.3);
}
#rl-settings-subscreen {
padding:20px;
}
@ -256,12 +237,12 @@ html.rl-side-preview-pane {
left: @rlLeftWidth + 20;
}
.RL-MailMessageList {
#V-MailMessageList {
width: 40%;
}
html.rl-side-preview-pane {
.RL-MailMessageView {
#V-MailMessageView {
left: 40%;
}
}
@ -317,7 +298,7 @@ html.rl-left-panel-disabled {
html.rl-no-preview-pane {
.RL-MailMessageList {
#V-MailMessageList {
right: @rlBottomMargin !important;
width: inherit;
}
@ -331,14 +312,14 @@ html.rl-no-preview-pane #rl-right .resizer {
html.rl-bottom-preview-pane {
.RL-MailMessageList {
#V-MailMessageList {
bottom: inherit;
width: inherit;
height: 300px;
right: 0;
}
.RL-MailMessageView {
#V-MailMessageView {
left: 0;
top: 356px;
}

10
dev/Styles/User/MessageList.less
View file

@ -1,12 +1,12 @@
html.rl-mobile,
html.rl-no-preview-pane {
.message-selected .RL-MailMessageList {
.message-selected #V-MailMessageList {
display: none;
}
}
.RL-MailMessageList.focused .messageList {
#V-MailMessageList.focused .messageList {
border-color: #9d9d9d;
}
@ -15,7 +15,7 @@ html.rl-no-preview-pane {
padding-right: 6px;
}
.RL-MailMessageList .btn-toolbar {
#V-MailMessageList .btn-toolbar {
height: 30px;
padding: 10px 1px;
white-space: nowrap;
@ -42,15 +42,13 @@ html.rl-no-preview-pane {
border-top: 1px solid #bbb;
.e-quota {
border-bottom: 1px dashed #333;
display: inline-block;
margin-top: 5px;
margin-left: 5px;
font-size: 18px;
cursor: help;
}
.e-quota:hover {
border-bottom: 1px dashed #333;
}
}
.btn.buttonMoreSearch {

12
dev/Styles/User/MessageView.less
View file

@ -1,11 +1,11 @@
html.rl-no-preview-pane {
#rl-right:not(.message-selected) .RL-MailMessageView {
#rl-right:not(.message-selected) #V-MailMessageView {
display: none;
}
}
.RL-MailMessageView.focused .messageView {
#V-MailMessageView.focused .messageView {
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
border-color: darken(@rlMainDarkColor, 5%);
}
@ -501,10 +501,10 @@ html.rl-message-fullscreen {
}
#rl-right {
.RL-MailMessageList,
.RL-SettingsPane,
.RL-SystemDropDown,
.RL-MailMessageView .messageView .toolbar {
#V-MailMessageList,
#V-SettingsPane,
#V-SystemDropDown,
#V-MailMessageView .messageView .toolbar {
display: none !important;
}
}

27
dev/Styles/User/OpenPgpKey.less
View file

@ -1,20 +1,16 @@
.b-open-pgp-key-view-content, .b-open-pgp-key-generate-content {
&.modal {
max-width: 570px;
}
#V-PopupsViewOpenPgpKey, #V-PopupsNewOpenPgpKey {
max-width: 570px;
}
.b-open-pgp-key-view-content {
#V-PopupsViewOpenPgpKey {
.key-viewer {
max-height: 500px;
overflow: auto;
}
}
.b-compose-open-pgp-content {
&.modal {
max-width: 800px;
}
#V-PopupsComposeOpenPgp {
max-width: 800px;
.key-list {
@ -95,10 +91,8 @@
}
}
.b-message-open-pgp-content {
&.modal {
max-width: 700px;
}
#V-PopupsMessageOpenPgp {
max-width: 700px;
.key-list {
@ -132,10 +126,9 @@
}
}
.b-open-pgp-key-add-content {
&.modal {
max-width: 645px;
}
#V-PopupsAddOpenPgpKey {
max-width: 645px;
.inputKey {
font-family: var(--fontMono);
width: 600px;

6
dev/Styles/User/SettingsFilters.less
View file

@ -1,10 +1,10 @@
.b-filter-script {
#V-PopupsSieveScript {
width: auto;
max-width: 720px;
}
.b-filter-script .filter-item,
#V-PopupsSieveScript .filter-item,
.b-settings-filters .script-item {
white-space: nowrap;
}
@ -30,7 +30,7 @@
color: #aaa;
}
.b-filter-script textarea {
#V-PopupsSieveScript textarea {
height: 300px;
font-family: var(--fontMono);
}

6
dev/Styles/User/Shortcuts.less
View file

@ -1,7 +1,5 @@
.b-shortcuts-content {
&.modal {
max-width: 700px;
}
#V-PopupsKeyboardShortcutsHelp {
max-width: 700px;
td[class^="icon-"] {
display: table-cell;

8
dev/Styles/User/SquireUI.less
View file

@ -175,14 +175,14 @@ Secondly, we can't rely on MUA's what to do with :empty
}
}
.rl-mobile .b-compose.modal,
.rl-mobile .b-identity-content.modal {
.rl-mobile #V-PopupsCompose,
.rl-mobile #V-PopupsIdentity {
margin-bottom: 50px;
}
.rl-mobile .b-compose.modal {
.rl-mobile #V-PopupsCompose {
min-height: calc(100% - 62px);
}
.RL-PopupsCompose[data-wysiwyg*=Forced] #squire-toolgroup-mode {
#V-PopupsCompose[data-wysiwyg*=Forced] #squire-toolgroup-mode {
display: none;
}

2
dev/Styles/User/SystemDropDown.less
View file

@ -10,7 +10,7 @@
top: 40px;
}
.RL-SystemDropDown {
#V-SystemDropDown {
position: absolute;
top: 0;

19
dev/View/Admin/Login.js
View file

@ -1,19 +1,14 @@
import ko from 'ko';
import { Settings } from 'Common/Globals';
import { getNotification } from 'Common/Translator';
import Remote from 'Remote/Admin/Fetch';
import { decorateKoCommands } from 'Knoin/Knoin';
import { AbstractViewCenter } from 'Knoin/AbstractViews';
import { AbstractViewLogin } from 'Knoin/AbstractViews';
class LoginAdminView extends AbstractViewCenter {
class LoginAdminView extends AbstractViewLogin {
constructor() {
super('AdminLogin');
this.hideSubmitButton = Settings.app('hideSubmitButton');
this.addObservables({
login: '',
password: '',
@ -26,8 +21,6 @@ class LoginAdminView extends AbstractViewCenter {
submitError: ''
});
this.formError = ko.observable(false).extend({ falseTimeout: 500 });
this.addSubscribables({
login: () => this.loginError(false),
password: () => this.passwordError(false)
@ -67,14 +60,6 @@ class LoginAdminView extends AbstractViewCenter {
return valid;
}
onShow() {
rl.route.off();
}
submitForm() {
// return false;
}
}
export { LoginAdminView };

1
dev/View/Popup/Account.js
View file

@ -8,6 +8,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
class AccountPopupView extends AbstractViewPopup {
constructor() {
super('Account');
this.viewNoUserSelect = true;
this.addObservables({
isNew: true,

1
dev/View/Popup/AddOpenPgpKey.js
View file

@ -6,6 +6,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
class AddOpenPgpKeyPopupView extends AbstractViewPopup {
constructor() {
super('AddOpenPgpKey');
this.viewNoUserSelect = true;
this.addObservables({
key: '',

1
dev/View/Popup/AdvancedSearch.js
View file

@ -11,6 +11,7 @@ import { FolderUserStore } from 'Stores/User/Folder';
class AdvancedSearchPopupView extends AbstractViewPopup {
constructor() {
super('AdvancedSearch');
this.viewNoUserSelect = true;
this.addObservables({
from: '',

1
dev/View/Popup/Ask.js
View file

@ -7,6 +7,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
class AskPopupView extends AbstractViewPopup {
constructor() {
super('Ask');
this.viewNoUserSelect = true;
this.addObservables({
askDesc: '',

1
dev/View/Popup/ComposeOpenPgp.js
View file

@ -18,6 +18,7 @@ const KEY_NAME_SUBSTR = -8,
class ComposeOpenPgpPopupView extends AbstractViewPopup {
constructor() {
super('ComposeOpenPgp');
this.viewNoUserSelect = true;
this.publicKeysOptionsCaption = i18nPGP('ADD_A_PUBLICK_KEY');
this.privateKeysOptionsCaption = i18nPGP('SELECT_A_PRIVATE_KEY');

1
dev/View/Popup/Domain.js
View file

@ -11,6 +11,7 @@ import { DomainAdminStore } from 'Stores/Admin/Domain';
class DomainPopupView extends AbstractViewPopup {
constructor() {
super('Domain');
this.viewNoUserSelect = true;
this.addObservables(this.getDefaults());
this.addObservables({

1
dev/View/Popup/Filter.js
View file

@ -16,6 +16,7 @@ import { folderListOptionsBuilder } from 'Common/UtilsUser';
class FilterPopupView extends AbstractViewPopup {
constructor() {
super('Filter');
this.viewNoUserSelect = true;
this.addObservables({
isNew: true,

1
dev/View/Popup/FolderClear.js
View file

@ -11,6 +11,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
class FolderClearPopupView extends AbstractViewPopup {
constructor() {
super('FolderClear');
this.viewNoUserSelect = true;
this.addObservables({
selectedFolder: null,

1
dev/View/Popup/FolderCreate.js
View file

@ -15,6 +15,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
class FolderCreatePopupView extends AbstractViewPopup {
constructor() {
super('FolderCreate');
this.viewNoUserSelect = true;
this.addObservables({
folderName: '',

1
dev/View/Popup/FolderSystem.js
View file

@ -13,6 +13,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
class FolderSystemPopupView extends AbstractViewPopup {
constructor() {
super('FolderSystem');
this.viewNoUserSelect = true;
this.sChooseOnText = '';
this.sUnuseText = '';

1
dev/View/Popup/Languages.js
View file

@ -7,6 +7,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
class LanguagesPopupView extends AbstractViewPopup {
constructor() {
super('Languages');
this.viewNoUserSelect = true;
this.fLang = null;
this.userLanguage = ko.observable('');

1
dev/View/Popup/MessageOpenPgp.js
View file

@ -9,6 +9,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
class MessageOpenPgpPopupView extends AbstractViewPopup {
constructor() {
super('MessageOpenPgp');
this.viewNoUserSelect = true;
this.addObservables({
notification: '',

1
dev/View/Popup/NewOpenPgpKey.js
View file

@ -8,6 +8,7 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
class NewOpenPgpKeyPopupView extends AbstractViewPopup {
constructor() {
super('NewOpenPgpKey');
this.viewNoUserSelect = true;
this.addObservables({
email: '',

1
dev/View/Popup/SieveScript.js
View file

@ -16,6 +16,7 @@ import { FilterPopupView } from 'View/Popup/Filter';
class SieveScriptPopupView extends AbstractViewPopup {
constructor() {
super('SieveScript');
this.viewNoUserSelect = true;
addObservablesTo(this, {
saveError: false,

22
dev/View/User/Login.js
View file

@ -1,8 +1,6 @@
import ko from 'ko';
import { Notification } from 'Common/Enums';
import { ClientSideKeyName } from 'Common/EnumsUser';
import { Settings, SettingsGet } from 'Common/Globals';
import { SettingsGet } from 'Common/Globals';
import { getNotification, translatorReload, convertLangName } from 'Common/Translator';
import { LanguageStore } from 'Stores/Language';
@ -12,7 +10,7 @@ import * as Local from 'Storage/Client';
import Remote from 'Remote/User/Fetch';
import { decorateKoCommands, showScreenPopup } from 'Knoin/Knoin';
import { AbstractViewCenter } from 'Knoin/AbstractViews';
import { AbstractViewLogin } from 'Knoin/AbstractViews';
import { LanguagesPopupView } from 'View/Popup/Languages';
@ -21,12 +19,10 @@ const SignMeOff = 0,
SignMeUnused = 2;
class LoginUserView extends AbstractViewCenter {
class LoginUserView extends AbstractViewLogin {
constructor() {
super('Login');
this.hideSubmitButton = Settings.app('hideSubmitButton');
this.addObservables({
loadingDesc: SettingsGet('LoadingDescription'),
@ -46,8 +42,6 @@ class LoginUserView extends AbstractViewCenter {
signMeType: SignMeUnused
});
this.formError = ko.observable(false).extend({ falseTimeout: 500 });
this.allowLanguagesOnLogin = !!SettingsGet('AllowLanguagesOnLogin');
this.language = LanguageStore.language;
@ -129,11 +123,9 @@ class LoginUserView extends AbstractViewCenter {
return valid;
}
onShow() {
rl.route.off();
}
onBuild(dom) {
super.onBuild(dom);
onBuild() {
const signMeLocal = Local.get(ClientSideKeyName.LastSignMe),
signMe = (SettingsGet('SignMe') || '').toLowerCase();
@ -161,10 +153,6 @@ class LoginUserView extends AbstractViewCenter {
}
}
submitForm() {
// return false;
}
selectLanguage() {
showScreenPopup(LanguagesPopupView, [this.language, this.languages(), LanguageStore.userLanguage()]);
}