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

Merge remote branch 'upstream/master' into mode-transform

Browse source
This commit is contained in:
c-spencer 2011-05-25 16:02:17 +01:00
commit bbb4648ebe
35 changed files with 5237 additions and 2517 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ace/editor.js
View file

@ -346,6 +346,8 @@ var Editor =function(renderer, session) {
var range = this.selection.getRange();
var style = this.getSelectionStyle();
session.$selectionMarker = session.addMarker(range, "ace_selection", style);
} else {
this.$updateHighlightActiveLine();
}
if (this.$highlightSelectedWord)
@ -381,6 +383,9 @@ var Editor =function(renderer, session) {
};
this.onChangeFold = function() {
// Update the active line marker as due to folding changes the current
// line range on the screen might have changed.
this.$updateHighlightActiveLine();
// TODO: This might be too much updating. Okay for now.
this.renderer.updateFull();
};