codemirror-rails 2.3 → 2.21

data/vendor/assets/javascripts/codemirror/modes/xml.js

@@ -1,44 +1,11 @@
 CodeMirror.defineMode("xml", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var Kludges = parserConfig.htmlMode ? {
-    autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
-                      'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
-                      'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
-                      'track': true, 'wbr': true},
-    implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
-                       'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
-                       'th': true, 'tr': true},
-    contextGrabbers: {
-      'dd': {'dd': true, 'dt': true},
-      'dt': {'dd': true, 'dt': true},
-      'li': {'li': true},
-      'option': {'option': true, 'optgroup': true},
-      'optgroup': {'optgroup': true},
-      'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
-            'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
-            'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
-            'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
-            'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
-      'rp': {'rp': true, 'rt': true},
-      'rt': {'rp': true, 'rt': true},
-      'tbody': {'tbody': true, 'tfoot': true},
-      'td': {'td': true, 'th': true},
-      'tfoot': {'tbody': true},
-      'th': {'td': true, 'th': true},
-      'thead': {'tbody': true, 'tfoot': true},
-      'tr': {'tr': true}
-    },
+    autoSelfClosers: {"br": true, "img": true, "hr": true, "link": true, "input": true,
+                      "meta": true, "col": true, "frame": true, "base": true, "area": true},
     doNotIndent: {"pre": true},
-    allowUnquoted: true,
-    allowMissing: false
-  } : {
-    autoSelfClosers: {},
-    implicitlyClosed: {},
-    contextGrabbers: {},
-    doNotIndent: {},
-    allowUnquoted: false,
-    allowMissing: false
-  };
+    allowUnquoted: true
+  } : {autoSelfClosers: {}, doNotIndent: {}, allowUnquoted: false};
   var alignCDATA = parserConfig.alignCDATA;
 
   // Return variables for tokenizers
@@ -88,7 +55,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
           ok = stream.eatWhile(/[\d]/) && stream.eat(";");
         }
       } else {
-        ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";");
+        ok = stream.eatWhile(/[\w]/) && stream.eat(";");
       }
       return ok ? "atom" : "error";
     }
@@ -194,12 +161,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     } else if (type == "closeTag") {
       var err = false;
       if (curState.context) {
-        if (curState.context.tagName != tagName) {
-          if (Kludges.implicitlyClosed.hasOwnProperty(curState.context.tagName.toLowerCase())) {
-            popContext();
-          }
-          err = !curState.context || curState.context.tagName != tagName;
-        }
+        err = curState.context.tagName != tagName;
       } else {
         err = true;
       }
@@ -211,15 +173,9 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   function endtag(startOfLine) {
     return function(type) {
       if (type == "selfcloseTag" ||
-          (type == "endTag" && Kludges.autoSelfClosers.hasOwnProperty(curState.tagName.toLowerCase()))) {
-        maybePopContext(curState.tagName.toLowerCase());
+          (type == "endTag" && Kludges.autoSelfClosers.hasOwnProperty(curState.tagName.toLowerCase())))
         return cont();
-      }
-      if (type == "endTag") {
-        maybePopContext(curState.tagName.toLowerCase());
-        pushContext(curState.tagName, startOfLine);
-        return cont();
-      }
+      if (type == "endTag") {pushContext(curState.tagName, startOfLine); return cont();}
       return cont();
     };
   }
@@ -231,37 +187,17 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       return cont(arguments.callee);
     }
   }
-  function maybePopContext(nextTagName) {
-    var parentTagName;
-    while (true) {
-      if (!curState.context) {
-        return;
-      }
-      parentTagName = curState.context.tagName.toLowerCase();
-      if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
-          !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
-        return;
-      }
-      popContext();
-    }
-  }
 
   function attributes(type) {
-    if (type == "word") {setStyle = "attribute"; return cont(attribute, attributes);}
-    if (type == "endTag" || type == "selfcloseTag") return pass();
-    setStyle = "error";
-    return cont(attributes);
-  }
-  function attribute(type) {
+    if (type == "word") {setStyle = "attribute"; return cont(attributes);}
     if (type == "equals") return cont(attvalue, attributes);
-    if (!Kludges.allowMissing) setStyle = "error";
-    return (type == "endTag" || type == "selfcloseTag") ? pass() : cont();
+    if (type == "string") {setStyle = "error"; return cont(attributes);}
+    return pass();
   }
   function attvalue(type) {
-    if (type == "string") return cont(attvaluemaybe);
     if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return cont();}
