codemirror-rails 2.24 → 2.32

data/vendor/assets/stylesheets/codemirror.css

@@ -1,10 +1,16 @@
 .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: auto;
+  overflow-x: auto;
+  overflow-y: hidden;
   height: 300px;
   /* This is needed to prevent an IE[67] bug where the scrolled content
      is visible outside of the scrolling box. */
@@ -12,6 +18,37 @@
   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 {
   position: absolute; left: 0; top: 0;
   z-index: 10;
@@ -25,10 +62,16 @@
   text-align: right;
   padding: .4em .2em .4em .4em;
   white-space: pre !important;
+  cursor: default;
 }
 .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 {
@@ -43,6 +86,7 @@
   white-space: pre;
   word-wrap: normal;
   line-height: inherit;
+  color: inherit;
 }
 
 .CodeMirror-wrap pre {
@@ -63,8 +107,19 @@
   position: absolute;
   visibility: hidden;
   border-left: 1px solid black;
-  border-right:none;
-  width:0;
+  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 {
@@ -100,7 +155,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: #a0a;}
+.cm-s-default span.cm-header {color: blue;}
 .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,21 +1,14 @@
-.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; font-weight: bold;}
-.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;}
-
+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;
+}

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

@@ -21,7 +21,7 @@
 .cm-s-ambiance .cm-bracket { color: #24C2C7; }
 .cm-s-ambiance .cm-tag { color: #fee4ff }
 .cm-s-ambiance .cm-attribute {  color: #9B859D; }
-.cm-s-ambiance .cm-header {color: #blue;}
+.cm-s-ambiance .cm-header {color: blue;}
 .cm-s-ambiance .cm-quote { color: #24C2C7; }
 .cm-s-ambiance .cm-hr { color: pink; }
 .cm-s-ambiance .cm-link { color: #F4C20B; }
@@ -42,7 +42,6 @@
 .cm-s-ambiance {
   line-height: 1.40em;
   font-family: Monaco, Menlo,"Andale Mono","lucida console","Courier New",monospace !important;
-  font-size: 12px;
   color: #E6E1DC;
   background-color: #202020;
   -webkit-box-shadow: inset 0 0 10px black;

data/vendor/assets/stylesheets/codemirror/themes/erlang-dark.css

@@ -0,0 +1,21 @@
+.cm-s-erlang-dark { background: #002240; color: white; }
+.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; }
+.cm-s-erlang-dark .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-erlang-dark .CodeMirror-gutter-text { color: #d0d0d0; }
+.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-erlang-dark span.cm-atom       { color: #845dc4; }
+.cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
+.cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
+.cm-s-erlang-dark span.cm-builtin    { color: #eeaaaa; }
+.cm-s-erlang-dark span.cm-comment    { color: #7777ff; }
+.cm-s-erlang-dark span.cm-def        { color: #ee77aa; }
+.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
+.cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
+.cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
+.cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
+.cm-s-erlang-dark span.cm-operator   { color: #dd1111; }
+.cm-s-erlang-dark span.cm-string     { color: #3ad900; }
+.cm-s-erlang-dark span.cm-tag        { color: #9effff; }
+.cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
+.cm-s-erlang-dark span.cm-variable-2 { color: #ee00ee; }

data/vendor/assets/stylesheets/codemirror/themes/lesser-dark.css

@@ -2,12 +2,11 @@
 http://lesscss.org/ dark theme
 Ported to CodeMirror by Peter Kroon
 */
-.CodeMirror{
-  line-height: 15px;
+.cm-s-lesser-dark {
+  line-height: 1.3em;
 }
 .cm-s-lesser-dark {
   font-family: 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', Courier, monospace !important;
-  font-size:12px;
 }
 
 .cm-s-lesser-dark { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }

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: #a8f !important; }
+.cm-s-night div.CodeMirror-selected { background: #447 !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/vibrant-ink.css

@@ -0,0 +1,27 @@
+/* Taken from the popular Visual Studio Vibrant Ink Schema */
+
+.cm-s-vibrant-ink { background: black; color: white; }
+.cm-s-vibrant-ink .CodeMirror-selected { background: #35493c !important; }
+
+.cm-s-vibrant-ink .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-vibrant-ink .CodeMirror-gutter-text { color: #d0d0d0; }
+.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-vibrant-ink .cm-keyword {  color: #CC7832; }
+.cm-s-vibrant-ink .cm-atom { color: #FC0; }
+.cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
+.cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
+.cm-s-vibrant-ink span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #FFC66D }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-cobalt span.cm-def { color: #FFC66D }
+.cm-s-vibrant-ink .cm-operator { color: #888; }
+.cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
+.cm-s-vibrant-ink .cm-string { color:  #A5C25C }
+.cm-s-vibrant-ink .cm-string-2 { color: red }
+.cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
+.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
+.cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-header { color: #FF6400; }
+.cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
+.cm-s-vibrant-ink .cm-link { color: blue; }

data/vendor/assets/stylesheets/codemirror/utils/dialog.css

@@ -21,3 +21,7 @@
   color: inherit;
   font-family: monospace;
 }
+
+.CodeMirror-dialog button {
+  font-size: 70%;
+}

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: codemirror-rails
 version: !ruby/object:Gem::Version
-  version: '2.24'
+  version: '2.32'
   prerelease: 
 platform: ruby
 authors:
 - Nathan Fixler
+- Robin Bühler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000Z
+date: 2012-07-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2156178700 !ruby/object:Gem::Requirement
+  requirement: &2156136620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +22,51 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156178700
+  version_requirements: *2156136620
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2156135060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156135060
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2156118340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156118340
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2156117080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156117080
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &2156116060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156116060
 description: This gem provides CodeMirror assets for your Rails 3 application.
 email: nathan@fixler.org
 executables: []
@@ -32,6 +77,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - codemirror-rails.gemspec
 - doc/CodeMirror-LICENSE
 - lib/codemirror-rails.rb
@@ -40,6 +86,45 @@ files:
 - lib/codemirror/rails/railtie.rb
 - lib/codemirror/rails/version.rb
 - lib/generators/codemirror/install/install_generator.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/mailers/.gitkeep
+- test/dummy/app/models/.gitkeep
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/lib/assets/.gitkeep
+- test/dummy/log/.gitkeep
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/dummy/script/rails
+- test/dummy/tmp/cache/assets/C00/470/sprockets%2Fb33010913381c13a645c6a5123a90327
+- test/dummy/tmp/cache/assets/CB7/DA0/sprockets%2F08e08431c2f46368eb0718f7cc8c1864
+- test/dummy/tmp/cache/assets/D0F/6D0/sprockets%2Fdb9fe6d48f8b0201843fb454d078a602
+- test/dummy/tmp/cache/assets/D13/630/sprockets%2F44e7de890433a3acf03a890335e7ae69
+- test/dummy/tmp/cache/assets/D1C/3F0/sprockets%2Fd7a79ec5e13783ad8750590f4186ea0f
+- test/dummy/tmp/cache/assets/D8D/680/sprockets%2Fba7c769ef579c90ea8359b9c591eb5f4
+- test/integration/codemirror_rails_integration_test.rb
+- test/test_helper.rb
 - vendor/assets/javascripts/codemirror.js
 - vendor/assets/javascripts/codemirror/keymaps/emacs.js
 - vendor/assets/javascripts/codemirror/keymaps/vim.js
@@ -49,10 +134,12 @@ files:
 - 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
 - vendor/assets/javascripts/codemirror/modes/haskell.js
+- vendor/assets/javascripts/codemirror/modes/haxe.js
 - vendor/assets/javascripts/codemirror/modes/htmlembedded.js
 - vendor/assets/javascripts/codemirror/modes/htmlmixed.js
 - vendor/assets/javascripts/codemirror/modes/javascript.js
@@ -62,6 +149,7 @@ files:
 - vendor/assets/javascripts/codemirror/modes/markdown.js
 - vendor/assets/javascripts/codemirror/modes/mysql.js
 - vendor/assets/javascripts/codemirror/modes/ntriples.js
+- vendor/assets/javascripts/codemirror/modes/ocaml.js
 - vendor/assets/javascripts/codemirror/modes/pascal.js
 - vendor/assets/javascripts/codemirror/modes/perl.js
 - vendor/assets/javascripts/codemirror/modes/php.js
@@ -71,7 +159,6 @@ files:
 - vendor/assets/javascripts/codemirror/modes/python.js
 - vendor/assets/javascripts/codemirror/modes/r.js
 - vendor/assets/javascripts/codemirror/modes/rpm-changes.js
-- vendor/assets/javascripts/codemirror/modes/rpm-spec.css
 - vendor/assets/javascripts/codemirror/modes/rpm-spec.js
 - vendor/assets/javascripts/codemirror/modes/rst.js
 - vendor/assets/javascripts/codemirror/modes/ruby.js
@@ -84,6 +171,7 @@ files:
 - 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/vb.js
 - vendor/assets/javascripts/codemirror/modes/vbscript.js
 - vendor/assets/javascripts/codemirror/modes/velocity.js
 - vendor/assets/javascripts/codemirror/modes/verilog.js
@@ -98,11 +186,14 @@ files:
 - 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/utils/xml-hint.js
 - vendor/assets/stylesheets/codemirror.css
 - vendor/assets/stylesheets/codemirror/modes/diff.css
 - vendor/assets/stylesheets/codemirror/modes/rpm-spec.css
@@ -113,11 +204,13 @@ files:
 - 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

data/vendor/assets/javascripts/codemirror/modes/rpm-spec.css

@@ -1,5 +0,0 @@
-.cm-s-default span.cm-preamble {color: #b26818; font-weight: bold;}
-.cm-s-default span.cm-macro {color: #b218b2;}
-.cm-s-default span.cm-section {color: green; font-weight: bold;}
-.cm-s-default span.cm-script {color: red;}
-.cm-s-default span.cm-issue {color: yellow;}