Changeset 4932

Timestamp:

10/29/09 11:40:27 (4 weeks ago)

Author:

auno

Message:

Updated new version codemirror for fixing bugs. BugzID#102871 102872 102873

Location:

branches/greyhound

Files:

• mt-static/codemirror/css/docs.css (modified) (1 diff)
• mt-static/codemirror/index.html (modified) (2 diffs)
• mt-static/codemirror/js/codemirror.js (modified) (10 diffs)
• mt-static/codemirror/js/editor.js (modified) (31 diffs)
• mt-static/codemirror/js/mirrorframe.js (modified) (1 diff)
• mt-static/codemirror/js/parsejavascript.js (modified) (3 diffs)
• mt-static/codemirror/js/select.js (modified) (13 diffs)
• mt-static/codemirror/js/tokenizejavascript.js (modified) (1 diff)
• mt-static/codemirror/js/undo.js (modified) (3 diffs)
• mt-static/codemirror/js/util.js (modified) (2 diffs)
• mt-static/codemirror/manual.html (modified) (7 diffs)
• tmpl/cms/edit_template.tmpl (modified) (1 diff)

branches/greyhound/mt-static/codemirror/css/docs.css

@@ -16 +16 @@
 h2 {
   font-size: 14pt;
+}
+
+h3 {
+  font-size: 12pt;
 }
 

branches/greyhound/mt-static/codemirror/index.html

@@ -60 +60 @@
   <li><a href="contrib/python/index.html">Python</a> (courtesy of <a href="contrib/python/LICENSE">Timothy Farrell</a>)</li>
   <li><a href="contrib/lua/index.html">Lua</a> (courtesy of <a href="http://francio.pl/">Franciszek Wawrzak</a>)</li>
-  <li><a href="http://stuff.hantl.cz/ruby-in-codemirror/">Ruby</a> (by Michal Hantl, <a href="http://github.com/hakunin/ruby-in-codemirror/tree/master">unfinished</a>)</li>
+  <li><a href="http://d.hantl.cz/d/ruby-in-codemirror/">Ruby</a> (by Michal Hantl, <a href="http://github.com/hakunin/ruby-in-codemirror/tree/master">unfinished</a>)</li>
+  <li><a href="contrib/sql/index.html">SQL</a> (courtesy of John Benediktsson)</li>
 </ul>
 
@@ -78 +79 @@
 <h2>Releases</h2>
 
+<p class="rel"><em>23-09-2009</em>: <a
+href="http://marijn.haverbeke.nl/codemirror/codemirror-0.64.zip">Version
+0.64</a>: Solves some issues introduced by the paste-handling changes
+from the previous release. Adds <code>setSpellcheck</code>,
+<code>setTextWrapping</code>, <code>setIndentUnit</code>,
+<code>setUndoDepth</code>, <code>setTabMode</code>, and
+<code>setLineNumbers</code> to customise a running editor. Introduces
+an <a href="contrib/sql/index.html">SQL</a> parser. Fixes a few small
+problems in the <a href="contrib/python/index.html">Python</a> parser.
+And, as usual, add workarounds for various newly discovered browser
+incompatibilities.</p>
+
 <p class="rel"><em>31-08-2009</em>: <a
 href="http://marijn.haverbeke.nl/codemirror/codemirror-0.63.zip">Version
 0.63</a>: Overhaul of paste-handling (less fragile), fixes for several
 serious IE8 issues (cursor jumping, end-of-document bugs) and a number
-of small problems.
-
-Introduces <a href="contrib/python/index.html">Python</a>
-and <a href="contrib/lua/index.html">Lua</a> parsers. Add
-<code>setParser</code> (on-the-fly mode changing) and
-<code>clearHistory</code> methods. Make parsing passes time-based
-instead of lines-based (see the <code>passTime</code> option).</p>
+of small problems.</p>
 
 <p class="rel"><em>30-05-2009</em>: <a

branches/greyhound/mt-static/codemirror/js/codemirror.js

@@ -27 +27 @@
   // their meaning.
   setDefaults(CodeMirrorConfig, {
+    lang: "en",
     stylesheet: "",
     path: "",
@@ -54 +55 @@
   });
 
