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

[SSE mobile] Fix Bug 47765

Browse source
This commit is contained in:
Julia Radzhabova 2020-12-01 16:57:58 +03:00
parent a8237f4538
commit 3d4a21499b
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/common/mobile/lib/controller/Collaboration.js
View file

@ -851,7 +851,7 @@ define([
}
} else {
$('.comment-resolve, .comment-menu, .add-reply, .reply-menu').removeClass('disabled');
if (this.showComments.length > 1) {
if (this.showComments && this.showComments.length > 1) {
$('.prev-comment, .next-comment').removeClass('disabled');
}
}
@ -863,7 +863,7 @@ define([
$('.comment-menu').single('click', _.buffered(this.initMenuComments, 100, this));
$('.reply-menu').single('click', _.buffered(this.initReplyMenu, 100, this));
$('.comment-resolve').single('click', _.bind(this.onClickResolveComment, this, false));
if (this.showComments.length === 1) {
if (this.showComments && this.showComments.length === 1) {
$('.prev-comment, .next-comment').addClass('disabled');
}
},
@ -921,7 +921,7 @@ define([
$('.reply-menu').single('click', _.buffered(me.initReplyMenu, 100, me));
$('.comment-resolve').single('click', _.bind(me.onClickResolveComment, me, false));
if (me.showComments.length === 1) {
if (me.showComments && me.showComments.length === 1) {
$('.prev-comment, .next-comment').addClass('disabled');
}
@ -998,7 +998,7 @@ define([
},
onViewPrevComment: function() {
if (this.showComments.length > 0) {
if (this.showComments && this.showComments.length > 0) {
if (this.indexCurrentComment - 1 < 0) {
this.indexCurrentComment = this.showComments.length - 1;
} else {
@ -1015,7 +1015,7 @@ define([
},
onViewNextComment: function() {
if (this.showComments.length > 0) {
if (this.showComments && this.showComments.length > 0) {
if (this.indexCurrentComment + 1 === this.showComments.length) {
this.indexCurrentComment = 0;
} else {

9
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file

@ -237,7 +237,12 @@ define([
break;
case 'viewcomment':
me.view.hideMenu();
SSE.getController('Common.Controllers.Collaboration').showCommentModal();
var cellinfo = this.api.asc_getCellInfo(),
comments = cellinfo.asc_getComments();
if (comments.length) {
SSE.getController('Common.Controllers.Collaboration').apiShowComments(comments[0].asc_getId());
SSE.getController('Common.Controllers.Collaboration').showCommentModal();
}
break;
case 'addcomment':
me.view.hideMenu();
@ -248,7 +253,7 @@ define([
if ('showActionSheet' == event && _actionSheets.length > 0) {
_.delay(function () {
_.each(_actionSheets, function (action) {
action.text = action.caption
action.text = action.caption;
action.onClick = function () {
me.onContextMenuClick(null, action.event)
}