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

Merge pull request #2210 from ajaxorg/misc

Browse source 
Fix several small issues
This commit is contained in:
Lennart Kats 2014-10-28 11:04:05 +01:00
commit 695e24c418
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.dryice.js
View file

@ -502,7 +502,7 @@ function exportAce(ns, modules, requireBase, extModules) {
if (typeof modules == "string") if (typeof modules == "string")
modules = [modules]; modules = [modules];
return (text + ";" + template return (text.replace(/;\s*$/, "") + ";" + template
.toString() .toString()
.replace(/MODULES/g, JSON.stringify(modules)) .replace(/MODULES/g, JSON.stringify(modules))
.replace(/REQUIRE_NS/g, requireBase) .replace(/REQUIRE_NS/g, requireBase)

1
lib/ace/autocomplete.js
View file

@ -67,6 +67,7 @@ var Autocomplete = function() {
e.stop(); e.stop();
}.bind(this)); }.bind(this));
this.popup.focus = this.editor.focus.bind(this.editor); this.popup.focus = this.editor.focus.bind(this.editor);
this.popup.on("show", this.tooltipTimer.bind(null, null));
this.popup.on("select", this.tooltipTimer.bind(null, null)); this.popup.on("select", this.tooltipTimer.bind(null, null));
this.popup.on("changeHoverMarker", this.tooltipTimer.bind(null, null)); this.popup.on("changeHoverMarker", this.tooltipTimer.bind(null, null));
return this.popup; return this.popup;

3
lib/ace/mode/json_worker.js
View file

@ -48,7 +48,8 @@ oop.inherits(JsonWorker, Mirror);
var value = this.doc.getValue(); var value = this.doc.getValue();
try { try {
var result = parse(value); if (value)
parse(value);
} catch (e) { } catch (e) {
var pos = this.doc.indexToPosition(e.at-1); var pos = this.doc.indexToPosition(e.at-1);
this.sender.emit("error", { this.sender.emit("error", {

23
lib/ace/virtual_renderer.js
View file

@ -958,23 +958,24 @@ var VirtualRenderer = function(container, theme) {
this.scrollBarH.setVisible(horizScroll); this.scrollBarH.setVisible(horizScroll);
} }
if (!this.$maxLines && this.$scrollPastEnd) { var scrollPastEnd = !this.$maxLines && this.$scrollPastEnd
maxHeight += (size.scrollerHeight - this.lineHeight) * this.$scrollPastEnd; ? (size.scrollerHeight - this.lineHeight) * this.$scrollPastEnd
} : 0;
maxHeight += scrollPastEnd;
var vScroll = !hideScrollbars && (this.$vScrollBarAlwaysVisible ||
size.scrollerHeight - maxHeight < 0);
var vScrollChanged = this.$vScroll !== vScroll;
if (vScrollChanged) {
this.$vScroll = vScroll;
this.scrollBarV.setVisible(vScroll);
}
this.session.setScrollTop(Math.max(-this.scrollMargin.top, this.session.setScrollTop(Math.max(-this.scrollMargin.top,
Math.min(this.scrollTop, maxHeight - size.scrollerHeight + this.scrollMargin.bottom))); Math.min(this.scrollTop, maxHeight - size.scrollerHeight + this.scrollMargin.bottom)));
this.session.setScrollLeft(Math.max(-this.scrollMargin.left, Math.min(this.scrollLeft, this.session.setScrollLeft(Math.max(-this.scrollMargin.left, Math.min(this.scrollLeft,
longestLine + 2 * this.$padding - size.scrollerWidth + this.scrollMargin.right))); longestLine + 2 * this.$padding - size.scrollerWidth + this.scrollMargin.right)));
var vScroll = !hideScrollbars && (this.$vScrollBarAlwaysVisible ||
size.scrollerHeight - maxHeight + scrollPastEnd < 0 || this.scrollTop);
var vScrollChanged = this.$vScroll !== vScroll;
if (vScrollChanged) {
this.$vScroll = vScroll;
this.scrollBarV.setVisible(vScroll);
}
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));