codemirror-rails 0.3.2 → 2.2

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

@@ -3,9 +3,9 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   var Kludges = parserConfig.htmlMode ? {
     autoSelfClosers: {"br": true, "img": true, "hr": true, "link": true, "input": true,
                       "meta": true, "col": true, "frame": true, "base": true, "area": true},
-    doNotIndent: {"pre": true, "!cdata": true},
+    doNotIndent: {"pre": true},
     allowUnquoted: true
-  } : {autoSelfClosers: {}, doNotIndent: {"!cdata": true}, allowUnquoted: false};
+  } : {autoSelfClosers: {}, doNotIndent: {}, allowUnquoted: false};
   var alignCDATA = parserConfig.alignCDATA;
 
   // Return variables for tokenizers
@@ -27,7 +27,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         else if (stream.match("--")) return chain(inBlock("comment", "-->"));
         else if (stream.match("DOCTYPE", true, true)) {
           stream.eatWhile(/[\w\._\-]/);
-          return chain(inBlock("meta", ">"));
+          return chain(doctype(1));
         }
         else return null;
       }
@@ -102,6 +102,26 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       return style;
     };
   }
+  function doctype(depth) {
+    return function(stream, state) {
+      var ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == "<") {
+          state.tokenize = doctype(depth + 1);
+          return state.tokenize(stream, state);
+        } else if (ch == ">") {
+          if (depth == 1) {
+            state.tokenize = inText;
+            break;
+          } else {
+            state.tokenize = doctype(depth - 1);
+            return state.tokenize(stream, state);
+          }
+        }
+      }
+      return "meta";
+    };
+  }
 
   var curState, setStyle;
   function pass() {
@@ -127,8 +147,10 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   }
 
   function element(type) {
-    if (type == "openTag") {curState.tagName = tagName; return cont(attributes, endtag(curState.startOfLine));}
-    else if (type == "closeTag") {
+    if (type == "openTag") {
+      curState.tagName = tagName;
+      return cont(attributes, endtag(curState.startOfLine));
+    } else if (type == "closeTag") {
       var err = false;
       if (curState.context) {
         err = curState.context.tagName != tagName;
@@ -138,12 +160,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       if (err) setStyle = "error";
       return cont(endclosetag(err));
     }
-    else if (type == "string") {
-      if (!curState.context || curState.context.name != "!cdata") pushContext("!cdata");
-      if (curState.tokenize == inText) popContext();
-      return cont();
-    }
-    else return cont();
+    return cont();
   }
   function endtag(startOfLine) {
     return function(type) {
@@ -205,9 +222,11 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       return setStyle || style;
     },
 
-    indent: function(state, textAfter) {
+    indent: function(state, textAfter, fullLine) {
       var context = state.context;
-      if (context && context.noIndent) return 0;
+      if ((state.tokenize != inTag && state.tokenize != inText) ||
+          context && context.noIndent)
+        return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
       if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
       if (context && /^<\//.test(textAfter))
         context = context.prev;

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

@@ -412,7 +412,7 @@ CodeMirror.defineMode("xmlpure", function(config, parserConfig) {
     ///////////////////////////////////////////////////////////////////////////
     // returned object
     return {
-        electricChars: "/",
+        electricChars: "/[",
         
         startState: function() {
             return {
@@ -458,9 +458,13 @@ CodeMirror.defineMode("xmlpure", function(config, parserConfig) {
                     return;
                 }
                 if(textAfter.match(/^<\/.*/)) {
-                    // eng-tag - indent back to last context
+                    // end-tag - indent back to last context
                     return state.context.indent;
                 }
+                if(textAfter.match(/^<!\[CDATA\[/)) {
+                    // a stand-alone CDATA start-tag - indent back to column 0
+                    return 0;                
+                }
                 // indent to last context + regular indent unit
                 return state.context.indent + indentUnit;
             }

data/vendor/assets/stylesheets/codemirror.css

@@ -51,27 +51,54 @@
 }
 
 .CodeMirror textarea {
-  font-family: inherit !important;
-  font-size: inherit !important;
+  outline: none !important;
 }
 
-.CodeMirror-cursor {
+.CodeMirror pre.CodeMirror-cursor {
   z-index: 10;
   position: absolute;
   visibility: hidden;
-  border-left: 1px solid black !important;
+  border-left: 1px solid black;
 }
-.CodeMirror-focused .CodeMirror-cursor {
+.CodeMirror-focused pre.CodeMirror-cursor {
   visibility: visible;
 }
 
-span.CodeMirror-selected {
-  background: #ccc !important;
-  color: HighlightText !important;
-}
-.CodeMirror-focused span.CodeMirror-selected {
-  background: Highlight !important;
-}
+span.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused span.CodeMirror-selected { background: #d2dcf8; }
+
+.CodeMirror-searching {background: #ffa;}
+
+/* Default theme */
+
+.cm-s-default span.cm-keyword {color: #708;}
+.cm-s-default span.cm-atom {color: #219;}
+.cm-s-default span.cm-number {color: #164;}
+.cm-s-default span.cm-def {color: #00f;}
+.cm-s-default span.cm-variable {color: black;}
+.cm-s-default span.cm-variable-2 {color: #05a;}
+.cm-s-default span.cm-variable-3 {color: #085;}
+.cm-s-default span.cm-property {color: black;}
+.cm-s-default span.cm-operator {color: black;}
+.cm-s-default span.cm-comment {color: #a50;}
+.cm-s-default span.cm-string {color: #a11;}
+.cm-s-default span.cm-string-2 {color: #f50;}
+.cm-s-default span.cm-meta {color: #555;}
+.cm-s-default span.cm-error {color: #f00;}
+.cm-s-default span.cm-qualifier {color: #555;}
+.cm-s-default span.cm-builtin {color: #30a;}
+.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: #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;}
+
+span.cm-header, span.cm-strong {font-weight: bold;}
+span.cm-em {font-style: italic;}
+span.cm-emstrong {font-style: italic; font-weight: bold;}
+span.cm-link {text-decoration: underline;}
 
-.CodeMirror-matchingbracket {color: #0f0 !important;}
-.CodeMirror-nonmatchingbracket {color: #f22 !important;}
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}

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

@@ -1,3 +1,3 @@
-.cm-s-default span.cm-rangeinfo {color: #a0b;}
-.cm-s-default span.cm-minus {color: #a22;}
-.cm-s-default span.cm-plus {color: #2b2;}
+span.cm-rangeinfo {color: #a0b;}
+span.cm-minus {color: red;}
+span.cm-plus {color: #2b2;}

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

@@ -15,3 +15,4 @@
 .cm-s-cobalt span.cm-error { color: #9d1e15; }
 .cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
 .cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
+.cm-s-cobalt span.cm-link { color: #845dc4; }

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

@@ -17,8 +17,9 @@
 .cm-s-eclipse span.cm-bracket {color: #cc7;}
 .cm-s-eclipse span.cm-tag {color: #170;}
 .cm-s-eclipse span.cm-attribute {color: #00c;}
+.cm-s-eclipse span.cm-link {color: #219;}
 
-.CodeMirror-matchingbracket{
+.cm-s-eclipse .CodeMirror-matchingbracket {
 	border:1px solid grey;
 	color:black !important;;
-}
+}

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

@@ -7,3 +7,4 @@
 .cm-s-elegant span.cm-keyword {color: #730;}
 .cm-s-elegant span.cm-builtin {color: #30a;}
 .cm-s-elegant span.cm-error {background-color: #fdd;}
+.cm-s-elegant span.cm-link {color: #762;}

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

@@ -1,27 +1,28 @@
 /* Based on Sublime Text's Monokai theme */
 
-.cm-s-monokai { background: #272822; color: #F8F8F2; }
-.cm-s-monokai span.CodeMirror-selected { background: #FFE792 !important; }
-.cm-s-monokai .CodeMirror-gutter { background: #272822; border-right: 0px; }
-.cm-s-monokai .CodeMirror-gutter-text { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #F8F8F0 !important; }
+.cm-s-monokai {background: #272822; color: #f8f8f2;}
+.cm-s-monokai span.CodeMirror-selected {background: #ffe792 !important;}
+.cm-s-monokai .CodeMirror-gutter {background: #272822; border-right: 0px;}
+.cm-s-monokai .CodeMirror-gutter-text {color: #d0d0d0;}
+.cm-s-monokai .CodeMirror-cursor {border-left: 1px solid #f8f8f0 !important;}
 
-.cm-s-monokai span.cm-comment { color: #75715E; }
-.cm-s-monokai span.cm-atom { color: #AE81FF; }
-.cm-s-monokai span.cm-number { color: #AE81FF; }
+.cm-s-monokai span.cm-comment {color: #75715e;}
+.cm-s-monokai span.cm-atom {color: #ae81ff;}
+.cm-s-monokai span.cm-number {color: #ae81ff;}
 
-.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute {color: #A6E22E;}
-.cm-s-monokai span.cm-keyword { color: #F92672; }
-.cm-s-monokai span.cm-string { color: #E6DB74; }
+.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute {color: #a6e22e;}
+.cm-s-monokai span.cm-keyword {color: #f92672;}
+.cm-s-monokai span.cm-string {color: #e6db74;}
 
-.cm-s-monokai span.cm-variable {color: #A6E22E;}
-.cm-s-monokai span.cm-variable-2 { color: #9effff; }
-.cm-s-monokai span.cm-def { color: #FD971F; }
-.cm-s-monokai span.cm-error { background: #F92672; color: #F8F8F0; }
-.cm-s-monokai span.cm-bracket { color: #f8F8F2; }
-.cm-s-monokai span.cm-tag {color: #F92672;}
+.cm-s-monokai span.cm-variable {color: #a6e22e;}
+.cm-s-monokai span.cm-variable-2 {color: #9effff;}
+.cm-s-monokai span.cm-def {color: #fd971f;}
+.cm-s-monokai span.cm-error {background: #f92672; color: #f8f8f0;}
+.cm-s-monokai span.cm-bracket {color: #f8f8f2;}
+.cm-s-monokai span.cm-tag {color: #f92672;}
+.cm-s-monokai span.cm-link {color: #ae81ff;}
 
-.CodeMirror-matchingbracket{
-	text-decoration: underline;
-	color: white !important;
-}
+.cm-s-monokai .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}

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

@@ -6,3 +6,4 @@
 .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;}
+.cm-s-neat span.cm-link { color: #3a3; }

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

@@ -18,3 +18,4 @@
 .cm-s-night span.cm-bracket { color: #8da6ce; }
 .cm-s-night span.cm-comment { color: #6900a1; }
 .cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
+.cm-s-night span.cm-link { color: #845dc4; }

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

@@ -16,5 +16,6 @@
 .cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
 .cm-s-rubyblue span.cm-error { color: #AF2018; }
 .cm-s-rubyblue span.cm-bracket { color: #F0F; }
+.cm-s-rubyblue span.cm-link { color: #F4C20B; }
 .cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
 .cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codemirror-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: '2.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000Z
+date: 2012-01-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2161682920 !ruby/object:Gem::Requirement
+  requirement: &2164530160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161682920
+  version_requirements: *2164530160
 description: This gem provides CodeMirror assets for your Rails 3 application.
 email: nathan@fixler.org
 executables: []
@@ -49,6 +49,7 @@ files:
 - vendor/assets/javascripts/codemirror/modes/gfm.js
 - vendor/assets/javascripts/codemirror/modes/groovy.js
 - vendor/assets/javascripts/codemirror/modes/haskell.js
+- vendor/assets/javascripts/codemirror/modes/htmlembedded.js
 - vendor/assets/javascripts/codemirror/modes/htmlmixed.js
 - vendor/assets/javascripts/codemirror/modes/javascript.js
 - vendor/assets/javascripts/codemirror/modes/jinja2.js