Update/download dependencies

pull/103/head
Wes Cossick 9 years ago
parent c9db36af67
commit f77dbc6aab

File diff suppressed because one or more lines are too long

@ -1285,6 +1285,7 @@
on(te, "compositionstart", function() { on(te, "compositionstart", function() {
var start = cm.getCursor("from"); var start = cm.getCursor("from");
if (input.composing) input.composing.range.clear()
input.composing = { input.composing = {
start: start, start: start,
range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"}) range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
@ -8504,14 +8505,16 @@
// KEY NAMES // KEY NAMES
var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt", var keyNames = CodeMirror.keyNames = {
3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End", 19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert", 36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod", 107: "=", 109: "-", 127: "Delete", 46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\", 173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete", 221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"}; 63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
CodeMirror.keyNames = keyNames; };
(function() { (function() {
// Number keys // Number keys
for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i); for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);

@ -72,7 +72,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
, ulRE = /^[*\-+]\s+/ , ulRE = /^[*\-+]\s+/
, olRE = /^[0-9]+([.)])\s+/ , olRE = /^[0-9]+([.)])\s+/
, taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE , taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
, atxHeaderRE = /^(#+)(?: |$)/ , atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
, setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/ , setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
, textRE = /^[^#!\[\]*_\\<>` "'(~]+/; , textRE = /^[^#!\[\]*_\\<>` "'(~]+/;
@ -178,7 +178,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
stream.match(olRE, true); stream.match(olRE, true);
listType = 'ol'; listType = 'ol';
} }
state.indentation += 4; state.indentation = stream.column() + stream.current().length;
state.list = true; state.list = true;
state.listDepth++; state.listDepth++;
if (modeCfg.taskLists && stream.match(taskListRE, false)) { if (modeCfg.taskLists && stream.match(taskListRE, false)) {
@ -702,6 +702,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
text: s.text, text: s.text,
formatting: false, formatting: false,
linkTitle: s.linkTitle, linkTitle: s.linkTitle,
code: s.code,
em: s.em, em: s.em,
strong: s.strong, strong: s.strong,
strikethrough: s.strikethrough, strikethrough: s.strikethrough,
@ -742,9 +743,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
// Reset state.taskList // Reset state.taskList
state.taskList = false; state.taskList = false;
// Reset state.code
state.code = false;
// Reset state.trailingSpace // Reset state.trailingSpace
state.trailingSpace = 0; state.trailingSpace = 0;
state.trailingSpaceNewLine = false; state.trailingSpaceNewLine = false;

@ -1,5 +1,5 @@
/** /**
* marked - a markdown parser - v0.3.5 * marked - a markdown parser
* Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed) * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
* https://github.com/chjj/marked * https://github.com/chjj/marked
*/ */

Loading…
Cancel
Save