Changeset 4966

Timestamp:

11/02/09 07:41:56 (4 weeks ago)

Author:

auno

Message:

Fixed template editor weirdness. BugzID#102871 102872

Location:

branches/greyhound/mt-static/codemirror

Files:

• js/editor.js (modified) (10 diffs)
• manual.html (modified) (1 diff)

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

@@ -441 +441 @@
 
       if (this.options.autoMatchParens)
-        addEventHandler(document.body, "click", method(this, "scheduleParenBlink"));
+        addEventHandler(document.body, "click", method(this, "scheduleParenHighlight"));
     }
     else if (!options.textWrapping) {
@@ -449 +449 @@
 
   function isSafeKey(code) {
-    return (code >= 16 && code <= 18) || // shift, control, alt
+    return (code >= 16 && code <= 18) || (code == 13) || // shift, control, alt
            (code >= 33 && code <= 40); // arrows, home, end
   }
@@ -696 +696 @@
       // Schedule a paren-highlight event, if configured.
       if (this.options.autoMatchParens)
-        this.scheduleParenBlink();
+        this.scheduleParenHighlight();
 
       // The various checks for !altKey are there because AltGr sets both
@@ -727 +727 @@
       }
       else if ((code == 219 || code == 221) && event.ctrlKey && !event.altKey) { // [, ]
-        this.blinkParens(event.shiftKey);
+        this.highlightParens(event.shiftKey, true);
         event.stop();
       }
@@ -783 +783 @@
     keyUp: function(event) {
       this.cursorActivity(isSafeKey(event.keyCode));
+      if (event.keyCode == 13)
+        this.scheduleHighlight();
     },
 
@@ -898 +900 @@
     },
 
-    // Delay (or initiate) the next paren blink event.
-    scheduleParenBlink: function() {
+    // Delay (or initiate) the next paren highlight event.
+    scheduleParenHighlight: function() {
       if (this.parenEvent) this.parent.clearTimeout(this.parenEvent);
       var self = this;
-      this.parenEvent = this.parent.setTimeout(function(){self.blinkParens();}, 300);
+      this.parenEvent = this.parent.setTimeout(function(){self.highlightParens();}, 300);
     },
 
@@ -909 +911 @@
     // highlight them in green for a moment, or red if no proper match
     // was found.
-    blinkParens: function(jump) {
+    highlightParens: function(jump, fromKey) {
+      var self = this;
+      // give the relevant nodes a colour.
+      function highlight(node, ok) {
+        if (!node) return;
+        if (self.options.markParen) {
+          self.options.markParen(node, ok);
+        }
+        else {
+          node.style.fontWeight = "bold";
+          node.style.color = ok ? "#8F8" : "#F88";
+        }
+      }
+      function unhighlight(node) {
+        if (!node) return;
+        if (self.options.unmarkParen) {
+          self.options.unmarkParen(node);
+        }
+        else {
+          node.style.fontWeight = "";
+          node.style.color = "";
+        }
+      }
+      if (!fromKey && self.highlighted) {
+        unhighlight(self.highlighted[0]);
+        unhighlight(self.highlighted[1]);
+      }
+
       if (!window.select) return;
       // Clear the event property.
@@ -927 +956 @@
       }
 
-      var ch, self = this, cursor = select.selectionTopNode(this.container, true);
+      var ch, cursor = select.selectionTopNode(this.container, true);
       if (!cursor || !this.highlightAtCursor()) return;
       cursor = select.selectionTopNode(this.container, true);
@@ -957 +986 @@
         return {node: runner, status: runner && ok};
       }
-      // Temporarily give the relevant nodes a colour.
-      function blink(node, ok) {
-        node.style.fontWeight = "bold";
-        node.style.color = ok ? "#8F8" : "#F88";
-        self.parent.setTimeout(function() {node.style.fontWeight = ""; node.style.color = "";}, 500);
-      }
 
       while (true) {
@@ -974 +997 @@
         }
         else {
-          blink(cursor, found.status);
-          if (found.node) {
-            blink(found.node, found.status);
-            if (jump) select.focusAfterNode(found.node.previousSibling, this.container);
-          }
+          highlight(cursor, found.status);
+          highlight(found.node, found.status);
+          if (fromKey)
+            self.parent.setTimeout(function() {unhighlight(cursor); unhighlight(found.node);}, 500);
+          else
+            self.highlighted = [cursor, found.node];
+          if (jump && found.node)
+            select.focusAfterNode(found.node.previousSibling, this.container);
           break;
         }

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

@@ -226 +226 @@
       the user clicks on the document. Defaults to <code>false</code>.
       Might be expensive for big documents.</dd>
+
+      <dt><code>markParen</code>,
+      <code>unmarkParen</code></dt><dd>Functions. Can be used to
+      customise the way brackets are marked (and unmarked) when
+      matched. Both take the bracket's <code>SPAN</code> node as their
+      first argument, and <code>markParen</code> takes a second
+      boolean argument indicating whether a successful match was
+      found. The default is to make the brackets bold and green (or
+      red, if not matched).</dd>
 
       <dt><code>saveFunction</code></dt><dd>If given a function