jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2174 from ajaxorg/autoscroll

Browse source 
AutoScrollEditorIntoView doesn't work for search
This commit is contained in:
Ruben Daniels 2014-10-06 16:57:58 -07:00
commit 18f999fc47
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/editor.js
View file

@ -2553,7 +2553,9 @@ var Editor = function(renderer, session) {
rect = self.renderer.container.getBoundingClientRect(); rect = self.renderer.container.getBoundingClientRect();
}); });
var onAfterRender = this.renderer.on("afterRender", function() { var onAfterRender = this.renderer.on("afterRender", function() {
if (shouldScroll && rect && self.isFocused()) { if (shouldScroll && rect && (self.isFocused()
|| self.searchBox && self.searchBox.isFocused())
) {
var renderer = self.renderer; var renderer = self.renderer;
var pos = renderer.$cursorLayer.$pixelPos; var pos = renderer.$cursorLayer.$pixelPos;
var config = renderer.layerConfig; var config = renderer.layerConfig;

4
lib/ace/ext/searchbox.js
View file

@ -281,6 +281,10 @@ var SearchBox = function(editor, range, showReplaceForm) {
this.editor.keyBinding.addKeyboardHandler(this.$closeSearchBarKb); this.editor.keyBinding.addKeyboardHandler(this.$closeSearchBarKb);
}; };
this.isFocused = function() {
var el = document.activeElement;
return el == this.searchInput || el == this.replaceInput;
}
}).call(SearchBox.prototype); }).call(SearchBox.prototype);
exports.SearchBox = SearchBox; exports.SearchBox = SearchBox;