diff --git a/apps/common/mobile/lib/controller/collaboration/Comments.jsx b/apps/common/mobile/lib/controller/collaboration/Comments.jsx index 55eae7387..e3ae0aa0b 100644 --- a/apps/common/mobile/lib/controller/collaboration/Comments.jsx +++ b/apps/common/mobile/lib/controller/collaboration/Comments.jsx @@ -92,8 +92,10 @@ class CommentsController extends Component { } addComment (id, data) { const comment = this.readSDKComment(id, data); + if (comment) { this.storeComments.addComment(comment); + this.changeShowComments([comment.uid]); } } addComments (data) { @@ -294,6 +296,7 @@ class AddCommentController extends Component { !!comment.asc_putDocumentFlag && comment.asc_putDocumentFlag(documentFlag); api.asc_addComment(comment); + Common.Notifications.trigger('viewcomment'); } } render() { diff --git a/apps/common/mobile/lib/store/comments.js b/apps/common/mobile/lib/store/comments.js index 28a2d7a63..39ea23113 100644 --- a/apps/common/mobile/lib/store/comments.js +++ b/apps/common/mobile/lib/store/comments.js @@ -10,6 +10,7 @@ export class storeComments { showComments: observable, changeShowComment: action, + removeShowComment: action, addComment: action, removeComment: action, diff --git a/apps/common/mobile/lib/view/collaboration/Comments.jsx b/apps/common/mobile/lib/view/collaboration/Comments.jsx index 55d9a621f..ff5a69fed 100644 --- a/apps/common/mobile/lib/view/collaboration/Comments.jsx +++ b/apps/common/mobile/lib/view/collaboration/Comments.jsx @@ -791,10 +791,12 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob {isEdit && !viewMode && {onCommentMenuClick('addReply', comment);}}>{_t.textAddReply} } -
- - -
+ {comments.length > 1 && +
+ + +
+ }
diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index ff36bcc82..e4ffca696 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -505,8 +505,8 @@ } .actions-button-text { - height: 57px; - line-height: 57px; + // height: 57px; + // line-height: 57px; font-size: 20px; color: @text-normal; white-space: normal; diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index c414be24b..9891e1247 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -123,7 +123,7 @@ "textMultiple": "multiple", "textNoBreakBefore": "No page break before", "textNoChanges": "There are no changes.", - "textNoComments": "This document doesn't contain comments", + "textNoComments": "No Comments", "textNoContextual": "Add interval between paragraphs of the same style", "textNoKeepLines": "Don't keep lines together", "textNoKeepNext": "Don't keep with next", diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx index b49ecc209..e88becd0e 100644 --- a/apps/documenteditor/mobile/src/page/main.jsx +++ b/apps/documenteditor/mobile/src/page/main.jsx @@ -113,11 +113,12 @@ class MainPage extends Component { const api = Common.EditorApi.get(); const appOptions = this.props.storeAppOptions; + f7.popover.close('.document-menu.modal-in', false); + f7.navbar.show('.main-navbar', false); + appOptions.changeViewerMode(); api.asc_removeRestriction(Asc.c_oAscRestrictionType.View) api.asc_addRestriction(Asc.c_oAscRestrictionType.None); - - f7.navbar.show('.main-navbar'); }; render() { diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index ad13071df..b08ced2f3 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -27,7 +27,7 @@ "textEditUser": "Users who are editing the file:", "textMessageDeleteComment": "Do you really want to delete this comment?", "textMessageDeleteReply": "Do you really want to delete this reply?", - "textNoComments": "This document doesn't contain comments", + "textNoComments": "No Comments", "textOk": "Ok", "textReopen": "Reopen", "textResolve": "Resolve", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 79f382a98..fa512d66e 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -27,7 +27,7 @@ "textEditUser": "Users who are editing the file:", "textMessageDeleteComment": "Do you really want to delete this comment?", "textMessageDeleteReply": "Do you really want to delete this reply?", - "textNoComments": "This document doesn't contain comments", + "textNoComments": "No Comments", "textOk": "Ok", "textReopen": "Reopen", "textResolve": "Resolve",