diff --git a/app/assets/javascripts/discourse/app/controllers/change-post-notice.js b/app/assets/javascripts/discourse/app/controllers/change-post-notice.js index ffcbbaa175e..da2af416568 100644 --- a/app/assets/javascripts/discourse/app/controllers/change-post-notice.js +++ b/app/assets/javascripts/discourse/app/controllers/change-post-notice.js @@ -47,7 +47,7 @@ export default Controller.extend(ModalFunctionality, { ? { type: "custom", raw: notice, - cooked: cooked.string, + cooked: cooked.toString(), } : null ) diff --git a/app/assets/javascripts/discourse/app/models/user-drafts-stream.js b/app/assets/javascripts/discourse/app/models/user-drafts-stream.js index d58437c8dcb..30e91fd2045 100644 --- a/app/assets/javascripts/discourse/app/models/user-drafts-stream.js +++ b/app/assets/javascripts/discourse/app/models/user-drafts-stream.js @@ -69,7 +69,7 @@ export default RestModel.extend({ const promises = result.drafts.map((draft) => { draft.data = JSON.parse(draft.data); return cookAsync(draft.data.reply).then((cooked) => { - draft.excerpt = excerpt(cooked.string, 300); + draft.excerpt = excerpt(cooked.toString(), 300); draft.post_number = draft.data.postId || null; if ( draft.draft_key === NEW_PRIVATE_MESSAGE_KEY || diff --git a/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js b/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js index 8c035ccadfb..49d5739e2ab 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js @@ -172,6 +172,6 @@ module("Unit | Utility | computed", function (hooks) { desc: htmlSafe("cookies"), }).create({ cookies }); - assert.strictEqual(t.desc.string, cookies); + assert.strictEqual(t.desc.toString(), cookies); }); }); diff --git a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/process-html-test.js b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/process-html-test.js index f9bf75e83cb..28449af57d2 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/process-html-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/process-html-test.js @@ -58,8 +58,8 @@ module("Unit | lib | Experimental lightbox | processHTML()", function () { assert.strictEqual(item.index, LIGHTBOX_IMAGE_FIXTURES.first.index); assert.strictEqual( - item.cssVars.string, - LIGHTBOX_IMAGE_FIXTURES.first.cssVars.string + item.cssVars.toString(), + LIGHTBOX_IMAGE_FIXTURES.first.cssVars.toString() ); assert.strictEqual(startingIndex, 0); @@ -140,7 +140,7 @@ module("Unit | lib | Experimental lightbox | processHTML()", function () { assert.strictEqual(items[0].aspectRatio, null); assert.strictEqual( - items[0].cssVars.string, + items[0].cssVars.toString(), `--dominant-color: #${LIGHTBOX_IMAGE_FIXTURES.first.dominantColor};--small-url: url(${LIGHTBOX_IMAGE_FIXTURES.first.smallURL});` ); }); @@ -171,7 +171,7 @@ module("Unit | lib | Experimental lightbox | processHTML()", function () { assert.strictEqual(items[0].dominantColor, null); assert.strictEqual( - items[0].cssVars.string, + items[0].cssVars.toString(), `--aspect-ratio: ${LIGHTBOX_IMAGE_FIXTURES.first.aspectRatio};--small-url: url(${LIGHTBOX_IMAGE_FIXTURES.first.smallURL});` ); }); @@ -250,7 +250,7 @@ module("Unit | lib | Experimental lightbox | processHTML()", function () { ); assert.strictEqual( - item.cssVars.string, + item.cssVars.toString(), `--small-url: url(${LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL});` ); }); diff --git a/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js b/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js index 29a5bf760f6..3bc3c329456 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js @@ -47,7 +47,7 @@ module("Unit | Model | pending-post", function (hooks) { await settled(); assert.strictEqual( - post.expandedExcerpt.string, + post.expandedExcerpt.toString(), "

bold text

" ); }); diff --git a/plugins/checklist/test/javascripts/lib/checklist-test.js b/plugins/checklist/test/javascripts/lib/checklist-test.js index b30bbbbaf61..243340a410e 100644 --- a/plugins/checklist/test/javascripts/lib/checklist-test.js +++ b/plugins/checklist/test/javascripts/lib/checklist-test.js @@ -16,7 +16,7 @@ async function prepare(raw) { const model = Post.create({ id: 42, can_edit: true }); const decoratorHelper = { widget, getModel: () => model }; - const $elem = $(`
${cooked.string}
`); + const $elem = $(`
${cooked.toString()}
`); checklistSyntax($elem[0], decoratorHelper); currentRaw = raw; diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-markdown.js b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-markdown.js index 993b8061bbe..8847cfc8990 100644 --- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-markdown.js +++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-markdown.js @@ -6,6 +6,8 @@ export default Component.extend({ this._super(...arguments); const contents = $(this.element).html(); - cookAsync(contents).then((cooked) => $(this.element).html(cooked.string)); + cookAsync(contents).then((cooked) => + $(this.element).html(cooked.toString()) + ); }, });