Permalink
Browse files

package

  • Loading branch information...
1 parent 9b662c9 commit 9146d3140b93828d0232031570f8cec22c1cca45 @fjakobs fjakobs committed Jun 7, 2011
Showing with 13 additions and 14 deletions.
  1. +1 −1 build/Readme.md
  2. +10 −11 build/src/ace-uncompressed.js
  3. +1 −1 build/src/ace.js
  4. +1 −1 build/src/keybinding-vim.js
View
@@ -24,7 +24,7 @@ Features
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).
@@ -12832,7 +12832,7 @@ var VirtualRenderer = function(container, theme) {
this.scrollBar = new ScrollBar(container);
this.scrollBar.addEventListener("scroll", this.onScroll.bind(this));
- this.scrollTop = this.desiredScrollTop = 0;
+ this.scrollTop = 0;
this.cursorPos = {
row : 0,
@@ -13207,8 +13207,7 @@ var VirtualRenderer = function(container, theme) {
this.scroller.style.overflowX = horizScroll ? "scroll" : "hidden";
var maxHeight = this.session.getScreenLength() * this.lineHeight;
- this.scrollTop = this.desiredScrollTop =
- Math.max(0, Math.min(this.desiredScrollTop, maxHeight - this.$size.scrollerHeight));
+ this.scrollTop = Math.max(0, Math.min(this.scrollTop, maxHeight - this.$size.scrollerHeight));
var lineCount = Math.ceil(minHeight / this.lineHeight) - 1;
var firstRow = Math.max(0, Math.round((this.scrollTop - offset) / this.lineHeight));
@@ -13354,11 +13353,11 @@ var VirtualRenderer = function(container, theme) {
var left = pos.left + this.$padding;
var top = pos.top;
- if (this.desiredScrollTop > top) {
+ if (this.scrollTop > 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);
}
@@ -13412,9 +13411,10 @@ var VirtualRenderer = function(container, theme) {
this.scrollToY = function(scrollTop) {
// after calling scrollBar.setScrollTop
// 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.desiredScrollTop = scrollTop;
+ this.scrollTop = scrollTop;
}
};
@@ -14001,10 +14001,9 @@ var Text = function(parentEl) {
}
var style = this.$measureNode.style;
- for (var prop in this.$fontStyles) {
- var value = dom.computedStyle(this.element, prop);
- style[prop] = value;
- }
+ var computedStyle = dom.computedStyle(this.element);
+ for (var prop in this.$fontStyles)
+ style[prop] = computedStyle[prop];
var size = {
height: this.$measureNode.offsetHeight,
View

Large diffs are not rendered by default.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit 9146d31

Please sign in to comment.