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

Merge pull request #549 from ONLYOFFICE/fix/bugfix

Browse source 
[SSE mobile] Fix Bug 47246
This commit is contained in:
Julia Radzhabova 2020-11-03 21:31:48 +03:00 committed by GitHub
parent 48337f68b8 a57a451a3b
commit 60c5217f3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -830,9 +830,6 @@ define([
me.indexCurrentComment = 0;
me.updateViewComment();
}
if (window.SSE) {
SSE.getController('AddOther').setHideAddComment(true);
}
},
apiHideComments: function() {
@ -840,9 +837,6 @@ define([
uiApp.closeModal();
$('.container-view-comment').remove();
}
if (window.SSE) {
SSE.getController('AddOther').setHideAddComment(false);
}
},
disabledViewComments: function(disabled) {

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

@ -86,16 +86,6 @@ define([
this.api.asc_registerCallback('asc_onHidePopMenu', _.bind(this.onApiHidePopMenu, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect,this));
this.api.asc_registerCallback('asc_onShowComment', _.bind(this.onApiShowComment, this));
this.api.asc_registerCallback('asc_onHideComment', _.bind(this.onApiHideComment, this));
},
onApiShowComment: function(comments) {
_isComments = comments && comments.length>0;
},
onApiHideComment: function() {
_isComments = false;
},
setMode: function (mode) {
@ -313,6 +303,7 @@ define([
var iscelllocked = cellinfo.asc_getLocked(),
seltype = cellinfo.asc_getSelectionType(),
xfs = cellinfo.asc_getXfs();
_isComments = cellinfo.asc_getComments().length>0; //prohibit adding multiple comments in one cell;
switch (seltype) {
case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break;

5
apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
View file

@ -70,6 +70,7 @@ define([
var me = this;
me.api = api;
me.api.asc_registerCallback('asc_onError', _.bind(me.onError, me));
me.api.asc_registerCallback('asc_onSelectionChanged', _.bind(me.onApiSelectionChanged, me));
// me.api.asc_registerCallback('asc_onInitEditorFonts', _.bind(onApiLoadFonts, me));
@ -80,8 +81,8 @@ define([
this.view.canViewComments = mode.canViewComments;
},
setHideAddComment: function(hide) {
this.view.isComments = hide; //prohibit adding multiple comments in one cell
onApiSelectionChanged: function(info) {
this.view.isComments = info.asc_getComments().length>0; //prohibit adding multiple comments in one cell
},
onLaunch: function () {