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

Merge pull request #1076 from ONLYOFFICE/feature/fix-bug-reactjs

Browse source 
Feature/fix bug reactjs
This commit is contained in:
Julia Radzhabova 2021-08-13 21:43:41 +03:00 committed by GitHub
parent 43491e0115 238512f1ed
commit 6d67430e62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/mobile/resources/less/common-material.less
View file

@ -62,8 +62,13 @@
margin-bottom: 0; margin-bottom: 0;
margin-top: 8px; margin-top: 8px;
} }
.add-image {
ul:before, :after{
display: none;
}
}
.inputs-list { .inputs-list {
ul:after, :before{ ul:after {
display: none; display: none;
} }
} }

6
apps/documenteditor/mobile/src/controller/LongActions.jsx
View file

@ -64,7 +64,9 @@ const LongActionsController = () => {
if (action && !forceClose) { if (action && !forceClose) {
setLongActionView(action); setLongActionView(action);
} else { } else {
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el); loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') ?
f7.dialog.close(loadMask.el) :
f7.dialog.close($$('.dialog-preloader'));
} }
}; };
@ -171,6 +173,8 @@ const LongActionsController = () => {
if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) { if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) {
loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title; loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title;
} else if ($$('.dialog-preloader').hasClass('modal-in')) {
$$('.dialog-preloader').find('dialog-title').text(title);
} else { } else {
loadMask = f7.dialog.preloader(title); loadMask = f7.dialog.preloader(title);
} }

6
apps/presentationeditor/mobile/src/controller/LongActions.jsx
View file

@ -64,7 +64,9 @@ const LongActionsController = () => {
if (action && !forceClose) { if (action && !forceClose) {
setLongActionView(action) setLongActionView(action)
} else { } else {
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el); loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') ?
f7.dialog.close(loadMask.el) :
f7.dialog.close($$('.dialog-preloader'));
} }
}; };
@ -161,6 +163,8 @@ const LongActionsController = () => {
if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) { if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) {
loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title; loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title;
} else if ($$('.dialog-preloader').hasClass('modal-in')) {
$$('.dialog-preloader').find('dialog-title').text(title);
} else { } else {
loadMask = f7.dialog.preloader(title); loadMask = f7.dialog.preloader(title);
} }

2
apps/presentationeditor/mobile/src/view/add/AddImage.jsx
View file

@ -11,7 +11,7 @@ const PageLinkSettings = props => {
<Page> <Page>
<Navbar title={_t.textLinkSettings} backLink={_t.textBack}></Navbar> <Navbar title={_t.textLinkSettings} backLink={_t.textBack}></Navbar>
<BlockTitle>{_t.textAddress}</BlockTitle> <BlockTitle>{_t.textAddress}</BlockTitle>
<List className='inputs-list'> <List className='add-image'>
<ListInput <ListInput
type='text' type='text'
placeholder={_t.textImageURL} placeholder={_t.textImageURL}

7
apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx
View file

@ -66,7 +66,9 @@ const LongActionsController = () => {
if (action && !forceClose) { if (action && !forceClose) {
setLongActionView(action) setLongActionView(action)
} else { } else {
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el); loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') ?
f7.dialog.close(loadMask.el) :
f7.dialog.close($$('.dialog-preloader'));
} }
}; };
@ -167,8 +169,11 @@ const LongActionsController = () => {
} }
if (action.type == Asc.c_oAscAsyncActionType.BlockInteraction) { if (action.type == Asc.c_oAscAsyncActionType.BlockInteraction) {
if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) { if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) {
loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title; loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title;
} else if ($$('.dialog-preloader').hasClass('modal-in')) {
$$('.dialog-preloader').find('dialog-title').text(title);
} else { } else {
loadMask = f7.dialog.preloader(title); loadMask = f7.dialog.preloader(title);
} }

2
apps/spreadsheeteditor/mobile/src/view/add/AddImage.jsx
View file

@ -27,7 +27,7 @@ const PageLinkSettings = props => {
<Page> <Page>
<Navbar title={_t.textLinkSettings} backLink={_t.textBack}></Navbar> <Navbar title={_t.textLinkSettings} backLink={_t.textBack}></Navbar>
<BlockTitle>{_t.textAddress}</BlockTitle> <BlockTitle>{_t.textAddress}</BlockTitle>
<List className='inputs-list'> <List className='add-image'>
<ListInput <ListInput
type='text' type='text'
placeholder={_t.textImageURL} placeholder={_t.textImageURL}