Fix the dependency checking

if (!(CSSParser ...)) was giving "Uncaught ReferenceError" rather than the intended error message.
codemirror · Oct 8, 2010 · 01ded91 · 01ded91
1 parent 03f7485
commit 01ded91
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/js/parsehtmlmixed.js b/js/parsehtmlmixed.js
@@ -1,16 +1,22 @@
 var HTMLMixedParser = Editor.Parser = (function() {
-  if (!(CSSParser && JSParser && XMLParser))
-    throw new Error("CSS, JS, and XML parsers must be loaded for HTML mixed mode to work.");
-  XMLParser.configure({useHTMLKludges: true});
 
   // tags that trigger seperate parsers
   var triggers = {
     "script": "JSParser",
     "style":  "CSSParser"
   };
 
+  function checkDependencies() {
+    var parsers = ['XMLParser'];
+    for (var p in triggers) parsers.push(triggers[p]);
+    for (var i in parsers) {
+      if (!window[parsers[i]]) throw new Error(parsers[i] + " parser must be loaded for HTML mixed mode to work.");
+    }
+    XMLParser.configure({useHTMLKludges: true});
+  }
 
   function parseMixed(stream) {
+    checkDependencies();
     var htmlParser = XMLParser.make(stream), localParser = null, inTag = false;
     var iter = {next: top, copy: copy};