Changeset - c384703b3ae3
[Not reviewed]
default
! ! !
Christian Oyarzun - 11 years ago 2014-11-13 16:53:38
oyarzun@gmail.com
codemirror: updated to version 4.7

wget http://codemirror.net/codemirror-4.7.zip
rm -rf codemirror-4.7 kallithea/public/codemirror/*
unzip codemirror-4.7.zip -x '*.html' '*/test.js'
mv codemirror-4.7/{LICENSE,lib,mode} kallithea/public/codemirror/
hg addremove kallithea/public/codemirror/
3 files changed:
0 comments (0 inline, 0 general)
LICENSE.md
Show inline comments
 
@@ -43,9 +43,9 @@ Codemirror
 
----------
 

	
 
Kallithea incorporates parts of the Javascript system called
 
[Codemirror](http://codemirror.net/), which is primarily:
 
[Codemirror](http://codemirror.net/), version 4.7.0, which is primarily:
 

	
 
Copyright &copy; 2013 by Marijn Haverbeke <marijnh@gmail.com>
 
Copyright &copy; 2013-2014 by Marijn Haverbeke <marijnh@gmail.com>
 

	
 
and licensed under the MIT-permissive license, which is
 
[included in this distribution](MIT-Permissive-License.txt).
kallithea/public/codemirror/LICENSE
Show inline comments
 
new file 100644
 
Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others
 

	
 
Permission is hereby granted, free of charge, to any person obtaining a copy
 
of this software and associated documentation files (the "Software"), to deal
 
in the Software without restriction, including without limitation the rights
 
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 
copies of the Software, and to permit persons to whom the Software is
 
furnished to do so, subject to the following conditions:
 

	
 
The above copyright notice and this permission notice shall be included in
 
all copies or substantial portions of the Software.
 

	
 
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 
THE SOFTWARE.
kallithea/public/codemirror/lib/codemirror.css
Show inline comments
 
@@ -36,13 +36,17 @@
 
  min-width: 20px;
 
  text-align: right;
 
  color: #999;
 
  -moz-box-sizing: content-box;
 
  box-sizing: content-box;
 
}
 

	
 
.CodeMirror-guttermarker { color: black; }
 
.CodeMirror-guttermarker-subtle { color: #999; }
 

	
 
/* CURSOR */
 

	
 
.CodeMirror div.CodeMirror-cursor {
 
  border-left: 1px solid black;
 
  z-index: 3;
 
}
 
/* Shown when moving in bi-directional text */
 
.CodeMirror div.CodeMirror-secondarycursor {
 
@@ -52,12 +56,43 @@
 
  width: auto;
 
  border: 0;
 
  background: #7e7;
 
}
 
.CodeMirror.cm-keymap-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;
 
}
 
@-moz-keyframes blink {
 
  0% { background: #7e7; }
 
  50% { background: none; }
 
  100% { background: #7e7; }
 
}
 
@-webkit-keyframes blink {
 
  0% { background: #7e7; }
 
  50% { background: none; }
 
  100% { background: #7e7; }
 
}
 
@keyframes blink {
 
  0% { background: #7e7; }
 
  50% { background: none; }
 
  100% { background: #7e7; }
 
}
 

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

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

	
 
.cm-tab { display: inline-block; }
 
.CodeMirror-ruler {
 
  border-left: 1px solid #ccc;
 
  position: absolute;
 
}
 

	
 
/* DEFAULT THEME */
 

	
 
@@ -65,16 +100,16 @@
 
.cm-s-default .cm-atom {color: #219;}
 
.cm-s-default .cm-number {color: #164;}
 
.cm-s-default .cm-def {color: #00f;}
 
.cm-s-default .cm-variable {color: black;}
 
.cm-s-default .cm-variable,
 
.cm-s-default .cm-punctuation,
 
.cm-s-default .cm-property,
 
.cm-s-default .cm-operator {}
 
.cm-s-default .cm-variable-2 {color: #05a;}
 
.cm-s-default .cm-variable-3 {color: #085;}
 
.cm-s-default .cm-property {color: black;}
 
.cm-s-default .cm-operator {color: black;}
 
.cm-s-default .cm-comment {color: #a50;}
 
.cm-s-default .cm-string {color: #a11;}
 
.cm-s-default .cm-string-2 {color: #f50;}
 
.cm-s-default .cm-meta {color: #555;}
 
.cm-s-default .cm-error {color: #f00;}
 
.cm-s-default .cm-qualifier {color: #555;}
 
.cm-s-default .cm-builtin {color: #30a;}
 
.cm-s-default .cm-bracket {color: #997;}
 
@@ -91,10 +126,15 @@
 
.cm-em {font-style: italic;}
 
.cm-link {text-decoration: underline;}
 

	
 
.cm-s-default .cm-error {color: #f00;}
 
.cm-invalidchar {color: #f00;}
 

	
 
/* Default styles for common addons */
 

	
 
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
 
div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
 
.CodeMirror-activeline-background {background: #e8f2ff;}
 

	
 
/* STOP */
 

	
 
@@ -113,13 +153,18 @@ div.CodeMirror span.CodeMirror-nonmatchi
 
  /* 30px is the magic margin used to hide the element's real scrollbars */
 
  /* See overflow: hidden in .CodeMirror */
 
  margin-bottom: -30px; margin-right: -30px;
 
  padding-bottom: 30px; padding-right: 30px;
 
  padding-bottom: 30px;
 
  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
 
@@ -155,6 +200,8 @@ div.CodeMirror span.CodeMirror-nonmatchi
 
.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;
 
@@ -170,6 +217,7 @@ div.CodeMirror span.CodeMirror-nonmatchi
 

	
 
.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 */
 
@@ -192,16 +240,7 @@ div.CodeMirror span.CodeMirror-nonmatchi
 
  white-space: pre-wrap;
 
  word-break: normal;
 
}
 
.CodeMirror-code pre {
 
  border-right: 30px solid transparent;
 
  width: -webkit-fit-content;
 
  width: -moz-fit-content;
 
  width: fit-content;
 
}
 
.CodeMirror-wrap .CodeMirror-code pre {
 
  border-right: none;
 
  width: auto;
 
}
 

	
 
.CodeMirror-linebackground {
 
  position: absolute;
 
  left: 0; right: 0; top: 0; bottom: 0;
 
@@ -214,8 +253,7 @@ div.CodeMirror span.CodeMirror-nonmatchi
 
  overflow: auto;
 
}
 

	
 
.CodeMirror-widget {
 
}
 
.CodeMirror-widget {}
 

	
 
.CodeMirror-wrap .CodeMirror-scroll {
 
  overflow-x: hidden;
 
@@ -223,7 +261,8 @@ div.CodeMirror span.CodeMirror-nonmatchi
 

	
 
.CodeMirror-measure {
 
  position: absolute;
 
  width: 100%; height: 0px;
 
  width: 100%;
 
  height: 0;
 
  overflow: hidden;
 
  visibility: hidden;
 
}
 
@@ -231,16 +270,22 @@ div.CodeMirror span.CodeMirror-nonmatchi
 

	
 
.CodeMirror div.CodeMirror-cursor {
 
  position: absolute;
 
  visibility: hidden;
 
  border-right: none;
 
  width: 0;
 
}
 
.CodeMirror-focused div.CodeMirror-cursor {
 

	
 
div.CodeMirror-cursors {
 
  visibility: hidden;
 
  position: relative;
 
  z-index: 3;
 
}
 
.CodeMirror-focused div.CodeMirror-cursors {
 
  visibility: visible;
 
}
 

	
 
.CodeMirror-selected { background: #d9d9d9; }
 
.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
 
.CodeMirror-crosshair { cursor: crosshair; }
 

	
 
.cm-searching {
 
  background: #ffa;
 
@@ -250,9 +295,15 @@ div.CodeMirror span.CodeMirror-nonmatchi
 
/* IE7 hack to prevent it from returning funny offsetTops on the spans */
 
.CodeMirror span { *vertical-align: text-bottom; }
 

	
 
/* Used to force a border model for a node */
 
.cm-force-border { padding-right: .1px; }
 

	
 
@media print {
 
  /* Hide the cursor when printing */
 
  .CodeMirror div.CodeMirror-cursor {
 
  .CodeMirror div.CodeMirror-cursors {
 
    visibility: hidden;
 
  }
 
}
 

	
 
/* Help users use markselection to safely style text background */
 
span.CodeMirror-selectedtext { background: none; }

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)