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

Merge pull request #1502 from ajaxorg/scrolling_issues

Browse source 
fix several small issues on mac
This commit is contained in:
Ruben Daniels 2013-07-06 03:48:01 -07:00
commit 65713e974b
4 changed files with 69 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ace/virtual_renderer.js
View file

@ -727,7 +727,8 @@ var VirtualRenderer = function(container, theme) {
changes & this.CHANGE_SIZE ||
changes & this.CHANGE_TEXT ||
changes & this.CHANGE_LINES ||
changes & this.CHANGE_SCROLL
changes & this.CHANGE_SCROLL ||
changes & this.CHANGE_H_SCROLL
)
this.$computeLayerConfig();
@ -1269,7 +1270,9 @@ var VirtualRenderer = function(container, theme) {
if (deltaY > 0 && this.session.getScrollTop() + this.$size.scrollerHeight
- this.layerConfig.maxHeight < -1 + this.scrollMargin.bottom)
return true;
// todo: handle horizontal scrolling
// todo: better handle horizontal scrolling
if (deltaX)
return true;
};
this.pixelToScreenCoordinates = function(x, y) {