Editor: reroute the browser search to a closest CodeMirror box

Won't work if invoked via the browser menu or a non-standard hotkey
This commit is contained in:
tophf 2015-03-26 10:11:18 +03:00
parent 7a72326f2f
commit 413c454713
2 changed files with 67 additions and 6 deletions

View File

@ -135,6 +135,17 @@
.CodeMirror-vscrollbar { .CodeMirror-vscrollbar {
margin-bottom: 8px; /* make space for resize-grip */ margin-bottom: 8px; /* make space for resize-grip */
} }
.CodeMirror-search-field {
-webkit-animation: highlight 3s ease-out;
}
@-webkit-keyframes highlight {
from {
background-color: #ff9;
}
to {
background-color: transparent;
}
}
.resize-grip { .resize-grip {
position: absolute; position: absolute;
display: block; display: block;

62
edit.js
View File

@ -178,6 +178,7 @@ function setupCodeMirror(textarea, index) {
// ensure the section doesn't jump when clicking selected text // ensure the section doesn't jump when clicking selected text
cm.on("cursorActivity", function(cm) { cm.on("cursorActivity", function(cm) {
editors.lastActive = cm;
setTimeout(function() { setTimeout(function() {
lockScroll = { lockScroll = {
windowScrollY: window.scrollY, windowScrollY: window.scrollY,
@ -224,10 +225,21 @@ document.addEventListener("scroll", function(e) {
} }
}); });
window.addEventListener("keydown", function(e) { document.addEventListener("keydown", function(e) {
if (e.ctrlKey && !e.shiftKey && !e.altKey && !e.metaKey && e.keyCode == 83) { if (!e.altKey && e.keyCode >= 70 && e.keyCode <= 114) {
e.preventDefault(); if (e.keyCode == 83 && (e.ctrlKey || e.metaKey) && !e.shiftKey) { // Ctrl-S, Cmd-S
save(); e.preventDefault();
e.stopPropagation();
save();
} else if (e.target.localName != "textarea") { // textareas are handled by CodeMirror
if (e.keyCode == 70 && (e.ctrlKey || e.metaKey) && !e.shiftKey) { /* Ctrl-F, Cmd-F */
document.browserSearchHandler(e, "find");
} else if (e.keyCode == 71 && (e.ctrlKey || e.metaKey)) { /*Ctrl-G, Ctrl-Shift-G, Cmd-G, Cmd-Shift-G*/
document.browserSearchHandler(e, e.shiftKey ? "findPrev" : "findNext");
} else if (e.keyCode == 114 && !e.ctrlKey && !e.metaKey) { /*F3, Shift-F3*/
document.browserSearchHandler(e, e.shiftKey ? "findPrev" : "findNext");
}
}
} }
}); });
@ -438,9 +450,47 @@ function setupGlobalSearch() {
originalCommand[reverse ? "findPrev" : "findNext"](activeCM); originalCommand[reverse ? "findPrev" : "findNext"](activeCM);
} }
function findPrev(cm) {
findNext(cm, true);
}
function getVisibleEditor() {
var linesVisible = 2; // closest editor should have at least # lines visible
function getScrollDistance(cm) {
var bounds = cm.display.wrapper.parentNode.getBoundingClientRect();
if (bounds.top < 0) {
return -bounds.top;
} else if (bounds.top < window.innerHeight - cm.defaultTextHeight() * linesVisible) {
return 0;
} else {
return bounds.top - bounds.height;
}
}
if (editors.lastActive && getScrollDistance(editors.lastActive) == 0) {
return editors.lastActive;
}
var sorted = editors
.map(function(cm, index) { return {cm: cm, distance: getScrollDistance(cm), index: index} })
.sort(function(a, b) { return Math.sign(a.distance - b.distance) || Math.sign(a.index - b.index)});
var cm = sorted[0].cm;
if (sorted[0].distance > 0) {
makeSectionVisible(cm)
}
cm.focus();
return cm;
}
document.browserSearchHandler = function(event, command) {
event.preventDefault();
event.stopPropagation();
if (!event.target.classList.contains("CodeMirror-search-field")) {
CodeMirror.commands[command](getVisibleEditor());
}
}
CodeMirror.commands.find = find; CodeMirror.commands.find = find;
CodeMirror.commands.findNext = function(cm) { findNext(cm) } CodeMirror.commands.findNext = findNext;
CodeMirror.commands.findPrev = function(cm) { findNext(cm, true) } CodeMirror.commands.findPrev = findPrev;
} }
function jumpToLine(cm) { function jumpToLine(cm) {