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

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

Browse source 
Feature/bug fixes
This commit is contained in:
Julia Radzhabova 2021-08-09 17:59:39 +03:00 committed by GitHub
parent 7db4733018 46acf8489a
commit 4900bdc57b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/mobile/lib/component/ThemeColorPalette.jsx
View file

@ -11,7 +11,7 @@ const ThemeColors = ({ themeColors, onColorClick, curColor }) => {
{row.map((effect, index) => { {row.map((effect, index) => {
return( return(
<a key={`tc-${rowIndex}-${index}`} <a key={`tc-${rowIndex}-${index}`}
className={(curColor && curColor.color === effect.color && curColor.effectValue === effect.effectValue) ? 'active' : ''} className={(curColor && ((curColor.color === effect.color && curColor.effectValue === effect.effectValue) || (curColor === effect.color))) ? 'active' : ''}
style={{ background: `#${effect.color}`}} style={{ background: `#${effect.color}`}}
onClick={() => {onColorClick(effect.color, effect.effectId, effect.effectValue)}} onClick={() => {onColorClick(effect.color, effect.effectId, effect.effectValue)}}
></a> ></a>

4
apps/common/mobile/lib/controller/ContextMenu.jsx
View file

@ -150,8 +150,8 @@ class ContextMenuController extends Component {
this.setState({openedMore: false}); this.setState({openedMore: false});
} }
onMenuItemClick(action) { async onMenuItemClick(action) {
this.onApiHideContextMenu(); await this.onApiHideContextMenu();
if (action === 'showActionSheet') { if (action === 'showActionSheet') {
this.setState({openedMore: true}); this.setState({openedMore: true});

12
apps/documenteditor/mobile/src/controller/Search.jsx
View file

@ -37,13 +37,11 @@ class SearchSettings extends SearchSettingsView {
</Navbar> </Navbar>
<List> <List>
<ListItem radio title={_t.textFind} name="find-replace-checkbox" checked={!this.state.useReplace} onClick={e => this.onFindReplaceClick('find')} /> <ListItem radio title={_t.textFind} name="find-replace-checkbox" checked={!this.state.useReplace} onClick={e => this.onFindReplaceClick('find')} />
{isEdit ? {isEdit ? [
<ListItem radio title={_t.textFindAndReplace} name="find-replace-checkbox" checked={this.state.useReplace} <ListItem key="replace" radio title={_t.textFindAndReplace} name="find-replace-checkbox" checked={this.state.useReplace}
onClick={e => this.onFindReplaceClick('replace')} /> onClick={e => this.onFindReplaceClick('replace')} />,
: null} <ListItem key="replace-all" radio title={_t.textFindAndReplaceAll} name="find-replace-checkbox" checked={this.state.isReplaceAll}
{isEdit ? onClick={() => this.onFindReplaceClick('replace-all')}></ListItem>]
<ListItem radio title={_t.textFindAndReplaceAll} name="find-replace-checkbox" checked={this.state.isReplaceAll}
onClick={() => this.onFindReplaceClick('replace-all')}></ListItem>
: null} : null}
</List> </List>
<List> <List>

2
apps/documenteditor/mobile/src/page/main.jsx
View file

@ -26,7 +26,7 @@ class MainPage extends Component {
} }
handleClickToOpenOptions = (opts, showOpts) => { handleClickToOpenOptions = (opts, showOpts) => {
ContextMenu.closeContextMenu(); f7.popover.close('.document-menu.modal-in', false);
setTimeout(() => { setTimeout(() => {
let opened = false; let opened = false;

12
apps/presentationeditor/mobile/src/controller/Search.jsx
View file

@ -30,13 +30,11 @@ class SearchSettings extends SearchSettingsView {
</Navbar> </Navbar>
<List> <List>
<ListItem radio title={_t.textFind} name="find-replace-checkbox" checked={!this.state.useReplace} onClick={e => this.onFindReplaceClick('find')} /> <ListItem radio title={_t.textFind} name="find-replace-checkbox" checked={!this.state.useReplace} onClick={e => this.onFindReplaceClick('find')} />
{isEdit ? {isEdit ? [
<ListItem radio title={_t.textFindAndReplace} name="find-replace-checkbox" checked={this.state.useReplace} <ListItem key="replace" radio title={_t.textFindAndReplace} name="find-replace-checkbox" checked={this.state.useReplace}
onClick={e => this.onFindReplaceClick('replace')} /> onClick={e => this.onFindReplaceClick('replace')} />,
: null} <ListItem key="replace-all" radio title={_t.textFindAndReplaceAll} name="find-replace-checkbox" checked={this.state.isReplaceAll}
{isEdit ? onClick={() => this.onFindReplaceClick('replace-all')}></ListItem>]
<ListItem radio title={_t.textFindAndReplaceAll} name="find-replace-checkbox" checked={this.state.isReplaceAll}
onClick={() => this.onFindReplaceClick('replace-all')}></ListItem>
: null} : null}
</List> </List>
<List> <List>

2
apps/presentationeditor/mobile/src/page/main.jsx
View file

@ -28,7 +28,7 @@ class MainPage extends Component {
} }
handleClickToOpenOptions = (opts, showOpts) => { handleClickToOpenOptions = (opts, showOpts) => {
ContextMenu.closeContextMenu(); f7.popover.close('.document-menu.modal-in', false);
setTimeout(() => { setTimeout(() => {
let opened = false; let opened = false;

12
apps/spreadsheeteditor/mobile/src/controller/Search.jsx
View file

@ -38,13 +38,11 @@ class SearchSettings extends SearchSettingsView {
</Navbar> </Navbar>
<List> <List>
<ListItem radio title={_t.textFind} name="find-replace-checkbox" checked={!this.state.useReplace} onClick={e => this.onFindReplaceClick('find')} /> <ListItem radio title={_t.textFind} name="find-replace-checkbox" checked={!this.state.useReplace} onClick={e => this.onFindReplaceClick('find')} />
{isEdit ? {isEdit ? [
<ListItem radio title={_t.textFindAndReplace} name="find-replace-checkbox" checked={this.state.useReplace} <ListItem key="replace" radio title={_t.textFindAndReplace} name="find-replace-checkbox" checked={this.state.useReplace}
onClick={e => this.onFindReplaceClick('replace')} /> onClick={e => this.onFindReplaceClick('replace')} />,
: null} <ListItem key="replace-all" radio title={_t.textFindAndReplaceAll} name="find-replace-checkbox" checked={this.state.isReplaceAll}
{isEdit ? onClick={() => this.onFindReplaceClick('replace-all')}></ListItem>]
<ListItem radio title={_t.textFindAndReplaceAll} name="find-replace-checkbox" checked={this.state.isReplaceAll}
onClick={() => this.onFindReplaceClick('replace-all')}></ListItem>
: null} : null}
</List> </List>
<BlockTitle>{_t.textSearchIn}</BlockTitle> <BlockTitle>{_t.textSearchIn}</BlockTitle>