open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96 from tophf/search-box-select

Browse Source 
Editor: when in applies-to, use its code box for search on Ctrl-F, etc.
This commit is contained in:
Jason Barnabe 2015-04-07 09:59:34 -05:00
commit 8200a7c483
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
edit.js
View File

@ -468,7 +468,7 @@ function setupGlobalSearch() {
findNext(cm, true); findNext(cm, true);
} }
function getVisibleEditor() { function getVisibleEditor(activeElement) {
var linesVisible = 2; // closest editor should have at least # lines visible var linesVisible = 2; // closest editor should have at least # lines visible
function getScrollDistance(cm) { function getScrollDistance(cm) {
var bounds = cm.display.wrapper.parentNode.getBoundingClientRect(); var bounds = cm.display.wrapper.parentNode.getBoundingClientRect();
@ -480,6 +480,17 @@ function setupGlobalSearch() {
return bounds.top - bounds.height; return bounds.top - bounds.height;
} }
} }
if (activeElement && activeElement.className.indexOf("applies-") >= 0) {
for (var section = activeElement; section.parentNode; section = section.parentNode) {
var cmWrapper = section.querySelector(".CodeMirror");
if (cmWrapper) {
if (getScrollDistance(cmWrapper.CodeMirror) == 0) {
return cmWrapper.CodeMirror;
}
break;
}
}
}
if (editors.lastActive && getScrollDistance(editors.lastActive) == 0) { if (editors.lastActive && getScrollDistance(editors.lastActive) == 0) {
return editors.lastActive; return editors.lastActive;
} }
@ -498,7 +509,7 @@ function setupGlobalSearch() {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
if (!event.target.classList.contains("CodeMirror-search-field")) { if (!event.target.classList.contains("CodeMirror-search-field")) {
CodeMirror.commands[command](getVisibleEditor()); CodeMirror.commands[command](getVisibleEditor(event.target));
} }
} }