Fix typo 'compact' --> 'graph' for output

[erdiag.git] / parser.js

diff --git a/parser.js b/parser.js
index d6cee80..0ab6a43 100644 (file)
--- a/parser.js
+++ b/parser.js
@@ -9,7 +9,7 @@ class ErDiags
                this.tables = { };
                this.mcdParsing(description);
                this.mldParsing();
-               this.output = output || "compact";
+               this.output = output || "graph";
                this.image = image || "svg";
        }
 
@@ -187,13 +187,8 @@ class ErDiags
                                        name: inh.parent + "_id",
                                        type: this.tables[inh.parent][idx].type,
                                        isKey: true,
-<<<<<<< HEAD
-                                       qualifiers: (this.tables[inh.parent][idx].qualifiers || "") + " foreign key references " + inh.parent,
-                                       ref: inh.parent,
-=======
                                        qualifiers: this.tables[inh.parent][idx].qualifiers || "",
                                        ref: inh.parent + "(" + this.tables[inh.parent][idx].name + ")",
->>>>>>> 40b4a9d230d105a61e22bef0a63a6e8d515524e9
                                });
                        });
                });
@@ -408,7 +403,7 @@ class ErDiags
                mcdDot += '}';
                if (this.output == "graph") //draw graph in element
                        element.innerHTML = "<img src='scripts/getGraph_" + this.image + ".php?dot=" + encodeURIComponent(mcdDot) + "'/>";
-               else //just show dot input
+               else //output = "text": just show dot input
                        element.innerHTML = mcdDot.replace(/</g,"&lt;").replace(/>/g,"&gt;");
        }