You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/09/09 11:53:38 UTC
[18/50] [abbrv] Update codemirror to v2.38
http://git-wip-us.apache.org/repos/asf/couchdb/blob/8905089f/src/fauxton/assets/js/libs/codemirror.js
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/libs/codemirror.js b/src/fauxton/assets/js/libs/codemirror.js
index 532dd89..cac755e 100644
--- a/src/fauxton/assets/js/libs/codemirror.js
+++ b/src/fauxton/assets/js/libs/codemirror.js
@@ -1,11 +1,12 @@
-// CodeMirror version 2.32
+// CodeMirror version 2.38
//
// All functions that need access to the editor's state live inside
// the CodeMirror function. Below that, at the bottom of the file,
// some utilities are defined.
// CodeMirror is the only global var we claim
-var CodeMirror = (function() {
+window.CodeMirror = (function() {
+ "use strict";
// This is the function that produces an editor instance. Its
// closure is used to store the editor state.
function CodeMirror(place, givenOptions) {
@@ -15,38 +16,33 @@ var CodeMirror = (function() {
if (defaults.hasOwnProperty(opt))
options[opt] = (givenOptions && givenOptions.hasOwnProperty(opt) ? givenOptions : defaults)[opt];
+ var input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em");
+ input.setAttribute("wrap", "off"); input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off");
+ // Wraps and hides input textarea
+ var inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+ // The empty scrollbar content, used solely for managing the scrollbar thumb.
+ var scrollbarInner = elt("div", null, "CodeMirror-scrollbar-inner");
+ // The vertical scrollbar. Horizontal scrolling is handled by the scroller itself.
+ var scrollbar = elt("div", [scrollbarInner], "CodeMirror-scrollbar");
+ // DIVs containing the selection and the actual code
+ var lineDiv = elt("div"), selectionDiv = elt("div", null, null, "position: relative; z-index: -1");
+ // Blinky cursor, and element used to ensure cursor fits at the end of a line
+ var cursor = elt("pre", "\u00a0", "CodeMirror-cursor"), widthForcer = elt("pre", "\u00a0", "CodeMirror-cursor", "visibility: hidden");
+ // Used to measure text size
+ var measure = elt("div", null, null, "position: absolute; width: 100%; height: 0px; overflow: hidden; visibility: hidden;");
+ var lineSpace = elt("div", [measure, cursor, widthForcer, selectionDiv, lineDiv], null, "position: relative; z-index: 0");
+ var gutterText = elt("div", null, "CodeMirror-gutter-text"), gutter = elt("div", [gutterText], "CodeMirror-gutter");
+ // Moved around its parent to cover visible view
+ var mover = elt("div", [gutter, elt("div", [lineSpace], "CodeMirror-lines")], null, "position: relative");
+ // Set to the height of the text, causes scrolling
+ var sizer = elt("div", [mover], null, "position: relative");
+ // Provides scrolling
+ var scroller = elt("div", [sizer], "CodeMirror-scroll");
+ scroller.setAttribute("tabIndex", "-1");
// The element in which the editor lives.
- var wrapper = document.createElement("div");
- wrapper.className = "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : "");
- // This mess creates the base DOM structure for the editor.
- wrapper.innerHTML =
- '<div style="overflow: hidden; position: relative; width: 3px; height: 0px;">' + // Wraps and hides input textarea
- '<textarea style="position: absolute; padding: 0; width: 1px; height: 1em" wrap="off" ' +
- 'autocorrect="off" autocapitalize="off"></textarea></div>' +
- '<div class="CodeMirror-scrollbar">' + // The vertical scrollbar. Horizontal scrolling is handled by the scroller itself.
- '<div class="CodeMirror-scrollbar-inner">' + // The empty scrollbar content, used solely for managing the scrollbar thumb.
- '</div></div>' + // This must be before the scroll area because it's float-right.
- '<div class="CodeMirror-scroll" tabindex="-1">' +
- '<div style="position: relative">' + // Set to the height of the text, causes scrolling
- '<div style="position: relative">' + // Moved around its parent to cover visible view
- '<div class="CodeMirror-gutter"><div class="CodeMirror-gutter-text"></div></div>' +
- // Provides positioning relative to (visible) text origin
- '<div class="CodeMirror-lines"><div style="position: relative; z-index: 0">' +
- // Used to measure text size
- '<div style="position: absolute; width: 100%; height: 0px; overflow: hidden; visibility: hidden;"></div>' +
- '<pre class="CodeMirror-cursor"> </pre>' + // Absolutely positioned blinky cursor
- '<pre class="CodeMirror-cursor" style="visibility: hidden"> </pre>' + // Used to force a width
- '<div style="position: relative; z-index: -1"></div><div></div>' + // DIVs containing the selection and the actual code
- '</div></div></div></div></div>';
+ var wrapper = elt("div", [inputDiv, scrollbar, scroller], "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : ""));
if (place.appendChild) place.appendChild(wrapper); else place(wrapper);
- // I've never seen more elegant code in my life.
- var inputDiv = wrapper.firstChild, input = inputDiv.firstChild,
- scroller = wrapper.lastChild, code = scroller.firstChild,
- mover = code.firstChild, gutter = mover.firstChild, gutterText = gutter.firstChild,
- lineSpace = gutter.nextSibling.firstChild, measure = lineSpace.firstChild,
- cursor = measure.nextSibling, widthForcer = cursor.nextSibling,
- selectionDiv = widthForcer.nextSibling, lineDiv = selectionDiv.nextSibling,
- scrollbar = inputDiv.nextSibling, scrollbarInner = scrollbar.firstChild;
+
themeChanged(); keyMapChanged();
// Needed to hide big blue blinking cursor on Mobile Safari
if (ios) input.style.width = "0px";
@@ -58,33 +54,21 @@ var CodeMirror = (function() {
// Needed to handle Tab key in KHTML
if (khtml) inputDiv.style.height = "1px", inputDiv.style.position = "absolute";
- // Check for OS X >= 10.7. If so, we need to force a width on the scrollbar, and
- // make it overlap the content. (But we only do this if the scrollbar doesn't already
- // have a natural width. If the mouse is plugged in or the user sets the system pref
- // to always show scrollbars, the scrollbar shouldn't overlap.)
- if (mac_geLion) {
- scrollbar.className += (overlapScrollbars() ? " cm-sb-overlap" : " cm-sb-nonoverlap");
- } else if (ie_lt8) {
- // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
- scrollbar.className += " cm-sb-ie7";
- }
-
- // Check for problem with IE innerHTML not working when we have a
- // P (or similar) parent node.
- try { stringWidth("x"); }
- catch (e) {
- if (e.message.match(/runtime/i))
- e = new Error("A CodeMirror inside a P-style element does not work in Internet Explorer. (innerHTML bug)");
- throw e;
- }
+ // Check for OS X >= 10.7. This has transparent scrollbars, so the
+ // overlaying of one scrollbar with another won't work. This is a
+ // temporary hack to simply turn off the overlay scrollbar. See
+ // issue #727.
+ if (mac_geLion) { scrollbar.style.zIndex = -2; scrollbar.style.visibility = "hidden"; }
+ // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
+ else if (ie_lt8) scrollbar.style.minWidth = "18px";
// Delayed object wrap timeouts, making sure only one is active. blinker holds an interval.
var poll = new Delayed(), highlight = new Delayed(), blinker;
// mode holds a mode API object. doc is the tree of Line objects,
- // work an array of lines that should be parsed, and history the
- // undo history (instance of History constructor).
- var mode, doc = new BranchChunk([new LeafChunk([new Line("")])]), work, focused;
+ // frontier is the point up to which the content has been parsed,
+ // and history the undo history (instance of History constructor).
+ var mode, doc = new BranchChunk([new LeafChunk([new Line("")])]), frontier = 0, focused;
loadMode();
// The selection. These are always maintained to point at valid
// positions. Inverted is used to remember that the user is
@@ -92,11 +76,11 @@ var CodeMirror = (function() {
var sel = {from: {line: 0, ch: 0}, to: {line: 0, ch: 0}, inverted: false};
// Selection-related flags. shiftSelecting obviously tracks
// whether the user is holding shift.
- var shiftSelecting, lastClick, lastDoubleClick, lastScrollTop = 0, lastScrollLeft = 0, draggingText,
- overwrite = false, suppressEdits = false;
+ var shiftSelecting, lastClick, lastDoubleClick, lastScrollTop = 0, draggingText,
+ overwrite = false, suppressEdits = false, pasteIncoming = false;
// Variables used by startOperation/endOperation to track what
// happened during the operation.
- var updateInput, userSelChange, changes, textChanged, selectionChanged, leaveInputAlone,
+ var updateInput, userSelChange, changes, textChanged, selectionChanged,
gutterDirty, callbacks;
// Current visible range (may be bigger than the view window).
var displayOffset = 0, showingFrom = 0, showingTo = 0, lastSizeC = 0;
@@ -105,8 +89,9 @@ var CodeMirror = (function() {
var bracketHighlighted;
// Tracks the maximum line length so that the horizontal scrollbar
// can be kept static when scrolling.
- var maxLine = "", updateMaxLine = false, maxLineChanged = true;
- var tabCache = {};
+ var maxLine = getLine(0), updateMaxLine = false, maxLineChanged = true;
+ var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll
+ var goalColumn = null;
// Initialize the content.
operation(function(){setValue(options.value || ""); updateInput = false;})();
@@ -120,12 +105,13 @@ var CodeMirror = (function() {
// which point we can't mess with it anymore. Context menu is
// handled in onMouseDown for Gecko.
if (!gecko) connect(scroller, "contextmenu", onContextMenu);
- connect(scroller, "scroll", onScroll);
- connect(scrollbar, "scroll", onScroll);
+ connect(scroller, "scroll", onScrollMain);
+ connect(scrollbar, "scroll", onScrollBar);
connect(scrollbar, "mousedown", function() {if (focused) setTimeout(focusInput, 0);});
- connect(scroller, "mousewheel", onMouseWheel);
- connect(scroller, "DOMMouseScroll", onMouseWheel);
- connect(window, "resize", function() {updateDisplay(true);});
+ var resizeHandler = connect(window, "resize", function() {
+ if (wrapper.parentNode) updateDisplay(true);
+ else resizeHandler();
+ }, true);
connect(input, "keyup", operation(onKeyUp));
connect(input, "input", fastPoll);
connect(input, "keydown", operation(onKeyDown));
@@ -133,24 +119,24 @@ var CodeMirror = (function() {
connect(input, "focus", onFocus);
connect(input, "blur", onBlur);
+ function drag_(e) {
+ if (options.onDragEvent && options.onDragEvent(instance, addStop(e))) return;
+ e_stop(e);
+ }
if (options.dragDrop) {
connect(scroller, "dragstart", onDragStart);
- function drag_(e) {
- if (options.onDragEvent && options.onDragEvent(instance, addStop(e))) return;
- e_stop(e);
- }
connect(scroller, "dragenter", drag_);
connect(scroller, "dragover", drag_);
connect(scroller, "drop", operation(onDrop));
}
connect(scroller, "paste", function(){focusInput(); fastPoll();});
- connect(input, "paste", fastPoll);
+ connect(input, "paste", function(){pasteIncoming = true; fastPoll();});
connect(input, "cut", operation(function(){
if (!options.readOnly) replaceSelection("");
}));
// Needed to handle Tab key in KHTML
- if (khtml) connect(code, "mouseup", function() {
+ if (khtml) connect(sizer, "mouseup", function() {
if (document.activeElement == input) input.blur();
focusInput();
});
@@ -183,12 +169,16 @@ var CodeMirror = (function() {
else if (option == "lineWrapping" && oldVal != value) operation(wrappingChanged)();
else if (option == "tabSize") updateDisplay(true);
else if (option == "keyMap") keyMapChanged();
- if (option == "lineNumbers" || option == "gutter" || option == "firstLineNumber" || option == "theme") {
+ else if (option == "tabindex") input.tabIndex = value;
+ else if (option == "showCursorWhenSelecting") updateSelection();
+ if (option == "lineNumbers" || option == "gutter" || option == "firstLineNumber" ||
+ option == "theme" || option == "lineNumberFormatter") {
gutterChanged();
updateDisplay(true);
}
},
getOption: function(option) {return options[option];},
+ getMode: function() {return mode;},
undo: operation(undo),
redo: operation(redo),
indentLine: operation(function(n, dir) {
@@ -207,13 +197,23 @@ var CodeMirror = (function() {
history.undone = histData.undone;
},
getHistory: function() {
- history.time = 0;
- return {done: history.done.concat([]), undone: history.undone.concat([])};
+ function cp(arr) {
+ for (var i = 0, nw = [], nwelt; i < arr.length; ++i) {
+ nw.push(nwelt = []);
+ for (var j = 0, elt = arr[i]; j < elt.length; ++j) {
+ var old = [], cur = elt[j];
+ nwelt.push({start: cur.start, added: cur.added, old: old});
+ for (var k = 0; k < cur.old.length; ++k) old.push(hlText(cur.old[k]));
+ }
+ }
+ return nw;
+ }
+ return {done: cp(history.done), undone: cp(history.undone)};
},
matchBrackets: operation(function(){matchBrackets(true);}),
getTokenAt: operation(function(pos) {
pos = clipPos(pos);
- return getLine(pos.line).getTokenAt(mode, getStateBefore(pos.line), pos.ch);
+ return getLine(pos.line).getTokenAt(mode, getStateBefore(pos.line), options.tabSize, pos.ch);
}),
getStateAfter: function(line) {
line = clipLine(line == null ? doc.size - 1: line);
@@ -233,6 +233,7 @@ var CodeMirror = (function() {
var off = eltOffset(lineSpace);
return coordsChar(coords.x - off.left, coords.y - off.top);
},
+ defaultTextHeight: function() { return textHeight(); },
markText: operation(markText),
setBookmark: setBookmark,
findMarksAt: findMarksAt,
@@ -250,15 +251,16 @@ var CodeMirror = (function() {
return line;
},
lineInfo: lineInfo,
+ getViewport: function() { return {from: showingFrom, to: showingTo};},
addWidget: function(pos, node, scroll, vert, horiz) {
pos = localCoords(clipPos(pos));
var top = pos.yBot, left = pos.x;
node.style.position = "absolute";
- code.appendChild(node);
+ sizer.appendChild(node);
if (vert == "over") top = pos.y;
else if (vert == "near") {
var vspace = Math.max(scroller.offsetHeight, doc.height * textHeight()),
- hspace = Math.max(code.clientWidth, lineSpace.clientWidth) - paddingLeft();
+ hspace = Math.max(sizer.clientWidth, lineSpace.clientWidth) - paddingLeft();
if (pos.yBot + node.offsetHeight > vspace && pos.y > node.offsetHeight)
top = pos.y - node.offsetHeight;
if (left + node.offsetWidth > hspace)
@@ -267,11 +269,11 @@ var CodeMirror = (function() {
node.style.top = (top + paddingTop()) + "px";
node.style.left = node.style.right = "";
if (horiz == "right") {
- left = code.clientWidth - node.offsetWidth;
+ left = sizer.clientWidth - node.offsetWidth;
node.style.right = "0px";
} else {
if (horiz == "left") left = 0;
- else if (horiz == "middle") left = (code.clientWidth - node.offsetWidth) / 2;
+ else if (horiz == "middle") left = (sizer.clientWidth - node.offsetWidth) / 2;
node.style.left = (left + paddingLeft()) + "px";
}
if (scroll)
@@ -281,7 +283,9 @@ var CodeMirror = (function() {
lineCount: function() {return doc.size;},
clipPos: clipPos,
getCursor: function(start) {
- if (start == null) start = sel.inverted;
+ if (start == null || start == "head") start = sel.inverted;
+ if (start == "anchor") start = !sel.inverted;
+ if (start == "end") start = false;
return copyPos(start ? sel.from : sel.to);
},
somethingSelected: function() {return !posEq(sel.from, sel.to);},
@@ -339,13 +343,18 @@ var CodeMirror = (function() {
},
scrollTo: function(x, y) {
if (x != null) scroller.scrollLeft = x;
- if (y != null) scrollbar.scrollTop = y;
+ if (y != null) scrollbar.scrollTop = scroller.scrollTop = y;
updateDisplay([]);
},
getScrollInfo: function() {
return {x: scroller.scrollLeft, y: scrollbar.scrollTop,
height: scrollbar.scrollHeight, width: scroller.scrollWidth};
},
+ scrollIntoView: function(pos) {
+ var coords = localCoords(pos ? clipPos(pos) : sel.inverted ? sel.from : sel.to);
+ scrollIntoView(coords.x, coords.y, coords.x, coords.yBot);
+ },
+
setSize: function(width, height) {
function interpret(val) {
val = String(val);
@@ -353,6 +362,7 @@ var CodeMirror = (function() {
}
if (width != null) wrapper.style.width = interpret(width);
if (height != null) scroller.style.height = interpret(height);
+ instance.refresh();
},
operation: function(f){return operation(f)();},
@@ -375,6 +385,12 @@ var CodeMirror = (function() {
for (var n = line; n; n = n.parent) n.height += diff;
}
+ function lineContent(line, wrapAt) {
+ if (!line.styles)
+ line.highlight(mode, line.stateAfter = getStateBefore(lineNo(line)), options.tabSize);
+ return line.getContent(options.tabSize, wrapAt, options.lineWrapping);
+ }
+
function setValue(code) {
var top = {line: 0, ch: 0};
updateLines(top, {line: doc.size - 1, ch: getLine(doc.size-1).text.length},
@@ -387,25 +403,30 @@ var CodeMirror = (function() {
return text.join(lineSep || "\n");
}
- function onScroll(e) {
- if (scroller.scrollTop) {
- scrollbar.scrollTop += scroller.scrollTop;
- scroller.scrollTop = 0;
+ function onScrollBar(e) {
+ if (Math.abs(scrollbar.scrollTop - lastScrollTop) > 1) {
+ lastScrollTop = scroller.scrollTop = scrollbar.scrollTop;
+ updateDisplay([]);
}
- if (lastScrollTop != scrollbar.scrollTop || lastScrollLeft != scroller.scrollLeft) {
- lastScrollTop = scrollbar.scrollTop;
- lastScrollLeft = scroller.scrollLeft;
+ }
+
+ function onScrollMain(e) {
+ if (options.fixedGutter && gutter.style.left != scroller.scrollLeft + "px")
+ gutter.style.left = scroller.scrollLeft + "px";
+ if (Math.abs(scroller.scrollTop - lastScrollTop) > 1) {
+ lastScrollTop = scroller.scrollTop;
+ if (scrollbar.scrollTop != lastScrollTop)
+ scrollbar.scrollTop = lastScrollTop;
updateDisplay([]);
- if (options.fixedGutter) gutter.style.left = scroller.scrollLeft + "px";
- if (options.onScroll) options.onScroll(instance);
}
+ if (options.onScroll) options.onScroll(instance);
}
function onMouseDown(e) {
setShift(e_prop(e, "shiftKey"));
// Check whether this is a click in a widget
for (var n = e_target(e); n != wrapper; n = n.parentNode)
- if (n.parentNode == code && n != mover) return;
+ if (n.parentNode == sizer && n != mover) return;
// See if this is a click in the gutter
for (var n = e_target(e); n != wrapper; n = n.parentNode)
@@ -448,21 +469,21 @@ var CodeMirror = (function() {
setSelectionUser(word.from, word.to);
} else { lastClick = {time: now, pos: start}; }
+ function dragEnd(e2) {
+ if (webkit) scroller.draggable = false;
+ draggingText = false;
+ up(); drop();
+ if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
+ e_preventDefault(e2);
+ setCursor(start.line, start.ch, true);
+ focusInput();
+ }
+ }
var last = start, going;
if (options.dragDrop && dragAndDrop && !options.readOnly && !posEq(sel.from, sel.to) &&
!posLess(start, sel.from) && !posLess(sel.to, start) && type == "single") {
// Let the drag handler handle this.
if (webkit) scroller.draggable = true;
- function dragEnd(e2) {
- if (webkit) scroller.draggable = false;
- draggingText = false;
- up(); drop();
- if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
- e_preventDefault(e2);
- setCursor(start.line, start.ch, true);
- focusInput();
- }
- }
var up = connect(document, "mouseup", operation(dragEnd), true);
var drop = connect(scroller, "drop", operation(dragEnd), true);
draggingText = true;
@@ -477,8 +498,12 @@ var CodeMirror = (function() {
function doSelect(cur) {
if (type == "single") {
- setSelectionUser(start, cur);
- } else if (type == "double") {
+ setSelectionUser(clipPos(start), cur);
+ return;
+ }
+ startstart = clipPos(startstart);
+ startend = clipPos(startend);
+ if (type == "double") {
var word = findWordAt(cur);
if (posLess(cur, startstart)) setSelectionUser(word.from, startend);
else setSelectionUser(startstart, word.to);
@@ -525,11 +550,12 @@ var CodeMirror = (function() {
}
function onDrop(e) {
if (options.onDragEvent && options.onDragEvent(instance, addStop(e))) return;
- e.preventDefault();
+ e_preventDefault(e);
var pos = posFromMouse(e, true), files = e.dataTransfer.files;
if (!pos || options.readOnly) return;
if (files && files.length && window.FileReader && window.File) {
- function loadFile(file, i) {
+ var n = files.length, text = Array(n), read = 0;
+ var loadFile = function(file, i) {
var reader = new FileReader;
reader.onload = function() {
text[i] = reader.result;
@@ -542,8 +568,7 @@ var CodeMirror = (function() {
}
};
reader.readAsText(file);
- }
- var n = files.length, text = Array(n), read = 0;
+ };
for (var i = 0; i < n; ++i) loadFile(files[i], i);
} else {
// Don't do a replace if the drop happened inside of the selected text.
@@ -566,13 +591,10 @@ var CodeMirror = (function() {
function onDragStart(e) {
var txt = getSelection();
e.dataTransfer.setData("Text", txt);
-
+
// Use dummy image instead of default browsers image.
- if (gecko || chrome || opera) {
- var img = document.createElement('img');
- img.scr = 'data:image/gif;base64,R0lGODdhAgACAIAAAAAAAP///ywAAAAAAgACAAACAoRRADs='; //1x1 image
- e.dataTransfer.setDragImage(img, 0, 0);
- }
+ if (e.dataTransfer.setDragImage)
+ e.dataTransfer.setDragImage(elt('img'), 0, 0);
}
function doHandleBinding(bound, dropShift) {
@@ -594,6 +616,7 @@ var CodeMirror = (function() {
}
return true;
}
+ var maybeTransition;
function handleKeyBinding(e) {
// Handle auto keymap transitions
var startMap = getKeyMap(options.keyMap), next = startMap.auto;
@@ -607,8 +630,8 @@ var CodeMirror = (function() {
var name = keyNames[e_prop(e, "keyCode")], handled = false;
if (name == null || e.altGraphKey) return false;
if (e_prop(e, "altKey")) name = "Alt-" + name;
- if (e_prop(e, "ctrlKey")) name = "Ctrl-" + name;
- if (e_prop(e, "metaKey")) name = "Cmd-" + name;
+ if (e_prop(e, flipCtrlCmd ? "metaKey" : "ctrlKey")) name = "Ctrl-" + name;
+ if (e_prop(e, flipCtrlCmd ? "ctrlKey" : "metaKey")) name = "Cmd-" + name;
var stopped = false;
function stop() { stopped = true; }
@@ -626,7 +649,7 @@ var CodeMirror = (function() {
if (handled) {
e_preventDefault(e);
restartBlink();
- if (ie) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }
+ if (ie_lt9) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }
}
return handled;
}
@@ -640,7 +663,7 @@ var CodeMirror = (function() {
return handled;
}
- var lastStoppedKey = null, maybeTransition;
+ var lastStoppedKey = null;
function onKeyDown(e) {
if (!focused) onFocus();
if (ie && e.keyCode == 27) { e.returnValue = false; }
@@ -684,7 +707,6 @@ var CodeMirror = (function() {
focused = true;
if (scroller.className.search(/\bCodeMirror-focused\b/) == -1)
scroller.className += " CodeMirror-focused";
- if (!leaveInputAlone) resetInput(true);
}
slowPoll();
restartBlink();
@@ -703,53 +725,20 @@ var CodeMirror = (function() {
setTimeout(function() {if (!focused) shiftSelecting = null;}, 150);
}
- function chopDelta(delta) {
- // Make sure we always scroll a little bit for any nonzero delta.
- if (delta > 0.0 && delta < 1.0) return 1;
- else if (delta > -1.0 && delta < 0.0) return -1;
- else return Math.round(delta);
- }
-
- function onMouseWheel(e) {
- var deltaX = 0, deltaY = 0;
- if (e.type == "DOMMouseScroll") { // Firefox
- var delta = -e.detail * 8.0;
- if (e.axis == e.HORIZONTAL_AXIS) deltaX = delta;
- else if (e.axis == e.VERTICAL_AXIS) deltaY = delta;
- } else if (e.wheelDeltaX !== undefined && e.wheelDeltaY !== undefined) { // WebKit
- deltaX = e.wheelDeltaX / 3.0;
- deltaY = e.wheelDeltaY / 3.0;
- } else if (e.wheelDelta !== undefined) { // IE or Opera
- deltaY = e.wheelDelta / 3.0;
- }
-
- var scrolled = false;
- deltaX = chopDelta(deltaX);
- deltaY = chopDelta(deltaY);
- if ((deltaX > 0 && scroller.scrollLeft > 0) ||
- (deltaX < 0 && scroller.scrollLeft + scroller.clientWidth < scroller.scrollWidth)) {
- scroller.scrollLeft -= deltaX;
- scrolled = true;
- }
- if ((deltaY > 0 && scrollbar.scrollTop > 0) ||
- (deltaY < 0 && scrollbar.scrollTop + scrollbar.clientHeight < scrollbar.scrollHeight)) {
- scrollbar.scrollTop -= deltaY;
- scrolled = true;
- }
- if (scrolled) e_stop(e);
- }
-
// Replace the range from from to to by the strings in newText.
// Afterwards, set the selection to selFrom, selTo.
function updateLines(from, to, newText, selFrom, selTo) {
if (suppressEdits) return;
+ var old = [];
+ doc.iter(from.line, to.line + 1, function(line) {
+ old.push(newHL(line.text, line.markedSpans));
+ });
if (history) {
- var old = [];
- doc.iter(from.line, to.line + 1, function(line) { old.push(line.text); });
history.addChange(from.line, newText.length, old);
while (history.done.length > options.undoDepth) history.done.shift();
}
- updateLinesNoUndo(from, to, newText, selFrom, selTo);
+ var lines = updateMarkedSpans(hlSpans(old[0]), hlSpans(lst(old)), from.ch, to.ch, newText);
+ updateLinesNoUndo(from, to, lines, selFrom, selTo);
}
function unredoHelper(from, to) {
if (!from.length) return;
@@ -757,11 +746,12 @@ var CodeMirror = (function() {
for (var i = set.length - 1; i >= 0; i -= 1) {
var change = set[i];
var replaced = [], end = change.start + change.added;
- doc.iter(change.start, end, function(line) { replaced.push(line.text); });
+ doc.iter(change.start, end, function(line) { replaced.push(newHL(line.text, line.markedSpans)); });
out.push({start: change.start, added: change.old.length, old: replaced});
var pos = {line: change.start + change.old.length - 1,
- ch: editEnd(replaced[replaced.length-1], change.old[change.old.length-1])};
- updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length}, change.old, pos, pos);
+ ch: editEnd(hlText(lst(replaced)), hlText(lst(change.old)))};
+ updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length},
+ change.old, pos, pos);
}
updateInput = true;
to.push(out);
@@ -769,95 +759,86 @@ var CodeMirror = (function() {
function undo() {unredoHelper(history.done, history.undone);}
function redo() {unredoHelper(history.undone, history.done);}
- function updateLinesNoUndo(from, to, newText, selFrom, selTo) {
+ function updateLinesNoUndo(from, to, lines, selFrom, selTo) {
if (suppressEdits) return;
- var recomputeMaxLength = false, maxLineLength = maxLine.length;
+ var recomputeMaxLength = false, maxLineLength = maxLine.text.length;
if (!options.lineWrapping)
doc.iter(from.line, to.line + 1, function(line) {
if (!line.hidden && line.text.length == maxLineLength) {recomputeMaxLength = true; return true;}
});
- if (from.line != to.line || newText.length > 1) gutterDirty = true;
+ if (from.line != to.line || lines.length > 1) gutterDirty = true;
var nlines = to.line - from.line, firstLine = getLine(from.line), lastLine = getLine(to.line);
- // First adjust the line structure, taking some care to leave highlighting intact.
- if (from.ch == 0 && to.ch == 0 && newText[newText.length - 1] == "") {
+ var lastHL = lst(lines);
+
+ // First adjust the line structure
+ if (from.ch == 0 && to.ch == 0 && hlText(lastHL) == "") {
// This is a whole-line replace. Treated specially to make
// sure line objects move the way they are supposed to.
var added = [], prevLine = null;
- if (from.line) {
- prevLine = getLine(from.line - 1);
- prevLine.fixMarkEnds(lastLine);
- } else lastLine.fixMarkStarts();
- for (var i = 0, e = newText.length - 1; i < e; ++i)
- added.push(Line.inheritMarks(newText[i], prevLine));
+ for (var i = 0, e = lines.length - 1; i < e; ++i)
+ added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
+ lastLine.update(lastLine.text, hlSpans(lastHL));
if (nlines) doc.remove(from.line, nlines, callbacks);
if (added.length) doc.insert(from.line, added);
} else if (firstLine == lastLine) {
- if (newText.length == 1)
- firstLine.replace(from.ch, to.ch, newText[0]);
- else {
- lastLine = firstLine.split(to.ch, newText[newText.length-1]);
- firstLine.replace(from.ch, null, newText[0]);
- firstLine.fixMarkEnds(lastLine);
- var added = [];
- for (var i = 1, e = newText.length - 1; i < e; ++i)
- added.push(Line.inheritMarks(newText[i], firstLine));
- added.push(lastLine);
+ if (lines.length == 1) {
+ firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]) + firstLine.text.slice(to.ch), hlSpans(lines[0]));
+ } else {
+ for (var added = [], i = 1, e = lines.length - 1; i < e; ++i)
+ added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
+ added.push(new Line(hlText(lastHL) + firstLine.text.slice(to.ch), hlSpans(lastHL)));
+ firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]), hlSpans(lines[0]));
doc.insert(from.line + 1, added);
}
- } else if (newText.length == 1) {
- firstLine.replace(from.ch, null, newText[0]);
- lastLine.replace(null, to.ch, "");
- firstLine.append(lastLine);
+ } else if (lines.length == 1) {
+ firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]) + lastLine.text.slice(to.ch), hlSpans(lines[0]));
doc.remove(from.line + 1, nlines, callbacks);
} else {
var added = [];
- firstLine.replace(from.ch, null, newText[0]);
- lastLine.replace(null, to.ch, newText[newText.length-1]);
- firstLine.fixMarkEnds(lastLine);
- for (var i = 1, e = newText.length - 1; i < e; ++i)
- added.push(Line.inheritMarks(newText[i], firstLine));
+ firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]), hlSpans(lines[0]));
+ lastLine.update(hlText(lastHL) + lastLine.text.slice(to.ch), hlSpans(lastHL));
+ for (var i = 1, e = lines.length - 1; i < e; ++i)
+ added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
if (nlines > 1) doc.remove(from.line + 1, nlines - 1, callbacks);
doc.insert(from.line + 1, added);
}
if (options.lineWrapping) {
var perLine = Math.max(5, scroller.clientWidth / charWidth() - 3);
- doc.iter(from.line, from.line + newText.length, function(line) {
+ doc.iter(from.line, from.line + lines.length, function(line) {
if (line.hidden) return;
var guess = Math.ceil(line.text.length / perLine) || 1;
if (guess != line.height) updateLineHeight(line, guess);
});
} else {
- doc.iter(from.line, from.line + newText.length, function(line) {
+ doc.iter(from.line, from.line + lines.length, function(line) {
var l = line.text;
if (!line.hidden && l.length > maxLineLength) {
- maxLine = l; maxLineLength = l.length; maxLineChanged = true;
+ maxLine = line; maxLineLength = l.length; maxLineChanged = true;
recomputeMaxLength = false;
}
});
if (recomputeMaxLength) updateMaxLine = true;
}
- // Add these lines to the work array, so that they will be
- // highlighted. Adjust work lines if lines were added/removed.
- var newWork = [], lendiff = newText.length - nlines - 1;
- for (var i = 0, l = work.length; i < l; ++i) {
- var task = work[i];
- if (task < from.line) newWork.push(task);
- else if (task > to.line) newWork.push(task + lendiff);
- }
- var hlEnd = from.line + Math.min(newText.length, 500);
- highlightLines(from.line, hlEnd);
- newWork.push(hlEnd);
- work = newWork;
- startWorker(100);
+ // Adjust frontier, schedule worker
+ frontier = Math.min(frontier, from.line);
+ startWorker(400);
+
+ var lendiff = lines.length - nlines - 1;
// Remember that these lines changed, for updating the display
changes.push({from: from.line, to: to.line + 1, diff: lendiff});
- var changeObj = {from: from, to: to, text: newText};
- if (textChanged) {
- for (var cur = textChanged; cur.next; cur = cur.next) {}
- cur.next = changeObj;
- } else textChanged = changeObj;
+ if (options.onChange) {
+ // Normalize lines to contain only strings, since that's what
+ // the change event handler expects
+ for (var i = 0; i < lines.length; ++i)
+ if (typeof lines[i] != "string") lines[i] = lines[i].text;
+ var changeObj = {from: from, to: to, text: lines};
+ if (textChanged) {
+ for (var cur = textChanged; cur.next; cur = cur.next) {}
+ cur.next = changeObj;
+ } else textChanged = changeObj;
+ }
// Update the selection
function updateLine(n) {return n <= Math.min(to.line, to.line + lendiff) ? n : n + lendiff;}
@@ -867,46 +848,43 @@ var CodeMirror = (function() {
function needsScrollbar() {
var realHeight = doc.height * textHeight() + 2 * paddingTop();
- return realHeight - 1 > scroller.offsetHeight ? realHeight : false;
+ return realHeight * .99 > scroller.offsetHeight ? realHeight : false;
}
function updateVerticalScroll(scrollTop) {
var scrollHeight = needsScrollbar();
scrollbar.style.display = scrollHeight ? "block" : "none";
if (scrollHeight) {
- scrollbarInner.style.height = scrollHeight + "px";
- scrollbar.style.height = scroller.offsetHeight + "px";
- if (scrollTop != null) scrollbar.scrollTop = scrollTop;
+ scrollbarInner.style.height = sizer.style.minHeight = scrollHeight + "px";
+ scrollbar.style.height = scroller.clientHeight + "px";
+ if (scrollTop != null) {
+ scrollbar.scrollTop = scroller.scrollTop = scrollTop;
+ // 'Nudge' the scrollbar to work around a Webkit bug where,
+ // in some situations, we'd end up with a scrollbar that
+ // reported its scrollTop (and looked) as expected, but
+ // *behaved* as if it was still in a previous state (i.e.
+ // couldn't scroll up, even though it appeared to be at the
+ // bottom).
+ if (webkit) setTimeout(function() {
+ if (scrollbar.scrollTop != scrollTop) return;
+ scrollbar.scrollTop = scrollTop + (scrollTop ? -1 : 1);
+ scrollbar.scrollTop = scrollTop;
+ }, 0);
+ }
+ } else {
+ sizer.style.minHeight = "";
}
// Position the mover div to align with the current virtual scroll position
- mover.style.top = (displayOffset * textHeight() - scrollbar.scrollTop) + "px";
- }
-
- // On Mac OS X Lion and up, detect whether the mouse is plugged in by measuring
- // the width of a div with a scrollbar in it. If the width is <= 1, then
- // the mouse isn't plugged in and scrollbars should overlap the content.
- function overlapScrollbars() {
- var tmpSb = document.createElement('div'),
- tmpSbInner = document.createElement('div');
- tmpSb.className = "CodeMirror-scrollbar";
- tmpSb.style.cssText = "position: absolute; left: -9999px; height: 100px;";
- tmpSbInner.className = "CodeMirror-scrollbar-inner";
- tmpSbInner.style.height = "200px";
- tmpSb.appendChild(tmpSbInner);
-
- document.body.appendChild(tmpSb);
- var result = (tmpSb.offsetWidth <= 1);
- document.body.removeChild(tmpSb);
- return result;
+ mover.style.top = displayOffset * textHeight() + "px";
}
function computeMaxLength() {
- var maxLineLength = 0;
- maxLine = ""; maxLineChanged = true;
- doc.iter(0, doc.size, function(line) {
+ maxLine = getLine(0); maxLineChanged = true;
+ var maxLineLength = maxLine.text.length;
+ doc.iter(1, doc.size, function(line) {
var l = line.text;
if (!line.hidden && l.length > maxLineLength) {
- maxLineLength = l.length; maxLine = l;
+ maxLineLength = l.length; maxLine = line;
}
});
updateMaxLine = false;
@@ -922,7 +900,7 @@ var CodeMirror = (function() {
var line = pos.line + code.length - (to.line - from.line) - 1;
var ch = pos.ch;
if (pos.line == to.line)
- ch += code[code.length-1].length - (to.ch - (to.line == from.line ? from.ch : 0));
+ ch += lst(code).length - (to.ch - (to.line == from.line ? from.ch : 0));
return {line: line, ch: ch};
}
var end;
@@ -940,7 +918,7 @@ var CodeMirror = (function() {
});
}
function replaceRange1(code, from, to, computeSel) {
- var endch = code.length == 1 ? code[0].length + from.ch : code[code.length-1].length;
+ var endch = code.length == 1 ? code[0].length + from.ch : lst(code).length;
var newSel = computeSel({line: from.line + code.length - 1, ch: endch});
updateLines(from, to, code, newSel.from, newSel.to);
}
@@ -957,25 +935,20 @@ var CodeMirror = (function() {
return getRange(sel.from, sel.to, lineSep);
}
- var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll
function slowPoll() {
if (pollingFast) return;
poll.set(options.pollInterval, function() {
- startOperation();
readInput();
if (focused) slowPoll();
- endOperation();
});
}
function fastPoll() {
var missed = false;
pollingFast = true;
function p() {
- startOperation();
var changed = readInput();
if (!changed && !missed) {missed = true; poll.set(60, p);}
else {pollingFast = false; slowPoll();}
- endOperation();
}
poll.set(20, p);
}
@@ -987,43 +960,54 @@ var CodeMirror = (function() {
// supported or compatible enough yet to rely on.)
var prevInput = "";
function readInput() {
- if (leaveInputAlone || !focused || hasSelection(input) || options.readOnly) return false;
+ if (!focused || hasSelection(input) || options.readOnly) return false;
var text = input.value;
if (text == prevInput) return false;
+ if (!nestedOperation) startOperation();
shiftSelecting = null;
var same = 0, l = Math.min(prevInput.length, text.length);
while (same < l && prevInput[same] == text[same]) ++same;
if (same < prevInput.length)
sel.from = {line: sel.from.line, ch: sel.from.ch - (prevInput.length - same)};
- else if (overwrite && posEq(sel.from, sel.to))
+ else if (overwrite && posEq(sel.from, sel.to) && !pasteIncoming)
sel.to = {line: sel.to.line, ch: Math.min(getLine(sel.to.line).text.length, sel.to.ch + (text.length - same))};
replaceSelection(text.slice(same), "end");
if (text.length > 1000) { input.value = prevInput = ""; }
else prevInput = text;
+ if (!nestedOperation) endOperation();
+ pasteIncoming = false;
return true;
}
function resetInput(user) {
if (!posEq(sel.from, sel.to)) {
prevInput = "";
input.value = getSelection();
- selectInput(input);
+ if (focused) selectInput(input);
} else if (user) prevInput = input.value = "";
}
function focusInput() {
- if (options.readOnly != "nocursor") input.focus();
+ if (options.readOnly != "nocursor" && (ie_lt9 || document.activeElement != input))
+ input.focus();
}
- function scrollEditorIntoView() {
- var rect = cursor.getBoundingClientRect();
- // IE returns bogus coordinates when the instance sits inside of an iframe and the cursor is hidden
- if (ie && rect.top == rect.bottom) return;
- var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
- if (rect.top < 0 || rect.bottom > winH) scrollCursorIntoView();
- }
function scrollCursorIntoView() {
var coords = calculateCursorCoords();
- return scrollIntoView(coords.x, coords.y, coords.x, coords.yBot);
+ scrollIntoView(coords.x, coords.y, coords.x, coords.yBot);
+ if (!focused) return;
+ var box = sizer.getBoundingClientRect(), doScroll = null;
+ if (coords.y + box.top < 0) doScroll = true;
+ else if (coords.y + box.top + textHeight() > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
+ if (doScroll != null) {
+ var hidden = cursor.style.display == "none";
+ if (hidden) {
+ cursor.style.display = "";
+ cursor.style.left = coords.x + "px";
+ cursor.style.top = (coords.y - displayOffset) + "px";
+ }
+ cursor.scrollIntoView(doScroll);
+ if (hidden) cursor.style.display = "none";
+ }
}
function calculateCursorCoords() {
var cursor = localCoords(sel.inverted ? sel.from : sel.to);
@@ -1031,17 +1015,16 @@ var CodeMirror = (function() {
return {x: x, y: cursor.y, yBot: cursor.yBot};
}
function scrollIntoView(x1, y1, x2, y2) {
- var scrollPos = calculateScrollPos(x1, y1, x2, y2), scrolled = false;
- if (scrollPos.scrollLeft != null) {scroller.scrollLeft = scrollPos.scrollLeft; scrolled = true;}
- if (scrollPos.scrollTop != null) {scrollbar.scrollTop = scrollPos.scrollTop; scrolled = true;}
- if (scrolled && options.onScroll) options.onScroll(instance);
+ var scrollPos = calculateScrollPos(x1, y1, x2, y2);
+ if (scrollPos.scrollLeft != null) {scroller.scrollLeft = scrollPos.scrollLeft;}
+ if (scrollPos.scrollTop != null) {scrollbar.scrollTop = scroller.scrollTop = scrollPos.scrollTop;}
}
function calculateScrollPos(x1, y1, x2, y2) {
var pl = paddingLeft(), pt = paddingTop();
y1 += pt; y2 += pt; x1 += pl; x2 += pl;
var screen = scroller.clientHeight, screentop = scrollbar.scrollTop, result = {};
- var docBottom = scroller.scrollHeight;
- var atTop = y1 < pt + 10, atBottom = y2 + pt > docBottom - 10;;
+ var docBottom = needsScrollbar() || Infinity;
+ var atTop = y1 < pt + 10, atBottom = y2 + pt > docBottom - 10;
if (y1 < screentop) result.scrollTop = atTop ? 0 : Math.max(0, y1);
else if (y2 > screentop + screen) result.scrollTop = (atBottom ? docBottom : y2) - screen;
@@ -1113,8 +1096,13 @@ var CodeMirror = (function() {
// This is just a bogus formula that detects when the editor is
// resized or the font size changes.
if (different) lastSizeC = scroller.clientHeight + th;
+ if (from != showingFrom || to != showingTo && options.onViewportChange)
+ setTimeout(function(){
+ if (options.onViewportChange) options.onViewportChange(instance, from, to);
+ });
showingFrom = from; showingTo = to;
displayOffset = heightAtLine(doc, from);
+ startWorker(100);
// Since this is all rather error prone, it is honoured with the
// only assertion in the whole file.
@@ -1125,6 +1113,10 @@ var CodeMirror = (function() {
function checkHeights() {
var curNode = lineDiv.firstChild, heightChanged = false;
doc.iter(showingFrom, showingTo, function(line) {
+ // Work around bizarro IE7 bug where, sometimes, our curNode
+ // is magically replaced with a new node in the DOM, leaving
+ // us with a reference to an orphan (nextSibling-less) node.
+ if (!curNode) return;
if (!line.hidden) {
var height = Math.round(curNode.offsetHeight / th) || 1;
if (line.height != height) {
@@ -1137,16 +1129,7 @@ var CodeMirror = (function() {
return heightChanged;
}
- if (options.lineWrapping) {
- checkHeights();
- var scrollHeight = needsScrollbar();
- var shouldHaveScrollbar = scrollHeight ? "block" : "none";
- if (scrollbar.style.display != shouldHaveScrollbar) {
- scrollbar.style.display = shouldHaveScrollbar;
- if (scrollHeight) scrollbarInner.style.height = scrollHeight + "px";
- checkHeights();
- }
- }
+ if (options.lineWrapping) checkHeights();
gutter.style.display = gutterDisplay;
if (different || gutterDirty) {
@@ -1183,14 +1166,14 @@ var CodeMirror = (function() {
}
function patchDisplay(from, to, intact) {
+ function killNode(node) {
+ var tmp = node.nextSibling;
+ node.parentNode.removeChild(node);
+ return tmp;
+ }
// The first pass removes the DOM nodes that aren't intact.
- if (!intact.length) lineDiv.innerHTML = "";
+ if (!intact.length) removeChildren(lineDiv);
else {
- function killNode(node) {
- var tmp = node.nextSibling;
- node.parentNode.removeChild(node);
- return tmp;
- }
var domPos = 0, curNode = lineDiv.firstChild, n;
for (var i = 0; i < intact.length; ++i) {
var cur = intact[i];
@@ -1201,21 +1184,20 @@ var CodeMirror = (function() {
}
// This pass fills in the lines that actually changed.
var nextIntact = intact.shift(), curNode = lineDiv.firstChild, j = from;
- var scratch = document.createElement("div");
doc.iter(from, to, function(line) {
if (nextIntact && nextIntact.to == j) nextIntact = intact.shift();
if (!nextIntact || nextIntact.from > j) {
- if (line.hidden) var html = scratch.innerHTML = "<pre></pre>";
+ if (line.hidden) var lineElement = elt("pre");
else {
- var html = '<pre' + (line.className ? ' class="' + line.className + '"' : '') + '>'
- + line.getHTML(makeTab) + '</pre>';
+ var lineElement = lineContent(line);
+ if (line.className) lineElement.className = line.className;
// Kludge to make sure the styled element lies behind the selection (by z-index)
- if (line.bgClassName)
- html = '<div style="position: relative"><pre class="' + line.bgClassName +
- '" style="position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: -2"> </pre>' + html + "</div>";
+ if (line.bgClassName) {
+ var pre = elt("pre", "\u00a0", line.bgClassName, "position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: -2");
+ lineElement = elt("div", [pre, lineElement], null, "position: relative");
+ }
}
- scratch.innerHTML = html;
- lineDiv.insertBefore(scratch.firstChild, curNode);
+ lineDiv.insertBefore(lineElement, curNode);
} else {
curNode = curNode.nextSibling;
}
@@ -1227,10 +1209,10 @@ var CodeMirror = (function() {
if (!options.gutter && !options.lineNumbers) return;
var hText = mover.offsetHeight, hEditor = scroller.clientHeight;
gutter.style.height = (hText - hEditor < 2 ? hEditor : hText) + "px";
- var html = [], i = showingFrom, normalNode;
+ var fragment = document.createDocumentFragment(), i = showingFrom, normalNode;
doc.iter(showingFrom, Math.max(showingTo, showingFrom + 1), function(line) {
if (line.hidden) {
- html.push("<pre></pre>");
+ fragment.appendChild(elt("pre"));
} else {
var marker = line.gutterMarker;
var text = options.lineNumbers ? options.lineNumberFormatter(i + options.firstLineNumber) : null;
@@ -1238,15 +1220,18 @@ var CodeMirror = (function() {
text = marker.text.replace("%N%", text != null ? text : "");
else if (text == null)
text = "\u00a0";
- html.push((marker && marker.style ? '<pre class="' + marker.style + '">' : "<pre>"), text);
- for (var j = 1; j < line.height; ++j) html.push("<br/> ");
- html.push("</pre>");
+ var markerElement = fragment.appendChild(elt("pre", null, marker && marker.style));
+ markerElement.innerHTML = text;
+ for (var j = 1; j < line.height; ++j) {
+ markerElement.appendChild(elt("br"));
+ markerElement.appendChild(document.createTextNode("\u00a0"));
+ }
if (!marker) normalNode = i;
}
++i;
});
gutter.style.display = "none";
- gutterText.innerHTML = html.join("");
+ removeChildrenAndAdd(gutterText, fragment);
// Make sure scrolling doesn't cause number gutter size to pop
if (normalNode != null && options.lineNumbers) {
var node = gutterText.childNodes[normalNode - showingFrom];
@@ -1268,21 +1253,23 @@ var CodeMirror = (function() {
var wrapOff = eltOffset(wrapper), lineOff = eltOffset(lineDiv);
inputDiv.style.top = Math.max(0, Math.min(scroller.offsetHeight, headPos.y + lineOff.top - wrapOff.top)) + "px";
inputDiv.style.left = Math.max(0, Math.min(scroller.offsetWidth, headPos.x + lineOff.left - wrapOff.left)) + "px";
- if (collapsed) {
+ if (collapsed || options.showCursorWhenSelecting) {
cursor.style.top = headPos.y + "px";
cursor.style.left = (options.lineWrapping ? Math.min(headPos.x, lineSpace.offsetWidth) : headPos.x) + "px";
cursor.style.display = "";
- selectionDiv.style.display = "none";
} else {
- var sameLine = fromPos.y == toPos.y, html = "";
+ cursor.style.display = "none";
+ }
+ if (!collapsed) {
+ var sameLine = fromPos.y == toPos.y, fragment = document.createDocumentFragment();
var clientWidth = lineSpace.clientWidth || lineSpace.offsetWidth;
var clientHeight = lineSpace.clientHeight || lineSpace.offsetHeight;
- function add(left, top, right, height) {
+ var add = function(left, top, right, height) {
var rstyle = quirksMode ? "width: " + (!right ? clientWidth : clientWidth - right - left) + "px"
- : "right: " + right + "px";
- html += '<div class="CodeMirror-selected" style="position: absolute; left: ' + left +
- 'px; top: ' + top + 'px; ' + rstyle + '; height: ' + height + 'px"></div>';
- }
+ : "right: " + (right - 1) + "px";
+ fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
+ "px; top: " + top + "px; " + rstyle + "; height: " + height + "px"));
+ };
if (sel.from.ch && fromPos.y >= 0) {
var right = sameLine ? clientWidth - toPos.x : 0;
add(fromPos.x, fromPos.y, right, th);
@@ -1293,9 +1280,10 @@ var CodeMirror = (function() {
add(0, middleStart, 0, middleHeight);
if ((!sameLine || !sel.from.ch) && toPos.y < clientHeight - .5 * th)
add(0, toPos.y, clientWidth - toPos.x, th);
- selectionDiv.innerHTML = html;
- cursor.style.display = "none";
+ removeChildrenAndAdd(selectionDiv, fragment);
selectionDiv.style.display = "";
+ } else {
+ selectionDiv.style.display = "none";
}
}
@@ -1425,13 +1413,16 @@ var CodeMirror = (function() {
else replaceRange("", sel.from, findPosH(dir, unit));
userSelChange = true;
}
- var goalColumn = null;
function moveV(dir, unit) {
var dist = 0, pos = localCoords(sel.inverted ? sel.from : sel.to, true);
if (goalColumn != null) pos.x = goalColumn;
- if (unit == "page") dist = Math.min(scroller.clientHeight, window.innerHeight || document.documentElement.clientHeight);
- else if (unit == "line") dist = textHeight();
- var target = coordsChar(pos.x, pos.y + dist * dir + 2);
+ if (unit == "page") {
+ var screen = Math.min(scroller.clientHeight, window.innerHeight || document.documentElement.clientHeight);
+ var target = coordsChar(pos.x, pos.y + screen * dir);
+ } else if (unit == "line") {
+ var th = textHeight();
+ var target = coordsChar(pos.x, pos.y + .5 * th + dir * th);
+ }
if (unit == "page") scrollbar.scrollTop += localCoords(target, true).y - pos.y;
setCursor(target.line, target.ch, true);
goalColumn = pos.x;
@@ -1440,10 +1431,15 @@ var CodeMirror = (function() {
function findWordAt(pos) {
var line = getLine(pos.line).text;
var start = pos.ch, end = pos.ch;
- var check = isWordChar(line.charAt(start < line.length ? start : start - 1)) ?
- isWordChar : function(ch) {return !isWordChar(ch);};
- while (start > 0 && check(line.charAt(start - 1))) --start;
- while (end < line.length && check(line.charAt(end))) ++end;
+ if (line) {
+ if (pos.after === false || end == line.length) --start; else ++end;
+ var startChar = line.charAt(start);
+ var check = isWordChar(startChar) ? isWordChar :
+ /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);} :
+ function(ch) {return !/\s/.test(ch) && isWordChar(ch);};
+ while (start > 0 && check(line.charAt(start - 1))) --start;
+ while (end < line.length && check(line.charAt(end))) ++end;
+ }
return {from: {line: pos.line, ch: start}, to: {line: pos.line, ch: end}};
}
function selectLine(line) {
@@ -1480,16 +1476,18 @@ var CodeMirror = (function() {
var indentString = "", pos = 0;
if (options.indentWithTabs)
for (var i = Math.floor(indentation / options.tabSize); i; --i) {pos += options.tabSize; indentString += "\t";}
- while (pos < indentation) {++pos; indentString += " ";}
+ if (pos < indentation) indentString += spaceStr(indentation - pos);
- replaceRange(indentString, {line: n, ch: 0}, {line: n, ch: curSpaceString.length});
+ if (indentString != curSpaceString)
+ replaceRange(indentString, {line: n, ch: 0}, {line: n, ch: curSpaceString.length});
+ line.stateAfter = null;
}
function loadMode() {
mode = CodeMirror.getMode(options, options.mode);
doc.iter(0, doc.size, function(line) { line.stateAfter = null; });
- work = [0];
- startWorker();
+ frontier = 0;
+ startWorker(100);
}
function gutterChanged() {
var visible = options.gutter || options.lineNumbers;
@@ -1506,24 +1504,16 @@ var CodeMirror = (function() {
var guess = Math.ceil(line.text.length / perLine) || 1;
if (guess != 1) updateLineHeight(line, guess);
});
- lineSpace.style.width = code.style.width = "";
- widthForcer.style.left = "";
+ lineSpace.style.minWidth = widthForcer.style.left = "";
} else {
wrapper.className = wrapper.className.replace(" CodeMirror-wrap", "");
- maxLine = ""; maxLineChanged = true;
+ computeMaxLength();
doc.iter(0, doc.size, function(line) {
if (line.height != 1 && !line.hidden) updateLineHeight(line, 1);
- if (line.text.length > maxLine.length) maxLine = line.text;
});
}
changes.push({from: 0, to: doc.size});
}
- function makeTab(col) {
- var w = options.tabSize - col % options.tabSize, cached = tabCache[w];
- if (cached) return cached;
- for (var str = '<span class="cm-tab">', i = 0; i < w; ++i) str += " ";
- return (tabCache[w] = {html: str + "</span>", width: w});
- }
function themeChanged() {
scroller.className = scroller.className.replace(/\s*cm-s-\S+/g, "") +
options.theme.replace(/(^|\s)\s*/g, " cm-s-");
@@ -1534,74 +1524,71 @@ var CodeMirror = (function() {
(style ? " cm-keymap-" + style : "");
}
- function TextMarker() { this.set = []; }
+ function TextMarker(type, style) { this.lines = []; this.type = type; if (style) this.style = style; }
TextMarker.prototype.clear = operation(function() {
- var min = Infinity, max = -Infinity;
- for (var i = 0, e = this.set.length; i < e; ++i) {
- var line = this.set[i], mk = line.marked;
- if (!mk || !line.parent) continue;
- var lineN = lineNo(line);
- min = Math.min(min, lineN); max = Math.max(max, lineN);
- for (var j = 0; j < mk.length; ++j)
- if (mk[j].marker == this) mk.splice(j--, 1);
- }
- if (min != Infinity)
- changes.push({from: min, to: max + 1});
+ var min, max;
+ for (var i = 0; i < this.lines.length; ++i) {
+ var line = this.lines[i];
+ var span = getMarkedSpanFor(line.markedSpans, this);
+ if (span.from != null) min = lineNo(line);
+ if (span.to != null) max = lineNo(line);
+ line.markedSpans = removeMarkedSpan(line.markedSpans, span);
+ }
+ if (min != null) changes.push({from: min, to: max + 1});
+ this.lines.length = 0;
+ this.explicitlyCleared = true;
});
TextMarker.prototype.find = function() {
var from, to;
- for (var i = 0, e = this.set.length; i < e; ++i) {
- var line = this.set[i], mk = line.marked;
- for (var j = 0; j < mk.length; ++j) {
- var mark = mk[j];
- if (mark.marker == this) {
- if (mark.from != null || mark.to != null) {
- var found = lineNo(line);
- if (found != null) {
- if (mark.from != null) from = {line: found, ch: mark.from};
- if (mark.to != null) to = {line: found, ch: mark.to};
- }
- }
- }
+ for (var i = 0; i < this.lines.length; ++i) {
+ var line = this.lines[i];
+ var span = getMarkedSpanFor(line.markedSpans, this);
+ if (span.from != null || span.to != null) {
+ var found = lineNo(line);
+ if (span.from != null) from = {line: found, ch: span.from};
+ if (span.to != null) to = {line: found, ch: span.to};
}
}
- return {from: from, to: to};
+ if (this.type == "bookmark") return from;
+ return from && {from: from, to: to};
};
- function markText(from, to, className) {
+ function markText(from, to, className, options) {
from = clipPos(from); to = clipPos(to);
- var tm = new TextMarker();
- if (!posLess(from, to)) return tm;
- function add(line, from, to, className) {
- getLine(line).addMark(new MarkedText(from, to, className, tm));
- }
- if (from.line == to.line) add(from.line, from.ch, to.ch, className);
- else {
- add(from.line, from.ch, null, className);
- for (var i = from.line + 1, e = to.line; i < e; ++i)
- add(i, null, null, className);
- add(to.line, null, to.ch, className);
- }
+ var marker = new TextMarker("range", className);
+ if (options) for (var opt in options) if (options.hasOwnProperty(opt))
+ marker[opt] = options[opt];
+ var curLine = from.line;
+ doc.iter(curLine, to.line + 1, function(line) {
+ var span = {from: curLine == from.line ? from.ch : null,
+ to: curLine == to.line ? to.ch : null,
+ marker: marker};
+ line.markedSpans = (line.markedSpans || []).concat([span]);
+ marker.lines.push(line);
+ ++curLine;
+ });
changes.push({from: from.line, to: to.line + 1});
- return tm;
+ return marker;
}
function setBookmark(pos) {
pos = clipPos(pos);
- var bm = new Bookmark(pos.ch);
- getLine(pos.line).addMark(bm);
- return bm;
+ var marker = new TextMarker("bookmark"), line = getLine(pos.line);
+ history.addChange(pos.line, 1, [newHL(line.text, line.markedSpans)], true);
+ var span = {from: pos.ch, to: pos.ch, marker: marker};
+ line.markedSpans = (line.markedSpans || []).concat([span]);
+ marker.lines.push(line);
+ return marker;
}
function findMarksAt(pos) {
pos = clipPos(pos);
- var markers = [], marked = getLine(pos.line).marked;
- if (!marked) return markers;
- for (var i = 0, e = marked.length; i < e; ++i) {
- var m = marked[i];
- if ((m.from == null || m.from <= pos.ch) &&
- (m.to == null || m.to >= pos.ch))
- markers.push(m.marker || m);
+ var markers = [], spans = getLine(pos.line).markedSpans;
+ if (spans) for (var i = 0; i < spans.length; ++i) {
+ var span = spans[i];
+ if ((span.from == null || span.from <= pos.ch) &&
+ (span.to == null || span.to >= pos.ch))
+ markers.push(span.marker);
}
return markers;
}
@@ -1641,11 +1628,10 @@ var CodeMirror = (function() {
if (line.hidden != hidden) {
line.hidden = hidden;
if (!options.lineWrapping) {
- var l = line.text;
- if (hidden && l.length == maxLine.length) {
+ if (hidden && line.text.length == maxLine.text.length) {
updateMaxLine = true;
- } else if (!hidden && l.length > maxLine.length) {
- maxLine = l; updateMaxLine = false;
+ } else if (!hidden && line.text.length > maxLine.text.length) {
+ maxLine = line; updateMaxLine = false;
}
}
updateLineHeight(line, hidden ? 0 : 1);
@@ -1677,53 +1663,16 @@ var CodeMirror = (function() {
markerClass: marker && marker.style, lineClass: line.className, bgClass: line.bgClassName};
}
- function stringWidth(str) {
- measure.innerHTML = "<pre><span>x</span></pre>";
- measure.firstChild.firstChild.firstChild.nodeValue = str;
- return measure.firstChild.firstChild.offsetWidth || 10;
- }
- // These are used to go from pixel positions to character
- // positions, taking varying character widths into account.
- function charFromX(line, x) {
- if (x <= 0) return 0;
- var lineObj = getLine(line), text = lineObj.text;
- function getX(len) {
- return measureLine(lineObj, len).left;
- }
- var from = 0, fromX = 0, to = text.length, toX;
- // Guess a suitable upper bound for our search.
- var estimated = Math.min(to, Math.ceil(x / charWidth()));
- for (;;) {
- var estX = getX(estimated);
- if (estX <= x && estimated < to) estimated = Math.min(to, Math.ceil(estimated * 1.2));
- else {toX = estX; to = estimated; break;}
- }
- if (x > toX) return to;
- // Try to guess a suitable lower bound as well.
- estimated = Math.floor(to * 0.8); estX = getX(estimated);
- if (estX < x) {from = estimated; fromX = estX;}
- // Do a binary search between these bounds.
- for (;;) {
- if (to - from <= 1) return (toX - x > x - fromX) ? from : to;
- var middle = Math.ceil((from + to) / 2), middleX = getX(middle);
- if (middleX > x) {to = middle; toX = middleX;}
- else {from = middle; fromX = middleX;}
- }
- }
-
- var tempId = "CodeMirror-temp-" + Math.floor(Math.random() * 0xffffff).toString(16);
function measureLine(line, ch) {
if (ch == 0) return {top: 0, left: 0};
- var wbr = options.lineWrapping && ch < line.text.length &&
- spanAffectsWrapping.test(line.text.slice(ch - 1, ch + 1));
- measure.innerHTML = "<pre>" + line.getHTML(makeTab, ch, tempId, wbr) + "</pre>";
- var elt = document.getElementById(tempId);
- var top = elt.offsetTop, left = elt.offsetLeft;
+ var pre = lineContent(line, ch);
+ removeChildrenAndAdd(measure, pre);
+ var anchor = pre.anchor;
+ var top = anchor.offsetTop, left = anchor.offsetLeft;
// Older IEs report zero offsets for spans directly after a wrap
if (ie && top == 0 && left == 0) {
- var backup = document.createElement("span");
- backup.innerHTML = "x";
- elt.parentNode.insertBefore(backup, elt.nextSibling);
+ var backup = elt("span", "x");
+ anchor.parentNode.insertBefore(backup, anchor.nextSibling);
top = backup.offsetTop;
}
return {top: top, left: left};
@@ -1740,17 +1689,19 @@ var CodeMirror = (function() {
}
// Coords must be lineSpace-local
function coordsChar(x, y) {
- if (y < 0) y = 0;
var th = textHeight(), cw = charWidth(), heightPos = displayOffset + Math.floor(y / th);
+ if (heightPos < 0) return {line: 0, ch: 0};
var lineNo = lineAtHeight(doc, heightPos);
if (lineNo >= doc.size) return {line: doc.size - 1, ch: getLine(doc.size - 1).text.length};
var lineObj = getLine(lineNo), text = lineObj.text;
var tw = options.lineWrapping, innerOff = tw ? heightPos - heightAtLine(doc, lineNo) : 0;
if (x <= 0 && innerOff == 0) return {line: lineNo, ch: 0};
+ var wrongLine = false;
function getX(len) {
var sp = measureLine(lineObj, len);
if (tw) {
var off = Math.round(sp.top / th);
+ wrongLine = off != innerOff;
return Math.max(0, sp.left + (off - innerOff) * scroller.clientWidth);
}
return sp.left;
@@ -1769,9 +1720,12 @@ var CodeMirror = (function() {
if (estX < x) {from = estimated; fromX = estX;}
// Do a binary search between these bounds.
for (;;) {
- if (to - from <= 1) return {line: lineNo, ch: (toX - x > x - fromX) ? from : to};
+ if (to - from <= 1) {
+ var after = x - fromX < toX - x;
+ return {line: lineNo, ch: after ? from : to, after: after};
+ }
var middle = Math.ceil((from + to) / 2), middleX = getX(middle);
- if (middleX > x) {to = middle; toX = middleX;}
+ if (middleX > x) {to = middle; toX = middleX; if (wrongLine) toX += 1000; }
else {from = middle; fromX = middleX;}
}
}
@@ -1780,26 +1734,32 @@ var CodeMirror = (function() {
return {x: off.left + local.x, y: off.top + local.y, yBot: off.top + local.yBot};
}
- var cachedHeight, cachedHeightFor, measureText;
+ var cachedHeight, cachedHeightFor, measurePre;
function textHeight() {
- if (measureText == null) {
- measureText = "<pre>";
- for (var i = 0; i < 49; ++i) measureText += "x<br/>";
- measureText += "x</pre>";
+ if (measurePre == null) {
+ measurePre = elt("pre");
+ for (var i = 0; i < 49; ++i) {
+ measurePre.appendChild(document.createTextNode("x"));
+ measurePre.appendChild(elt("br"));
+ }
+ measurePre.appendChild(document.createTextNode("x"));
}
var offsetHeight = lineDiv.clientHeight;
if (offsetHeight == cachedHeightFor) return cachedHeight;
cachedHeightFor = offsetHeight;
- measure.innerHTML = measureText;
+ removeChildrenAndAdd(measure, measurePre.cloneNode(true));
cachedHeight = measure.firstChild.offsetHeight / 50 || 1;
- measure.innerHTML = "";
+ removeChildren(measure);
return cachedHeight;
}
var cachedWidth, cachedWidthFor = 0;
function charWidth() {
if (scroller.clientWidth == cachedWidthFor) return cachedWidth;
cachedWidthFor = scroller.clientWidth;
- return (cachedWidth = stringWidth("x"));
+ var anchor = elt("span", "x");
+ var pre = elt("pre", [anchor]);
+ removeChildrenAndAdd(measure, pre);
+ return (cachedWidth = anchor.offsetWidth || 10);
}
function paddingTop() {return lineSpace.offsetTop;}
function paddingLeft() {return lineSpace.offsetLeft;}
@@ -1816,6 +1776,7 @@ var CodeMirror = (function() {
var offL = eltOffset(lineSpace, true);
return coordsChar(x - offL.left, y - offL.top);
}
+ var detectingSelectAll;
function onContextMenu(e) {
var pos = posFromMouse(e), scrollPos = scrollbar.scrollTop;
if (!pos || opera) return; // Opera is difficult.
@@ -1827,19 +1788,30 @@ var CodeMirror = (function() {
input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
"px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: white; " +
"border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
- leaveInputAlone = true;
- var val = input.value = getSelection();
focusInput();
- selectInput(input);
+ resetInput(true);
+ // Adds "Select all" to context menu in FF
+ if (posEq(sel.from, sel.to)) input.value = prevInput = " ";
+
function rehide() {
- var newVal = splitLines(input.value).join("\n");
- if (newVal != val && !options.readOnly) operation(replaceSelection)(newVal, "end");
inputDiv.style.position = "relative";
input.style.cssText = oldCSS;
if (ie_lt9) scrollbar.scrollTop = scrollPos;
- leaveInputAlone = false;
- resetInput(true);
slowPoll();
+
+ // Try to detect the user choosing select-all
+ if (input.selectionStart != null) {
+ clearTimeout(detectingSelectAll);
+ var extval = input.value = " " + (posEq(sel.from, sel.to) ? "" : input.value), i = 0;
+ prevInput = " ";
+ input.selectionStart = 1; input.selectionEnd = extval.length;
+ detectingSelectAll = setTimeout(function poll(){
+ if (prevInput == " " && input.selectionStart == 0)
+ operation(commands.selectAll)(instance);
+ else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);
+ else resetInput();
+ }, 200);
+ }
}
if (gecko) {
@@ -1860,7 +1832,7 @@ var CodeMirror = (function() {
cursor.style.visibility = "";
blinker = setInterval(function() {
cursor.style.visibility = (on = !on) ? "" : "hidden";
- }, 650);
+ }, options.cursorBlinkRate);
}
var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
@@ -1923,70 +1895,39 @@ var CodeMirror = (function() {
return minline;
}
function getStateBefore(n) {
- var start = findStartLine(n), state = start && getLine(start-1).stateAfter;
+ var pos = findStartLine(n), state = pos && getLine(pos-1).stateAfter;
if (!state) state = startState(mode);
else state = copyState(mode, state);
- doc.iter(start, n, function(line) {
- line.highlight(mode, state, options.tabSize);
- line.stateAfter = copyState(mode, state);
+ doc.iter(pos, n, function(line) {
+ line.process(mode, state, options.tabSize);
+ line.stateAfter = (pos == n - 1 || pos % 5 == 0) ? copyState(mode, state) : null;
});
- if (start < n) changes.push({from: start, to: n});
- if (n < doc.size && !getLine(n).stateAfter) work.push(n);
return state;
}
- function highlightLines(start, end) {
- var state = getStateBefore(start);
- doc.iter(start, end, function(line) {
- line.highlight(mode, state, options.tabSize);
- line.stateAfter = copyState(mode, state);
- });
- }
function highlightWorker() {
- var end = +new Date + options.workTime;
- var foundWork = work.length;
- while (work.length) {
- if (!getLine(showingFrom).stateAfter) var task = showingFrom;
- else var task = work.pop();
- if (task >= doc.size) continue;
- var start = findStartLine(task), state = start && getLine(start-1).stateAfter;
- if (state) state = copyState(mode, state);
- else state = startState(mode);
-
- var unchanged = 0, compare = mode.compareStates, realChange = false,
- i = start, bail = false;
- doc.iter(i, doc.size, function(line) {
- var hadState = line.stateAfter;
- if (+new Date > end) {
- work.push(i);
- startWorker(options.workDelay);
- if (realChange) changes.push({from: task, to: i + 1});
- return (bail = true);
- }
- var changed = line.highlight(mode, state, options.tabSize);
- if (changed) realChange = true;
+ if (frontier >= showingTo) return;
+ var end = +new Date + options.workTime, state = copyState(mode, getStateBefore(frontier));
+ var startFrontier = frontier;
+ doc.iter(frontier, showingTo, function(line) {
+ if (frontier >= showingFrom) { // Visible
+ line.highlight(mode, state, options.tabSize);
line.stateAfter = copyState(mode, state);
- var done = null;
- if (compare) {
- var same = hadState && compare(hadState, state);
- if (same != Pass) done = !!same;
- }
- if (done == null) {
- if (changed !== false || !hadState) unchanged = 0;
- else if (++unchanged > 3 && (!mode.indent || mode.indent(hadState, "") == mode.indent(state, "")))
- done = true;
- }
- if (done) return true;
- ++i;
- });
- if (bail) return;
- if (realChange) changes.push({from: task, to: i + 1});
- }
- if (foundWork && options.onHighlightComplete)
- options.onHighlightComplete(instance);
+ } else {
+ line.process(mode, state, options.tabSize);
+ line.stateAfter = frontier % 5 == 0 ? copyState(mode, state) : null;
+ }
+ ++frontier;
+ if (+new Date > end) {
+ startWorker(options.workDelay);
+ return true;
+ }
+ });
+ if (showingTo > startFrontier && frontier >= showingFrom)
+ operation(function() {changes.push({from: startFrontier, to: frontier});})();
}
function startWorker(time) {
- if (!work.length) return;
- highlight.set(time, operation(highlightWorker));
+ if (frontier < showingTo)
+ highlight.set(time, highlightWorker);
}
// Operations are used to wrap changes in such a way that each
@@ -2000,9 +1941,11 @@ var CodeMirror = (function() {
function endOperation() {
if (updateMaxLine) computeMaxLength();
if (maxLineChanged && !options.lineWrapping) {
- var cursorWidth = widthForcer.offsetWidth, left = stringWidth(maxLine);
- widthForcer.style.left = left + "px";
- lineSpace.style.minWidth = (left + cursorWidth) + "px";
+ var cursorWidth = widthForcer.offsetWidth, left = measureLine(maxLine, maxLine.text.length).left;
+ if (!ie_lt8) {
+ widthForcer.style.left = left + "px";
+ lineSpace.style.minWidth = (left + cursorWidth) + "px";
+ }
maxLineChanged = false;
}
var newScrollPos, updated;
@@ -2010,16 +1953,16 @@ var CodeMirror = (function() {
var coords = calculateCursorCoords();
newScrollPos = calculateScrollPos(coords.x, coords.y, coords.x, coords.yBot);
}
- if (changes.length) updated = updateDisplay(changes, true, (newScrollPos ? newScrollPos.scrollTop : null));
- else {
+ if (changes.length || newScrollPos && newScrollPos.scrollTop != null)
+ updated = updateDisplay(changes, true, newScrollPos && newScrollPos.scrollTop);
+ if (!updated) {
if (selectionChanged) updateSelection();
if (gutterDirty) updateGutter();
}
if (newScrollPos) scrollCursorIntoView();
- if (selectionChanged) {scrollEditorIntoView(); restartBlink();}
+ if (selectionChanged) restartBlink();
- if (focused && !leaveInputAlone &&
- (updateInput === true || (updateInput !== false && selectionChanged)))
+ if (focused && (updateInput === true || (updateInput !== false && selectionChanged)))
resetInput(userSelChange);
if (selectionChanged && options.matchBrackets)
@@ -2054,6 +1997,7 @@ var CodeMirror = (function() {
if (extensions.propertyIsEnumerable(ext) &&
!instance.propertyIsEnumerable(ext))
instance[ext] = extensions[ext];
+ for (var i = 0; i < initHooks.length; ++i) initHooks[i](instance);
return instance;
} // (end of function CodeMirror)
@@ -2077,15 +2021,17 @@ var CodeMirror = (function() {
gutter: false,
fixedGutter: false,
firstLineNumber: 1,
+ showCursorWhenSelecting: false,
readOnly: false,
dragDrop: true,
onChange: null,
onCursorActivity: null,
+ onViewportChange: null,
onGutterClick: null,
- onHighlightComplete: null,
onUpdate: null,
onFocus: null, onBlur: null, onScroll: null,
matchBrackets: false,
+ cursorBlinkRate: 530,
workTime: 100,
workDelay: 200,
pollInterval: 100,
@@ -2124,7 +2070,17 @@ var CodeMirror = (function() {
var spec = CodeMirror.resolveMode(spec);
var mfactory = modes[spec.name];
if (!mfactory) return CodeMirror.getMode(options, "text/plain");
- return mfactory(options, spec);
+ var modeObj = mfactory(options, spec);
+ if (modeExtensions.hasOwnProperty(spec.name)) {
+ var exts = modeExtensions[spec.name];
+ for (var prop in exts) {
+ if (!exts.hasOwnProperty(prop)) continue;
+ if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
+ modeObj[prop] = exts[prop];
+ }
+ }
+ modeObj.name = spec.name;
+ return modeObj;
};
CodeMirror.listModes = function() {
var list = [];
@@ -2144,6 +2100,16 @@ var CodeMirror = (function() {
extensions[name] = func;
};
+ var initHooks = [];
+ CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
+
+ var modeExtensions = CodeMirror.modeExtensions = {};
+ CodeMirror.extendMode = function(mode, properties) {
+ var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
+ for (var prop in properties) if (properties.hasOwnProperty(prop))
+ exts[prop] = properties[prop];
+ };
+
var commands = CodeMirror.commands = {
selectAll: function(cm) {cm.setSelection({line: 0, ch: 0}, {line: cm.lineCount() - 1});},
killLine: function(cm) {
@@ -2229,7 +2195,7 @@ var CodeMirror = (function() {
keyMap.emacsy = {
"Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
"Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
- "Ctrl-V": "goPageUp", "Shift-Ctrl-V": "goPageDown", "Ctrl-D": "delCharRight", "Ctrl-H": "delCharLeft",
+ "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharRight", "Ctrl-H": "delCharLeft",
"Alt-D": "delWordRight", "Alt-Backspace": "delWordLeft", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
};
@@ -2241,6 +2207,10 @@ var CodeMirror = (function() {
function lookup(map) {
map = getKeyMap(map);
var found = map[name];
+ if (found === false) {
+ if (stop) stop();
+ return true;
+ }
if (found != null && handle(found)) return true;
if (map.nofallthrough) {
if (stop) stop();
@@ -2262,29 +2232,34 @@ var CodeMirror = (function() {
var name = keyNames[e_prop(event, "keyCode")];
return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
}
+ CodeMirror.isModifierKey = isModifierKey;
CodeMirror.fromTextArea = function(textarea, options) {
if (!options) options = {};
options.value = textarea.value;
if (!options.tabindex && textarea.tabindex)
options.tabindex = textarea.tabindex;
- if (options.autofocus == null && textarea.getAttribute("autofocus") != null)
- options.autofocus = true;
+ // Set autofocus to true if this textarea is focused, or if it has
+ // autofocus and no other element is focused.
+ if (options.autofocus == null) {
+ var hasFocus = document.body;
+ // doc.activeElement occasionally throws on IE
+ try { hasFocus = document.activeElement; } catch(e) {}
+ options.autofocus = hasFocus == textarea ||
+ textarea.getAttribute("autofocus") != null && hasFocus == document.body;
+ }
function save() {textarea.value = instance.getValue();}
if (textarea.form) {
// Deplorable hack to make the submit method do the right thing.
var rmSubmit = connect(textarea.form, "submit", save, true);
- if (typeof textarea.form.submit == "function") {
- var realSubmit = textarea.form.submit;
- function wrappedSubmit() {
- save();
- textarea.form.submit = realSubmit;
- textarea.form.submit();
- textarea.form.submit = wrappedSubmit;
- }
- textarea.form.submit = wrappedSubmit;
- }
+ var form = textarea.form, realSubmit = form.submit;
+ textarea.form.submit = function wrappedSubmit() {
+ save();
+ form.submit = realSubmit;
+ form.submit();
+ form.submit = wrappedSubmit;
+ };
}
textarea.style.display = "none";
@@ -2306,6 +2281,24 @@ var CodeMirror = (function() {
return instance;
};
+ var gecko = /gecko\/\d/i.test(navigator.userAgent);
+ var ie = /MSIE \d/.test(navigator.userAgent);
+ var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
+ var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
+ var quirksMode = ie && document.documentMode == 5;
+ var webkit = /WebKit\//.test(navigator.userAgent);
+ var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
+ var chrome = /Chrome\//.test(navigator.userAgent);
+ var opera = /Opera\//.test(navigator.userAgent);
+ var safari = /Apple Computer/.test(navigator.vendor);
+ var khtml = /KHTML\//.test(navigator.userAgent);
+ var mac_geLion = /Mac OS X 10\D([7-9]|\d\d)\D/.test(navigator.userAgent);
+
+ var opera_version = opera && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
+ if (opera_version) opera_version = Number(opera_version[1]);
+ // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
+ var flipCtrlCmd = mac && (qtwebkit || opera && (opera_version == null || opera_version < 12.11));
+
// Utility functions for working with state. Exported because modes
// sometimes need to do this.
function copyState(mode, state) {
@@ -2324,6 +2317,14 @@ var CodeMirror = (function() {
return mode.startState ? mode.startState(a1, a2) : true;
}
CodeMirror.startState = startState;
+ CodeMirror.innerMode = function(mode, state) {
+ while (mode.innerMode) {
+ var info = mode.innerMode(state);
+ state = info.state;
+ mode = info.mode;
+ }
+ return info || {mode: mode, state: state};
+ };
// The character stream used by a mode's parser.
function StringStream(string, tabSize) {
@@ -2334,7 +2335,7 @@ var CodeMirror = (function() {
StringStream.prototype = {
eol: function() {return this.pos >= this.string.length;},
sol: function() {return this.pos == 0;},
- peek: function() {return this.string.charAt(this.pos);},
+ peek: function() {return this.string.charAt(this.pos) || undefined;},
next: function() {
if (this.pos < this.string.length)
return this.string.charAt(this.pos++);
@@ -2365,13 +2366,14 @@ var CodeMirror = (function() {
indentation: function() {return countColumn(this.string, null, this.tabSize);},
match: function(pattern, consume, caseInsensitive) {
if (typeof pattern == "string") {
- function cased(str) {return caseInsensitive ? str.toLowerCase() : str;}
+ var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) {
if (consume !== false) this.pos += pattern.length;
return true;
}
} else {
var match = this.string.slice(this.pos).match(pattern);
+ if (match && match.index > 0) return null;
if (match && consume !== false) this.pos += match[0].length;
return match;
}
@@ -2380,210 +2382,174 @@ var CodeMirror = (function() {
};
CodeMirror.StringStream = StringStream;
- function MarkedText(from, to, className, marker) {
- this.from = from; this.to = to; this.style = className; this.marker = marker;
+ function MarkedSpan(from, to, marker) {
+ this.from = from; this.to = to; this.marker = marker;
}
- MarkedText.prototype = {
- attach: function(line) { this.marker.set.push(line); },
- detach: function(line) {
- var ix = indexOf(this.marker.set, line);
- if (ix > -1) this.marker.set.splice(ix, 1);
- },
- split: function(pos, lenBefore) {
- if (this.to <= pos && this.to != null) return null;
- var from = this.from < pos || this.from == null ? null : this.from - pos + lenBefore;
- var to = this.to == null ? null : this.to - pos + lenBefore;
- return new MarkedText(from, to, this.style, this.marker);
- },
- dup: function() { return new MarkedText(null, null, this.style, this.marker); },
- clipTo: function(fromOpen, from, toOpen, to, diff) {
- if (fromOpen && to > this.from && (to < this.to || this.to == null))
- this.from = null;
- else if (this.from != null && this.from >= from)
- this.from = Math.max(to, this.from) + diff;
- if (toOpen && (from < this.to || this.to == null) && (from > this.from || this.from == null))
- this.to = null;
- else if (this.to != null && this.to > from)
- this.to = to < this.to ? this.to + diff : from;
- },
- isDead: function() { return this.from != null && this.to != null && this.from >= this.to; },
- sameSet: function(x) { return this.marker == x.marker; }
- };
- function Bookmark(pos) {
- this.from = pos; this.to = pos; this.line = null;
- }
- Bookmark.prototype = {
- attach: function(line) { this.line = line; },
- detach: function(line) { if (this.line == line) this.line = null; },
- split: function(pos, lenBefore) {
- if (pos < this.from) {
- this.from = this.to = (this.from - pos) + lenBefore;
- return this;
- }
- },
- isDead: function() { return this.from > this.to; },
- clipTo: function(fromOpen, from, toOpen, to, diff) {
- if ((fromOpen || from < this.from) && (toOpen || to > this.to)) {
- this.from = 0; this.to = -1;
- } else if (this.from > from) {
- this.from = this.to = Math.max(to, this.from) + diff;
- }
- },
- sameSet: function(x) { return false; },
- find: function() {
-
<TRUNCATED>