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

Merge pull request #1500 from ONLYOFFICE/feature/bug-fixes

Browse source 
Fix Bug 54797
This commit is contained in:
maxkadushkin 2022-01-26 22:39:07 +03:00 committed by GitHub
parent 7d19d36a13 f11ea1159f
commit f74ed73317
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/common/mobile/lib/view/Search.jsx
View file

@ -162,11 +162,10 @@ class SearchView extends Component {
} }
onReplaceClick() { onReplaceClick() {
if (this.searchbar && this.state.replaceQuery) { if (this.searchbar) {
if (this.props.onReplaceQuery) { if (this.props.onReplaceQuery) {
let params = this.searchParams(); let params = this.searchParams();
params.find = this.state.searchQuery; params.find = this.state.searchQuery;
// console.log(params);
this.props.onReplaceQuery(params); this.props.onReplaceQuery(params);
} }
@ -174,11 +173,10 @@ class SearchView extends Component {
} }
onReplaceAllClick() { onReplaceAllClick() {
if (this.searchbar && this.state.replaceQuery) { if (this.searchbar) {
if (this.props.onReplaceAllQuery) { if (this.props.onReplaceAllQuery) {
let params = this.searchParams(); let params = this.searchParams();
params.find = this.state.searchQuery; params.find = this.state.searchQuery;
// console.log(params);
this.props.onReplaceAllQuery(params); this.props.onReplaceAllQuery(params);
} }
@ -281,10 +279,11 @@ class SearchView extends Component {
<div className="buttons-row buttons-row-replace"> <div className="buttons-row buttons-row-replace">
{/* <a id="replace-link" className={"link " + (searchQuery.trim().length ? "" : "disabled")} style={!usereplace ? hidden: null} onClick={() => this.onReplaceClick()}>{_t.textReplace}</a> {/* <a id="replace-link" className={"link " + (searchQuery.trim().length ? "" : "disabled")} style={!usereplace ? hidden: null} onClick={() => this.onReplaceClick()}>{_t.textReplace}</a>
<a id="replace-all-link" className={"link " + (searchQuery.trim().length ? "" : "disabled")} style={!usereplace ? hidden: null} onClick={() => this.onReplaceAllClick()}>{_t.textReplaceAll}</a> */} <a id="replace-all-link" className={"link " + (searchQuery.trim().length ? "" : "disabled")} style={!usereplace ? hidden: null} onClick={() => this.onReplaceAllClick()}>{_t.textReplaceAll}</a> */}
{isReplaceAll ? ( {isReplaceAll ? (
<a id="replace-all-link" className={"link " + (replaceQuery.trim().length ? "" : "disabled")} onClick={() => this.onReplaceAllClick()}>{_t.textReplaceAll}</a> <a id="replace-all-link" className={"link " + (replaceQuery.trim().length || searchQuery.trim().length ? "" : "disabled")} onClick={() => this.onReplaceAllClick()}>{_t.textReplaceAll}</a>
) : usereplace ? ( ) : usereplace ? (
<a id="replace-link" className={"link " + (replaceQuery.trim().length ? "" : "disabled")} onClick={() => this.onReplaceClick()}>{_t.textReplace}</a> <a id="replace-link" className={"link " + (replaceQuery.trim().length || searchQuery.trim().length ? "" : "disabled")} onClick={() => this.onReplaceClick()}>{_t.textReplace}</a>
) : null} ) : null}
</div> </div>
<div className="buttons-row"> <div className="buttons-row">