liquid_cms 0.2.2.0 → 0.3.0

data/{test/rails_app/public/cms/javascripts/parseliquid.js → lib/generators/liquid_cms/templates/public/cms/codemirror/js/parsexml.js}

@@ -6,7 +6,7 @@
  * {useHTMLKludges: false} as parserConfig option.
  */
 
-var LiquidParser = Editor.Parser = (function() {
+var XMLParser = Editor.Parser = (function() {
   var Kludges = {
     autoSelfClosers: {"br": true, "img": true, "hr": true, "link": true, "input": true,
                       "meta": true, "col": true, "frame": true, "base": true, "area": true},
@@ -15,12 +15,6 @@ var LiquidParser = Editor.Parser = (function() {
   var NoKludges = {autoSelfClosers: {}, doNotIndent: {"!cdata": true}};
   var UseKludges = Kludges;
   var alignCDATA = false;
-    
-  var isQuote = /[\'\"]/;
-  var isWordChar = /[\w\_]/
-  var isPunctuation = /[\.\|\=\:]/;
-  
-  var keywords = {'in': true, 'by': true};
 
   // Simple stateful tokenizer for XML documents. Returns a
   // MochiKit-style iterator, with a state property that contains a
@@ -59,21 +53,6 @@ var LiquidParser = Editor.Parser = (function() {
           setState(inTag);
           return "xml-punctuation";
         }
-      } 
-      else if (ch == "{") {        
-        if (source.equals("{")) {
-          source.next();
-          setState(inLiquidOutput);
-          return 'liquid-start-punctuation';
-        }
-        if (source.equals("%")) {
-          source.next();
-          setState(inLiquidTagName);
-          return 'liquid-start-punctuation';
-        }
-        else {
-          return "xml-text";
-        }
       }
       else if (ch == "&") {
         while (!source.endOfLine()) {
@@ -83,7 +62,7 @@ var LiquidParser = Editor.Parser = (function() {
         return "xml-entity";
       }
       else {
-        source.nextWhileMatches(/[^{&<\n]/);
+        source.nextWhileMatches(/[^&<\n]/);
         return "xml-text";
       }
     }
@@ -112,86 +91,6 @@ var LiquidParser = Editor.Parser = (function() {
       }
     }
 
-    function inLiquidOutput(source, setState) {
-      var ch = source.next();
-      if (ch == "}") {
-        if(source.equals("}")) {
-          source.next();
-          setState(inText);
-          return "liquid-end-punctuation";
-        }         
-        else {
-          setState(inText);
-          return "liquid-bad-punctuation";
-        }
-      }
-      else if (isQuote.test(ch)) {
-        setState(inLiquidString(ch, inLiquidOutput));
-        return null;        
-      }
-      else if (isPunctuation.test(ch)) {
-        return "liquid-punctuation";
-      }
-
-      return "liquid-text";
-    }
-    
-    function inLiquidTagName(source, setState) {
-      source.nextWhileMatches(isWordChar);
-      setState(inLiquidTag);
-      return "liquid-tag-name";      
-    }
-
-    function inLiquidTag(source, setState) {
-      var ch = source.next();
-      if (ch == "%") {
-        if(source.equals("}")) {
-          source.next();
-          setState(inText);
-          return "liquid-end-punctuation";
-        }
-        else {
-          setState(inText);
-          return "liquid-bad-punctuation";
-        }
-      }
-      else if (isQuote.test(ch)) {
-        setState(inLiquidString(ch, inLiquidTag));
-        return null;        
-      }
-      else if (isPunctuation.test(ch)) {
-        return "liquid-punctuation";
-      }
-      else {        
-        return readWord(source, keywords)
-      }
-    }
-    
-    function readWord(source, keywords) {
-      source.nextWhileMatches(isWordChar);      
-      var word = source.get();
-            
-      if (keywords && keywords.propertyIsEnumerable(word)) {
-        return {type: "string", style: "liquid-keyword", content: word};
-      }
-      else {
-        return {type: "string", style: "liquid-text", content: word};
-      }
-    }
-    
-    function inLiquidString(quote, outer) {
-      return function(source, setState) {
-        while (!source.endOfLine()) {
-          if (source.next() == quote) {
-            setState(outer);
-            break;
-          }
-        }
-        return "liquid-string";
-      };
-    }
-  
-
     function inAttribute(quote) {
       return function(source, setState) {
         while (!source.endOfLine()) {
@@ -226,11 +125,11 @@ var LiquidParser = Editor.Parser = (function() {
   // parseJavaScript in parsejavascript.js (there is actually a bit more
   // shared code than I'd like), but it is quite a bit simpler.
   function parseXML(source) {
-    var tokens = tokenizeXML(source);
+    var tokens = tokenizeXML(source), token;
     var cc = [base];
     var tokenNr = 0, indented = 0;
     var currentTag = null, context = null;
-    var consume, marked;
+    var consume;
     
     function push(fs) {
       for (var i = fs.length - 1; i >= 0; i--)
@@ -245,13 +144,13 @@ var LiquidParser = Editor.Parser = (function() {
       consume = false;
     }
 
-    function mark(style) {
-      marked = style;
+    function markErr() {
+      token.style += " xml-error";
     }
     function expect(text) {
       return function(style, content) {
         if (content == text) cont();
-        else mark("xml-error") || cont(arguments.callee);
+        else {markErr(); cont(arguments.callee);}
       };
     }
 
@@ -284,11 +183,8 @@ var LiquidParser = Editor.Parser = (function() {
       return pass(element, base);
     }
     var harmlessTokens = {"xml-text": true, "xml-entity": true, "xml-comment": true, "xml-processing": true};
-    var liquidTokens = {"liquid-punctuation": true, "liquid-bad-punctuation": true, "liquid-keyword": true, "liquid-tag-name": true, "liquid-variable": true, "liquid-text": true, "liquid-string": true};
-    var liquidDelimiterTokens = {"liquid-start-punctuation": true, "liquid-end-punctuation": true};
     function element(style, content) {
-      if (content == "<" && (!context || context.name != "liquid"))
-        cont(tagname, attributes, endtag(tokenNr == 1));
+      if (content == "<") cont(tagname, attributes, endtag(tokenNr == 1));
       else if (content == "</") cont(closetagname, expect(">"));
       else if (style == "xml-cdata") {
         if (!context || context.name != "!cdata") pushContext("!cdata");
@@ -296,20 +192,12 @@ var LiquidParser = Editor.Parser = (function() {
         cont();
       }
       else if (harmlessTokens.hasOwnProperty(style)) cont();
-      else if (liquidTokens.hasOwnProperty(style)) cont();
-      else if (liquidDelimiterTokens.hasOwnProperty(style)) {
-        if (style == "liquid-start-punctuation")
-          pushContext("liquid");
-        else
-          popContext();
-        cont();
-      }
-      else mark("xml-error") || cont();
+      else {markErr(); cont();}
     }
     function tagname(style, content) {
       if (style == "xml-name") {
         currentTag = content.toLowerCase();
-        mark("xml-tagname");
+        token.style = "xml-tagname";
         cont();
       }
       else {
@@ -318,34 +206,22 @@ var LiquidParser = Editor.Parser = (function() {
       }
     }
     function closetagname(style, content) {
-      if (style == "xml-name" && context && content.toLowerCase() == context.name) {
-        popContext();
-        mark("xml-tagname");
-      }
-      else {
-        mark("xml-error");
-      }
-      cont();
-    }
-    function closeliquidtagname(style, content) {
-      if (style == "liquid-tag-name" && context && content.toLowerCase() == context.name) {
-        popContext();
-        mark("xml-tagname");
-      }
-      else {
-        mark("xml-error");
+      if (style == "xml-name") {
+        token.style = "xml-tagname";
+        if (context && content.toLowerCase() == context.name) popContext();
+        else markErr();
       }
       cont();
     }
     function endtag(startOfLine) {
       return function(style, content) {
         if (content == "/>" || (content == ">" && UseKludges.autoSelfClosers.hasOwnProperty(currentTag))) cont();
-        else if (content == ">") pushContext(currentTag, startOfLine) || cont();
-        else mark("xml-error") || cont(arguments.callee);
+        else if (content == ">") {pushContext(currentTag, startOfLine); cont();}
+        else {markErr(); cont(arguments.callee);}
       };
     }
     function attributes(style) {
-      if (style == "xml-name") mark("xml-attname") || cont(attribute, attributes);
+      if (style == "xml-name") {token.style = "xml-attname"; cont(attribute, attributes);}
       else pass();
     }
     function attribute(style, content) {
@@ -362,7 +238,7 @@ var LiquidParser = Editor.Parser = (function() {
       indentation: function() {return indented;},
 
       next: function(){
-        var token = tokens.next();
+        token = tokens.next();
         if (token.style == "whitespace" && tokenNr == 0)
           indented = token.value.length;
         else
@@ -376,13 +252,9 @@ var LiquidParser = Editor.Parser = (function() {
           return token;
 
         while(true){
-          consume = marked = false;
+          consume = false;
           cc.pop()(token.style, token.content);
-          if (consume){
-            if (marked)
-              token.style = marked;
-            return token;
-          }
+          if (consume) return token;
         }
       },