Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE PE SSE] Fix bug 58696

Browse source
This commit is contained in:
JuliaSvinareva 2022-12-04 18:30:48 +03:00
parent ca5738bd99
commit 3d24b01699
4 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/template/SearchPanel.template
View file

@ -3,6 +3,7 @@
<label id="search-adv-title"></label> <label id="search-adv-title"></label>
<div id="search-btn-close"></div> <div id="search-btn-close"></div>
</div> </div>
<div id="search-container">
<div id="search-adv-settings"> <div id="search-adv-settings">
<table cols="1"> <table cols="1">
<tbody> <tbody>
@ -60,4 +61,5 @@
</div> </div>
<div id="search-results" class="ps-container oo"> <div id="search-results" class="ps-container oo">
</div> </div>
</div>
</div> </div>

10
apps/common/main/lib/view/SearchPanel.js
View file

@ -176,6 +176,13 @@ define([
this.$resultsContainer = $('#search-results'); this.$resultsContainer = $('#search-results');
this.$resultsContainer.hide(); this.$resultsContainer.hide();
this.$searchContainer = $('#search-container');
this.$searchContainer.scroller = new Common.UI.Scroller({
el : $('#search-container'),
useKeyboard : true,
minScrollbarLength: 40
});
Common.NotificationCenter.on('search:updateresults', _.bind(this.disableNavButtons, this)); Common.NotificationCenter.on('search:updateresults', _.bind(this.disableNavButtons, this));
if (window.SSE) { if (window.SSE) {
this.cmbWithin = new Common.UI.ComboBox({ this.cmbWithin = new Common.UI.ComboBox({
@ -329,8 +336,9 @@ define([
updateResultsContainerHeight: function () { updateResultsContainerHeight: function () {
if (this.$resultsContainer) { if (this.$resultsContainer) {
this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight()); this.$resultsContainer.outerHeight(Math.max($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight(), 112));
this.$resultsContainer.scroller.update({alwaysVisibleY: true}); this.$resultsContainer.scroller.update({alwaysVisibleY: true});
this.$searchContainer.scroller.update({alwaysVisibleY: false});
} }
}, },

19
apps/common/main/resources/less/searchdialog.less
View file

@ -136,10 +136,7 @@
} }
#search-adv-settings { #search-adv-settings {
position: absolute; position: relative;
left: 0;
right: 0;
top: 45px;
padding: 10px 15px 0 15px; padding: 10px 15px 0 15px;
table { table {
@ -238,10 +235,7 @@
} }
#search-results { #search-results {
position: absolute; position: relative;
left: 0;
right: 0;
bottom: 0;
width: 100%; width: 100%;
border-top: @scaled-one-px-value-ie solid @border-toolbar-ie; border-top: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-top: @scaled-one-px-value solid @border-toolbar; border-top: @scaled-one-px-value solid @border-toolbar;
@ -270,4 +264,13 @@
} }
} }
#search-container {
position: absolute;
overflow: hidden;
top: 45px;
left: 0;
right: 0;
bottom: 0;
}
} }

1
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -779,6 +779,7 @@
top: 28px; top: 28px;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
padding-bottom: 10px;
.item { .item {
padding: 0; padding: 0;
display: flex; display: flex;