-  function wrapLineNumberDiv(place) {
-    return function(node) {
-      var container = document.createElement("DIV"),
-          nums = document.createElement("DIV"),
-          scroller = document.createElement("DIV");
-      container.style.position = "relative";
-      nums.style.position = "absolute";
-      nums.style.height = "100%";
-      if (nums.style.setExpression) {
-        try {nums.style.setExpression("height", "this.previousSibling.offsetHeight + 'px'");}
-        catch(e) {} // Seems to throw 'Not Implemented' on some IE8 versions
-      }
-      nums.style.top = "0px";
-      nums.style.overflow = "hidden";
-      place(container);
-      container.appendChild(node);
-      container.appendChild(nums);
-      scroller.className = "CodeMirror-line-numbers";
-      nums.appendChild(scroller);
-    }
-  }
-
-  function applyLineNumbers(frame) {
+  function addLineNumberDiv(container) {
+    var nums = document.createElement("DIV"),
+        scroller = document.createElement("DIV");
+    nums.style.position = "absolute";
+    nums.style.height = "100%";
+    if (nums.style.setExpression) {
+      try {nums.style.setExpression("height", "this.previousSibling.offsetHeight + 'px'");}
+      catch(e) {} // Seems to throw 'Not Implemented' on some IE8 versions
+    }
+    nums.style.top = "0px";
+    nums.style.overflow = "hidden";
+    container.appendChild(nums);
+    scroller.className = "CodeMirror-line-numbers";
+    nums.appendChild(scroller);
+    return nums;
+  }
+
+  function activateLineNumbers(frame, nums) {
     var win = frame.contentWindow, doc = win.document,
-        nums = frame.nextSibling, scroller = nums.firstChild;
+        scroller = nums.firstChild;
 
     var nextNum = 1, barWidth = null;
     function sizeBar() {
-      if (!frame.offsetWidth || !win.Editor) {
-        for (var cur = frame; cur.parentNode; cur = cur.parentNode) {
-          if (cur != document) {
-            clearInterval(sizeInterval);
-            return;
-          }
-        }
+      for (var root = frame; root.parentNode; root = root.parentNode);
+      if (!nums.parentNode || root != document || !win.Editor) {
+        // Clear event handlers (their nodes might already be collected, so try/catch)
+        try{onScroll();}catch(e){}
+        try{onResize();}catch(e){}
+        clearInterval(sizeInterval);
+        return;
       }
 
@@ -105 +101 @@
       nums.scrollTop = doc.body.scrollTop || doc.documentElement.scrollTop || 0;
     }
+    var onScroll = win.addEventHandler(win, "scroll", update, true),
+        onResize = win.addEventHandler(win, "resize", update, true),
+        sizeInterval = setInterval(sizeBar, 500);
     sizeBar();
     update();
-    win.addEventHandler(win, "scroll", update);
-    win.addEventHandler(win, "resize", update);
-    var sizeInterval = setInterval(sizeBar, 500);
   }
 
@@ -132 +128 @@
     frame.style.display = "block";
 
-    if (place.appendChild) {
-      var node = place;
-      place = function(n){node.appendChild(n);};
-    }
-    if (options.lineNumbers) place = wrapLineNumberDiv(place);
-    place(frame);
+    var div = this.wrapping = document.createElement("DIV");
+    div.style.position = "relative";
+    div.className = "CodeMirror-wrapping";
+    if (place.appendChild) place.appendChild(div);
+    else place(div);
+    div.appendChild(frame);
+    if (options.lineNumbers) this.lineNumbers = addLineNumberDiv(div);
 
     // Link back to this object, so that the editor can fetch options
@@ -149 +146 @@
       options.stylesheet = [options.stylesheet];
 
-    var html = ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"><html><head>"];
+    var html = ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"><html lang="+options.lang+"><head>"];
     // Hack to work around a bunch of IE8-specific problems.
     html.push("<meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\"/>");
