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

Merge pull request #1763 from ONLYOFFICE/fix/fix-bugs

Browse source 
[DE PE SSE] Fix search
This commit is contained in:
Julia Radzhabova 2022-05-26 18:01:37 +03:00 committed by GitHub
parent 4b56a2a2a3 54ddb63473
commit b0608d6679
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -121,7 +121,7 @@ define([
this._state.useRegExp = checked;
break;
}
if (this._state.searchText !== '') {
if (this._state.searchText) {
this.hideResults();
if (this.onQuerySearch()) {
if (this.searchTimer) {

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

@ -197,6 +197,8 @@ define([
toolbar = me.getApplication().getController('Toolbar').getView();
toolbar.btnCollabChanges = me.header.btnSave;
}
me.header.btnSearch.on('toggle', me.onSearchToggle.bind(this));
},
onAppReady: function (config) {

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

@ -118,7 +118,7 @@ define([
this._state.useRegExp = checked;
break;
}
if (this._state.searchText !== '') {
if (this._state.searchText) {
this.hideResults();
if (this.onQuerySearch()) {
if (this.searchTimer) {

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

@ -200,6 +200,8 @@ define([
if ( config.customization.toolbarHideFileName )
me.viewport.vlayout.getItem('toolbar').el.addClass('style-skip-docname');
}
me.header.btnSearch.on('toggle', me.onSearchToggle.bind(this));
},
onAppReady: function (config) {

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

@ -157,7 +157,7 @@ define([
this._state.lookInFormulas = value;
break;
}
if (runSearch && this._state.searchText !== '') {
if (runSearch && this._state.searchText) {
this.hideResults();
if (this.onQuerySearch()) {
this.searchTimer && clearInterval(this.searchTimer);

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

@ -177,6 +177,8 @@ define([
if ( config.customization.toolbarHideFileName )
me.viewport.vlayout.getItem('toolbar').el.addClass('style-skip-docname');
}
me.header.btnSearch.on('toggle', me.onSearchToggle.bind(this));
},
onAppReady: function (config) {

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

@ -753,8 +753,9 @@
}
}
#search-results {
padding-top: 6px;
padding: 0;
.search-table {
padding-top: 5px;
width:100%;
height: 100%;
position: relative;
@ -766,6 +767,7 @@
text-align: start;
font-weight: normal;
padding-left: 4px;
padding-top: 2px;
&:not(:first-child) {
border-left: @scaled-one-px-value-ie solid @border-divider-ie;
border-left: @scaled-one-px-value solid @border-divider;
@ -777,7 +779,7 @@
.search-items {
height: calc(100% - 24px);
position: absolute;
top: 23px;
top: 28px;
width: 100%;
overflow: hidden;
.item {