diff options
Diffstat (limited to 'apps/comments/js/commentstabview.js')
| -rw-r--r-- | apps/comments/js/commentstabview.js | 60 |
1 files changed, 32 insertions, 28 deletions
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js index 8b20bac571b..3c428fe86a6 100644 --- a/apps/comments/js/commentstabview.js +++ b/apps/comments/js/commentstabview.js @@ -196,24 +196,26 @@ sorter: function (q, items) { return items; } }, displayTpl: function (item) { - return '<li>' - + '<span class="avatar-name-wrapper">' - + '<div class="avatar" ' - + ' data-username="' + escapeHTML(item.id) + '"' // for avatars - + ' data-user="' + escapeHTML(item.id) + '"' // for contactsmenu - + ' data-user-display-name="' + escapeHTML(item.label) + '"></div>' - + ' <strong>' + escapeHTML(item.label) + '</strong>' - + '</span></li>'; + return '<li>' + + '<span class="avatar-name-wrapper">' + + '<span class="avatar" ' + + 'data-username="' + escapeHTML(item.id) + '" ' + // for avatars + 'data-user="' + escapeHTML(item.id) + '" ' + // for contactsmenu + '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" ' - + ' data-username="' + escapeHTML(item.id) + '"' // for avatars - + ' data-user="' + escapeHTML(item.id) + '"' // for contactsmenu - + ' data-user-display-name="' + escapeHTML(item.label) + '"></div>' - + ' <strong>' + escapeHTML(item.label) + '</strong>' - + '</span>'; + return '' + + '<span class="avatar-name-wrapper">' + + '<span class="avatar" ' + + 'data-username="' + escapeHTML(item.id) + '" ' + // for avatars + 'data-user="' + escapeHTML(item.id) + '" ' + // for contactsmenu + 'data-user-display-name="' + escapeHTML(item.label) + '">' + + '</span>' + + '<strong>' + escapeHTML(item.label) + '</strong>' + + '</span>'; }, searchKey: "label" }); @@ -224,7 +226,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 ); @@ -486,20 +488,22 @@ }, _composeHTMLMention: function(uid, displayName) { - var avatar = '<div class="avatar" ' - + 'data-username="' + _.escape(uid) + '"' - + ' data-user="' + _.escape(uid) + '"' - + ' data-user-display-name="' - + _.escape(displayName) + '"></div>'; + var avatar = '' + + '<span class="avatar" ' + + 'data-username="' + _.escape(uid) + '" ' + + 'data-user="' + _.escape(uid) + '" ' + + 'data-user-display-name="' + _.escape(displayName) + '">' + + '</span>'; var isCurrentUser = (uid === OC.getCurrentUser().uid); - return '' - + '<span class="atwho-inserted" contenteditable="false">' - + '<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">' - + avatar + ' <strong>'+ _.escape(displayName)+'</strong>' - + '</span>' - + '</span>'; + return '' + + '<span class="atwho-inserted" contenteditable="false">' + + '<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">' + + avatar + + '<strong>' + _.escape(displayName) + '</strong>' + + '</span>' + + '</span>'; }, nextPage: function() { |