mirror of
https://github.com/sparksuite/simplemde-markdown-editor.git
synced 2024-06-09 17:32:19 +02:00
Merge 18f8256a4a
into 6abda7ab68
This commit is contained in:
commit
d9f417fa63
5
.github/ISSUE_TEMPLATE.md
vendored
Normal file
5
.github/ISSUE_TEMPLATE.md
vendored
Normal file
|
@ -0,0 +1,5 @@
|
|||
If you're submitting a bug, complete these tasks:
|
||||
|
||||
- Set up a [JSFiddle](https://jsfiddle.net/) that replicates the bug
|
||||
- Link to your JSFiddle
|
||||
- Provide an exact list of step-by-step instructions that will replicate the bug
|
|
@ -3,7 +3,6 @@ node_js:
|
|||
- '6'
|
||||
- '5'
|
||||
- '4'
|
||||
- '0.12'
|
||||
before_script:
|
||||
- npm install -g gulp
|
||||
script: gulp
|
||||
|
|
26
README.md
26
README.md
|
@ -88,16 +88,19 @@ simplemde.value("This text will appear in the editor");
|
|||
- link
|
||||
- table
|
||||
- **lineWrapping**: If set to `false`, disable line wrapping. Defaults to `true`.
|
||||
- **minHeight**: Sets the minimum height for the composition area, before it starts auto-growing. Should be a string containing a valid CSS value like `"500px"`. Dafaults to `"300px"`.
|
||||
- **parsingConfig**: Adjust settings for parsing the Markdown during editing (not previewing).
|
||||
- **allowAtxHeaderWithoutSpace**: If set to `true`, will render headers without a space after the `#`. Defaults to `false`.
|
||||
- **strikethrough**: If set to `false`, will not process GFM strikethrough syntax. Defaults to `true`.
|
||||
- **underscoresBreakWords**: If set to `true`, let underscores be a delimiter for separating words. Defaults to `false`.
|
||||
- **placeholder**: Custom placeholder that should be displayed
|
||||
- **placeholder**: If set, displays a custom placeholder message.
|
||||
- **previewRender**: Custom function for parsing the plaintext Markdown and returning HTML. Used when user previews.
|
||||
- **promptURLs**: If set to `true`, a JS alert window appears asking for the link or image URL. Defaults to `false`.
|
||||
- **renderingConfig**: Adjust settings for parsing the Markdown during previewing (not editing).
|
||||
- **codeSyntaxHighlighting**: If set to `true`, will highlight using [highlight.js](https://github.com/isagalaev/highlight.js). Defaults to `false`. To use this feature you must include highlight.js on your page or pass in using the `hljs` option. For example, include the script and the CSS files like:<br>`<script src="https://cdn.jsdelivr.net/highlight.js/latest/highlight.min.js"></script>`<br>`<link rel="stylesheet" href="https://cdn.jsdelivr.net/highlight.js/latest/styles/github.min.css">`
|
||||
- **hljs**: An injectible instance of [highlight.js](https://github.com/isagalaev/highlight.js). If you don't want to rely on the global namespace (`window.hljs`), you can provide an instance here. Defaults to `undefined`.
|
||||
- **markedOptions**: Set the internal Markdown renderer's [options](https://github.com/chjj/marked#options-1). Other `renderingConfig` options will take precedence.
|
||||
- **singleLineBreaks**: If set to `false`, disable parsing GFM single line breaks. Defaults to `true`.
|
||||
- **codeSyntaxHighlighting**: If set to `true`, will highlight using [highlight.js](https://github.com/isagalaev/highlight.js). Defaults to `false`. To use this feature you must include highlight.js on your page. For example, include the script and the CSS files like:<br>`<script src="https://cdn.jsdelivr.net/highlight.js/latest/highlight.min.js"></script>`<br>`<link rel="stylesheet" href="https://cdn.jsdelivr.net/highlight.js/latest/styles/github.min.css">`
|
||||
- **shortcuts**: Keyboard shortcuts associated with this instance. Defaults to the [array of shortcuts](#keyboard-shortcuts).
|
||||
- **showIcons**: An array of icon names to show. Can be used to show specific icons hidden by default without completely customizing the toolbar.
|
||||
- **spellChecker**: If set to `false`, disable the spell checker. Defaults to `true`.
|
||||
|
@ -133,6 +136,7 @@ var simplemde = new SimpleMDE({
|
|||
table: ["", "\n\n| Column 1 | Column 2 | Column 3 |\n| -------- | -------- | -------- |\n| Text | Text | Text |\n\n"],
|
||||
},
|
||||
lineWrapping: false,
|
||||
minHeight: "500px",
|
||||
parsingConfig: {
|
||||
allowAtxHeaderWithoutSpace: true,
|
||||
strikethrough: false,
|
||||
|
@ -276,24 +280,6 @@ Shortcuts are automatically converted between platforms. If you define a shortcu
|
|||
|
||||
The list of actions that can be bound is the same as the list of built-in actions available for [toolbar buttons](#toolbar-icons).
|
||||
|
||||
#### Height
|
||||
|
||||
To change the minimum height (before it starts auto-growing):
|
||||
|
||||
```CSS
|
||||
.CodeMirror, .CodeMirror-scroll {
|
||||
min-height: 200px;
|
||||
}
|
||||
```
|
||||
|
||||
Or, you can keep the height static:
|
||||
|
||||
```CSS
|
||||
.CodeMirror {
|
||||
height: 300px;
|
||||
}
|
||||
```
|
||||
|
||||
## Event handling
|
||||
You can catch the following list of events: https://codemirror.net/doc/manual.html#events
|
||||
|
||||
|
|
|
@ -94,8 +94,14 @@
|
|||
|
||||
.cm-tab { display: inline-block; text-decoration: inherit; }
|
||||
|
||||
.CodeMirror-rulers {
|
||||
position: absolute;
|
||||
left: 0; right: 0; top: -50px; bottom: -20px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.CodeMirror-ruler {
|
||||
border-left: 1px solid #ccc;
|
||||
top: 0; bottom: 0;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
|
@ -297,7 +303,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
|
|||
visibility: hidden;
|
||||
}
|
||||
|
||||
.CodeMirror-cursor { position: absolute; }
|
||||
.CodeMirror-cursor {
|
||||
position: absolute;
|
||||
pointer-events: none;
|
||||
}
|
||||
.CodeMirror-measure pre { position: static; }
|
||||
|
||||
div.CodeMirror-cursors {
|
||||
|
@ -345,7 +354,6 @@ span.CodeMirror-selectedtext { background: none; }
|
|||
|
||||
.CodeMirror {
|
||||
height: auto;
|
||||
min-height: 300px;
|
||||
border: 1px solid #ddd;
|
||||
border-bottom-left-radius: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
|
@ -354,10 +362,6 @@ span.CodeMirror-selectedtext { background: none; }
|
|||
z-index: 1;
|
||||
}
|
||||
|
||||
.CodeMirror-scroll {
|
||||
min-height: 300px
|
||||
}
|
||||
|
||||
.CodeMirror-fullscreen {
|
||||
background: #fff;
|
||||
position: fixed !important;
|
||||
|
@ -367,6 +371,8 @@ span.CodeMirror-selectedtext { background: none; }
|
|||
bottom: 0;
|
||||
height: auto;
|
||||
z-index: 9;
|
||||
border-right: none !important;
|
||||
border-bottom-right-radius: 0 !important;
|
||||
}
|
||||
|
||||
.CodeMirror-sided {
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -173,7 +173,7 @@ exports.kMaxLength = kMaxLength()
|
|||
function typedArraySupport () {
|
||||
try {
|
||||
var arr = new Uint8Array(1)
|
||||
arr.foo = function () { return 42 }
|
||||
arr.__proto__ = {__proto__: Uint8Array.prototype, foo: function () { return 42 }}
|
||||
return arr.foo() === 42 && // typed array instances can be augmented
|
||||
typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`
|
||||
arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray`
|
||||
|
@ -317,7 +317,7 @@ function allocUnsafe (that, size) {
|
|||
assertSize(size)
|
||||
that = createBuffer(that, size < 0 ? 0 : checked(size) | 0)
|
||||
if (!Buffer.TYPED_ARRAY_SUPPORT) {
|
||||
for (var i = 0; i < size; i++) {
|
||||
for (var i = 0; i < size; ++i) {
|
||||
that[i] = 0
|
||||
}
|
||||
}
|
||||
|
@ -373,7 +373,9 @@ function fromArrayBuffer (that, array, byteOffset, length) {
|
|||
throw new RangeError('\'length\' is out of bounds')
|
||||
}
|
||||
|
||||
if (length === undefined) {
|
||||
if (byteOffset === undefined && length === undefined) {
|
||||
array = new Uint8Array(array)
|
||||
} else if (length === undefined) {
|
||||
array = new Uint8Array(array, byteOffset)
|
||||
} else {
|
||||
array = new Uint8Array(array, byteOffset, length)
|
||||
|
@ -495,14 +497,14 @@ Buffer.concat = function concat (list, length) {
|
|||
var i
|
||||
if (length === undefined) {
|
||||
length = 0
|
||||
for (i = 0; i < list.length; i++) {
|
||||
for (i = 0; i < list.length; ++i) {
|
||||
length += list[i].length
|
||||
}
|
||||
}
|
||||
|
||||
var buffer = Buffer.allocUnsafe(length)
|
||||
var pos = 0
|
||||
for (i = 0; i < list.length; i++) {
|
||||
for (i = 0; i < list.length; ++i) {
|
||||
var buf = list[i]
|
||||
if (!Buffer.isBuffer(buf)) {
|
||||
throw new TypeError('"list" argument must be an Array of Buffers')
|
||||
|
@ -534,7 +536,6 @@ function byteLength (string, encoding) {
|
|||
switch (encoding) {
|
||||
case 'ascii':
|
||||
case 'binary':
|
||||
// Deprecated
|
||||
case 'raw':
|
||||
case 'raws':
|
||||
return len
|
||||
|
@ -772,15 +773,16 @@ function arrayIndexOf (arr, val, byteOffset, encoding) {
|
|||
}
|
||||
|
||||
var foundIndex = -1
|
||||
for (var i = 0; byteOffset + i < arrLength; i++) {
|
||||
if (read(arr, byteOffset + i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
|
||||
for (var i = byteOffset; i < arrLength; ++i) {
|
||||
if (read(arr, i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
|
||||
if (foundIndex === -1) foundIndex = i
|
||||
if (i - foundIndex + 1 === valLength) return (byteOffset + foundIndex) * indexSize
|
||||
if (i - foundIndex + 1 === valLength) return foundIndex * indexSize
|
||||
} else {
|
||||
if (foundIndex !== -1) i -= i - foundIndex
|
||||
foundIndex = -1
|
||||
}
|
||||
}
|
||||
|
||||
return -1
|
||||
}
|
||||
|
||||
|
@ -845,7 +847,7 @@ function hexWrite (buf, string, offset, length) {
|
|||
if (length > strLen / 2) {
|
||||
length = strLen / 2
|
||||
}
|
||||
for (var i = 0; i < length; i++) {
|
||||
for (var i = 0; i < length; ++i) {
|
||||
var parsed = parseInt(string.substr(i * 2, 2), 16)
|
||||
if (isNaN(parsed)) return i
|
||||
buf[offset + i] = parsed
|
||||
|
@ -1059,7 +1061,7 @@ function asciiSlice (buf, start, end) {
|
|||
var ret = ''
|
||||
end = Math.min(buf.length, end)
|
||||
|
||||
for (var i = start; i < end; i++) {
|
||||
for (var i = start; i < end; ++i) {
|
||||
ret += String.fromCharCode(buf[i] & 0x7F)
|
||||
}
|
||||
return ret
|
||||
|
@ -1069,7 +1071,7 @@ function binarySlice (buf, start, end) {
|
|||
var ret = ''
|
||||
end = Math.min(buf.length, end)
|
||||
|
||||
for (var i = start; i < end; i++) {
|
||||
for (var i = start; i < end; ++i) {
|
||||
ret += String.fromCharCode(buf[i])
|
||||
}
|
||||
return ret
|
||||
|
@ -1082,7 +1084,7 @@ function hexSlice (buf, start, end) {
|
|||
if (!end || end < 0 || end > len) end = len
|
||||
|
||||
var out = ''
|
||||
for (var i = start; i < end; i++) {
|
||||
for (var i = start; i < end; ++i) {
|
||||
out += toHex(buf[i])
|
||||
}
|
||||
return out
|
||||
|
@ -1125,7 +1127,7 @@ Buffer.prototype.slice = function slice (start, end) {
|
|||
} else {
|
||||
var sliceLen = end - start
|
||||
newBuf = new Buffer(sliceLen, undefined)
|
||||
for (var i = 0; i < sliceLen; i++) {
|
||||
for (var i = 0; i < sliceLen; ++i) {
|
||||
newBuf[i] = this[i + start]
|
||||
}
|
||||
}
|
||||
|
@ -1352,7 +1354,7 @@ Buffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) {
|
|||
|
||||
function objectWriteUInt16 (buf, value, offset, littleEndian) {
|
||||
if (value < 0) value = 0xffff + value + 1
|
||||
for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; i++) {
|
||||
for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; ++i) {
|
||||
buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>>
|
||||
(littleEndian ? i : 1 - i) * 8
|
||||
}
|
||||
|
@ -1386,7 +1388,7 @@ Buffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert
|
|||
|
||||
function objectWriteUInt32 (buf, value, offset, littleEndian) {
|
||||
if (value < 0) value = 0xffffffff + value + 1
|
||||
for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; i++) {
|
||||
for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; ++i) {
|
||||
buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff
|
||||
}
|
||||
}
|
||||
|
@ -1601,12 +1603,12 @@ Buffer.prototype.copy = function copy (target, targetStart, start, end) {
|
|||
|
||||
if (this === target && start < targetStart && targetStart < end) {
|
||||
// descending copy from end
|
||||
for (i = len - 1; i >= 0; i--) {
|
||||
for (i = len - 1; i >= 0; --i) {
|
||||
target[i + targetStart] = this[i + start]
|
||||
}
|
||||
} else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {
|
||||
// ascending copy from start
|
||||
for (i = 0; i < len; i++) {
|
||||
for (i = 0; i < len; ++i) {
|
||||
target[i + targetStart] = this[i + start]
|
||||
}
|
||||
} else {
|
||||
|
@ -1667,7 +1669,7 @@ Buffer.prototype.fill = function fill (val, start, end, encoding) {
|
|||
|
||||
var i
|
||||
if (typeof val === 'number') {
|
||||
for (i = start; i < end; i++) {
|
||||
for (i = start; i < end; ++i) {
|
||||
this[i] = val
|
||||
}
|
||||
} else {
|
||||
|
@ -1675,7 +1677,7 @@ Buffer.prototype.fill = function fill (val, start, end, encoding) {
|
|||
? val
|
||||
: utf8ToBytes(new Buffer(val, encoding).toString())
|
||||
var len = bytes.length
|
||||
for (i = 0; i < end - start; i++) {
|
||||
for (i = 0; i < end - start; ++i) {
|
||||
this[i + start] = bytes[i % len]
|
||||
}
|
||||
}
|
||||
|
@ -1717,7 +1719,7 @@ function utf8ToBytes (string, units) {
|
|||
var leadSurrogate = null
|
||||
var bytes = []
|
||||
|
||||
for (var i = 0; i < length; i++) {
|
||||
for (var i = 0; i < length; ++i) {
|
||||
codePoint = string.charCodeAt(i)
|
||||
|
||||
// is surrogate component
|
||||
|
@ -1792,7 +1794,7 @@ function utf8ToBytes (string, units) {
|
|||
|
||||
function asciiToBytes (str) {
|
||||
var byteArray = []
|
||||
for (var i = 0; i < str.length; i++) {
|
||||
for (var i = 0; i < str.length; ++i) {
|
||||
// Node's code seems to be doing this and not & 0x7F..
|
||||
byteArray.push(str.charCodeAt(i) & 0xFF)
|
||||
}
|
||||
|
@ -1802,7 +1804,7 @@ function asciiToBytes (str) {
|
|||
function utf16leToBytes (str, units) {
|
||||
var c, hi, lo
|
||||
var byteArray = []
|
||||
for (var i = 0; i < str.length; i++) {
|
||||
for (var i = 0; i < str.length; ++i) {
|
||||
if ((units -= 2) < 0) break
|
||||
|
||||
c = str.charCodeAt(i)
|
||||
|
@ -1820,7 +1822,7 @@ function base64ToBytes (str) {
|
|||
}
|
||||
|
||||
function blitBuffer (src, dst, offset, length) {
|
||||
for (var i = 0; i < length; i++) {
|
||||
for (var i = 0; i < length; ++i) {
|
||||
if ((i + offset >= dst.length) || (i >= src.length)) break
|
||||
dst[i + offset] = src[i]
|
||||
}
|
||||
|
@ -3543,7 +3545,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
};
|
||||
|
||||
function hiddenTextarea() {
|
||||
var te = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
|
||||
var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none");
|
||||
var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
|
||||
// The textarea is kept positioned near the cursor to prevent the
|
||||
// fact that it'll be scrolled into view on input from scrolling
|
||||
|
@ -5010,6 +5012,16 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
|
||||
}
|
||||
|
||||
function getUsefulRect(rects, bias) {
|
||||
var rect = nullRect
|
||||
if (bias == "left") for (var i = 0; i < rects.length; i++) {
|
||||
if ((rect = rects[i]).left != rect.right) break
|
||||
} else for (var i = rects.length - 1; i >= 0; i--) {
|
||||
if ((rect = rects[i]).left != rect.right) break
|
||||
}
|
||||
return rect
|
||||
}
|
||||
|
||||
function measureCharInner(cm, prepared, ch, bias) {
|
||||
var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
|
||||
var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
|
||||
|
@ -5019,17 +5031,10 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
|
||||
while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
|
||||
while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
|
||||
if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) {
|
||||
if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
|
||||
rect = node.parentNode.getBoundingClientRect();
|
||||
} else if (ie && cm.options.lineWrapping) {
|
||||
var rects = range(node, start, end).getClientRects();
|
||||
if (rects.length)
|
||||
rect = rects[bias == "right" ? rects.length - 1 : 0];
|
||||
else
|
||||
rect = nullRect;
|
||||
} else {
|
||||
rect = range(node, start, end).getBoundingClientRect() || nullRect;
|
||||
}
|
||||
else
|
||||
rect = getUsefulRect(range(node, start, end).getClientRects(), bias)
|
||||
if (rect.left || rect.right || start == 0) break;
|
||||
end = start;
|
||||
start = start - 1;
|
||||
|
@ -5255,10 +5260,23 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
for (;;) {
|
||||
if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
|
||||
var ch = x < fromX || x - fromX <= toX - x ? from : to;
|
||||
var outside = ch == from ? fromOutside : toOutside
|
||||
var xDiff = x - (ch == from ? fromX : toX);
|
||||
// This is a kludge to handle the case where the coordinates
|
||||
// are after a line-wrapped line. We should replace it with a
|
||||
// more general handling of cursor positions around line
|
||||
// breaks. (Issue #4078)
|
||||
if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
|
||||
ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
|
||||
var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right");
|
||||
if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
|
||||
outside = false
|
||||
ch++
|
||||
xDiff = x - charSize.right
|
||||
}
|
||||
}
|
||||
while (isExtendingChar(lineObj.text.charAt(ch))) ++ch;
|
||||
var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside,
|
||||
xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
|
||||
var pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
|
||||
return pos;
|
||||
}
|
||||
var step = Math.ceil(dist / 2), middle = from + step;
|
||||
|
@ -5982,6 +6000,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
// Let the drag handler handle this.
|
||||
if (webkit) display.scroller.draggable = true;
|
||||
cm.state.draggingText = dragEnd;
|
||||
dragEnd.copy = mac ? e.altKey : e.ctrlKey
|
||||
// IE's approach to draggable
|
||||
if (display.scroller.dragDrop) display.scroller.dragDrop();
|
||||
on(document, "mouseup", dragEnd);
|
||||
|
@ -6212,7 +6231,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
try {
|
||||
var text = e.dataTransfer.getData("Text");
|
||||
if (text) {
|
||||
if (cm.state.draggingText && !(mac ? e.altKey : e.ctrlKey))
|
||||
if (cm.state.draggingText && !cm.state.draggingText.copy)
|
||||
var selected = cm.listSelections();
|
||||
setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
|
||||
if (selected) for (var i = 0; i < selected.length; ++i)
|
||||
|
@ -6727,7 +6746,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
|
||||
// Revert a change stored in a document's history.
|
||||
function makeChangeFromHistory(doc, type, allowSelectionOnly) {
|
||||
if (doc.cm && doc.cm.state.suppressEdits) return;
|
||||
if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return;
|
||||
|
||||
var hist = doc.history, event, selAfter = doc.sel;
|
||||
var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
|
||||
|
@ -9252,6 +9271,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
|
||||
var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
|
||||
col: 0, pos: 0, cm: cm,
|
||||
trailingSpace: false,
|
||||
splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
|
||||
lineView.measure = {};
|
||||
|
||||
|
@ -9313,7 +9333,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
// the line map. Takes care to render special characters separately.
|
||||
function buildToken(builder, text, style, startStyle, endStyle, title, css) {
|
||||
if (!text) return;
|
||||
var displayText = builder.splitSpaces ? text.replace(/ {3,}/g, splitSpaces) : text;
|
||||
var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
|
||||
var special = builder.cm.state.specialChars, mustWrap = false;
|
||||
if (!special.test(text)) {
|
||||
builder.col += text.length;
|
||||
|
@ -9358,6 +9378,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
builder.pos++;
|
||||
}
|
||||
}
|
||||
builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32
|
||||
if (style || startStyle || endStyle || mustWrap || css) {
|
||||
var fullStyle = style || "";
|
||||
if (startStyle) fullStyle += startStyle;
|
||||
|
@ -9369,11 +9390,17 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
builder.content.appendChild(content);
|
||||
}
|
||||
|
||||
function splitSpaces(old) {
|
||||
var out = " ";
|
||||
for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
|
||||
out += " ";
|
||||
return out;
|
||||
function splitSpaces(text, trailingBefore) {
|
||||
if (text.length > 1 && !/ /.test(text)) return text
|
||||
var spaceBefore = trailingBefore, result = ""
|
||||
for (var i = 0; i < text.length; i++) {
|
||||
var ch = text.charAt(i)
|
||||
if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
|
||||
ch = "\u00a0"
|
||||
result += ch
|
||||
spaceBefore = ch == " "
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// Work around nonsense dimensions being reported for stretches of
|
||||
|
@ -9410,6 +9437,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
builder.content.appendChild(widget);
|
||||
}
|
||||
builder.pos += size;
|
||||
builder.trailingSpace = false
|
||||
}
|
||||
|
||||
// Outputs a number of spans to make up a line, taking highlighting
|
||||
|
@ -10857,8 +10885,9 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
if (badBidiRects != null) return badBidiRects;
|
||||
var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
|
||||
var r0 = range(txt, 0, 1).getBoundingClientRect();
|
||||
if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
|
||||
var r1 = range(txt, 1, 2).getBoundingClientRect();
|
||||
removeChildren(measure);
|
||||
if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
|
||||
return badBidiRects = (r1.right - r0.right < 3);
|
||||
}
|
||||
|
||||
|
@ -11224,7 +11253,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|||
|
||||
// THE END
|
||||
|
||||
CodeMirror.version = "5.15.2";
|
||||
CodeMirror.version = "5.17.0";
|
||||
|
||||
return CodeMirror;
|
||||
});
|
||||
|
@ -11427,7 +11456,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|||
list2: "variable-3",
|
||||
list3: "keyword",
|
||||
hr: "hr",
|
||||
image: "tag",
|
||||
image: "image",
|
||||
imageAltText: "image-alt-text",
|
||||
imageMarker: "image-marker",
|
||||
formatting: "formatting",
|
||||
linkInline: "link",
|
||||
linkEmail: "link",
|
||||
|
@ -11677,6 +11708,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|||
if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
|
||||
if (state.linkText) { styles.push(tokenTypes.linkText); }
|
||||
if (state.code) { styles.push(tokenTypes.code); }
|
||||
if (state.image) { styles.push(tokenTypes.image); }
|
||||
if (state.imageAltText) { styles.push(tokenTypes.imageAltText, "link"); }
|
||||
if (state.imageMarker) { styles.push(tokenTypes.imageMarker); }
|
||||
}
|
||||
|
||||
if (state.header) { styles.push(tokenTypes.header, tokenTypes.header + "-" + state.header); }
|
||||
|
@ -11796,12 +11830,29 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|||
}
|
||||
|
||||
if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
|
||||
stream.match(/\[[^\]]*\]/);
|
||||
state.inline = state.f = linkHref;
|
||||
return tokenTypes.image;
|
||||
state.imageMarker = true;
|
||||
state.image = true;
|
||||
if (modeCfg.highlightFormatting) state.formatting = "image";
|
||||
return getType(state);
|
||||
}
|
||||
|
||||
if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false)) {
|
||||
if (ch === '[' && state.imageMarker) {
|
||||
state.imageMarker = false;
|
||||
state.imageAltText = true
|
||||
if (modeCfg.highlightFormatting) state.formatting = "image";
|
||||
return getType(state);
|
||||
}
|
||||
|
||||
if (ch === ']' && state.imageAltText) {
|
||||
if (modeCfg.highlightFormatting) state.formatting = "image";
|
||||
var type = getType(state);
|
||||
state.imageAltText = false;
|
||||
state.image = false;
|
||||
state.inline = state.f = linkHref;
|
||||
return type;
|
||||
}
|
||||
|
||||
if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false) && !state.image) {
|
||||
state.linkText = true;
|
||||
if (modeCfg.highlightFormatting) state.formatting = "link";
|
||||
return getType(state);
|
||||
|
@ -15784,8 +15835,10 @@ function _replaceSelection(cm, active, startEnd, url) {
|
|||
var text;
|
||||
var start = startEnd[0];
|
||||
var end = startEnd[1];
|
||||
var startPoint = cm.getCursor("start");
|
||||
var endPoint = cm.getCursor("end");
|
||||
var startPoint = {},
|
||||
endPoint = {};
|
||||
Object.assign(startPoint, cm.getCursor("start"));
|
||||
Object.assign(endPoint, cm.getCursor("end"));
|
||||
if(url) {
|
||||
end = end.replace("#url#", url);
|
||||
}
|
||||
|
@ -15885,18 +15938,21 @@ function _toggleLine(cm, name) {
|
|||
if(/editor-preview-active/.test(cm.getWrapperElement().lastChild.className))
|
||||
return;
|
||||
|
||||
var listRegexp = /^(\s*)(\*|\-|\+|\d*\.)(\s+)/;
|
||||
var whitespacesRegexp = /^\s*/;
|
||||
|
||||
var stat = getState(cm);
|
||||
var startPoint = cm.getCursor("start");
|
||||
var endPoint = cm.getCursor("end");
|
||||
var repl = {
|
||||
"quote": /^(\s*)\>\s+/,
|
||||
"unordered-list": /^(\s*)(\*|\-|\+)\s+/,
|
||||
"ordered-list": /^(\s*)\d+\.\s+/
|
||||
"unordered-list": listRegexp,
|
||||
"ordered-list": listRegexp
|
||||
};
|
||||
var map = {
|
||||
"quote": "> ",
|
||||
"unordered-list": "* ",
|
||||
"ordered-list": "1. "
|
||||
"quote": ">",
|
||||
"unordered-list": "*",
|
||||
"ordered-list": "1."
|
||||
};
|
||||
for(var i = startPoint.line; i <= endPoint.line; i++) {
|
||||
(function(i) {
|
||||
|
@ -15904,7 +15960,16 @@ function _toggleLine(cm, name) {
|
|||
if(stat[name]) {
|
||||
text = text.replace(repl[name], "$1");
|
||||
} else {
|
||||
text = map[name] + text;
|
||||
var arr = listRegexp.exec(text);
|
||||
if(arr !== null) {
|
||||
var char = map[name];
|
||||
if(arr[2] && arr[2] == map[name]) {
|
||||
char = "";
|
||||
}
|
||||
text = arr[1] + char + arr[3] + text.replace(whitespacesRegexp, "").replace(repl[name], "$1");
|
||||
} else {
|
||||
text = map[name] + " " + text;
|
||||
}
|
||||
}
|
||||
cm.replaceRange(text, {
|
||||
line: i,
|
||||
|
@ -16353,6 +16418,8 @@ function SimpleMDE(options) {
|
|||
// Merging the shortcuts, with the given options
|
||||
options.shortcuts = extend({}, shortcuts, options.shortcuts || {});
|
||||
|
||||
options.minHeight = options.minHeight || "300px";
|
||||
|
||||
|
||||
// Change unique_id to uniqueId for backwards compatibility
|
||||
if(options.autosave != undefined && options.autosave.unique_id != undefined && options.autosave.unique_id != "")
|
||||
|
@ -16381,8 +16448,12 @@ function SimpleMDE(options) {
|
|||
SimpleMDE.prototype.markdown = function(text) {
|
||||
if(marked) {
|
||||
// Initialize
|
||||
var markedOptions = {};
|
||||
|
||||
var markedOptions;
|
||||
if(this.options && this.options.renderingConfig && this.options.renderingConfig.markedOptions) {
|
||||
markedOptions = this.options.renderingConfig.markedOptions;
|
||||
} else {
|
||||
markedOptions = {};
|
||||
}
|
||||
|
||||
// Update options
|
||||
if(this.options && this.options.renderingConfig && this.options.renderingConfig.singleLineBreaks === false) {
|
||||
|
@ -16391,10 +16462,17 @@ SimpleMDE.prototype.markdown = function(text) {
|
|||
markedOptions.breaks = true;
|
||||
}
|
||||
|
||||
if(this.options && this.options.renderingConfig && this.options.renderingConfig.codeSyntaxHighlighting === true && window.hljs) {
|
||||
markedOptions.highlight = function(code) {
|
||||
return window.hljs.highlightAuto(code).value;
|
||||
};
|
||||
if(this.options && this.options.renderingConfig && this.options.renderingConfig.codeSyntaxHighlighting === true) {
|
||||
|
||||
/* Get HLJS from config or window */
|
||||
var hljs = this.options.renderingConfig.hljs || window.hljs;
|
||||
|
||||
/* Check if HLJS loaded */
|
||||
if(hljs) {
|
||||
markedOptions.highlight = function(code) {
|
||||
return hljs.highlightAuto(code).value;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -16484,6 +16562,8 @@ SimpleMDE.prototype.render = function(el) {
|
|||
styleSelectedText: (options.styleSelectedText != undefined) ? options.styleSelectedText : true
|
||||
});
|
||||
|
||||
this.codemirror.getScrollerElement().style.minHeight = options.minHeight;
|
||||
|
||||
if(options.forceSync === true) {
|
||||
var cm = this.codemirror;
|
||||
cm.on("change", function() {
|
||||
|
|
2
dist/simplemde.min.css
vendored
2
dist/simplemde.min.css
vendored
File diff suppressed because one or more lines are too long
18
dist/simplemde.min.js
vendored
18
dist/simplemde.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,5 @@
|
|||
.CodeMirror {
|
||||
height: auto;
|
||||
min-height: 300px;
|
||||
border: 1px solid #ddd;
|
||||
border-bottom-left-radius: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
|
@ -9,10 +8,6 @@
|
|||
z-index: 1;
|
||||
}
|
||||
|
||||
.CodeMirror-scroll {
|
||||
min-height: 300px
|
||||
}
|
||||
|
||||
.CodeMirror-fullscreen {
|
||||
background: #fff;
|
||||
position: fixed !important;
|
||||
|
@ -22,6 +17,8 @@
|
|||
bottom: 0;
|
||||
height: auto;
|
||||
z-index: 9;
|
||||
border-right: none !important;
|
||||
border-bottom-right-radius: 0 !important;
|
||||
}
|
||||
|
||||
.CodeMirror-sided {
|
||||
|
|
|
@ -100,7 +100,7 @@ function createIcon(options, enableTooltips, shortcuts) {
|
|||
enableTooltips = (enableTooltips == undefined) ? true : enableTooltips;
|
||||
|
||||
if(options.title && enableTooltips) {
|
||||
el.title = createTootlip(options.title, options.action, shortcuts);
|
||||
el.title = createTooltip(options.title, options.action, shortcuts);
|
||||
|
||||
if(isMac) {
|
||||
el.title = el.title.replace("Ctrl", "⌘");
|
||||
|
@ -120,7 +120,7 @@ function createSep() {
|
|||
return el;
|
||||
}
|
||||
|
||||
function createTootlip(title, action, shortcuts) {
|
||||
function createTooltip(title, action, shortcuts) {
|
||||
var actionName;
|
||||
var tooltip = title;
|
||||
|
||||
|
@ -211,12 +211,14 @@ function toggleFullScreen(editor) {
|
|||
|
||||
|
||||
// Update toolbar button
|
||||
var toolbarButton = editor.toolbarElements.fullscreen;
|
||||
if (editor.toolbarElements.fullscreen) {
|
||||
var toolbarButton = editor.toolbarElements.fullscreen;
|
||||
|
||||
if(!/active/.test(toolbarButton.className)) {
|
||||
toolbarButton.className += " active";
|
||||
} else {
|
||||
toolbarButton.className = toolbarButton.className.replace(/\s*active\s*/g, "");
|
||||
if(!/active/.test(toolbarButton.className)) {
|
||||
toolbarButton.className += " active";
|
||||
} else {
|
||||
toolbarButton.className = toolbarButton.className.replace(/\s*active\s*/g, "");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -795,8 +797,10 @@ function _replaceSelection(cm, active, startEnd, url) {
|
|||
var text;
|
||||
var start = startEnd[0];
|
||||
var end = startEnd[1];
|
||||
var startPoint = cm.getCursor("start");
|
||||
var endPoint = cm.getCursor("end");
|
||||
var startPoint = {},
|
||||
endPoint = {};
|
||||
Object.assign(startPoint, cm.getCursor("start"));
|
||||
Object.assign(endPoint, cm.getCursor("end"));
|
||||
if(url) {
|
||||
end = end.replace("#url#", url);
|
||||
}
|
||||
|
@ -896,26 +900,57 @@ function _toggleLine(cm, name) {
|
|||
if(/editor-preview-active/.test(cm.getWrapperElement().lastChild.className))
|
||||
return;
|
||||
|
||||
var listRegexp = /^(\s*)(\*|\-|\+|\d*\.)(\s+)/;
|
||||
var whitespacesRegexp = /^\s*/;
|
||||
|
||||
var stat = getState(cm);
|
||||
var startPoint = cm.getCursor("start");
|
||||
var endPoint = cm.getCursor("end");
|
||||
var repl = {
|
||||
"quote": /^(\s*)\>\s+/,
|
||||
"unordered-list": /^(\s*)(\*|\-|\+)\s+/,
|
||||
"ordered-list": /^(\s*)\d+\.\s+/
|
||||
"unordered-list": listRegexp,
|
||||
"ordered-list": listRegexp
|
||||
};
|
||||
var map = {
|
||||
"quote": "> ",
|
||||
"unordered-list": "* ",
|
||||
"ordered-list": "1. "
|
||||
|
||||
var _getChar = function(name, i) {
|
||||
var map = {
|
||||
"quote": ">",
|
||||
"unordered-list": "*",
|
||||
"ordered-list": "%%i."
|
||||
};
|
||||
|
||||
return map[name].replace("%%i", i);
|
||||
};
|
||||
|
||||
var _checkChar = function(name, char) {
|
||||
var map = {
|
||||
"quote": "\>",
|
||||
"unordered-list": "\*",
|
||||
"ordered-list": "\d+."
|
||||
};
|
||||
var rt = new RegExp(map[name]);
|
||||
|
||||
return char && rt.test(char);
|
||||
};
|
||||
|
||||
var line = 1;
|
||||
for(var i = startPoint.line; i <= endPoint.line; i++) {
|
||||
(function(i) {
|
||||
var text = cm.getLine(i);
|
||||
if(stat[name]) {
|
||||
text = text.replace(repl[name], "$1");
|
||||
} else {
|
||||
text = map[name] + text;
|
||||
var arr = listRegexp.exec(text);
|
||||
var char = _getChar(name, line);
|
||||
if(arr !== null) {
|
||||
if(_checkChar(name, arr[2])) {
|
||||
char = "";
|
||||
}
|
||||
text = arr[1] + char + arr[3] + text.replace(whitespacesRegexp, "").replace(repl[name], "$1");
|
||||
} else {
|
||||
text = char + " " + text;
|
||||
}
|
||||
line += 1;
|
||||
}
|
||||
cm.replaceRange(text, {
|
||||
line: i,
|
||||
|
@ -1364,6 +1399,8 @@ function SimpleMDE(options) {
|
|||
// Merging the shortcuts, with the given options
|
||||
options.shortcuts = extend({}, shortcuts, options.shortcuts || {});
|
||||
|
||||
options.minHeight = options.minHeight || "300px";
|
||||
|
||||
|
||||
// Change unique_id to uniqueId for backwards compatibility
|
||||
if(options.autosave != undefined && options.autosave.unique_id != undefined && options.autosave.unique_id != "")
|
||||
|
@ -1392,8 +1429,12 @@ function SimpleMDE(options) {
|
|||
SimpleMDE.prototype.markdown = function(text) {
|
||||
if(marked) {
|
||||
// Initialize
|
||||
var markedOptions = {};
|
||||
|
||||
var markedOptions;
|
||||
if(this.options && this.options.renderingConfig && this.options.renderingConfig.markedOptions) {
|
||||
markedOptions = this.options.renderingConfig.markedOptions;
|
||||
} else {
|
||||
markedOptions = {};
|
||||
}
|
||||
|
||||
// Update options
|
||||
if(this.options && this.options.renderingConfig && this.options.renderingConfig.singleLineBreaks === false) {
|
||||
|
@ -1402,10 +1443,17 @@ SimpleMDE.prototype.markdown = function(text) {
|
|||
markedOptions.breaks = true;
|
||||
}
|
||||
|
||||
if(this.options && this.options.renderingConfig && this.options.renderingConfig.codeSyntaxHighlighting === true && window.hljs) {
|
||||
markedOptions.highlight = function(code) {
|
||||
return window.hljs.highlightAuto(code).value;
|
||||
};
|
||||
if(this.options && this.options.renderingConfig && this.options.renderingConfig.codeSyntaxHighlighting === true) {
|
||||
|
||||
/* Get HLJS from config or window */
|
||||
var hljs = this.options.renderingConfig.hljs || window.hljs;
|
||||
|
||||
/* Check if HLJS loaded */
|
||||
if(hljs) {
|
||||
markedOptions.highlight = function(code) {
|
||||
return hljs.highlightAuto(code).value;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -1495,6 +1543,8 @@ SimpleMDE.prototype.render = function(el) {
|
|||
styleSelectedText: (options.styleSelectedText != undefined) ? options.styleSelectedText : true
|
||||
});
|
||||
|
||||
this.codemirror.getScrollerElement().style.minHeight = options.minHeight;
|
||||
|
||||
if(options.forceSync === true) {
|
||||
var cm = this.codemirror;
|
||||
cm.on("change", function() {
|
||||
|
@ -1867,10 +1917,16 @@ SimpleMDE.prototype.createStatusbar = function(status) {
|
|||
* Get or set the text content.
|
||||
*/
|
||||
SimpleMDE.prototype.value = function(val) {
|
||||
var cm = this.codemirror;
|
||||
if(val === undefined) {
|
||||
return this.codemirror.getValue();
|
||||
return cm.getValue();
|
||||
} else {
|
||||
this.codemirror.getDoc().setValue(val);
|
||||
cm.getDoc().setValue(val);
|
||||
if(this.isPreviewActive()) {
|
||||
var wrapper = cm.getWrapperElement();
|
||||
var preview = wrapper.lastChild;
|
||||
preview.innerHTML = this.options.previewRender(val, preview);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue