codemirror-rails 4.7 → 4.8

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

@@ -23,8 +23,13 @@ CodeMirror.defineMode("yaml", function() {
       state.escaped = false;
       /* comments */
       if (ch == "#" && (stream.pos == 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) {
-        stream.skipToEnd(); return "comment";
+        stream.skipToEnd();
+        return "comment";
       }
+
+      if (stream.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))
+        return "string";
+
       if (state.literal && stream.indentation() > state.keyCol) {
         stream.skipToEnd(); return "string";
       } else if (state.literal) { state.literal = false; }

data/vendor/assets/stylesheets/codemirror.css

@@ -52,12 +52,12 @@
 .CodeMirror div.CodeMirror-secondarycursor {
   border-left: 1px solid silver;
 }
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
   width: auto;
   border: 0;
   background: #7e7;
 }
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursors {
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
   z-index: 1;
 }
 
@@ -125,6 +125,7 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-header, .cm-strong {font-weight: bold;}
 .cm-em {font-style: italic;}
 .cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
 
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
@@ -209,6 +210,11 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   *zoom:1;
   *display:inline;
 }
+.CodeMirror-gutter-wrapper {
+  position: absolute;
+  z-index: 4;
+  height: 100%;
+}
 .CodeMirror-gutter-elt {
   position: absolute;
   cursor: default;
@@ -305,5 +311,8 @@ div.CodeMirror-cursors {
   }
 }
 
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
 /* Help users use markselection to safely style text background */
 span.CodeMirror-selectedtext { background: none; }

data/vendor/assets/stylesheets/codemirror/themes/3024-day.css

@@ -35,4 +35,4 @@
 .cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
 
 .cm-s-3024-day .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important;}

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

@@ -88,11 +88,6 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   text-decoration-style: dotted;
 }
 .cm-s-solarized .cm-strong { color: #eee; }
-.cm-s-solarized .cm-tab:before {
-  content: "➤";   /*visualize tab character*/
-  color: #586e75;
-  position:absolute;
-}
 .cm-s-solarized .cm-error,
 .cm-s-solarized .cm-invalidchar {
   color: #586e75;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codemirror-rails
 version: !ruby/object:Gem::Version
-  version: '4.7'
+  version: '4.8'
 platform: ruby
 authors:
 - Nathan Fixler
@@ -275,6 +275,7 @@ files:
 - vendor/assets/javascripts/codemirror/modes/d.js
 - vendor/assets/javascripts/codemirror/modes/diff.js
 - vendor/assets/javascripts/codemirror/modes/django.js
+- vendor/assets/javascripts/codemirror/modes/dockerfile.js
 - vendor/assets/javascripts/codemirror/modes/dtd.js
 - vendor/assets/javascripts/codemirror/modes/dylan.js
 - vendor/assets/javascripts/codemirror/modes/ecl.js
@@ -292,6 +293,7 @@ files:
 - vendor/assets/javascripts/codemirror/modes/htmlembedded.js
 - vendor/assets/javascripts/codemirror/modes/htmlmixed.js
 - vendor/assets/javascripts/codemirror/modes/http.js
+- vendor/assets/javascripts/codemirror/modes/idl.js
 - vendor/assets/javascripts/codemirror/modes/jade.js
 - vendor/assets/javascripts/codemirror/modes/javascript.js
 - vendor/assets/javascripts/codemirror/modes/jinja2.js