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

Bug 17406: вернула правку от 2013-08-21 17:35:35 (убрала выделение текста в комментарии при просмотре).

Browse source
This commit is contained in:
Julia Radzhabova 2016-03-25 10:38:34 +03:00
parent 6c285c0b32
commit 21234995c4
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/template/Comments.template
View file

@ -9,7 +9,7 @@
<div class="user-quote"><%=scope.getFixedQuote(quote)%></div>
<% } %>
<% if (!editText) { %>
<div class="user-message user-select" data-can-copy="true"><%=scope.pickLink(comment)%></div>
<div class="user-message" data-can-copy="true"><%=scope.pickLink(comment)%></div>
<% } else { %>
<div class="inner-edit-ct">
<textarea class="msg-reply user-select" maxlength="maxCommLength"><%=comment%></textarea>
@ -27,7 +27,7 @@
<div class="user-name"><%=scope.getUserName(item.get("username"))%></div>
<div class="user-date"><%=item.get("date")%></div>
<% if (!item.get("editText")) { %>
<div class="user-message user-select" data-can-copy="true"><%=scope.pickLink(item.get("reply"))%></div>
<div class="user-message" data-can-copy="true"><%=scope.pickLink(item.get("reply"))%></div>
<div class="btns-reply-ct">
<div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
<div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>

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

@ -5,7 +5,7 @@
<div class="user-name"><%=scope.getUserName(username)%></div>
<div class="user-date"><%=date%></div>
<% if (!editTextInPopover || hint) { %>
<div class="user-message user-select"><%=scope.pickLink(comment)%></div>
<div class="user-message"><%=scope.pickLink(comment)%></div>
<% } else { %>
<div class="inner-edit-ct">
<textarea class="msg-reply user-select" maxlength="maxCommLength"><%=comment%></textarea>
@ -27,7 +27,7 @@
<div class="user-name"><%=scope.getUserName(item.get("username"))%></div>
<div class="user-date"><%=item.get("date")%></div>
<% if (!item.get("editTextInPopover")) { %>
<div class="user-message user-select"><%=scope.pickLink(item.get("reply"))%></div>
<div class="user-message"><%=scope.pickLink(item.get("reply"))%></div>
<% if (!hint) { %>
<div class="btns-reply-ct">
<div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>

2
apps/common/main/lib/template/ReviewChangesPopover.template
View file

@ -1,7 +1,7 @@
<div id="<%=id%>" class="user-comment-item">
<div class="user-name-colored"><span style="background-color:<%=usercolor%>;"><%=scope.getUserName(username)%></span></div>
<div class="user-date"><%=date%></div>
<div class="user-message user-select limit-height"><%=changetext%></div>
<div class="user-message limit-height"><%=changetext%></div>
<div class="edit-ct">
<% if (scope.isReviewOnly) { %>
<div class="btn-delete img-commonctrl"></div>

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

@ -43,7 +43,7 @@ define([
'<% if (msg.get("type")==1) { %>',
'<div class="message service" data-can-copy="true"><%= msg.get("message") %></div>',
'<% } else { %>',
'<div class="user user-select" data-can-copy="true" style="color: <%= msg.get("usercolor") %>;"><%= scope.getUserName(msg.get("username")) %></div>',
'<div class="user" data-can-copy="true" style="color: <%= msg.get("usercolor") %>;"><%= scope.getUserName(msg.get("username")) %></div>',
'<label class="message user-select" data-can-copy="true"><%= msg.get("message") %></label>',
'<% } %>',
'</li>'].join(''),