tweaks

Author: longhotsummer

indigo_app/static/javascript/indigo/models.js

@@ -64,6 +64,7 @@
      * @param mutation MutationRecord
      * @param element Element in this XML document
      * @returns 'changed' if the mutation impacts the element, 'removed' if the element was removed from the tree,
+     *          'replaced', if the element has been replaced (with a node in mutation.addedNodes),
      *          or null if there is no impact
      */
     getMutationImpact(mutation, element) {
@@ -98,7 +99,7 @@
       let root = null;
 
       try {
-        root = $.parseXML(newValue);
+        root = Indigo.parseXml(newValue);
       } catch(e) {
         Indigo.errorView.show("The document has invalid XML.");
         return;

indigo_app/static/javascript/indigo/utils.js

@@ -30,4 +30,19 @@ $(function() {
     }
   }
   setTimeout(nukeToasts, 3 * 1000);
+
+  /**
+   * Parses text into an XML document.
+   * @param text
+   * @returns {Document}
+   * @throws {Error} if the text is not valid XML
+   */
+  Indigo.parseXml = function(text) {
+    const parser = new DOMParser();
+    const doc = parser.parseFromString(text, "application/xml");
+    if (doc.querySelector("parsererror")) {
+      throw Error("Invalid XML: " + new XMLSerializer().serializeToString(doc));
+    }
+    return doc;
+  }
 });

indigo_app/static/javascript/indigo/views/document_xml_editor.js

@@ -436,14 +436,16 @@ class XMLEditor {
   onEditorChanged() {
     const text = this.editor.getValue().trim();
     if (text) {
-      console.log('Parsing changes to XML');
-      const parser = new DOMParser();
-      const doc = parser.parseFromString(text, "application/xml");
-      if (doc.querySelector("parsererror")) {
-        console.log("Invalid XML:" + new XMLSerializer().serializeToString(doc));
-      } else {
-        this.onElementParsed(doc.documentElement);
+      let doc;
+      try {
+        console.log('Parsing changes to XML');
+        doc = Indigo.parseXml(text);
+      } catch (err) {
+        // squash errors
+        console.log(err);
+        return;
       }
+      this.onElementParsed(doc.documentElement);
     }
   }
 }