`;
+ } else {
+ popupAjaxError(e);
}
}
} else {
diff --git a/app/assets/javascripts/discourse/app/models/post.js b/app/assets/javascripts/discourse/app/models/post.js
index 515136b0a455c..8a450250c26fe 100644
--- a/app/assets/javascripts/discourse/app/models/post.js
+++ b/app/assets/javascripts/discourse/app/models/post.js
@@ -192,12 +192,15 @@ export default class Post extends RestModel {
@trackedPostProperty post_number;
@trackedPostProperty post_type;
@trackedPostProperty primary_group_name;
+ @trackedPostProperty quoted;
@trackedPostProperty read;
@trackedPostProperty reply_count;
@trackedPostProperty reply_to_user;
@trackedPostProperty staff;
@trackedPostProperty staged;
@trackedPostProperty title_is_group;
+ @trackedPostProperty topic_id;
+ @trackedPostProperty topic;
@trackedPostProperty trust_level;
@trackedPostProperty updated_at;
@trackedPostProperty user;
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
index 4fd11f1cbb5ac..731f2bae86836 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
@@ -666,6 +666,12 @@ import { i18n } from "discourse-i18n";
topicFixtures["/t/280/1.json"].post_stream.posts[2]
)
);
+ server.get("/posts/by_number/280/5", () =>
+ helper.response(
+ 200,
+ topicFixtures["/t/280/1.json"].post_stream.posts[4]
+ )
+ );
});
test("The quoted content is toggled correclty", async function (assert) {
@@ -711,6 +717,98 @@ import { i18n } from "discourse-i18n";
)
.hasAttribute("aria-expanded", "false");
});
+
+ // TODO (glimmer-post-stream): this test only works with the Glimmer Post Stream.
+ // When the removing the legacy code we should remove the `if` and run it unconditionally.
+ if (postStreamMode === "enabled") {
+ test("Nesting quoted content works", async function (assert) {
+ await visit("/t/internationalization-localization/280");
+
+ // outer quote
+ assert
+ .dom(
+ "#post_7 .cooked .quote[data-topic='280'][data-post='5'] > .title .quote-controls .quote-toggle"
+ )
+ .hasAttribute("aria-expanded", "false");
+
+ assert
+ .dom("#post_7 .quote[data-topic='280'][data-post='5']")
+ .includesText("The problem I see here")
+ .doesNotIncludeText("So you could replace that lookup table");
+
+ await click(
+ "#post_7 .cooked .quote[data-topic='280'][data-post='5'] > .title .quote-controls .quote-toggle"
+ );
+
+ assert
+ .dom(
+ "#post_7 .cooked .quote[data-topic='280'][data-post='5'] > .title .quote-controls .quote-toggle"
+ )
+ .hasAttribute("aria-expanded", "true");
+ assert
+ .dom("#post_7 .quote[data-topic='280'][data-post='5']")
+ .includesText("The problem I see here")
+ .includesText("So you could replace that lookup table");
+
+ // nested quote
+ assert
+ .dom(
+ "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3'] .quote-controls .quote-toggle"
+ )
+ .hasAttribute("aria-expanded", "false");
+ assert
+ .dom(
+ "#post_7 .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3']"
+ )
+ .includesText(
+ 'So you could replace that lookup table with the "de" one to get German.'
+ )
+ .doesNotIncludeText(
+ "Yep, all strings are going through a lookup table.*"
+ );
+
+ await click(
+ "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3'] .quote-controls .quote-toggle"
+ );
+
+ assert
+ .dom(
+ "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3'] .quote-controls .quote-toggle"
+ )
+ .hasAttribute("aria-expanded", "true");
+ assert
+ .dom(
+ "#post_7 .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3']"
+ )
+ .includesText(
+ 'So you could replace that lookup table with the "de" one to get German.'
+ )
+ .includesText(
+ "Yep, all strings are going through a lookup table.*"
+ );
+
+ await click(
+ "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3'] .quote-controls .quote-toggle"
+ );
+
+ assert
+ .dom(
+ "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3'] .quote-controls .quote-toggle"
+ )
+ .hasAttribute("aria-expanded", "false");
+
+ // outer quote
+ await click(
+ "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote-controls .quote-toggle"
+ );
+
+ assert
+ .dom(
+ "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote-controls .quote-toggle"
+ )
+ .hasAttribute("aria-expanded", "false");
+ });
+ }
}
);
diff --git a/app/assets/javascripts/discourse/tests/fixtures/topic.js b/app/assets/javascripts/discourse/tests/fixtures/topic.js
index eb38516ae7102..e0ce9c068e100 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/topic.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/topic.js
@@ -874,7 +874,7 @@ export default {
uploaded_avatar_id: 5253,
created_at: "2013-02-07T14:08:17.493Z",
cooked:
- '
Looks interesting, I\'ll take a peek.
\n\n
As said on dev, the best tool I can see in terms of giving translators a proper interface and quality control would be something like GlotPress. It\'s based on the PO messages format (is that somehow related to ICU?) but looks pretty great.
\n\n\n\n
I\'m not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like message_error_nametooshort ?)
',
+ '
Looks interesting, I\'ll take a peek.
\n\n
As said on dev, the best tool I can see in terms of giving translators a proper interface and quality control would be something like GlotPress. It\'s based on the PO messages format (is that somehow related to ICU?) but looks pretty great.
\n\n\n\n
I\'m not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like message_error_nametooshort ?)