-    setStyle = "error";
-    return (type == "endTag" || type == "selfCloseTag") ? pass() : cont();
+    if (type == "string") return cont(attvaluemaybe);
+    return pass();
   }
   function attvaluemaybe(type) {
     if (type == "string") return cont(attvaluemaybe);
@@ -321,5 +257,4 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
 });
 
 CodeMirror.defineMIME("application/xml", "xml");
-if (!CodeMirror.mimeModes.hasOwnProperty("text/html"))
-  CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});
+CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});

data/vendor/assets/javascripts/codemirror/{utils/overlay.js → overlay.js}

@@ -6,8 +6,7 @@
 // overlay wins, unless the combine argument was true, in which case
 // the styles are combined.
 
-// overlayParser is the old, deprecated name
-CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, combine) {
+CodeMirror.overlayParser = function(base, overlay, combine) {
   return {
     startState: function() {
       return {
@@ -44,7 +43,7 @@ CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, comb
       else return state.overlayCur;
     },
     
-    indent: base.indent && function(state, textAfter) {
+    indent: function(state, textAfter) {
       return base.indent(state.base, textAfter);
     },
     electricChars: base.electricChars

data/vendor/assets/javascripts/codemirror/runmode.js

@@ -0,0 +1,27 @@
+CodeMirror.runMode = function(string, modespec, callback) {
+  var mode = CodeMirror.getMode({indentUnit: 2}, modespec);
+  var isNode = callback.nodeType == 1;
+  if (isNode) {
+    var node = callback, accum = [];
+    callback = function(string, style) {
+      if (string == "\n")
+        accum.push("<br>");
+      else if (style)
+        accum.push("<span class=\"cm-" + CodeMirror.htmlEscape(style) + "\">" + CodeMirror.htmlEscape(string) + "</span>");
+      else
+        accum.push(CodeMirror.htmlEscape(string));
+    }
+  }
+  var lines = CodeMirror.splitLines(string), state = CodeMirror.startState(mode);
+  for (var i = 0, e = lines.length; i < e; ++i) {
+    if (i) callback("\n");
+    var stream = new CodeMirror.StringStream(lines[i]);
+    while (!stream.eol()) {
+      var style = mode.token(stream, state);
+      callback(stream.current(), style, i, stream.start);
+      stream.start = stream.pos;
+    }
+  }
+  if (isNode)
+    node.innerHTML = accum.join("");
+};

data/vendor/assets/stylesheets/codemirror.css

@@ -1,52 +1,14 @@
 .CodeMirror {
   line-height: 1em;
   font-family: monospace;
-
-  /* Necessary so the scrollbar can be absolutely positioned within the wrapper on Lion. */
-  position: relative;
-  /* This prevents unwanted scrollbars from showing up on the body and wrapper in IE. */
-  overflow: hidden;
 }
 
 .CodeMirror-scroll {
-  overflow-x: auto;
-  overflow-y: hidden;
+  overflow: auto;
   height: 300px;
   /* This is needed to prevent an IE[67] bug where the scrolled content
      is visible outside of the scrolling box. */
   position: relative;
-  outline: none;
-}
-
-/* Vertical scrollbar */
-.CodeMirror-scrollbar {
-  float: right;
-  overflow-x: hidden;
-  overflow-y: scroll;
-
-  /* This corrects for the 1px gap introduced to the left of the scrollbar
-     by the rule for .CodeMirror-scrollbar-inner. */
-  margin-left: -1px;
-}
-.CodeMirror-scrollbar-inner {
-  /* This needs to have a nonzero width in order for the scrollbar to appear
-     in Firefox and IE9. */
-  width: 1px;
-}
-.CodeMirror-scrollbar.cm-sb-overlap {
-  /* Ensure that the scrollbar appears in Lion, and that it overlaps the content
-     rather than sitting to the right of it. */
-  position: absolute;
-  z-index: 1;
-  float: none;
-  right: 0;
-  min-width: 12px;
-}
-.CodeMirror-scrollbar.cm-sb-nonoverlap {
-  min-width: 12px;
-}
-.CodeMirror-scrollbar.cm-sb-ie7 {
-  min-width: 18px;
 }
 
 .CodeMirror-gutter {
@@ -65,12 +27,6 @@
 }
 .CodeMirror-lines {
   padding: .4em;
-  white-space: pre;
-  cursor: text;
-}
-.CodeMirror-lines * {
-  /* Necessary for throw-scrolling to decelerate properly on Safari. */
-  pointer-events: none;
 }
 
 .CodeMirror pre {
@@ -84,14 +40,11 @@
   padding: 0; margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: inherit;
-  color: inherit;
 }
 
 .CodeMirror-wrap pre {
   word-wrap: break-word;
   white-space: pre-wrap;
-  word-break: normal;
 }
 .CodeMirror-wrap .CodeMirror-scroll {
   overflow-x: hidden;
@@ -106,21 +59,7 @@
   position: absolute;
   visibility: hidden;
   border-left: 1px solid black;
-  border-right: none;
-  width: 0;
-}
-.cm-keymap-fat-cursor pre.CodeMirror-cursor {
-  width: auto;
-  border: 0;
-  background: transparent;
-  background: rgba(0, 200, 0, .4);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800);
-}
-/* Kludge to turn off filter in ie9+, which also accepts rgba */
-.cm-keymap-fat-cursor pre.CodeMirror-cursor:not(#nonsense_id) {
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
-.CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}
 .CodeMirror-focused pre.CodeMirror-cursor {
   visibility: visible;
 }
@@ -154,7 +93,7 @@ div.CodeMirror-selected { background: #d9d9d9; }
 .cm-s-default span.cm-bracket {color: #cc7;}
 .cm-s-default span.cm-tag {color: #170;}
 .cm-s-default span.cm-attribute {color: #00c;}
-.cm-s-default span.cm-header {color: blue;}
+.cm-s-default span.cm-header {color: #a0a;}
 .cm-s-default span.cm-quote {color: #090;}
 .cm-s-default span.cm-hr {color: #999;}
 .cm-s-default span.cm-link {color: #00c;}

data/vendor/assets/stylesheets/codemirror/modes/tiddlywiki.css

@@ -1,14 +1,21 @@
-span.cm-underlined {
-  text-decoration: underline;
-}
-span.cm-strikethrough {
-  text-decoration: line-through;
-}
-span.cm-brace {
-  color: #170;
-  font-weight: bold;
-}
-span.cm-table {
-  color: blue;
-  font-weight: bold;
-}
+.cm-s-default span.cm-header {color: blue; font-weight:bold;}
+.cm-s-default span.cm-code {color: #a50;}
+.cm-s-default span.cm-code-inline {color: #660;}
+
+.cm-s-default span.cm-quote {color: #555;}
+.cm-s-default span.cm-list {color: #c60;}
+.cm-s-default span.cm-hr {color: #999;}
+.cm-s-default span.cm-em {font-style: italic;}
+.cm-s-default span.cm-strong {font-weight: bold;}
+
+.cm-s-default span.cm-link-external {color: blue;}
+.cm-s-default span.cm-brace {color: #170; font-weight: bold;}
+.cm-s-default span.cm-macro {color: #9E3825;}
+.cm-s-default span.cm-table {color: blue;}
+.cm-s-default span.cm-warning {color: red; font-weight: bold;}
+
+.cm-s-default span.cm-underlined {text-decoration: underline;}
+.cm-s-default span.cm-line-through {text-decoration: line-through;}
+
+.cm-s-default span.cm-comment {color: #666;}
+

data/vendor/assets/stylesheets/codemirror/themes/eclipse.css

@@ -1,5 +1,5 @@
 .cm-s-eclipse span.cm-meta {color: #FF1717;}
-.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
+.cm-s-eclipse span.cm-keyword { font-weight: bold; color: #7F0055; }
 .cm-s-eclipse span.cm-atom {color: #219;}
 .cm-s-eclipse span.cm-number {color: #164;}
 .cm-s-eclipse span.cm-def {color: #00f;}

data/vendor/assets/stylesheets/codemirror/themes/elegant.css

@@ -1,6 +1,6 @@
 .cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;}
-.cm-s-elegant span.cm-comment {color: #262; font-style: italic; line-height: 1em;}
-.cm-s-elegant span.cm-meta {color: #555; font-style: italic; line-height: 1em;}
+.cm-s-elegant span.cm-comment {color: #262;font-style: italic;}
+.cm-s-elegant span.cm-meta {color: #555;font-style: italic;}
 .cm-s-elegant span.cm-variable {color: black;}
 .cm-s-elegant span.cm-variable-2 {color: #b11;}
 .cm-s-elegant span.cm-qualifier {color: #555;}

data/vendor/assets/stylesheets/codemirror/themes/neat.css

@@ -1,8 +1,8 @@
 .cm-s-neat span.cm-comment { color: #a86; }
-.cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
+.cm-s-neat span.cm-keyword { font-weight: bold; color: blue; }
 .cm-s-neat span.cm-string { color: #a22; }
-.cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; }
-.cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
+.cm-s-neat span.cm-builtin { font-weight: bold; color: #077; }
+.cm-s-neat span.cm-special { font-weight: bold; color: #0aa; }
 .cm-s-neat span.cm-variable { color: black; }
 .cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
 .cm-s-neat span.cm-meta {color: #555;}

data/vendor/assets/stylesheets/codemirror/themes/night.css

@@ -1,7 +1,7 @@
 /* Loosely based on the Midnight Textmate theme */
 
 .cm-s-night { background: #0a001f; color: #f8f8f8; }
-.cm-s-night div.CodeMirror-selected { background: #447 !important; }
+.cm-s-night div.CodeMirror-selected { background: #a8f !important; }
 .cm-s-night .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; }
 .cm-s-night .CodeMirror-gutter-text { color: #f8f8f8; }
 .cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; }

data/vendor/assets/stylesheets/codemirror/themes/rubyblue.css

@@ -1,12 +1,12 @@
 .cm-s-rubyblue { font:13px/1.4em Trebuchet, Verdana, sans-serif; }	/* - customized editor font - */
 
 .cm-s-rubyblue { background: #112435; color: white; }
-.cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
+.cm-s-rubyblue div.CodeMirror-selected { background: #0000FF !important; }
 .cm-s-rubyblue .CodeMirror-gutter { background: #1F4661; border-right: 7px solid #3E7087; min-width:2.5em; }
 .cm-s-rubyblue .CodeMirror-gutter-text { color: white; }
 .cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; }
 
-.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
+.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; }
 .cm-s-rubyblue span.cm-atom { color: #F4C20B; }
 .cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
 .cm-s-rubyblue span.cm-keyword { color: #F0F; }

metadata

@@ -1,20 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: codemirror-rails
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '2.21'
   prerelease: 
 platform: ruby
 authors:
 - Nathan Fixler
-- Robin Bühler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000Z
+date: 2012-01-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2156141460 !ruby/object:Gem::Requirement
+  requirement: &2168664600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +21,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156141460
+  version_requirements: *2168664600
 description: This gem provides CodeMirror assets for your Rails 3 application.
 email: nathan@fixler.org
 executables: []
@@ -42,15 +41,11 @@ files:
 - lib/codemirror/rails/version.rb
 - lib/generators/codemirror/install/install_generator.rb
 - vendor/assets/javascripts/codemirror.js
-- vendor/assets/javascripts/codemirror/keymaps/emacs.js
-- vendor/assets/javascripts/codemirror/keymaps/vim.js
 - vendor/assets/javascripts/codemirror/modes/clike.js
 - vendor/assets/javascripts/codemirror/modes/clojure.js
 - vendor/assets/javascripts/codemirror/modes/coffeescript.js
 - vendor/assets/javascripts/codemirror/modes/css.js
 - vendor/assets/javascripts/codemirror/modes/diff.js
-- vendor/assets/javascripts/codemirror/modes/ecl.js
-- vendor/assets/javascripts/codemirror/modes/erlang.js
 - vendor/assets/javascripts/codemirror/modes/gfm.js
 - vendor/assets/javascripts/codemirror/modes/go.js
 - vendor/assets/javascripts/codemirror/modes/groovy.js
@@ -67,9 +62,7 @@ files:
 - vendor/assets/javascripts/codemirror/modes/pascal.js
 - vendor/assets/javascripts/codemirror/modes/perl.js
 - vendor/assets/javascripts/codemirror/modes/php.js
-- vendor/assets/javascripts/codemirror/modes/pig.js
 - vendor/assets/javascripts/codemirror/modes/plsql.js
-- vendor/assets/javascripts/codemirror/modes/properties.js
 - vendor/assets/javascripts/codemirror/modes/python.js
 - vendor/assets/javascripts/codemirror/modes/r.js
 - vendor/assets/javascripts/codemirror/modes/rpm-changes.js
@@ -78,54 +71,28 @@ files:
 - vendor/assets/javascripts/codemirror/modes/ruby.js
 - vendor/assets/javascripts/codemirror/modes/rust.js
 - vendor/assets/javascripts/codemirror/modes/scheme.js
-- vendor/assets/javascripts/codemirror/modes/shell.js
 - vendor/assets/javascripts/codemirror/modes/smalltalk.js
-- vendor/assets/javascripts/codemirror/modes/smarty.js
 - vendor/assets/javascripts/codemirror/modes/sparql.js
 - vendor/assets/javascripts/codemirror/modes/stex.js
 - vendor/assets/javascripts/codemirror/modes/tiddlywiki.js
-- vendor/assets/javascripts/codemirror/modes/tiki.js
-- vendor/assets/javascripts/codemirror/modes/vbscript.js
 - vendor/assets/javascripts/codemirror/modes/velocity.js
 - vendor/assets/javascripts/codemirror/modes/verilog.js
 - vendor/assets/javascripts/codemirror/modes/xml.js
 - vendor/assets/javascripts/codemirror/modes/xmlpure.js
-- vendor/assets/javascripts/codemirror/modes/xquery.js
 - vendor/assets/javascripts/codemirror/modes/yaml.js
-- vendor/assets/javascripts/codemirror/utils/closetag.js
-- vendor/assets/javascripts/codemirror/utils/dialog.js
-- vendor/assets/javascripts/codemirror/utils/foldcode.js
-- vendor/assets/javascripts/codemirror/utils/formatting.js
-- vendor/assets/javascripts/codemirror/utils/javascript-hint.js
-- vendor/assets/javascripts/codemirror/utils/loadmode.js
-- vendor/assets/javascripts/codemirror/utils/match-highlighter.js
-- vendor/assets/javascripts/codemirror/utils/multiplex.js
-- vendor/assets/javascripts/codemirror/utils/overlay.js
-- vendor/assets/javascripts/codemirror/utils/pig-hint.js
-- vendor/assets/javascripts/codemirror/utils/runmode.js
-- vendor/assets/javascripts/codemirror/utils/search.js
-- vendor/assets/javascripts/codemirror/utils/searchcursor.js
-- vendor/assets/javascripts/codemirror/utils/simple-hint.js
+- vendor/assets/javascripts/codemirror/overlay.js
+- vendor/assets/javascripts/codemirror/runmode.js
 - vendor/assets/stylesheets/codemirror.css
 - vendor/assets/stylesheets/codemirror/modes/diff.css
 - vendor/assets/stylesheets/codemirror/modes/rpm-spec.css
 - vendor/assets/stylesheets/codemirror/modes/tiddlywiki.css
-- vendor/assets/stylesheets/codemirror/modes/tiki.css
-- vendor/assets/stylesheets/codemirror/themes/ambiance.css
-- vendor/assets/stylesheets/codemirror/themes/blackboard.css
 - vendor/assets/stylesheets/codemirror/themes/cobalt.css
 - vendor/assets/stylesheets/codemirror/themes/eclipse.css
 - vendor/assets/stylesheets/codemirror/themes/elegant.css
-- vendor/assets/stylesheets/codemirror/themes/erlang-dark.css
-- vendor/assets/stylesheets/codemirror/themes/lesser-dark.css
 - vendor/assets/stylesheets/codemirror/themes/monokai.css
 - vendor/assets/stylesheets/codemirror/themes/neat.css
 - vendor/assets/stylesheets/codemirror/themes/night.css
 - vendor/assets/stylesheets/codemirror/themes/rubyblue.css
-- vendor/assets/stylesheets/codemirror/themes/vibrant-ink.css
-- vendor/assets/stylesheets/codemirror/themes/xq-dark.css
-- vendor/assets/stylesheets/codemirror/utils/dialog.css
-- vendor/assets/stylesheets/codemirror/utils/simple-hint.css
 homepage: https://rubygems.org/gems/codemirror-rails
 licenses: []
 post_install_message: