Updated CodeMirror and fixed various issues with compressed version

2025-11-03 03:46:30 +01:00 · 2015-08-04 11:21:41 -07:00
parent c0b3064a08
commit cab2bbb775
4 changed files with 73 additions and 48 deletions
--- a/themes/grav/css/codemirror/codemirror.css
+++ b/themes/grav/css/codemirror/codemirror.css
@@ -4,10 +4,7 @@
  /* Set height, width, borders, and global font properties here */
  font-family: monospace;
  height: 300px;
-}
-.CodeMirror-scroll {
-  /* Set scrolling behaviour here */
-  overflow: auto;
+  color: black;
 }

 /* PADDING */
@@ -36,8 +33,7 @@
  min-width: 20px;
  text-align: right;
  color: #999;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
+  white-space: nowrap;
 }

 .CodeMirror-guttermarker { color: black; }
@@ -52,38 +48,43 @@
 .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-fat-cursor div.CodeMirror-cursors {
+  z-index: 1;
+}
+
 .cm-animate-fat-cursor {
  width: auto;
  border: 0;
  -webkit-animation: blink 1.06s steps(1) infinite;
  -moz-animation: blink 1.06s steps(1) infinite;
  animation: blink 1.06s steps(1) infinite;
+  background-color: #7e7;
 }
@-moz-keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
 }
@-webkit-keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
 }
@keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
 }

 /* Can style cursor different in overwrite (non-insert) mode */
 div.CodeMirror-overwrite div.CodeMirror-cursor {}

-.cm-tab { display: inline-block; }
+.cm-tab { display: inline-block; text-decoration: inherit; }

 .CodeMirror-ruler {
  border-left: 1px solid #ccc;
@@ -92,6 +93,15 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}

 /* DEFAULT THEME */

+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.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-keyword {color: #708;}
 .cm-s-default .cm-atom {color: #219;}
 .cm-s-default .cm-number {color: #164;}
@@ -111,20 +121,14 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-s-default .cm-bracket {color: #997;}
 .cm-s-default .cm-tag {color: #170;}
 .cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
 .cm-s-default .cm-hr {color: #999;}
 .cm-s-default .cm-link {color: #00c;}

-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}

+.CodeMirror-composing { border-bottom: 2px solid; }
+
 /* Default styles for common addons */

 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
@@ -138,14 +142,13 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   the editor. You probably shouldn't touch them. */

 .CodeMirror {
-  line-height: 1;
  position: relative;
  overflow: hidden;
  background: white;
-  color: black;
 }

 .CodeMirror-scroll {
+  overflow: scroll !important; /* Things will break if this is overridden */
  /* 30px is the magic margin used to hide the element's real scrollbars */
  /* See overflow: hidden in .CodeMirror */
  margin-bottom: -30px; margin-right: -30px;
@@ -153,14 +156,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
  height: 100%;
  outline: none; /* Prevent dragging from highlighting the element */
  position: relative;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
 }
 .CodeMirror-sizer {
  position: relative;
  border-right: 30px solid transparent;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
 }

 /* The fake, visible scrollbars. Used to force redraw during scrolling
@@ -190,29 +189,42 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}

 .CodeMirror-gutters {
  position: absolute; left: 0; top: 0;
-  padding-bottom: 30px;
  z-index: 3;
 }
 .CodeMirror-gutter {
  white-space: normal;
  height: 100%;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  padding-bottom: 30px;
-  margin-bottom: -32px;
  display: inline-block;
+  margin-bottom: -30px;
  /* Hack to make IE7 behave */
  *zoom:1;
  *display:inline;
 }
+.CodeMirror-gutter-wrapper {
+  position: absolute;
+  z-index: 4;
+  background: none !important;
+  border: none !important;
+}
+.CodeMirror-gutter-background {
+  position: absolute;
+  top: 0; bottom: 0;
+  z-index: 4;
+}
 .CodeMirror-gutter-elt {
  position: absolute;
  cursor: default;
  z-index: 4;
 }
+.CodeMirror-gutter-wrapper {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}

 .CodeMirror-lines {
  cursor: text;
+  min-height: 1px; /* prevents collapsing before first draw */
 }
 .CodeMirror pre {
  /* Reset some styles that the rest of the page might have set */
@@ -229,6 +241,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
  z-index: 2;
  position: relative;
  overflow: visible;
+  -webkit-tap-highlight-color: transparent;
 }
 .CodeMirror-wrap pre {
  word-wrap: break-word;
@@ -250,8 +263,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}

 .CodeMirror-widget {}

-.CodeMirror-wrap .CodeMirror-scroll {
-  overflow-x: hidden;
+.CodeMirror-code {
+  outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
 }

 .CodeMirror-measure {
@@ -272,7 +295,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 div.CodeMirror-cursors {
  visibility: hidden;
  position: relative;
-  z-index: 1;
+  z-index: 3;
 }
 .CodeMirror-focused div.CodeMirror-cursors {
  visibility: visible;
@@ -281,6 +304,8 @@ div.CodeMirror-cursors {
 .CodeMirror-selected { background: #d9d9d9; }
 .CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
 .CodeMirror-crosshair { cursor: crosshair; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }

 .cm-searching {
  background: #ffa;
@@ -299,3 +324,9 @@ div.CodeMirror-cursors {
    visibility: hidden;
  }
 }
+
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }
--- a/themes/grav/js/codemirror-compressed.js
+++ b/themes/grav/js/codemirror-compressed.js
--- a/themes/grav/js/mdeditor.js
+++ b/themes/grav/js/mdeditor.js
@@ -42,7 +42,7 @@
            markdown     : false,
            autocomplete : true,
            height       : 500,
-            codemirror   : { mode: 'htmlmixed', theme: 'paper', lineWrapping: true, dragDrop: true, autoCloseTags: true, matchTags: true, autoCloseBrackets: true, matchBrackets: true, indentUnit: 4, indentWithTabs: false, tabSize: 4, hintOptions: {completionSingle:false} },
+            codemirror   : { mode: 'htmlmixed', theme: 'paper', lineWrapping: true, dragDrop: true, autoCloseTags: true, matchTags: true, autoCloseBrackets: true, matchBrackets: true, indentUnit: 4, indentWithTabs: false, tabSize: 4, hintOptions: {completionSingle:false}, extraKeys: {"Enter": "newlineAndIndentContinueMarkdownList"} },
            toolbar      : [ 'bold', 'italic', 'strike', 'link', 'image', 'blockquote', 'listUl', 'listOl' ],
            lblPreview   : '<i class="fa fa-fw fa-eye"></i>',
            lblCodeview  : '<i class="fa fa-fw fa-code"></i>',
--- a/themes/grav/templates/forms/fields/frontmatter/frontmatter.html.twig
+++ b/themes/grav/templates/forms/fields/frontmatter/frontmatter.html.twig
@@ -20,7 +20,7 @@
 </div>
 <script>
    ((function(){
-        var editor = CodeMirror.fromTextArea(jQuery('#frontmatter')[0], {
+        var editor = CodeMirror.fromTextArea(document.getElementById('frontmatter'), {
            mode: 'yaml',
            theme: 'paper'
        });