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

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

Browse source 
Feature/bug fixes
This commit is contained in:
maxkadushkin 2021-08-23 15:09:23 +03:00 committed by GitHub
parent f85d8e5b69 0550275944
commit 7f7e344ed4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
apps/common/mobile/lib/controller/collaboration/Comments.jsx
View file

@ -564,25 +564,37 @@ class ViewCommentsController extends Component {
this.onResolveComment(comment);
break;
case 'deleteComment':
f7.dialog.confirm(
_t.textMessageDeleteComment,
_t.textDeleteComment,
() => {
this.deleteComment(comment);
}
);
f7.dialog.create({
title: _t.textDeleteComment,
text: _t.textMessageDeleteComment,
buttons: [
{
text: _t.textCancel
},
{
text: _t.textOk,
onClick: () => this.deleteComment(comment)
}
]
}).open();
break;
case 'editReply':
this.props.storeComments.openEditReply(true, comment, reply);
break;
case 'deleteReply':
f7.dialog.confirm(
_t.textMessageDeleteReply,
_t.textDeleteReply,
() => {
this.deleteReply(comment, reply);
}
);
f7.dialog.create({
title: _t.textDeleteReply,
text: _t.textMessageDeleteReply,
buttons: [
{
text: _t.textCancel
},
{
text: _t.textOk,
onClick: () => this.deleteReply(comment, reply)
}
]
}).open();
break;
case 'addReply':
this.props.storeComments.openAddReply(true, comment);

1
apps/documenteditor/mobile/locale/en.json
View file

@ -75,6 +75,7 @@
"textBold": "Bold",
"textBreakBefore": "Page break before",
"textCancel": "Cancel",
"textOk": "Ok",
"textCaps": "All caps",
"textCenter": "Align center",
"textChart": "Chart",

6
apps/documenteditor/mobile/src/view/add/AddLink.jsx
View file

@ -13,8 +13,8 @@ const PageLink = props => {
const [stateLink, setLink] = useState('');
const [stateDisplay, setDisplay] = useState(display);
const [stateTip, setTip] = useState('');
const [stateAutoUpdate, setAutoUpdate] = useState(true);
const [stateAutoUpdate, setAutoUpdate] = useState(!stateDisplay ? true : false);
return (
<Page>
{!props.noNavbar && <Navbar title={_t.textAddLink} backLink={_t.textBack}></Navbar>}
@ -26,7 +26,7 @@ const PageLink = props => {
value={stateLink}
onChange={(event) => {
setLink(event.target.value);
if((!stateDisplay || stateDisplay === stateLink) && stateAutoUpdate) setDisplay(event.target.value);
if(stateAutoUpdate) setDisplay(event.target.value);
}}
></ListInput>
<ListInput

1
apps/presentationeditor/mobile/locale/en.json
View file

@ -15,6 +15,7 @@
"textAddReply": "Add Reply",
"textBack": "Back",
"textCancel": "Cancel",
"textOk": "Ok",
"textCollaboration": "Collaboration",
"textComments": "Comments",
"textDeleteComment": "Delete Comment",

4
apps/presentationeditor/mobile/src/view/add/AddLink.jsx
View file

@ -99,7 +99,7 @@ const PageLink = props => {
const display = props.getTextDisplay();
const displayDisabled = display !== false && display === null;
const [stateDisplay, setDisplay] = useState(display !== false ? ((display !== null) ? display : _t.textDefault) : "");
const [stateAutoUpdate, setAutoUpdate] = useState(true);
const [stateAutoUpdate, setAutoUpdate] = useState(!stateDisplay ? true : false);
const [screenTip, setScreenTip] = useState('');
return (
@ -117,7 +117,7 @@ const PageLink = props => {
value={link}
onChange={(event) => {
setLink(event.target.value);
if((!stateDisplay || stateDisplay === link) && stateAutoUpdate) setDisplay(event.target.value);
if(stateAutoUpdate) setDisplay(event.target.value);
}}
/> :
<ListItem link={'/add-link-to/'} title={_t.textLinkTo} after={displayTo} routeProps={{

1
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -15,6 +15,7 @@
"textAddReply": "Add Reply",
"textBack": "Back",
"textCancel": "Cancel",
"textOk": "Ok",
"textCollaboration": "Collaboration",
"textComments": "Comments",
"textDeleteComment": "Delete Comment",

4
apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx
View file

@ -63,7 +63,7 @@ const AddLinkView = props => {
displayText = displayDisabled ? _t.textSelectedRange : displayText;
const [stateDisplayText, setDisplayText] = useState(displayText);
const [stateAutoUpdate, setAutoUpdate] = useState(true);
const [stateAutoUpdate, setAutoUpdate] = useState(!stateDisplayText ? true : false);
const [screenTip, setScreenTip] = useState('');
const activeSheet = props.activeSheet;
@ -90,7 +90,7 @@ const AddLinkView = props => {
value={link}
onChange={(event) => {
setLink(event.target.value);
if((!stateDisplayText || stateDisplayText === link) && stateAutoUpdate && !displayDisabled) setDisplayText(event.target.value);
if(stateAutoUpdate && !displayDisabled) setDisplayText(event.target.value);
}}
className={isIos ? 'list-input-right' : ''}
/>