Skip to content

Commit

Permalink
package
Browse files Browse the repository at this point in the history
  • Loading branch information
fjakobs committed Jun 7, 2011
1 parent 9b662c9 commit 9146d31
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build/Readme.md
Expand Up @@ -24,7 +24,7 @@ Features
Take Ace for a spin! Take Ace for a spin!
-------------------- --------------------


Check out the Ace live [demo](http://ajaxorg.github.com/ace/build/editor.html) or get a [Cloud9 IDE account](http://run.cloud9ide.com) to experience Ace while editing one of your own GitHub projects. Check out the Ace live [demo](http://ajaxorg.github.com/ace/) or get a [Cloud9 IDE account](http://run.cloud9ide.com) to experience Ace while editing one of your own GitHub projects.


If you want, you can use Ace as a textarea replacement thanks to the [Ace Bookmarklet](http://ajaxorg.github.com/ace/build/textarea/editor.html). If you want, you can use Ace as a textarea replacement thanks to the [Ace Bookmarklet](http://ajaxorg.github.com/ace/build/textarea/editor.html).


Expand Down
21 changes: 10 additions & 11 deletions build/src/ace-uncompressed.js
Expand Up @@ -12832,7 +12832,7 @@ var VirtualRenderer = function(container, theme) {
this.scrollBar = new ScrollBar(container); this.scrollBar = new ScrollBar(container);
this.scrollBar.addEventListener("scroll", this.onScroll.bind(this)); this.scrollBar.addEventListener("scroll", this.onScroll.bind(this));


this.scrollTop = this.desiredScrollTop = 0; this.scrollTop = 0;


this.cursorPos = { this.cursorPos = {
row : 0, row : 0,
Expand Down Expand Up @@ -13207,8 +13207,7 @@ var VirtualRenderer = function(container, theme) {
this.scroller.style.overflowX = horizScroll ? "scroll" : "hidden"; this.scroller.style.overflowX = horizScroll ? "scroll" : "hidden";


var maxHeight = this.session.getScreenLength() * this.lineHeight; var maxHeight = this.session.getScreenLength() * this.lineHeight;
this.scrollTop = this.desiredScrollTop = this.scrollTop = Math.max(0, Math.min(this.scrollTop, maxHeight - this.$size.scrollerHeight));
Math.max(0, Math.min(this.desiredScrollTop, maxHeight - this.$size.scrollerHeight));


var lineCount = Math.ceil(minHeight / this.lineHeight) - 1; var lineCount = Math.ceil(minHeight / this.lineHeight) - 1;
var firstRow = Math.max(0, Math.round((this.scrollTop - offset) / this.lineHeight)); var firstRow = Math.max(0, Math.round((this.scrollTop - offset) / this.lineHeight));
Expand Down Expand Up @@ -13354,11 +13353,11 @@ var VirtualRenderer = function(container, theme) {
var left = pos.left + this.$padding; var left = pos.left + this.$padding;
var top = pos.top; var top = pos.top;


if (this.desiredScrollTop > top) { if (this.scrollTop > top) {
this.scrollToY(top); this.scrollToY(top);
} }


if (this.desiredScrollTop + this.$size.scrollerHeight < top + this.lineHeight) { if (this.scrollTop + this.$size.scrollerHeight < top + this.lineHeight) {
this.scrollToY(top + this.lineHeight - this.$size.scrollerHeight); this.scrollToY(top + this.lineHeight - this.$size.scrollerHeight);
} }


Expand Down Expand Up @@ -13412,9 +13411,10 @@ var VirtualRenderer = function(container, theme) {
this.scrollToY = function(scrollTop) { this.scrollToY = function(scrollTop) {
// after calling scrollBar.setScrollTop // after calling scrollBar.setScrollTop
// scrollbar sends us event with same scrollTop. ignore it // scrollbar sends us event with same scrollTop. ignore it
if (this.desiredScrollTop !== scrollTop) { scrollTop = Math.max(0, scrollTop);
if (this.scrollTop !== scrollTop) {
this.$loop.schedule(this.CHANGE_SCROLL); this.$loop.schedule(this.CHANGE_SCROLL);
this.desiredScrollTop = scrollTop; this.scrollTop = scrollTop;
} }
}; };


Expand Down Expand Up @@ -14001,10 +14001,9 @@ var Text = function(parentEl) {
} }


var style = this.$measureNode.style; var style = this.$measureNode.style;
for (var prop in this.$fontStyles) { var computedStyle = dom.computedStyle(this.element);
var value = dom.computedStyle(this.element, prop); for (var prop in this.$fontStyles)
style[prop] = value; style[prop] = computedStyle[prop];
}


var size = { var size = {
height: this.$measureNode.offsetHeight, height: this.$measureNode.offsetHeight,
Expand Down
2 changes: 1 addition & 1 deletion build/src/ace.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/src/keybinding-vim.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9146d31

Please sign in to comment.