github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 05:01:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: don’t include category in quote topic title, if present

Browse Source
This commit is contained in:
jbrw 2020-09-25 15:01:57 -04:00 committed by GitHub
parent b257253e7e
commit 4421820354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/components/quote-button.js
View File

@ -19,6 +19,12 @@ function getQuoteTitle(element) {
if (!titleEl) {
return;
}
const titleLink = titleEl.querySelector("a:not(.back)");
if (titleLink) {
return titleLink.textContent.trim();
}
return titleEl.textContent.trim().replace(/:$/, "");
}

17
test/javascripts/acceptance/topic-test.js
View File

@ -337,6 +337,23 @@ QUnit.test("Quoting a quote keeps the original poster name", async (assert) => {
);
});
QUnit.test(
"Quoting a quote of a different topic keeps the original topic title",
async (assert) => {
await visit("/t/internationalization-localization/280");
selectText("#post_9 blockquote");
await click(".quote-button .insert-quote");
assert.ok(
find(".d-editor-input")
.val()
.indexOf(
'quote="A new topic with a link to another topic, post:3, topic:62"'
) !== -1
);
}
);
QUnit.test(
"Quoting a quote with the Reply button keeps the original poster name",
async (assert) => {

2
test/javascripts/fixtures/topic.js
View File

@ -851,7 +851,7 @@ export default {
uploaded_avatar_id: 5253,
created_at: "2013-02-07T14:14:12.666Z",
cooked:
'<p><aside class="quote" data-post="8" data-topic="280"><div class="title">\n<div class="quote-controls"></div>\n<img width="20" height="20" src="/user_avatar/meta.discourse.org/sam/40/5243.png" class="avatar">sam said:</div>\n<blockquote><p>one letter change and all your translators need to validate it.</p></blockquote></aside></p>\n\n<p>Yeah, that\'s why I\'ve always been a friend of <code>message_error_nametooshort</code> placeholders, until I asked the SO question linked above. The accepted answer makes a good argument against those placeholders: you <em>want</em> translations to break even on small changes in the English original because the translations will probably need to reflect the change, too. Maybe that\'s not the case right now as new stuff is being checked in pretty much every couple of hours, but in the long run, it\'ll be overwhelmingly true.</p>',
'<aside class="quote no-group\" data-post="3" data-topic="62">\n<div class="title">\n<div class="quote-controls"></div>\n<img alt="" width="20" height="20" src="/user_avatar/meta.discourse.org/sam/40/5243.png" class="avatar"><a href="/t/a-new-topic-with-a-link-to-another-topic/62/3">A new topic with a link to another topic</a>\n</div>\n<blockquote>\n<p>Thanks for posting this</p>\n</blockquote>\n</aside>\n<p>repost after a reload thank you!</p>',
post_number: 9,
post_type: 1,
updated_at: "2013-02-07T14:18:09.569Z",