@wiris/mathtype-ckeditor5 8.11.1 → 8.13.0

package/src/plugin.js

@@ -15,6 +15,7 @@ import Listeners from "@wiris/mathtype-html-integration-devkit/src/listeners.js"
 import MathML from "@wiris/mathtype-html-integration-devkit/src/mathml.js";
 import Latex from "@wiris/mathtype-html-integration-devkit/src/latex.js";
 import StringManager from "@wiris/mathtype-html-integration-devkit/src/stringmanager.js";
+import "@wiris/mathtype-html-integration-devkit/src/md5.js";
 
 // Local imports
 import { MathTypeCommand, ChemTypeCommand } from "./commands.js";
@@ -61,8 +62,8 @@ export default class MathType extends Plugin {
    * Inherited from Plugin class: Executed when CKEditor5 is destroyed
    */
   destroy() {
-    // eslint-disable-line class-methods-use-this
-    currentInstance.destroy();
+      // eslint-disable-line class-methods-use-this
+      currentInstance?.destroy();
   }
 
   /**
@@ -91,7 +92,7 @@ export default class MathType extends Plugin {
     // etc
 
     // There are platforms like Drupal that initialize CKEditor but they hide or remove the container element.
-    // To avoid a wrong behaviour, this integration only starts if the workspace container exists.
+    // To avoid a wrong behavior, this integration only starts if the workspace container exists.
     let integration;
     if (integrationProperties.target) {
       // Instance of the integration associated to this editor instance
@@ -315,7 +316,7 @@ export default class MathType extends Plugin {
       }
 
       const mathAttributes = [...viewItem.getAttributes()].map(([key, value]) => ` ${key}="${value}"`).join("");
-      let htmlContent = Util.htmlSanitize(`<img${mathAttributes}>`);
+      const htmlContent = Util.htmlSanitize(`<img${mathAttributes}>`);
 
       const modelNode = writer.createElement("mathml", { htmlContent });
 
@@ -393,7 +394,7 @@ export default class MathType extends Plugin {
       const formula = modelItem.getAttribute("formula");
       const htmlContent = modelItem.getAttribute("htmlContent");
 
-      if(!formula && !htmlContent){
+      if (!formula && !htmlContent) {
         return null;
       }
 
@@ -401,7 +402,7 @@ export default class MathType extends Plugin {
 
       if (htmlContent) {
         imgElement = htmlDataProcessor.toView(htmlContent).getChild(0);
-      } else if(formula) {
+      } else if (formula) {
         const mathString = formula.replaceAll('ref="<"', 'ref="&lt;"');
 
         const imgHtml = Parser.initParse(mathString, integration.getLanguage());
@@ -412,9 +413,9 @@ export default class MathType extends Plugin {
       }
 
       /* Although we use the HtmlDataProcessor to obtain the attributes,
-        *  we must create a new EmptyElement which is independent of the
-        *  DataProcessor being used by this editor instance
-        */
+       *  we must create a new EmptyElement which is independent of the
+       *  DataProcessor being used by this editor instance
+       */
       if (imgElement) {
         return viewWriter.createEmptyElement("img", imgElement.getAttributes(), {
           renderUnsafeAttributes: ["src"],
@@ -463,7 +464,8 @@ export default class MathType extends Plugin {
       const htmlDataProcessor = new HtmlDataProcessor(viewWriter.document);
 
       // Load img element
-      let mathString = modelItem.getAttribute("htmlContent");
+      const mathString =
+        modelItem.getAttribute("htmlContent") || Parser.endParseSaveMode(modelItem.getAttribute("formula"));
 
       const sourceMathElement = htmlDataProcessor.toView(mathString).getChild(0);
 
@@ -485,7 +487,7 @@ export default class MathType extends Plugin {
     editor.data.on(
       "get",
       (e) => {
-        let output = e.return;
+        const output = e.return;
         const parsedResult = Parser.endParse(output);
 
         // Cleans all the semantics tag for safexml
@@ -517,14 +519,14 @@ export default class MathType extends Plugin {
         formulas.forEach((formula) => {
           if (formula.includes('encoding="LaTeX"')) {
             // LaTeX found.
-            let latex = "$$$" + Latex.getLatexFromMathML(formula) + "$$$"; // We add $$$ instead of $$ because the replace function ignores one $.
+            const latex = `$$$${Latex.getLatexFromMathML(formula)}$$$`; // We add $$$ instead of $$ because the replace function ignores one $.
             modifiedData = modifiedData.replace(formula, latex);
           } else if (formula.includes("<img")) {
             // If we found a formula image, we should find MathML data, and then substitute the entire image.
             const regexp = /«math\b[^»]*»(.*?)«\/math»/g;
             const safexml = formula.match(regexp);
-            if(safexml !== null) {
-              let decodeXML = MathML.safeXmlDecode(safexml[0]);
+            if (safexml !== null) {
+              const decodeXML = MathML.safeXmlDecode(safexml[0]);
               modifiedData = modifiedData.replace(formula, decodeXML);
             }
           }