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

Merge pull request #572 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2020-11-18 15:33:41 +03:00 committed by GitHub
parent ecd0e749c0 525a0a4aec
commit 2ceeaf34a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/common/main/lib/controller/Comments.js
View file

@ -291,7 +291,7 @@ define([
return false; return false;
}, },
onShowComment: function (id, selected) { onShowComment: function (id, selected, fromLeftPanelSelection) {
var comment = this.findComment(id); var comment = this.findComment(id);
if (comment) { if (comment) {
if (null !== comment.get('quote')) { if (null !== comment.get('quote')) {
@ -319,9 +319,11 @@ define([
this.isSelectedComment = selected; this.isSelectedComment = selected;
} }
this.api.asc_selectComment(id); if (!fromLeftPanelSelection || !((0 === _.difference(this.uids, [id]).length) && (0 === _.difference([id], this.uids).length))) {
this._dontScrollToComment = true; this.api.asc_selectComment(id);
this.api.asc_showComment(id,false); this._dontScrollToComment = true;
this.api.asc_showComment(id,false);
}
} }
} else { } else {

11
apps/common/main/lib/view/Comments.js
View file

@ -283,7 +283,16 @@ define([
} else if (!btn.hasClass('msg-reply') && } else if (!btn.hasClass('msg-reply') &&
!btn.hasClass('btn-resolve-check') && !btn.hasClass('btn-resolve-check') &&
!btn.hasClass('btn-resolve')) { !btn.hasClass('btn-resolve')) {
me.fireEvent('comment:show', [commentId, false]); var isTextSelected = false;
if (btn.hasClass('user-message')) {
if (window.getSelection) {
var selection = window.getSelection();
isTextSelected = (selection.toString()!=='')
} else if (document.selection) {
isTextSelected = document.selection;
}
}
me.fireEvent('comment:show', [commentId, false, isTextSelected]);
} }
} }
}, },

7
apps/documenteditor/mobile/app/controller/add/AddTable.js
View file

@ -123,12 +123,7 @@ define([
var size = picker.value; var size = picker.value;
if (me.api) { if (me.api) {
me.api.put_Table(parseInt(size[0]), parseInt(size[1])); me.api.put_Table(parseInt(size[0]), parseInt(size[1]), type.toString());
var properties = new Asc.CTableProp();
properties.put_TableStyle(type);
me.api.tblApply(properties);
} }
} }
} }

2
apps/documenteditor/mobile/app/controller/edit/EditTable.js
View file

@ -598,7 +598,7 @@ define([
$('#edit-table-styles .table-styles div').removeClass('active'); $('#edit-table-styles .table-styles div').removeClass('active');
$target.addClass('active'); $target.addClass('active');
properties.put_TableStyle(type); properties.put_TableStyle(type.toString());
me.api.tblApply(properties); me.api.tblApply(properties);
}, },

7
apps/presentationeditor/mobile/app/controller/add/AddTable.js
View file

@ -104,12 +104,7 @@ define([
var size = picker.value; var size = picker.value;
if (me.api) { if (me.api) {
me.api.put_Table(parseInt(size[0]), parseInt(size[1])); me.api.put_Table(parseInt(size[0]), parseInt(size[1]), undefined, type.toString());
var properties = new Asc.CTableProp();
properties.put_TableStyle(type);
me.api.tblApply(properties);
} }
} }
} }

2
apps/presentationeditor/mobile/app/controller/edit/EditTable.js
View file

@ -442,7 +442,7 @@ define([
$('#edit-table-styles .table-styles div').removeClass('active'); $('#edit-table-styles .table-styles div').removeClass('active');
$target.addClass('active'); $target.addClass('active');
properties.put_TableStyle(type); properties.put_TableStyle(type.toString());
me.api.tblApply(properties); me.api.tblApply(properties);
}, },