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

[SSE] Full info for the popover comment in hint mode

Browse source
This commit is contained in:
Alexei Koshelev 2022-11-04 22:57:10 +03:00
parent 36b461f6e1
commit a86884c73a
5 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,7 @@ define([
subEditStrings : {}, subEditStrings : {},
filter : undefined, filter : undefined,
hintmode : false, hintmode : false,
fullInfoHintMode: false,
viewmode: false, viewmode: false,
isSelectedComment : false, isSelectedComment : false,
uids : [], uids : [],
@ -186,6 +187,7 @@ define([
this.currentUserId = data.config.user.id; this.currentUserId = data.config.user.id;
this.sdkViewName = data['sdkviewname'] || this.sdkViewName; this.sdkViewName = data['sdkviewname'] || this.sdkViewName;
this.hintmode = data['hintmode'] || false; this.hintmode = data['hintmode'] || false;
this.fullInfoHintMode = data['fullInfoHintMode'] || false;
this.viewmode = data['viewmode'] || false; this.viewmode = data['viewmode'] || false;
} }
}, },
@ -1355,6 +1357,7 @@ define([
removable : (this.mode.canDeleteComments || (data.asc_getUserId() == this.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getUserName()), removable : (this.mode.canDeleteComments || (data.asc_getUserId() == this.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getUserName()),
hide : !AscCommon.UserInfoParser.canViewComment(data.asc_getUserName()), hide : !AscCommon.UserInfoParser.canViewComment(data.asc_getUserName()),
hint : !this.mode.canComments, hint : !this.mode.canComments,
fullInfoInHint : this.fullInfoHintMode,
groupName : (groupname && groupname.length>1) ? groupname[1] : null groupName : (groupname && groupname.length>1) ? groupname[1] : null
}); });
if (comment) { if (comment) {

1
apps/common/main/lib/model/Comment.js
View file

@ -82,6 +82,7 @@ define([
hide : false, hide : false,
filtered : false, filtered : false,
hint : false, hint : false,
fullInfoInHint : false,
dummy : undefined, dummy : undefined,
editable : true, editable : true,
removable : true removable : true

10
apps/common/main/lib/template/CommentsPopover.template
View file

@ -37,7 +37,7 @@
<div class="user-date"><%=item.get("date")%></div> <div class="user-date"><%=item.get("date")%></div>
<% if (!item.get("editTextInPopover")) { %> <% if (!item.get("editTextInPopover")) { %>
<div oo_editor_input="true" tabindex="-1" class="user-message user-select"><%=scope.pickLink(item.get("reply"))%></div> <div oo_editor_input="true" tabindex="-1" class="user-message user-select"><%=scope.pickLink(item.get("reply"))%></div>
<% if (!hint && !scope.viewmode) { %> <% if ((fullInfoInHint || !hint) && !scope.viewmode) { %>
<div class="btns-reply-ct"> <div class="btns-reply-ct">
<% if (item.get("editable")) { %> <% if (item.get("editable")) { %>
<div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div> <div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
@ -61,7 +61,7 @@
<!-- add reply button --> <!-- add reply button -->
<% if (!showReplyInPopover && !hideAddReply && !hint && !scope.viewmode) { %> <% if (!showReplyInPopover && !hideAddReply && (fullInfoInHint || !hint) && !scope.viewmode) { %>
<% if (replys.length && !add_arrow) { %> <% if (replys.length && !add_arrow) { %>
<label class="user-reply" style="margin-left: 20px; margin-top: 5px;" role="presentation" tabindex="-1">textAddReply</label> <label class="user-reply" style="margin-left: 20px; margin-top: 5px;" role="presentation" tabindex="-1">textAddReply</label>
<% } else { %> <% } else { %>
@ -73,7 +73,7 @@
<% if (!editTextInPopover && !lock) { %> <% if (!editTextInPopover && !lock) { %>
<div class="edit-ct"> <div class="edit-ct">
<% if (!hint && !scope.viewmode) { %> <% if ((fullInfoInHint || !hint) && !scope.viewmode) { %>
<% if (editable) { %> <% if (editable) { %>
<div class="btn-edit img-commonctrl"></div> <div class="btn-edit img-commonctrl"></div>
<% } %> <% } %>
@ -81,9 +81,9 @@
<div class="btn-delete img-commonctrl"></div> <div class="btn-delete img-commonctrl"></div>
<% } %> <% } %>
<% } %> <% } %>
<% if (editable && !hint && !scope.viewmode) { %> <% if (editable && (fullInfoInHint || !hint) && !scope.viewmode) { %>
<div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div> <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
<% } else if (!hint && (!editable || scope.viewmode) && resolved) { %> <% } else if ((fullInfoInHint || !hint) && (!editable || scope.viewmode) && resolved) { %>
<div class="icon-resolve i-comment-resolved" data-toggle="tooltip"></div> <div class="icon-resolve i-comment-resolved" data-toggle="tooltip"></div>
<% } %> <% } %>
</div> </div>

2
apps/common/main/lib/view/ReviewPopover.js
View file

@ -321,6 +321,8 @@ define([
if (record.get('hint')) { if (record.get('hint')) {
me.fireEvent('comment:disableHint', [record]); me.fireEvent('comment:disableHint', [record]);
if(!record.get('fullInfoInHint'))
return; return;
} }

1
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1458,6 +1458,7 @@ define([
commentsController.setConfig({ commentsController.setConfig({
config : this.editorConfig, config : this.editorConfig,
sdkviewname : '#ws-canvas-outer', sdkviewname : '#ws-canvas-outer',
fullInfoHintMode : true,
hintmode : true}, hintmode : true},
this.api); this.api);
} }