From d25736adad8b7a37f44ce1757e5493e86190d714 Mon Sep 17 00:00:00 2001 From: Keegan George Date: Tue, 9 Aug 2022 17:14:35 -0700 Subject: [PATCH] DEV: Remove Table HTML usage (#9) * DEV: Remove Table HTML usage * DEV: Apply ember linting --- javascripts/discourse/api-initializers/table-builder.js | 2 +- javascripts/discourse/api-initializers/table-editor.js | 3 --- javascripts/discourse/components/spreadsheet-editor.js | 2 +- javascripts/discourse/templates/modal/insert-table-modal.hbs | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/javascripts/discourse/api-initializers/table-builder.js b/javascripts/discourse/api-initializers/table-builder.js index cc9bd3c..e0329c0 100644 --- a/javascripts/discourse/api-initializers/table-builder.js +++ b/javascripts/discourse/api-initializers/table-builder.js @@ -10,7 +10,7 @@ export default apiInitializer("0.11.1", (api) => { showTableBuilder() { showModal("insert-table-modal").setProperties({ toolbarEvent: this.toolbarEvent, - tableHtml: null, + tableTokens: null, }); }, }); diff --git a/javascripts/discourse/api-initializers/table-editor.js b/javascripts/discourse/api-initializers/table-editor.js index 50187b3..1cf36c0 100644 --- a/javascripts/discourse/api-initializers/table-editor.js +++ b/javascripts/discourse/api-initializers/table-editor.js @@ -33,8 +33,6 @@ export default apiInitializer("0.11.1", (api) => { } function generateModal(event) { - const table = event.target.parentNode.lastElementChild; - const tempTable = table.cloneNode(true); const tableId = event.target.getAttribute("data-table-id"); return ajax(`/posts/${this.id}`, { type: "GET" }) @@ -53,7 +51,6 @@ export default apiInitializer("0.11.1", (api) => { showModal("insert-table-modal", { model: post, }).setProperties({ - tableHtml: tempTable, tableId, tableTokens, }); diff --git a/javascripts/discourse/components/spreadsheet-editor.js b/javascripts/discourse/components/spreadsheet-editor.js index 56039ae..7334dcd 100644 --- a/javascripts/discourse/components/spreadsheet-editor.js +++ b/javascripts/discourse/components/spreadsheet-editor.js @@ -14,7 +14,7 @@ export default class SpreadsheetEditor extends GlimmerComponent { // Getters: get isEditingTable() { - if (this.args.tableHtml) { + if (this.args.tableTokens) { return true; } diff --git a/javascripts/discourse/templates/modal/insert-table-modal.hbs b/javascripts/discourse/templates/modal/insert-table-modal.hbs index 9ec9b77..7bdd3b5 100644 --- a/javascripts/discourse/templates/modal/insert-table-modal.hbs +++ b/javascripts/discourse/templates/modal/insert-table-modal.hbs @@ -1,6 +1,5 @@