Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-11 00:14:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

messagelist search without float

Browse source 
and remove some usePreviewPane
This commit is contained in:
djmaze 2021-02-15 20:05:51 +01:00
parent b1c7bd2c50
commit 0d6335ed2c
9 changed files with 29 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/Common/Selector.js
View file

@ -363,7 +363,7 @@ export class Selector {
focused.checked(!focused.checked());
}
if (' ' !== sEventKey && (this.autoSelect() || !!bForceSelect) && !this.isListChecked()) {
if (' ' !== sEventKey && (this.autoSelect() || bForceSelect) && !this.isListChecked()) {
this.selectedItem(result);
}

1
dev/Settings/User/General.js
View file

@ -32,7 +32,6 @@ export class GeneralUserSettings {
this.editorDefaultType = SettingsStore.editorDefaultType;
this.layout = SettingsStore.layout;
this.usePreviewPane = SettingsStore.usePreviewPane;
this.enableSoundNotification = NotificationStore.enableSoundNotification;

4
dev/Styles/Animations.less
View file

@ -36,10 +36,6 @@ html.rl-started-delay {
transition: left 0.3s ease-out, right 0.3s ease-out;
}
#rl-sub-left, #rl-sub-left .messageList .inputSearch {
transition: width 0.3s ease-out;
}
#rl-sub-right {
transition: left 0.3s ease-out;
}

16
dev/Styles/Layout.less
View file

@ -251,10 +251,6 @@ html:not(.rl-left-panel-disabled) #rl-left.resizable > .resizer,
#rl-sub-left {
width: 310px;
.messageList .inputSearch {
width: 200px;
}
}
#rl-sub-right {
@ -339,10 +335,6 @@ html.rl-no-preview-pane {
#rl-sub-left {
right: @rlBottomMargin !important;
width: inherit;
.messageList .inputSearch {
width: 300px !important;
}
}
#rl-sub-right {
@ -366,20 +358,12 @@ html.rl-bottom-preview-pane:not(.rl-mobile) {
box-shadow: none;
}
.messageList .inputSearch {
width: 300px !important;
}
}
#rl-sub-right {
left: 0 !important;
.messageView .top-toolbar {
display: none;
}
.b-message-view-wrapper {
top: 356px;
left: 0;

27
dev/Styles/MessageList.less
View file

@ -47,10 +47,6 @@ html.rl-no-preview-pane {
}
}
.inputSearch {
width: 258px;
}
.btn.buttonMoreSearch {
padding-left: 8px;
padding-right: 8px;
@ -91,6 +87,22 @@ html.rl-no-preview-pane {
cursor: pointer;
line-height: 30px;
}
.input-append {
margin-left: 14px;
text-align: right;
width: calc(100% - 30px);
.close-input-wrp {
width: 90%;
min-width: 200px;
max-width: 300px;
}
.inputSearch {
width: calc(100% - 14px);
}
}
}
.line-loading {
@ -462,13 +474,6 @@ html .messageList .line-loading {
top: 0;
}
html.rl-mobile {
#rl-sub-left .messageList .inputSearch {
width: 160px !important;
}
}
.messageListItem {
display: flex;

6
dev/Styles/MessageView.less
View file

@ -605,6 +605,12 @@ html.rl-no-preview-pane .messageView {
}
}
html:not(.rl-mobile):not(.rl-no-preview-pane) .messageView {
.top-toolbar {
display: none;
}
}
html.rl-bottom-preview-pane:not(.rl-mobile) .messageView {
.b-content {
bottom: @rlBottomMargin;

5
dev/View/User/MailBox/MessageView.js
View file

@ -96,7 +96,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
this.useThreads = SettingsStore.useThreads;
this.replySameFolder = SettingsStore.replySameFolder;
this.layout = SettingsStore.layout;
this.usePreviewPane = SettingsStore.usePreviewPane;
this.isMessageSelected = MessageStore.isMessageSelected;
this.messageActiveDom = MessageStore.messageActiveDom;
this.messageError = MessageStore.messageError;
@ -284,14 +283,14 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
@command((self) => !self.messageListAndMessageViewLoading())
goUpCommand() {
dispatchEvent(new CustomEvent('mailbox.message-list.selector.go-up',
{detail:SettingsStore.usePreviewPane() || !!this.message()}
{detail:SettingsStore.usePreviewPane() || !!this.message()} // bForceSelect
));
}
@command((self) => !self.messageListAndMessageViewLoading())
goDownCommand() {
dispatchEvent(new CustomEvent('mailbox.message-list.selector.go-down',
{detail:SettingsStore.usePreviewPane() || !!this.message()}
{detail:SettingsStore.usePreviewPane() || !!this.message()} // bForceSelect
));
}

4
snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
View file

@ -112,7 +112,8 @@
<div class="b-message-list-wrapper">
<div class="second-toolbar thm-message-list-top-toolbar">
<div class="form-inline">
<div class="input-append pull-right" data-bind="visible: allowSearch">
<i class="checkboxCheckAll fontastic" data-bind="text: checkAll() ? (isIncompleteChecked() ? '▣' : '☑') : '☐'"></i>
<div class="input-append" data-bind="visible: allowSearch">
<div class="close-input-wrp">
<a class="close" data-bind="click: cancelSearch, visible: '' !== messageListSearchDesc()">×</a>
<input type="text" class="i18n span4 inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="value: inputProxyMessageListSearch, onEnter: searchEnterAction, hasfocus: inputMessageListSearchFocus" />
@ -121,7 +122,6 @@
<span class="caret"></span>
</a>
</div>
<i class="checkboxCheckAll fontastic" data-bind="text: checkAll() ? (isIncompleteChecked() ? '▣' : '☑') : '☐'"></i>
</div>
</div>
<div class="b-content" data-bind="initDom: dragOverBodyArea">

4
snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -1,6 +1,6 @@
<div id="rl-sub-right">
<div class="messageView" data-bind="css: {'message-selected': isMessageSelected, 'message-focused': messageFocused}">
<div class="toolbar top-toolbar g-ui-user-select-none" data-bind="visible: !usePreviewPane()">
<div class="toolbar top-toolbar g-ui-user-select-none">
<div class="messageButtons btn-toolbar">
<div class="btn-group" data-bind="tooltip: 'GLOBAL/CLOSE'">
<a class="btn buttonClose fontastic" data-bind="command: closeMessageCommand">✖</a>
@ -95,7 +95,7 @@
</a>
</li>
</div>
<div data-bind="visible: allowMessageListActions && usePreviewPane()" class="dividerbar">
<div data-bind="visible: allowMessageListActions" class="dividerbar">
<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled()">
<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: archiveCommand">
<i class="icon-archive"></i>