Skip to content

[stable14] Fix markup and style of mentions in comments #11077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 9 commits into from
Sep 20, 2018
Merged

[stable14] Fix markup and style of mentions in comments #11077

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da75c7f
Show avatar using "span" instead of "div"
danxuliu Sep 5, 2018
3ee07ac
Remove space between avatar and user name
danxuliu Sep 5, 2018
6b7e049
Reformat embedded HTML code to resemble HTML code
danxuliu Sep 5, 2018
3c63850
Ensure that the user name is shown in bold in mentions
danxuliu Sep 5, 2018
b14425e
Highlight mentions to the current user
danxuliu Sep 5, 2018
7c851b5
Fix pointer cursor not shown on avatars
danxuliu Sep 5, 2018
e7d4d3a
Remove unneeded CSS rule for mentions
danxuliu Sep 5, 2018
2e424d8
Ensure that the avatar and the user name will be kept together
danxuliu Sep 5, 2018
51b978d
Add new line at the end of file
danxuliu Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Show avatar using "span" instead of "div" 
Visually it makes no difference, but as the ".avatar" element is inside
a "span" element it can not be a block element to be compliant with the
HTML specification.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Sep 5, 2018
commit da75c7ff6dd616ac6131d68ac85c22b28970b5ee
14 changes: 7 additions & 7 deletions apps/comments/js/commentstabview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,20 +198,20 @@
displayTpl: function (item) {
return '<li>'
+ '<span class="avatar-name-wrapper">'
+ '<div class="avatar" '
+ '<span class="avatar" '
+ ' data-username="' + escapeHTML(item.id) + '"' // for avatars
+ ' data-user="' + escapeHTML(item.id) + '"' // for contactsmenu
+ ' data-user-display-name="' + escapeHTML(item.label) + '"></div>'
+ ' data-user-display-name="' + escapeHTML(item.label) + '"></span>'
+ ' <strong>' + escapeHTML(item.label) + '</strong>'
+ '</span></li>';
},
insertTpl: function (item) {
return ''
+ '<span class="avatar-name-wrapper">'
+ '<div class="avatar" '
+ '<span class="avatar" '
+ ' data-username="' + escapeHTML(item.id) + '"' // for avatars
+ ' data-user="' + escapeHTML(item.id) + '"' // for contactsmenu
+ ' data-user-display-name="' + escapeHTML(item.label) + '"></div>'
+ ' data-user-display-name="' + escapeHTML(item.label) + '"></span>'
+ ' <strong>' + escapeHTML(item.label) + '</strong>'
+ '</span>';
},
Expand All @@ -224,7 +224,7 @@
// passing the whole comments form would re-apply and request
// avatars from the server
$(je.target).find(
'div[data-username="' + $el.find('[data-username]').data('username') + '"]'
'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
).parent(),
editionMode
);
Expand Down Expand Up @@ -486,11 +486,11 @@
},

_composeHTMLMention: function(uid, displayName) {
var avatar = '<div class="avatar" '
var avatar = '<span class="avatar" '
+ 'data-username="' + _.escape(uid) + '"'
+ ' data-user="' + _.escape(uid) + '"'
+ ' data-user-display-name="'
+ _.escape(displayName) + '"></div>';
+ _.escape(displayName) + '"></span>';

var isCurrentUser = (uid === OC.getCurrentUser().uid);

Expand Down
2 changes: 1 addition & 1 deletion apps/comments/tests/js/commentstabviewSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {

expect(createStub.calledOnce).toEqual(false);
expect($newCommentForm.find('.message').html()).toContain('Mention to <span');
expect($newCommentForm.find('.message').html()).toContain('<div class="avatar"');
expect($newCommentForm.find('.message').html()).toContain('<span class="avatar"');
expect($newCommentForm.find('.message').html()).toContain('<strong>User Name</strong>');
expect($newCommentForm.find('.message').text()).not.toContain('@');
// In this case the default behaviour is prevented by the
Expand Down