Commit 17008958 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Upgrade CodeMirror editor to 2.24.

parent 25741bc3

template/resources/codemirror/LICENSE

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Copyright (C) 2012 by Marijn Haverbeke <marijnh@gmail.com>



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.



Please note that some subdirectories of the CodeMirror distribution

include their own LICENSE files, and are released under different

licences.

template/resources/codemirror/codemirror.css

+62 −17
Original line number Diff line number Diff line 
.CodeMirror {

  line-height: 1em;

  font-family: monospace;

  font-family: "Menlo", "Courier New", Courier, monospace;

  cursor: text;

}



.CodeMirror-scroll {

  height: auto;

  overflow: auto;

  height: 300px;

  /* This is needed to prevent an IE[67] bug where the scrolled content

     is visible outside of the scrolling box. */

  position: relative;

  outline: none;

}



.CodeMirror-gutter {
@@ -23,16 +24,17 @@ 
  color: #aaa;

  text-align: right;

  padding: .4em .2em .4em .4em;

  white-space: pre !important;

}

.CodeMirror-lines {

  padding: .4em;

  white-space: pre;

}



.CodeMirror pre {

  -moz-border-radius: 0;

  -webkit-border-radius: 0;

  -o-border-radius: 0;

  max-width: none;

  border-radius: 0;

  border-width: 0; margin: 0; padding: 0; background: transparent;

  font-family: inherit;
@@ -40,30 +42,73 @@ 
  padding: 0; margin: 0;

  white-space: pre;

  word-wrap: normal;

  line-height: inherit;

}



.CodeMirror-wrap pre {

  word-wrap: break-word;

  white-space: pre-wrap;

  word-break: normal;

}

.CodeMirror-wrap .CodeMirror-scroll {

  overflow-x: hidden;

}



.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;

  border-right:none;

  width:0;

}

.CodeMirror-focused .CodeMirror-cursor {

.CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}

.CodeMirror-focused pre.CodeMirror-cursor {

  visibility: visible;

}



span.CodeMirror-selected {

  background: #ccc !important;

  color: HighlightText !important;

}

.CodeMirror-focused span.CodeMirror-selected {

  background: Highlight !important;

div.CodeMirror-selected { background: #d9d9d9; }

.CodeMirror-focused div.CodeMirror-selected { background: #d7d4f0; }



.CodeMirror-searching {

  background: #ffa;

  background: rgba(255, 255, 0, .4);

}



.CodeMirror-matchingbracket {color: #0f0 !important;}

.CodeMirror-nonmatchingbracket {color: #f22 !important;}
 
/* 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;}



div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}

div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}

template/resources/codemirror/codemirror.js

+1814 −1005

File changed.

Preview size limit exceeded, changes collapsed.

template/resources/codemirror/default.css

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
.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: #0a5;}

.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;}



.CodeMirror-scroll {

  height: auto;

  overflow-y: hidden;

  overflow-x: auto;

}



.cm-s-default span.cm-header {color: #2f2f4f; font-weight:bold;}

.cm-s-default span.cm-code {color: #666;}

.cm-s-default span.cm-quote {color: #090;}

.cm-s-default span.cm-list {color: #a50;}

.cm-s-default span.cm-hr {color: #999;}

.cm-s-default span.cm-linktext {color: #00c; text-decoration: underline;}

.cm-s-default span.cm-linkhref {color: #00c;}

.cm-s-default span.cm-em {font-style: italic;}

.cm-s-default span.cm-strong {font-weight: bold;}

.cm-s-default span.cm-emstrong {font-style: italic; font-weight: bold;}

template/resources/codemirror/javascript.js

+22 −13
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) { 
    return {

      "if": A, "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,

      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C,

      "var": kw("var"), "function": kw("function"), "catch": kw("catch"),

      "var": kw("var"), "const": kw("var"), "let": kw("var"),

      "function": kw("function"), "catch": kw("catch"),

      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),

      "in": operator, "typeof": operator, "instanceof": operator,

      "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom
@@ -68,7 +69,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) { 
      else if (state.reAllowed) {

        nextUntilUnescaped(stream, "/");

        stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla

        return ret("regexp", "string");

        return ret("regexp", "string-2");

      }

      else {

        stream.eatWhile(isOperatorChar);
@@ -86,7 +87,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) { 
    else {

      stream.eatWhile(/[\w\$_]/);

      var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];

      return known ? ret(known.type, known.style, word) :

      return (known && state.kwAllowed) ? ret(known.type, known.style, word) :

                     ret("variable", "variable", word);

    }

  }
@@ -228,16 +229,21 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) { 
  function expression(type) {

    if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator);

    if (type == "function") return cont(functiondef);

    if (type == "keyword c") return cont(expression);

    if (type == "(") return cont(pushlex(")"), expression, expect(")"), poplex, maybeoperator);

    if (type == "keyword c") return cont(maybeexpression);

    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeoperator);

    if (type == "operator") return cont(expression);

    if (type == "[") return cont(pushlex("]"), commasep(expression, "]"), poplex, maybeoperator);

    if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator);

    return cont();

  }

  function maybeexpression(type) {

    if (type.match(/[;\}\)\],]/)) return pass();

    return pass(expression);

  }

    

  function maybeoperator(type, value) {

    if (type == "operator" && /\+\+|--/.test(value)) return cont(maybeoperator);

    if (type == "operator") return cont(expression);

    if (type == "operator" || type == ":") return cont(expression);

    if (type == ";") return;

    if (type == "(") return cont(pushlex(")"), commasep(expression, ")"), poplex, maybeoperator);

    if (type == ".") return cont(property, maybeoperator);
@@ -310,10 +316,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) { 
      return {

        tokenize: jsTokenBase,

        reAllowed: true,

        kwAllowed: true,

        cc: [],

        lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),

        localVars: null,

        context: null,

        localVars: parserConfig.localVars,

        context: parserConfig.localVars && {vars: parserConfig.localVars},

        indented: 0

      };

    },
@@ -327,14 +334,16 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) { 
      if (stream.eatSpace()) return null;

      var style = state.tokenize(stream, state);

      if (type == "comment") return style;

      state.reAllowed = type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/);

      state.reAllowed = !!(type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/));

      state.kwAllowed = type != '.';

      return parseJS(state, style, type, content, stream);

    },



    indent: function(state, textAfter) {

      if (state.tokenize != jsTokenBase) return 0;

      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical,

          type = lexical.type, closing = firstChar == type;

      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;

      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;

      var type = lexical.type, closing = firstChar == type;

      if (type == "vardef") return lexical.indented + 4;

      else if (type == "form" && firstChar == "{") return lexical.indented;

      else if (type == "stat" || type == "form") return lexical.indented + indentUnit;