@@ -156 +153 @@
     });
     forEach(options.basefiles.concat(options.parserfile), function(file) {
-      html.push("<script type=\"text/javascript\" src=\"" + options.path + file + "\"></script>");
+      html.push("<script type=\"text/javascript\" src=\"" + options.path + file + "\"><" + "/script>");
     });
     html.push("</head><body style=\"border-width: 0;\" class=\"editbox\" spellcheck=\"" +
@@ -170 +167 @@
     init: function() {
       if (this.options.initCallback) this.options.initCallback(this);
-      if (this.options.lineNumbers) applyLineNumbers(this.frame);
+      if (this.lineNumbers) activateLineNumbers(this.frame, this.lineNumbers);
       if (this.options.reindentOnLoad) this.reindent();
     },
@@ -176 +173 @@
     getCode: function() {return this.editor.getCode();},
     setCode: function(code) {this.editor.importCode(code);},
-    selection: function() {return this.editor.selectedText();},
+    selection: function() {this.focusIfIE(); return this.editor.selectedText();},
     reindent: function() {this.editor.reindent();},
-    reindentSelection: function() {this.editor.reindentSelection(null);},
-
+    reindentSelection: function() {this.focusIfIE(); this.editor.reindentSelection(null);},
+
+    focusIfIE: function() {
+      // in IE, a lot of selection-related functionality only works when the frame is focused
+      if (this.win.select.ie_selection) this.focus();
+    },
     focus: function() {
       this.win.focus();
       if (this.editor.selectionSnapshot) // IE hack
-        this.win.select.selectCoords(this.win, this.editor.selectionSnapshot);
+        this.win.select.setBookmark(this.win.document.body, this.editor.selectionSnapshot);
     },
     replaceSelection: function(text) {
@@ -193 +194 @@
       this.editor.replaceChars(text, start, end);
     },
-    getSearchCursor: function(string, fromCursor) {
-      return this.editor.getSearchCursor(string, fromCursor);
+    getSearchCursor: function(string, fromCursor, caseFold) {
+      return this.editor.getSearchCursor(string, fromCursor, caseFold);
     },
 
@@ -206 +207 @@
 
     setParser: function(name) {this.editor.setParser(name);},
-
-    cursorPosition: function(start) {
-      if (this.win.select.ie_selection) this.focus();
-      return this.editor.cursorPosition(start);
-    },
+    setSpellcheck: function(on) {this.win.document.body.spellcheck = on;},
+    setTextWrapping: function(on) {this.win.document.body.style.whiteSpace = on ? "" : "nowrap";},
+    setIndentUnit: function(unit) {this.win.indentUnit = unit;},
+    setUndoDepth: function(depth) {this.editor.history.maxDepth = depth;},
+    setTabMode: function(mode) {this.options.tabMode = mode;},
+    setLineNumbers: function(on) {
+      if (on && !this.lineNumbers) {
+        this.lineNumbers = addLineNumberDiv(this.wrapping);
+        activateLineNumbers(this.frame, this.lineNumbers);
+      }
+      else if (!on && this.lineNumbers) {
+        this.wrapping.removeChild(this.lineNumbers);
+        this.wrapping.style.marginLeft = "";
+        this.lineNumbers = null;
+      }
+    },
+
+    cursorPosition: function(start) {this.focusIfIE(); return this.editor.cursorPosition(start);},
     firstLine: function() {return this.editor.firstLine();},
     lastLine: function() {return this.editor.lastLine();},

branches/greyhound/mt-static/codemirror/js/editor.js

@@ -81 +81 @@
         result.push(node);
       }
-      else if (node.nodeName == "BR" && node.childNodes.length == 0) {
+      else if (isBR(node) && node.childNodes.length == 0) {
         leaving = true;
         result.push(node);
@@ -87 +87 @@
       else {
         forEach(node.childNodes, simplifyNode);
-        if (!leaving && newlineElements.hasOwnProperty(node.nodeName)) {
+        if (!leaving && newlineElements.hasOwnProperty(node.nodeName.toUpperCase())) {
           leaving = true;
           if (!atEnd || !top)
@@ -176 +176 @@
         return yield(node.currentText, c);
       }
-      else if (node.nodeName == "BR") {
+      else if (isBR(node)) {
         nodeQueue.push(node);
         return yield("\n", c);
@@ -196 +196 @@
   // Determine the text size of a processed node.
   function nodeSize(node) {
-    if (node.nodeName == "BR")
-      return 1;
-    else
-      return node.currentText.length;
+    return isBR(node) ? 1 : node.currentText.length;
   }
 
@@ -205 +202 @@
   // the start of the frame.
   function startOfLine(node) {
-    while (node && node.nodeName != "BR") node = node.previousSibling;
+    while (node && !isBR(node)) node = node.previousSibling;
     return node;
   }
   function endOfLine(node, container) {
     if (!node) node = container.firstChild;
-    else if (node.nodeName == "BR") node = node.nextSibling;
-
-    while (node && node.nodeName != "BR") node = node.nextSibling;
+    else if (isBR(node)) node = node.nextSibling;
+
+    while (node && !isBR(node)) node = node.nextSibling;
     return node;
   }
@@ -224 +221 @@
   // skip to the next find. Use the select and replace methods to
   // actually do something with the found locations.
-  function SearchCursor(editor, string, fromCursor) {
+  function SearchCursor(editor, string, fromCursor, caseFold) {
     this.editor = editor;
+    this.caseFold = caseFold;
+    if (caseFold) string = string.toLowerCase();
     this.history = editor.history;
     this.history.commit();
@@ -253 +252 @@
       // indexOf on the current line.
       function() {
-        var match = cleanText(self.history.textAfter(self.line).slice(self.offset)).indexOf(string);
+        var line = cleanText(self.history.textAfter(self.line).slice(self.offset));
+        var match = (self.caseFold ? line.toLowerCase() : line).indexOf(string);
         if (match > -1)
           return {from: {node: self.line, offset: self.offset + match},
@@ -263 +263 @@
       function() {
         var firstLine = cleanText(self.history.textAfter(self.line).slice(self.offset));
-        var match = firstLine.lastIndexOf(target[0]);
+        var match = (self.caseFold ? firstLine.toLowerCase() : firstLine).lastIndexOf(target[0]);
         if (match == -1 || match != firstLine.length - target[0].length)
           return false;
@@ -270 +270 @@
         var line = self.history.nodeAfter(self.line);
         for (var i = 1; i < target.length - 1; i++) {
-          if (cleanText(self.history.textAfter(line)) != target[i])
+          var line = cleanText(self.history.textAfter(line));
+          if ((self.caseFold ? line.toLowerCase() : line) != target[i])
             return false;
           line = self.history.nodeAfter(line);
         }
 
-        if (cleanText(self.history.textAfter(line)).indexOf(target[target.length - 1]) != 0)
+        var lastLine = cleanText(self.history.textAfter(line));
+        if ((self.caseFold ? lastLine.toLowerCase() : lastLine).indexOf(target[target.length - 1]) != 0)
           return false;
 
@@ -367 +369 @@
     if (options.content)
       this.importCode(options.content);
-    else // FF acts weird when the editable document is completely empty
-      container.appendChild(this.doc.createElement("BR"));
 
     if (!options.readOnly) {
@@ -403 +403 @@
 
       addEventHandler(document, "keydown", method(this, "keyDown"));
+      addEventHandler(document, "keypress", method(this, "keyPress"));
+      addEventHandler(document, "keyup", method(this, "keyUp"));
 
       function cursorActivity() {self.cursorActivity(false);}
@@ -418 +420 @@
         if (text !== null) {
           self.replaceSelection(text);
+          select.scrollToCursor(this.container);
           event.stop();
         }
       });
-
-      addEventHandler(document.body, "beforepaste", method(this, "reroutePasteEvent"));
 
       if (this.options.autoMatchParens)
@@ -505 +506 @@
       var accum = [];
       for (line = line ? line.nextSibling : this.container.firstChild;
-           line && line.nodeName != "BR"; line = line.nextSibling)
+           line && !isBR(line); line = line.nextSibling)
         accum.push(nodeText(line));
       return cleanText(accum.join(""));
@@ -530 +531 @@
             break;
           }
-          var text = (cur.innerText || cur.textContent || cur.nodeValue || "");
+          var text = nodeText(cur);
           if (text.length > position) {
             before = cur.nextSibling;
@@ -587 +588 @@
       var te = parent.document.createElement("TEXTAREA");
       te.style.position = "absolute";
-      te.style.left = "-500px";
+      te.style.left = "-10000px";
       te.style.width = "10px";
       te.style.top = nodeTop(frameElement) + "px";
-      parent.document.body.appendChild(te);
+      window.frameElement.CodeMirror.wrapping.appendChild(te);
       parent.focus();
       te.focus();
@@ -599 +600 @@
         self.win.focus();
         if (self.selectionSnapshot) // IE hack
-          self.win.select.selectCoords(self.win, self.selectionSnapshot);
+          self.win.select.setBookmark(self.container, self.selectionSnapshot);
         var text = te.value;
-        if (text) self.replaceSelection(text);
+        if (text) {
+          self.replaceSelection(text);
+          select.scrollToCursor(self.container);
+        }
         removeElement(te);
       }, 10);
@@ -617 +621 @@
     },
 
-    getSearchCursor: function(string, fromCursor) {
-      return new SearchCursor(this, string, fromCursor);
+    getSearchCursor: function(string, fromCursor, caseFold) {
+      return new SearchCursor(this, string, fromCursor, caseFold);
     },
 
@@ -698 +702 @@
       }
       else if (code == 36 && !event.shiftKey && !event.ctrlKey) { // home
-        if (this.home())
-          event.stop();
+        if (this.home()) event.stop();
+      }
+      else if (code == 35 && !event.shiftKey && !event.ctrlKey) { // end
+        if (this.end()) event.stop();
       }
       else if ((code == 219 || code == 221) && event.ctrlKey && !event.altKey) { // [, ]
@@ -728 +734 @@
           this.options.saveFunction();
           event.stop();
+        }
+        else if (internetExplorer && code == 86) {
+          this.reroutePasteEvent();
         }
       }
@@ -840 +849 @@
     },
 
+    // Custom home behaviour that doesn't land the cursor in front of
+    // leading whitespace unless pressed twice.
     home: function() {
       var cur = select.selectionTopNode(this.container, true), start = cur;
-      if (cur === false || !(!cur || cur.isPart || cur.nodeName == "BR") || !this.container.firstChild)
+      if (cur === false || !(!cur || cur.isPart || isBR(cur)) || !this.container.firstChild)
         return false;
 
-      while (cur && cur.nodeName != "BR") cur = cur.previousSibling;
+      while (cur && !isBR(cur)) cur = cur.previousSibling;
       var next = cur ? cur.nextSibling : this.container.firstChild;
       if (next && next != start && next.isPart && hasClass(next, "whitespace"))
@@ -852 +863 @@
         select.focusAfterNode(cur, this.container);
 
+      select.scrollToCursor(this.container);
+      return true;
+    },
+
+    // Some browsers (Opera) don't manage to handle the end key
+    // properly in the face of vertical scrolling.
+    end: function() {
+      var cur = select.selectionTopNode(this.container, true);
+      if (cur === false) return false;
+      cur = endOfLine(cur, this.container);
+      if (!cur) return false;
+      select.focusAfterNode(cur.previousSibling, this.container);
       select.scrollToCursor(this.container);
       return true;
@@ -900 +923 @@
         var stack = [], ch, ok = true;;
         for (var runner = cursor; runner; runner = dir ? runner.nextSibling : runner.previousSibling) {
-          if (runner.className == className && runner.nodeName == "SPAN" && (ch = paren(runner))) {
+          if (runner.className == className && isSpan(runner) && (ch = paren(runner))) {
             if (forward(ch) == dir)
               stack.push(ch);
@@ -909 +932 @@
             if (!stack.length) break;
           }
-          else if (runner.dirty || runner.nodeName != "SPAN" && runner.nodeName != "BR") {
+          else if (runner.dirty || !isSpan(runner) && !isBR(runner)) {
             return {node: runner, status: "dirty"};
           }
@@ -945 +968 @@
     // the cursor is on so that it is indented properly.
     indentAtCursor: function(direction) {
+      return;
       if (!this.container.firstChild) return;
       // The line has to have up-to-date lexical information, so we
       // highlight it first.
       if (!this.highlightAtCursor()) return;
-      // prevent indent for now.
-      return;
       var cursor = select.selectionTopNode(this.container, false);
       // If we couldn't determine the place of the cursor,
@@ -969 +991 @@
     indentRegion: function(start, end, direction) {
       var current = (start = startOfLine(start)), before = start && startOfLine(start.previousSibling);
-      if (end.nodeName != "BR") end = endOfLine(end, this.container);
+      if (!isBR(end)) end = endOfLine(end, this.container);
 
       do {
@@ -986 +1008 @@
       if (internetExplorer) {
         this.container.createTextRange().execCommand("unlink");
-        this.selectionSnapshot = select.selectionCoords(this.win);
+        this.selectionSnapshot = select.getBookmark(this.container);
       }
 
@@ -996 +1018 @@
         if (activity) activity(cursor);
         if (!safe) {
-          this.scheduleHighlight();
+//          this.scheduleHighlight();
           this.addDirtyNode(cursor);
         }
@@ -1128 +1150 @@
       // parse stored.
       while (from && (!from.parserFromHere || from.dirty)) {
-        if (maxBacktrack != null && from.nodeName == "BR" && (--maxBacktrack) < 0)
+        if (maxBacktrack != null && isBR(from) && (--maxBacktrack) < 0)
           return false;
         from = from.previousSibling;
@@ -1209 +1231 @@
           // for the FF cursor bug workaround (see select.js,
           // insertNewlineAtCursor).
-          while (part && part.nodeName == "SPAN" && part.currentText == "") {
+          while (part && isSpan(part) && part.currentText == "") {
             var old = part;
             this.remove();
@@ -1231 +1253 @@
           // The idea of the two streams actually staying synchronized
           // is such a long shot that we explicitly check.
-          if (part.nodeName != "BR")
+          if (!isBR(part))
             throw "Parser out of sync. Expected BR.";
 
@@ -1259 +1281 @@
         }
         else {
-          if (part.nodeName != "SPAN")
+          if (!isSpan(part))
             throw "Parser out of sync. Expected SPAN.";
           if (part.dirty)

branches/greyhound/mt-static/codemirror/js/mirrorframe.js

@@ -37 +37 @@
     var first = true;
     do {
-      var cursor = this.mirror.getSearchCursor(text, first);
+      var cursor = this.mirror.getSearchCursor(text, first, true);
       first = false;
       while (cursor.findNext()) {

branches/greyhound/mt-static/codemirror/js/parsejavascript.js

@@ -11 +11 @@
   // Token types that can be considered to be atoms.
   var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true};
+  // Setting that can be used to have JSON data indent properly.
+  var json = false;
   // Constructor for the lexical context objects.
   function JSLexical(indented, column, type, align, prev, info) {
@@ -231 +233 @@
       else if (type == "keyword a") cont(pushlex("form"), expression, statement, poplex);
       else if (type == "keyword b") cont(pushlex("form"), statement, poplex);
+      else if (type == "{" && json) cont(pushlex("}"), commasep(objprop, "}"), poplex);
       else if (type == "{") cont(pushlex("}"), block, poplex);
       else if (type == "function") cont(functiondef);
@@ -338 +341 @@
   }
 
-  return {make: parseJS, electricChars: "{}:"};
+  return {
+    make: parseJS,
+    electricChars: "{}:",
+    configure: function(obj) {
+      if (obj.json != null) json = obj.json;
+    }
+  };
 })();

branches/greyhound/mt-static/codemirror/js/select.js

@@ -38 +38 @@
                 || !element.nextSibling.nextSibling.nextSibling;
     // In Opera (and recent Webkit versions), BR elements *always*
-    // have a scrollTop property of zero.
+    // have a offsetTop property of zero.
     var compensateHack = 0;
     while (element && !element.offsetTop) {
@@ -53 +53 @@
       y += pos.offsetTop;
       // Don't count X offset for <br> nodes
-      if (pos.nodeName != "BR")
+      if (!isBR(pos))
         x += pos.offsetLeft;
       pos = pos.offsetParent;
@@ -248 +248 @@
           if (cur) {
             try{range.moveToElementText(cur);}
-            catch(e){}
+            catch(e){return false;}
             range.collapse(false);
           }
@@ -254 +254 @@
           if (count) range.move("character", count);
         }
-        else range.moveToElementText(node);
+        else {
+          try{range.moveToElementText(node);}
+          catch(e){return false;}
+        }
+        return true;
       }
 
@@ -263 +267 @@
         var middle = Math.ceil((end + start) / 2), node = container.childNodes[middle];
         if (!node) return false; // Don't ask. IE6 manages this sometimes.
-        moveToNodeStart(range2, node);
+        if (!moveToNodeStart(range2, node)) return false;
         if (range.compareEndPoints("StartToStart", range2) == 1)
           start = middle;
@@ -315 +319 @@
 
       var topNode = select.selectionTopNode(container, start);
-      while (topNode && topNode.nodeName != "BR")
+      while (topNode && !isBR(topNode))
         topNode = topNode.previousSibling;
 
@@ -357 +361 @@
 
     // Some hacks for storing and re-storing the selection when the editor loses and regains focus.
-    select.selectionCoords = function (win) {
-      var selection = win.document.selection;
-      if (!selection) return null;
-      var start = selection.createRange(), end = start.duplicate();
-      start.collapse(true);
-      end.collapse(false);
-
-      var body = win.document.body;
-      return {start: {x: start.boundingLeft + body.scrollLeft - 1,
-                      y: start.boundingTop + body.scrollTop},
-              end: {x: end.boundingLeft + body.scrollLeft - 1,
-                    y: end.boundingTop + body.scrollTop}};
+    select.getBookmark = function (container) {
+      var from = select.cursorPos(container, true), to = select.cursorPos(container, false);
+      if (from && to) return {from: from, to: to};
     };
 
     // Restore a stored selection.
-    select.selectCoords = function(win, coords) {
-      if (!coords) return;
-
-      var range1 = win.document.body.createTextRange(), range2 = range1.duplicate();
-      // This can fail for various hard-to-handle reasons.
-      try {
-        range1.moveToPoint(coords.start.x, coords.start.y);
-        range2.moveToPoint(coords.end.x, coords.end.y);
-        range1.setEndPoint("EndToStart", range2);
-        range1.select();
-      } catch(e) {}
+    select.setBookmark = function(container, mark) {
+      if (!mark) return;
+      select.setCursorPos(container, mark.from, mark.to);
     };
   }
@@ -408 +395 @@
       // until a 'leaf' is reached (or is it *up* the DOM tree?).
       function normalize(point){
-        while (point.node.nodeType != 3 && point.node.nodeName != "BR") {
+        while (point.node.nodeType != 3 && !isBR(point.node)) {
           var newNode = point.node.childNodes[point.offset] || point.node.nextSibling;
           point.offset = 0;
@@ -426 +413 @@
 
     select.selectMarked = function () {
-      if (!currentSelection || !currentSelection.changed) return;
-      var win = currentSelection.window, range = win.document.createRange();
+      var cs = currentSelection;
+      if (!(cs && (cs.changed || (webkit && cs.start.node == cs.end.node)))) return;
+      var win = cs.window, range = win.document.createRange();
 
       function setPoint(point, which) {
@@ -443 +431 @@
       }
 
-      setPoint(currentSelection.end, "End");
-      setPoint(currentSelection.start, "Start");
+      setPoint(cs.end, "End");
+      setPoint(cs.start, "Start");
       selectRange(range, win);
     };
@@ -472 +460 @@
       // Work around (yet another) bug in Opera's selection model.
       if (window.opera && !start && range.endContainer == container && range.endOffset == range.startOffset + 1 &&
-          container.childNodes[range.startOffset] && container.childNodes[range.startOffset].nodeName == "BR")
+          container.childNodes[range.startOffset] && isBR(container.childNodes[range.startOffset]))
         offset--;
 
@@ -487 +475 @@
       // selection. If the offset is 0, we take the start of the frame
       // ('after null'), otherwise, we take the last node.
-      else if (node.nodeName == "HTML") {
+      else if (node.nodeName.toUpperCase() == "HTML") {
         return (offset == 1 ? null : container.lastChild);
       }
@@ -558 +546 @@
 
       var topNode = select.selectionTopNode(container, start);
-      while (topNode && topNode.nodeName != "BR")
+      while (topNode && !isBR(topNode))
         topNode = topNode.previousSibling;
 

branches/greyhound/mt-static/codemirror/js/tokenizejavascript.js

@@ -49 +49 @@
 
   // Some helper regexps
-  var isOperatorChar = /[+\-*&%\/=<>!?|]/;
+  var isOperatorChar = /[+\-*&%=<>!?|]/;
   var isHexDigit = /[0-9A-Fa-f]/;
   var isWordChar = /[\w\$_]/;

branches/greyhound/mt-static/codemirror/js/undo.js

@@ -110 +110 @@
     }
     this.pushChains([chain], from == null && to == null);
+    if (this.onChange) this.onChange();
   },
 
@@ -251 +252 @@
       var text = [];
       for (var cur = node ? node.nextSibling : self.container.firstChild;
-           cur && cur.nodeName != "BR"; cur = cur.nextSibling)
+           cur && !isBR(cur); cur = cur.nextSibling)
         if (cur.currentText) text.push(cur.currentText);
       return {from: node, to: cur, text: cleanText(text.join(""))};
@@ -276 +277 @@
     function nextBR(node, dir) {
       var link = dir + "Sibling", search = node[link];
-      while (search && search.nodeName != "BR")
+      while (search && !isBR(search))
         search = search[link];
       return search;

branches/greyhound/mt-static/codemirror/js/util.js

@@ -113 +113 @@
 
 function nodeText(node) {
-  return node.innerText || node.textContent || node.nodeValue || "";
+  return node.textContent || node.innerText || node.nodeValue || "";
 }
 
@@ -124 +124 @@
   return top;
 }
+
+function isBR(node) {
+  var nn = node.nodeName;
+  return nn == "BR" || nn == "br";
+}
+function isSpan(node) {
+  var nn = node.nodeName;
+  return nn == "SPAN" || nn == "span";
+}

branches/greyhound/mt-static/codemirror/manual.html

@@ -234 +234 @@
 
       <dt><code>undoDepth</code></dt><dd>Maximum length of the undo
-      history. Default is 50.</dd>
+      history. Default is 50. This setting is changeable with the
+      <code>setUndoDepth(depth)</code> method on CodeMirror
+      instances.</dd>
 
       <dt><code>onChange</code></dt><dd>An optional function of zero
@@ -252 +254 @@
       disable spell-checking on browsers that support it (Firefox 2+).
       Default is <code>true</code>, since for most code spell-checking
-      is useless.</dd>
+      is useless. Can be changed with the
+      <code>setSpellCheck(on)</code> method.</dd>
 
       <dt><code>textWrapping</code></dt><dd>Can be used to disable or
       enable text-wrapping in the editor frame. Default is
-      <code>true</code>.</dd>
+      <code>true</code>. Changeable with the
+      <code>setTextWrapping(on)</code> method.</dd>
 
       <dt><code>lineNumbers</code></dt><dd>Show line numbers to the
@@ -268 +272 @@
       <code>false</code>. When enabling this, you have to disable
       <code>textWrapping</code>, since the line numbers don't take
-      wrapped lines into account.</dd>
+      wrapped lines into account. Changeable with the
+      <code>setLineNumbers(on)</code> method.</dd>
 
       <dt><code>indentUnit</code></dt><dd>An integer that specifies
       the amount of spaces one 'level' of indentation should add.
-      Default is <code>2</code>.</dd>
+      Default is <code>2</code>. Changeable in a running editor using
+      the <code>setIndentUnit(spaces)</code> method.</dd>
 
       <dt><code>tabMode</code></dt><dd>Determines what the effect of
@@ -290 +296 @@
         deeper, pressing shift-tab or ctrl-tab (whichever your browser
         does not interfere with), un-indents it.</dd>
-      </dl></dd>
+      </dl>
+      This option can be changed at run-time using the
+      <code>setTabMode(mode)</code> method.</dd>
 
       <dt><code>reindentOnLoad</code></dt><dd>When <code>true</code>,
@@ -356 +364 @@
       href="jstest.html">demo</a>)</dt><dd>The JavaScript parser.
       Example colours in <code><a
-      href="css/jscolors.css">css/jscolors.css</a></code></dd>
+      href="css/jscolors.css">css/jscolors.css</a></code>. Takes one
+      configuration option, <code>json</code>, that can be set when
+      the editor content is JSON data. It causes every opening brace
+      to be treated as the start of an object, rather than a
+      block.</dd>
 
       <dt><code><a href="js/parsecss.js">parsecss.js</a></code> (<a
@@ -404 +416 @@
     plain editable field, without any accompanying buttons, bells, and
     whistles. <code>CodeMirror</code> objects do, however, provide a
-    number of methods that make it possible to add extra functionality
-    around the editor. <a
-    href="js/mirrorframe.js"><code>mirrorframe.js</code></a> provides a
-    basic example of their usage.</p>
+    number of methods and properties that make it possible to add
+    extra functionality around the editor. <a
+    href="js/mirrorframe.js"><code>mirrorframe.js</code></a> provides
+    a basic example of their usage.</p>
+
+    <h3>Properties</h3>
 
     <dl>
-
+      <dt><code>frame</code></dt><dd>The editable frame.</dd>
+      <dt><code>win</code></dt><dd>The window of the editable frame.
+      Mostly useful for attaching event handlers.</dd>
+      <dt><code>wrapping</code></dt><dd>The <code>DIV</code> element
+      wrapped around the frame. This always has a CSS class of
+      <code>CodeMirror-wrapping</code>.</dd>
+    </dl>
+
+    <h3>Methods</h3>
+
+    <dl>
       <dt><code>getCode()</code> &#8594;
       <code>string</code></dt><dd>Returns the current content of the
@@ -444 +468 @@
       re-indent the selected lines.</dd>
 
-      <dt><code>getSearchCursor(string, atCursor)</code> &#8594;
-      <code>cursor</code></dt><dd>The first argument indicates the
-      string that should be searched for, and the second indicates
+      <dt><code>getSearchCursor(string, atCursor, caseFold)</code>
+      &#8594; <code>cursor</code></dt><dd>The first argument indicates
+      the string that should be searched for, and the second indicates
       whether searching should start at the cursor (<code>true</code>)
-      or at the start of the document (<code>false</code>). Returns an
-      object that provides an interface for searching. Call its
-      <code>findNext()</code> method to search for an occurrence of
-      the given string. This returns <code>true</code> if something is
-      found, or <code>false</code> if the end of document is reached.
-      When an occurrence has been found, you can call
-      <code>select()</code> to select it, or
+      or at the start of the document (<code>false</code>). When
+      <code>caseFold</code> is true, the search will be
+      case-insensivive. Returns an object that provides an interface
+      for searching. Call its <code>findNext()</code> method to search
+      for an occurrence of the given string. This returns
+      <code>true</code> if something is found, or <code>false</code>
+      if the end of document is reached. When an occurrence has been
+      found, you can call <code>select()</code> to select it, or
       <code>replace(string)</code> to replace it with a given string.
       Note that letting the user change the document, or

branches/greyhound/tmpl/cms/edit_template.tmpl

@@ -775 +775 @@
     tabMode: "default",
     indentUnit: 0,
-    height: "500px"
+    height: "500px",
+    lang: "<mt:var name="language_tag">"
 });
 /* ]]> */