Removed tidy html.

ether · Nov 15, 2023 · 11d81a4 · 11d81a4
1 parent 8d014fb
commit 11d81a4
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 132 deletions.
diff --git a/doc/docker.adoc b/doc/docker.adoc
@@ -441,10 +441,6 @@ For the editor container, you can also make it full width by adding `full-width-
 | This is the absolute path to the soffice executable. LibreOffice can be used in lieu of Abiword to export pads. Setting it to null disables LibreOffice exporting.
 | `null`
 
-| `TIDY_HTML`
-| Path to the Tidy executable. Tidy is used to improve the quality of exported pads. Setting it to null disables Tidy.
-| `null`
-
 | `ALLOW_UNKNOWN_FILE_ENDS`
 | Allow import of file types other than the supported ones: txt, doc, docx, rtf, odt, html & htm
 | `true`

diff --git a/settings.json.docker b/settings.json.docker
@@ -322,14 +322,6 @@
    */
   "soffice": "${SOFFICE:null}",
 
-  /*
-   * Path to the Tidy executable.
-   *
-   * Tidy is used to improve the quality of exported pads.
-   * Setting it to null disables Tidy.
-   */
-  "tidyHtml": "${TIDY_HTML:null}",
-
   /*
    * Allow import of file types other than the supported ones:
    * txt, doc, docx, rtf, odt, html & htm

diff --git a/settings.json.template b/settings.json.template
@@ -323,14 +323,6 @@
    */
   "soffice": null,
 
-  /*
-   * Path to the Tidy executable.
-   *
-   * Tidy is used to improve the quality of exported pads.
-   * Setting it to null disables Tidy.
-   */
-  "tidyHtml": null,
-
   /*
    * Allow import of file types other than the supported ones:
    * txt, doc, docx, rtf, odt, html & htm

diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js
@@ -27,7 +27,6 @@ const fs = require('fs');
 const settings = require('../utils/Settings');
 const os = require('os');
 const hooks = require('../../static/js/pluginfw/hooks');
-const TidyHtml = require('../utils/TidyHtml');
 const util = require('util');
 const { checkValidRev } = require('../utils/checkValidRev');
 
@@ -93,10 +92,8 @@ exports.doExport = async (req, res, padId, readOnlyId, type) => {
     const srcFile = `${tempDirectory}/etherpad_export_${randNum}.html`;
     await fsp_writeFile(srcFile, html);
 
-    // Tidy up the exported HTML
     // ensure html can be collected by the garbage collector
     html = null;
-    await TidyHtml.tidy(srcFile);
 
     // send the convert job to the converter (abiword, libreoffice, ..)
     const destFile = `${tempDirectory}/etherpad_export_${randNum}.${type}`;

diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
@@ -260,11 +260,6 @@ exports.abiword = null;
  */
 exports.soffice = null;
 
-/**
- * The path of the tidy executable
- */
-exports.tidyHtml = null;
-
 /**
  * Should we support none natively supported file types on import?
  */

diff --git a/src/node/utils/TidyHtml.js b/src/node/utils/TidyHtml.js
diff --git a/src/tests/backend/specs/api/tidy.js b/src/tests/backend/specs/api/tidy.js