- -

- - Comments Subject to Etiquette and Contributor Guidelines -

+ + Comments Subject to Etiquette and Contributor Guidelines

diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css index bf291d3b6..ee50c6b77 100644 --- a/extensions/BugModal/web/bug_modal.css +++ b/extensions/BugModal/web/bug_modal.css @@ -296,6 +296,7 @@ input[type="number"] { #user-story { margin: 0; + white-space: pre-wrap; min-height: 2em; } @@ -629,8 +630,7 @@ body.platform-Win32 .comment-text, body.platform-Win64 .comment-text { font-family: "Fira Mono", monospace; } -.comment-text span.quote, .comment-text span.quote_wrapped, -div.comment-text pre { +.comment-text span.quote, .comment-text span.quote_wrapped { background: #eee !important; color: #444 !important; display: block !important; @@ -644,40 +644,6 @@ div.comment-text pre { border: 1px dashed darkred; } -/* Markdown comments */ -div.comment-text { - white-space: normal; - padding: 0 8px 0 8px; - font-family: inherit !important; -} - -div.comment-text code { - color: #444; - background-color: #eee; - font-size: 13px; - font-family: "Fira Mono","Droid Sans Mono",Menlo,Monaco,"Courier New",monospace; -} - -div.comment-text table { - border-collapse: collapse; -} - -div.comment-text th, div.comment-text td { - padding: 5px 10px; - border: 1px solid #ccc; -} - -div.comment-text hr { - display: block !important; -} - -div.comment-text blockquote { - background: #fcfcfc; - border-left: 5px solid #ccc; - margin: 1.5em 10px; - padding: 0.5em 10px; -} - .comment-tags { padding: 0 8px 2px 8px !important; } @@ -751,16 +717,11 @@ div.comment-text blockquote { margin-top: 20px; } -#add-comment-private { +#add-comment-private, +#bugzilla-etiquette { float: right; } -#add-comment-tips { - display: flex; - justify-content: space-between; - margin-bottom: 1em; -} - #comment { border: 1px solid #ccc; } @@ -769,7 +730,7 @@ div.comment-text blockquote { clear: both; width: 100%; box-sizing: border-box !important; - margin: 0 0 0.5em; + margin: 0 0 1em; max-width: 1024px; } diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js index 19b5bfa2f..a4ae83d72 100644 --- a/extensions/BugModal/web/bug_modal.js +++ b/extensions/BugModal/web/bug_modal.js @@ -858,54 +858,31 @@ $(function() { var prefix = "(In reply to " + comment_author + " from comment #" + comment_id + ")\n"; var reply_text = ""; - - var quoteMarkdown = function($comment) { - const uid = $comment.data('uniqueid'); - bugzilla_ajax( - { - url: `rest/bug/comment/${uid}`, - }, - (data) => { - const quoted = data['comments'][uid]['text'].replace(/\n/g, "\n > "); - reply_text = `${prefix}\n > ${quoted}`; - populateNewComment(); - } - ); + if (BUGZILLA.user.settings.quote_replies == 'quoted_reply') { + var text = $('#ct-' + comment_id).text(); + reply_text = prefix + wrapReplyText(text); + } else if (BUGZILLA.user.settings.quote_replies == 'simply_reply') { + reply_text = prefix; } - var populateNewComment = function() { - // quoting a private comment, check the 'private' cb - $('#add-comment-private-cb').prop('checked', - $('#add-comment-private-cb:checked').length || $('#is-private-' + comment_id + ':checked').length); + // quoting a private comment, check the 'private' cb + $('#add-comment-private-cb').prop('checked', + $('#add-comment-private-cb:checked').length || $('#is-private-' + comment_id + ':checked').length); - // remove embedded links to attachment details - reply_text = reply_text.replace(/(attachment\s+\d+)(\s+\[[^\[\n]+\])+/gi, '$1'); + // remove embedded links to attachment details + reply_text = reply_text.replace(/(attachment\s+\d+)(\s+\[[^\[\n]+\])+/gi, '$1'); - $.scrollTo($('#comment'), function() { - if ($('#comment').val() != reply_text) { - $('#comment').val($('#comment').val() + reply_text); - } - - if (BUGZILLA.user.settings.autosize_comments) { - autosize.update($('#comment')); - } - - $('#comment').trigger('input').focus(); - }); - } + $.scrollTo($('#comment'), function() { + if ($('#comment').val() != reply_text) { + $('#comment').val($('#comment').val() + reply_text); + } - if (BUGZILLA.user.settings.quote_replies == 'quoted_reply') { - var $comment = $('#ct-' + comment_id); - if ($comment.attr('data-ismarkdown')) { - quoteMarkdown($comment); - } else { - reply_text = prefix + wrapReplyText($comment.text()); - populateNewComment(); + if (BUGZILLA.user.settings.autosize_comments) { + autosize.update($('#comment')); } - } else if (BUGZILLA.user.settings.quote_replies == 'simply_reply') { - reply_text = prefix; - populateNewComment(); - } + + $('#comment').focus(); + }); }); if (BUGZILLA.user.settings.autosize_comments) { @@ -1343,163 +1320,12 @@ $(function() { saveBugComment(event.target.value); }); - function smartLinkPreviews() { - const filterUnique = (value, index, array) => value && array.indexOf(value) === index; - const reduceListToMap = (all, one) => { all[one['id']] = one; return all; }; - - const getResourceId = anchor => { - if (['/bug/', '/attachment/'].some((path) => anchor.pathname.startsWith(path))) { - return anchor.pathname.split('/')[2]; - } else { - return (new URL(anchor.href)).searchParams.get("id"); - } - }; - - const findLinkElements = pathnames => { - return ( - Array - .from(document.querySelectorAll('.comment-text a')) - .filter(anchor => { - return ( - `${anchor.origin}/` === BUGZILLA.constant.URL_BASE && - pathnames.some((p) => anchor.pathname.startsWith(p)) && - /^\d+$/.test(getResourceId(anchor)) - ) - }) - .filter(anchor => - // Get only links created by markdown or private links. - !anchor.hasAttribute('title') || anchor.classList.contains('bz_private_link') - ) - .map(anchor => { - return { - id: getResourceId(anchor), - element: anchor - } - }) - ) - }; - - const enhanceBugLinks = () => { - let bugLinks = findLinkElements(['/show_bug.cgi', '/bug/']); - let bugIds = bugLinks.map((bug) => parseInt(bug['id'])).filter(filterUnique).join(','); - let params = $.param({ - Bugzilla_api_token: BUGZILLA.api_token, - id: bugIds, - include_fields: 'id,summary,status,resolution,is_open' - }); - - if(!bugIds) return; - - fetch(`/rest/bug?${params}`) - .then(response => { - if(response.ok){ - return response.json(); - } - throw new Error(`/rest/bug?ids=${bugIds} response not ok`); - }) - .then(responseJson => { - return responseJson.bugs.reduce(reduceListToMap, {}); - }) - .then(bugs => { - bugLinks.forEach(bugLink => { - let bug = bugs[bugLink['id']]; - if(!bug) return; - - bugLink.element.setAttribute( - "title", `${bug.status} ${bug.resolution} - ${bug.summary}` - ); - bugLink.element.classList.add('bz_bug_link'); - bugLink.element.classList.add(`bz_status_${bug.status}`); - if(!bug.is_open) { - bugLink.element.classList.add('bz_closed'); - } - $(bugLink.element).tooltip({ - position: { my: "left top+8", at: "left bottom", collision: "flipfit" }, - show: { effect: 'none' }, - hide: { effect: 'none' } - }); - }); - }) - .catch(e => console.log(e)); - }; - - const enhanceAttachmentLinks = () => { - let attachmentLinks = findLinkElements(['/attachment.cgi']); - let attachmentIds = ( - attachmentLinks.map(attachment => parseInt(attachment['id'])).filter(filterUnique) - ); - let params = $.param({ - Bugzilla_api_token: BUGZILLA.api_token, - include_fields: 'id,description,is_obsolete' - }); - - if(!attachmentIds) return; - - // Fetch all attachments for this bug only. This endpoint filters out - // attachments the user can't see for us (e.g. ones marked private). - // This one request will likely retrieve most of the attachments we need. - fetch(`/rest/bug/${BUGZILLA.bug_id}/attachment?${params}`) - .then(response => { - if(response.ok){ - return response.json(); - } - throw Error(`/rest/bug/${BUGZILLA.bug_id}/attachment response not ok`); - }) - .then(responseJson => { - return responseJson['bugs'][BUGZILLA.bug_id] || []; - }) - .then(attachments => { - // The BMO rest API that lets us batch request attachment ids unfortunatley - // fails the whole batch if the user is unable to view any of the attachments. - // So, we query each attachment id individually and group them as a promsie. - let missingAttachments = ( - attachmentIds - .filter(id => !attachments.map(attachment => attachment.id).includes(id)) - .map(attachmentId => { - return ( - fetch(`/rest/bug/attachment/${attachmentId}?${params}`) - .then((response) => { - // It's ok if the request failed. - return response.json(); - }) - .then(responseJson => { - // May be undefined. - return responseJson['attachments'][attachmentId]; - }) - ); - }) - ); - return Promise.all(attachments.concat(missingAttachments)); - }) - .then(attachments => { - // Remove undefined attachments and convert from list to dictonary mapped by id. - return attachments.filter(filterUnique).reduce(reduceListToMap, {}); - }) - .then(attachments => { - // Now we have all attachment data the user is able to see. - attachmentLinks.forEach(attachmentLink => { - let attachment = attachments[attachmentLink.id]; - if(!attachment) return; - - attachmentLink.element.setAttribute("title", attachment.description); - if(attachment.is_obsolete){ - attachmentLink.element.classList.add('bz_obsolete'); - } - }); - }) - .catch(e => console.log(e)); - }; - enhanceBugLinks(); - enhanceAttachmentLinks(); - } - // finally switch to edit mode if we navigate back to a page that was editing $(window).on('pageshow', restoreEditMode); $(window).on('pageshow', restoreSavedBugComment); $(window).on('focus', restoreSavedBugComment); restoreEditMode(); restoreSavedBugComment(); - smartLinkPreviews(); }); function confirmUnsafeURL(url) { diff --git a/extensions/EditComments/template/en/default/pages/editcomments.html.tmpl b/extensions/EditComments/template/en/default/pages/editcomments.html.tmpl index b38a6dc0b..13364f5b1 100644 --- a/extensions/EditComments/template/en/default/pages/editcomments.html.tmpl +++ b/extensions/EditComments/template/en/default/pages/editcomments.html.tmpl @@ -34,7 +34,7 @@

[% bug.short_desc FILTER renderComment(bug, undef, 1) FILTER wbr %]

[% bug.short_desc FILTER quoteUrls(bug) FILTER wbr %]