liquid_cms 0.3.0.8 → 0.3.0.9

data/lib/generators/liquid_cms/templates/public/cms/codemirror/js/highlight.js

@@ -41,7 +41,7 @@ var indentUnit = 2;
       callback = function(line) {
         for (var i = 0; i < line.length; i++)
           node.appendChild(line[i]);
-        node.appendChild(document.createElement("BR"));
+        node.appendChild(document.createElement("br"));
       };
     }
 
@@ -53,7 +53,7 @@ var indentUnit = 2;
           line = [];
         }
         else {
-          var span = document.createElement("SPAN");
+          var span = document.createElement("span");
           span.className = token.style;
           span.appendChild(document.createTextNode(token.value));
           line.push(span);

data/lib/generators/liquid_cms/templates/public/cms/codemirror/js/mirrorframe.js

@@ -4,7 +4,7 @@
  */
 
 function MirrorFrame(place, options) {
-  this.home = document.createElement("DIV");
+  this.home = document.createElement("div");
   if (place.appendChild)
     place.appendChild(this.home);
   else
@@ -12,7 +12,7 @@ function MirrorFrame(place, options) {
 
   var self = this;
   function makeButton(name, action) {
-    var button = document.createElement("INPUT");
+    var button = document.createElement("input");
     button.type = "button";
     button.value = name;
     self.home.appendChild(button);

data/lib/generators/liquid_cms/templates/public/cms/codemirror/js/parsecss.js

@@ -128,7 +128,9 @@ var CSSParser = Editor.Parser = (function() {
         if (content == "\n")
           token.indentation = indentCSS(inBraces, inRule, basecolumn);
 
-        if (content == "{")
+        if (content == "{" && inDecl == "@media")
+          inDecl = false;
+        else if (content == "{")
           inBraces = true;
         else if (content == "}")
           inBraces = inRule = inDecl = false;
@@ -136,8 +138,8 @@ var CSSParser = Editor.Parser = (function() {
           inRule = inDecl = false;
         else if (inBraces && style != "css-comment" && style != "whitespace")
           inRule = true;
-        else if (!inBraces && style == "css-at" && content != "@media")
-          inDecl = true;
+        else if (!inBraces && style == "css-at")
+          inDecl = content;
 
         return token;
       },

data/lib/generators/liquid_cms/templates/public/cms/codemirror/js/parsehtmlmixed.js

@@ -1,9 +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};
 
@@ -14,10 +27,10 @@ var HTMLMixedParser = Editor.Parser = (function() {
       else if (token.style == "xml-tagname" && inTag === true)
         inTag = token.content.toLowerCase();
       else if (token.content == ">") {
-        if (inTag == "script")
-          iter.next = local(JSParser, "</script");
-        else if (inTag == "style")
-          iter.next = local(CSSParser, "</style");
+        if (triggers[inTag]) {
+          var parser = window[triggers[inTag]];
+          iter.next = local(parser, "</" + inTag);
+        }
         inTag = false;
       }
       return token;
@@ -47,7 +60,7 @@ var HTMLMixedParser = Editor.Parser = (function() {
               return baseIndent;
             else
               return oldIndent(chars);
-          }
+          };
         }
 
         return token;
@@ -69,6 +82,12 @@ var HTMLMixedParser = Editor.Parser = (function() {
     return iter;
   }
 
-  return {make: parseMixed, electricChars: "{}/:"};
+  return {
+    make: parseMixed,
+    electricChars: "{}/:",
+    configure: function(obj) {
+      if (obj.triggers) triggers = obj.triggers;
+    }
+  };
 
 })();

data/lib/generators/liquid_cms/templates/public/cms/codemirror/js/parsexml.js

@@ -38,6 +38,11 @@ var XMLParser = Editor.Parser = (function() {
             setState(inBlock("xml-comment", "-->"));
             return null;
           }
+          else if (source.lookAhead("DOCTYPE", true)) {
+            source.nextWhileMatches(/[\w\._\-]/);
+            setState(inBlock("xml-doctype", ">"));
+            return "xml-doctype";
+          }
           else {
             return "xml-text";
           }
@@ -182,7 +187,7 @@ var XMLParser = Editor.Parser = (function() {
     function base() {
       return pass(element, base);
     }
-    var harmlessTokens = {"xml-text": true, "xml-entity": true, "xml-comment": true, "xml-processing": true};
+    var harmlessTokens = {"xml-text": true, "xml-entity": true, "xml-comment": true, "xml-processing": true, "xml-doctype": true};
     function element(style, content) {
       if (content == "<") cont(tagname, attributes, endtag(tokenNr == 1));
       else if (content == "</") cont(closetagname, expect(">"));

data/lib/generators/liquid_cms/templates/public/cms/codemirror/js/select.js

@@ -97,6 +97,21 @@ var select = {};
     if (currentSelection) currentSelection.changed = true;
   };
 
+  // Find the 'leaf' node (BR or text) after the given one.
+  function baseNodeAfter(node) {
+    var next = node.nextSibling;
+    if (next) {
+      while (next.firstChild) next = next.firstChild;
+      if (next.nodeType == 3 || isBR(next)) return next;
+      else return baseNodeAfter(next);
+    }
+    else {
+      var parent = node.parentNode;
+      while (parent && !parent.nextSibling) parent = parent.parentNode;
+      return parent && baseNodeAfter(parent);
+    }
+  }
+
   // This is called by the code in editor.js whenever it is replacing
   // a text node. The function sees whether the given oldNode is part
   // of the current selection, and updates this selection if it is.
@@ -121,6 +136,9 @@ var select = {};
           point.offset += (offset || 0);
         }
       }
+      else if (select.ie_selection && point.offset == 0 && point.node == baseNodeAfter(from)) {
+        currentSelection.changed = true;
+      }
     }
     replace(currentSelection.start);
     replace(currentSelection.end);
@@ -144,8 +162,15 @@ var select = {};
   // Most functions are defined in two ways, one for the IE selection
   // model, one for the W3C one.
   if (select.ie_selection) {
+    function selRange() {
+      var sel = document.selection;
+      if (!sel) return null;
+      if (sel.createRange) return sel.createRange();
+      else return sel.createTextRange();
+    }
+
     function selectionNode(start) {
-      var range = document.selection.createRange();
+      var range = selRange();
       range.collapse(start);
 
       function nodeAfter(node) {
@@ -232,9 +257,9 @@ var select = {};
     };
 
     select.offsetInNode = function(node) {
-      var sel = document.selection;
-      if (!sel) return 0;
-      var range = sel.createRange(), range2 = range.duplicate();
+      var range = selRange();
+      if (!range) return 0;
+      var range2 = range.duplicate();
       try {range2.moveToElementText(node);} catch(e){return 0;}
       range.setEndPoint("StartToStart", range2);
       return range.text.length;
@@ -244,10 +269,9 @@ var select = {};
     // after. Note that this returns false for 'no cursor', and null
     // for 'start of document'.
     select.selectionTopNode = function(container, start) {
-      var selection = document.selection;
-      if (!selection) return false;
-
-      var range = selection.createRange(), range2 = range.duplicate();
+      var range = selRange();
+      if (!range) return false;
+      var range2 = range.duplicate();
       range.collapse(start);
       var around = range.parentElement();
       if (around && isAncestor(container, around)) {
@@ -296,8 +320,12 @@ var select = {};
       }
       
       if (start == 0) {
-        var test1 = selection.createRange(), test2 = test1.duplicate();
-        test2.moveToElementText(container);
+        var test1 = selRange(), test2 = test1.duplicate();
+        try {
+          test2.moveToElementText(container);
+        } catch(exception) {
+          return null;
+        }
         if (test1.compareEndPoints("StartToStart", test2) == 0)
           return null;
       }
@@ -315,14 +343,13 @@ var select = {};
     };
 
     select.somethingSelected = function() {
-      var sel = document.selection;
-      return sel && (sel.createRange().text != "");
+      var range = selRange();
+      return range && (range.text != "");
     };
 
     function insertAtCursor(html) {
-      var selection = document.selection;
-      if (selection) {
-        var range = selection.createRange();
+      var range = selRange();
+      if (range) {
         range.pasteHTML(html);
         range.collapse(false);
         range.select();
@@ -343,14 +370,14 @@ var select = {};
     // currently is, and the offset into the line. Returns null as
     // node if cursor is on first line.
     select.cursorPos = function(container, start) {
-      var selection = document.selection;
-      if (!selection) return null;
+      var range = selRange();
+      if (!range) return null;
 
       var topNode = select.selectionTopNode(container, start);
       while (topNode && !isBR(topNode))
         topNode = topNode.previousSibling;
 
-      var range = selection.createRange(), range2 = range.duplicate();
+      var range2 = range.duplicate();
       range.collapse(start);
       if (topNode) {
         range2.moveToElementText(topNode);
@@ -565,7 +592,7 @@ var select = {};
       return range.toString().length;
     };
 
-    function insertNodeAtCursor(node) {
+    select.insertNodeAtCursor = function(node) {
       var range = selectionRange();
       if (!range) return;
 
@@ -593,11 +620,11 @@ var select = {};
     }
 
     select.insertNewlineAtCursor = function() {
-      insertNodeAtCursor(document.createElement("BR"));
+      select.insertNodeAtCursor(document.createElement("BR"));
     };
 
     select.insertTabAtCursor = function() {
-      insertNodeAtCursor(document.createTextNode(fourSpaces));
+      select.insertNodeAtCursor(document.createTextNode(fourSpaces));
     };
 
     select.cursorPos = function(container, start) {

data/lib/generators/liquid_cms/templates/public/cms/codemirror/js/stringstream.js

@@ -92,7 +92,7 @@ var stringStream = function(source){
         else if (str.slice(0, left) == cased(current.slice(pos))) {
           accum += current; current = "";
           try {current = source.next();}
-          catch (e) {break;}
+          catch (e) {if (e != StopIteration) throw e; break;}
           pos = 0;
           str = str.slice(left);
         }
@@ -109,6 +109,20 @@ var stringStream = function(source){
 
       return found;
     },
+    // Wont't match past end of line.
+    lookAheadRegex: function(regex, consume) {
+      if (regex.source.charAt(0) != "^")
+        throw new Error("Regexps passed to lookAheadRegex must start with ^");
+
+      // Fetch the rest of the line
+      while (current.indexOf("\n", pos) == -1) {
+        try {current += source.next();}
+        catch (e) {if (e != StopIteration) throw e; break;}
+      }
+      var matched = current.slice(pos).match(regex);
+      if (matched && consume) pos += matched[0].length;
+      return matched;
+    },
 
     // Utils built on top of the above
     // more: -> boolean

data/lib/generators/liquid_cms/templates/public/cms/codemirror/js/tokenizejavascript.js

@@ -101,7 +101,7 @@ var tokenizeJavaScript = (function() {
     }
     function readRegexp() {
       nextUntilUnescaped(source, "/");
-      source.nextWhileMatches(/[gi]/);
+      source.nextWhileMatches(/[gimy]/); // 'y' is "sticky" option in Mozilla
       return {type: "regexp", style: "js-string"};
     }
     // Mutli-line comments are tricky. We want to return the newlines

data/lib/generators/liquid_cms/templates/public/cms/codemirror/js/undo.js

@@ -29,7 +29,7 @@
 function UndoHistory(container, maxDepth, commitDelay, editor) {
   this.container = container;
   this.maxDepth = maxDepth; this.commitDelay = commitDelay;
-  this.editor = editor; this.parent = editor.parent;
+  this.editor = editor;
   // This line object represents the initial, empty editor.
   var initial = {text: "", from: null, to: null};
   // As the borders between lines are represented by BR elements, the
@@ -44,7 +44,7 @@ function UndoHistory(container, maxDepth, commitDelay, editor) {
   this.firstTouched = false;
   // History is the set of committed changes, touched is the set of
   // nodes touched since the last commit.
-  this.history = []; this.redoHistory = []; this.touched = [];
+  this.history = []; this.redoHistory = []; this.touched = []; this.lostundo = 0;
 }
 
 UndoHistory.prototype = {
@@ -52,8 +52,8 @@ UndoHistory.prototype = {
   // milliseconds).
   scheduleCommit: function() {
     var self = this;
-    this.parent.clearTimeout(this.commitTimeout);
-    this.commitTimeout = this.parent.setTimeout(function(){self.tryCommit();}, this.commitDelay);
+    parent.clearTimeout(this.commitTimeout);
+    this.commitTimeout = parent.setTimeout(function(){self.tryCommit();}, this.commitDelay);
   },
 
   // Mark a node as touched. Null is a valid argument.
@@ -92,18 +92,19 @@ UndoHistory.prototype = {
   clear: function() {
     this.history = [];
     this.redoHistory = [];
+    this.lostundo = 0;
   },
 
   // Ask for the size of the un/redo histories.
   historySize: function() {
-    return {undo: this.history.length, redo: this.redoHistory.length};
+    return {undo: this.history.length, redo: this.redoHistory.length, lostundo: this.lostundo};
   },
 
   // Push a changeset into the document.
   push: function(from, to, lines) {
     var chain = [];
     for (var i = 0; i < lines.length; i++) {
-      var end = (i == lines.length - 1) ? to : this.container.ownerDocument.createElement("BR");
+      var end = (i == lines.length - 1) ? to : document.createElement("br");
       chain.push({from: from, to: end, text: cleanText(lines[i])});
       from = end;
     }
@@ -128,7 +129,7 @@ UndoHistory.prototype = {
   // Clear the undo history, make the current document the start
   // position.
   reset: function() {
-    this.history = []; this.redoHistory = [];
+    this.history = []; this.redoHistory = []; this.lostundo = 0;
   },
 
   textAfter: function(br) {
@@ -145,7 +146,7 @@ UndoHistory.prototype = {
 
   // Commit unless there are pending dirty nodes.
   tryCommit: function() {
-    if (!window.parent || !window.UndoHistory) return; // Stop when frame has been unloaded
+    if (!window || !window.parent || !window.UndoHistory) return; // Stop when frame has been unloaded
     if (this.editor.highlightDirty()) this.commit(true);
     else this.scheduleCommit();
   },
@@ -153,7 +154,7 @@ UndoHistory.prototype = {
   // Check whether the touched nodes hold any changes, if so, commit
   // them.
   commit: function(doNotHighlight) {
-    this.parent.clearTimeout(this.commitTimeout);
+    parent.clearTimeout(this.commitTimeout);
     // Make sure there are no pending dirty nodes.
     if (!doNotHighlight) this.editor.highlightDirty(true);
     // Build set of chains.
@@ -192,7 +193,7 @@ UndoHistory.prototype = {
   },
 
   notifyEnvironment: function() {
-    if (this.onChange) this.onChange();
+    if (this.onChange) this.onChange(this.editor);
     // Used by the line-wrapping line-numbering code.
     if (window.frameElement && window.frameElement.CodeMirror.updateNumbers)
       window.frameElement.CodeMirror.updateNumbers();
@@ -235,8 +236,10 @@ UndoHistory.prototype = {
   // it than allowed.
   addUndoLevel: function(diffs) {
     this.history.push(diffs);
-    if (this.history.length > this.maxDepth)
+    if (this.history.length > this.maxDepth) {
       this.history.shift();
+      lostundo += 1;
+    }
   },
 
   // Build chains from a set of touched nodes.
@@ -257,8 +260,8 @@ UndoHistory.prototype = {
     function buildLine(node) {
       var text = [];
       for (var cur = node ? node.nextSibling : self.container.firstChild;
-           cur && !isBR(cur); cur = cur.nextSibling)
-        if (cur.currentText) text.push(cur.currentText);
+           cur && (!isBR(cur) || cur.hackBR); cur = cur.nextSibling)
+        if (!cur.hackBR && cur.currentText) text.push(cur.currentText);
       return {from: node, to: cur, text: cleanText(text.join(""))};
     }
 
@@ -267,7 +270,7 @@ UndoHistory.prototype = {
     var lines = [];
     if (self.firstTouched) self.touched.push(null);
     forEach(self.touched, function(node) {
-      if (node && node.parentNode != self.container) return;
+      if (node && (node.parentNode != self.container || node.hackBR)) return;
 
       if (node) node.historyTouched = false;
       else self.firstTouched = false;