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

[DE PE SSE] By bug 58696

Browse source
This commit is contained in:
JuliaSvinareva 2022-12-06 16:33:48 +03:00
parent 3d24b01699
commit e7ba2e0180
5 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -334,11 +334,23 @@ define([
ChangeSettings: function(props) {
},
updateScrollers: function () {
this.$resultsContainer.scroller.update({alwaysVisibleY: true});
this.$searchContainer.scroller.update({alwaysVisibleY: true});
setTimeout(_.bind(function () {
if (this.$searchContainer.find('> .ps-scrollbar-y-rail').is(':visible')) {
this.$resultsContainer.find('.ps-scrollbar-y-rail').addClass('set-left');
} else {
this.$resultsContainer.find('.ps-scrollbar-y-rail').removeClass('set-left');
}
}, this), 100);
},
updateResultsContainerHeight: function () {
if (this.$resultsContainer) {
this.$resultsContainer.outerHeight(Math.max($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight(), 112));
this.$resultsContainer.scroller.update({alwaysVisibleY: true});
this.$searchContainer.scroller.update({alwaysVisibleY: false});
this.updateScrollers();
}
},

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

@ -262,6 +262,12 @@
font-style: italic;
}
}
.ps-scrollbar-y-rail {
&.set-left {
right: 11px !important;
}
}
}
#search-container {

2
apps/documenteditor/main/app/controller/Search.js
View file

@ -333,7 +333,7 @@ define([
onEndTextAroundSearch: function () {
if (this.view) {
this._state.isStartedAddingResults = false;
this.view.$resultsContainer.scroller.update({alwaysVisibleY: true});
this.view.updateScrollers();
}
},

2
apps/presentationeditor/main/app/controller/Search.js
View file

@ -299,7 +299,7 @@ define([
onEndTextAroundSearch: function () {
if (this.view) {
this._state.isStartedAddingResults = false;
this.view.$resultsContainer.scroller.update({alwaysVisibleY: true});
this.view.updateScrollers();
}
},

2
apps/spreadsheeteditor/main/app/controller/Search.js
View file

@ -429,7 +429,7 @@ define([
onEndTextAroundSearch: function () {
if (this.view) {
this._state.isStartedAddingResults = false;
this.view.$resultsContainer.scroller.update({alwaysVisibleY: true});
this.view.updateScrollers();
}
},