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

[DE] Bug 41216

Browse source
This commit is contained in:
Julia Radzhabova 2019-04-15 14:06:41 +03:00
parent 4149278da7
commit 05a2056fa5
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1309,6 +1309,7 @@ define([
anchor.asc_getY(), anchor.asc_getY(),
this.hintmode ? anchor.asc_getX() : undefined); this.hintmode ? anchor.asc_getX() : undefined);
Common.NotificationCenter.trigger('comments:showdummy');
dialog.showComments(true, false, true, dialog.getDummyText()); dialog.showComments(true, false, true, dialog.getDummyText());
} }
} }

9
apps/documenteditor/main/app/controller/Main.js
View file

@ -220,7 +220,7 @@ define([
if (!/area_id/.test(e.target.id)) { if (!/area_id/.test(e.target.id)) {
if (/msg-reply/.test(e.target.className)) { if (/msg-reply/.test(e.target.className)) {
me.dontCloseDummyComment = true; me.dontCloseDummyComment = true;
me.beforeCloseDummyComment = false; me.beforeShowDummyComment = me.beforeCloseDummyComment = false;
} else if (/chat-msg-text/.test(e.target.id)) } else if (/chat-msg-text/.test(e.target.id))
me.dontCloseChat = true; me.dontCloseChat = true;
else if (!me.isModalShowed && /form-control/.test(e.target.className)) else if (!me.isModalShowed && /form-control/.test(e.target.className))
@ -1197,6 +1197,7 @@ define([
if (this.appOptions.canComments) if (this.appOptions.canComments)
Common.NotificationCenter.on('comments:cleardummy', _.bind(this.onClearDummyComment, this)); Common.NotificationCenter.on('comments:cleardummy', _.bind(this.onClearDummyComment, this));
Common.NotificationCenter.on('comments:showdummy', _.bind(this.onShowDummyComment, this));
this.applyModeCommonElements(); this.applyModeCommonElements();
this.applyModeEditorElements(); this.applyModeEditorElements();
@ -1626,7 +1627,7 @@ define([
} }
/** coauthoring begin **/ /** coauthoring begin **/
if (this.contComments.isDummyComment && !this.dontCloseDummyComment) { if (this.contComments.isDummyComment && !this.dontCloseDummyComment && !this.beforeShowDummyComment) {
this.contComments.clearDummyComment(); this.contComments.clearDummyComment();
} }
/** coauthoring end **/ /** coauthoring end **/
@ -2233,6 +2234,10 @@ define([
this.dontCloseDummyComment = false; this.dontCloseDummyComment = false;
}, },
onShowDummyComment: function() {
this.beforeShowDummyComment = true;
},
leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.', leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.',
defaultTitleText: 'ONLYOFFICE Document Editor', defaultTitleText: 'ONLYOFFICE Document Editor',
criticalErrorTitle: 'Error', criticalErrorTitle: 'Error',