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

Merge pull request #768 from danyaPostfactum/patch-4

Browse source 
Gutter active line in IE, fix js-error in IE
This commit is contained in:
Harutyun Amirjanyan 2012-05-24 00:23:42 -07:00
commit 5c60ebb753
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/ace/css/editor.css
View file

@ -128,6 +128,7 @@
.ace_gutter .ace_layer { .ace_gutter .ace_layer {
position: relative; position: relative;
min-width: 40px; min-width: 40px;
width: auto;
text-align: right; text-align: right;
pointer-events: auto; pointer-events: auto;
} }

3
lib/ace/editor.js
View file

@ -509,8 +509,9 @@ var Editor = function(renderer, session) {
this.$updateHighlightActiveLine(); this.$updateHighlightActiveLine();
} }
var self = this;
if (this.$highlightSelectedWord && !this.$wordHighlightTimer) if (this.$highlightSelectedWord && !this.$wordHighlightTimer)
this.$wordHighlightTimer = setTimeout(function(self) { this.$wordHighlightTimer = setTimeout(function() {
self.session.$mode.highlightSelection(self); self.session.$mode.highlightSelection(self);
self.$wordHighlightTimer = null; self.$wordHighlightTimer = null;
}, 30, this); }, 30, this);

4
lib/ace/virtual_renderer.js
View file

@ -451,10 +451,6 @@ var VirtualRenderer = function(container, theme) {
this.$highlightGutterLine = false; this.$highlightGutterLine = false;
this.setHighlightGutterLine = function(shouldHighlight) { this.setHighlightGutterLine = function(shouldHighlight) {
// adding this element to gutter causes strange behavior on ie
if (useragent.isIE)
return;
if (this.$highlightGutterLine == shouldHighlight) if (this.$highlightGutterLine == shouldHighlight)
return; return;
this.$highlightGutterLine = shouldHighlight; this.$highlightGutterLine = shouldHighlight;