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

Merge pull request #250 from jviereck/master

Browse source 
Small fixes
This commit is contained in:
Fabian Jakobs 2011-05-17 14:36:01 -07:00
commit b2ada28c64
3 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
demo/demo.js
View file

@ -155,6 +155,8 @@ exports.launch = function(env) {
var container = document.getElementById("editor");
var cockpitInput = document.getElementById("cockpitInput");
env.editor = new Editor(new Renderer(container, theme));
window.env = env;
window.ace = env.editor;
var modes = {
text: new TextMode(),
@ -337,7 +339,7 @@ exports.launch = function(env) {
}
function onResize() {
var width = (document.documentElement.clientWidth - 300);
var width = (document.documentElement.clientWidth - 280);
container.style.width = width + "px";
cockpitInput.style.width = width + "px";
container.style.height = (document.documentElement.clientHeight - 22) + "px";

6
demo/styles.css
View file

@ -1,6 +1,6 @@
html {
height: 100%;
width: 100%;
width: 100%;
overflow: hidden;
}
@ -24,7 +24,7 @@ body {
#editor {
position: absolute;
top: 0px;
left: 300px;
left: 280px;
bottom: 0px;
right: 0px;
background: white;
@ -44,7 +44,7 @@ body {
#cockpitInput {
position: absolute;
left: 300px;
left: 280px;
right: 0px;
bottom: 0;

40
lib/ace/edit_session.js
View file

@ -463,7 +463,7 @@ var EditSession = function(text, mode) {
this.$stopWorker();
if (this.$useWorker)
if (this.$useWorker)
this.$startWorker();
var tokenizer = mode.getTokenizer();
@ -492,10 +492,10 @@ var EditSession = function(text, mode) {
this.$stopWorker = function() {
if (this.$worker)
this.$worker.terminate();
this.$worker = null;
};
this.$startWorker = function() {
if (typeof Worker !== "undefined" && !require.noWorker) {
try {
@ -503,7 +503,7 @@ var EditSession = function(text, mode) {
} catch (e) {
console.log("Could not load worker");
console.log(e);
this.$worker = null;
this.$worker = null;
}
}
else
@ -1010,7 +1010,7 @@ var EditSession = function(text, mode) {
removedFolds = this.getFoldsInRange(e.data.range);
this.removeFolds(removedFolds);
var foldLine = this.getFoldLine(lastRow);
var foldLine = this.getFoldLine(end.row);
var idx = 0;
if (foldLine) {
foldLine.addRemoveChars(end.row, end.column, start.column - end.column);
@ -1026,7 +1026,7 @@ var EditSession = function(text, mode) {
for (idx; idx < foldLines.length; idx++) {
var foldLine = foldLines[idx];
if (foldLine.start.row >= lastRow) {
if (foldLine.start.row >= end.row) {
foldLine.shiftRow(-len);
}
}
@ -1418,7 +1418,7 @@ var EditSession = function(text, mode) {
}
}
var docRowCacheLast = docRow;
// clamp row before clamping column, for selection on last line
// clamp row before clamping column, for selection on last line
var maxRow = this.getLength() - 1;
var foldLine = this.getNextFold(docRow);
@ -1449,7 +1449,7 @@ var EditSession = function(text, mode) {
if (foldLine && foldLine.start.row <= docRow)
line = this.getFoldDisplayLine(foldLine);
else {
else {
line = this.getLine(docRow);
foldLine = null;
}
@ -1596,21 +1596,29 @@ var EditSession = function(text, mode) {
};
this.getScreenLength = function() {
var length = this.getLength();
var screenRows = 0;
var lastFoldLine = null;
var foldLine = null;
if (!this.$useWrapMode) {
screenRows = length;
screenRows = this.getLength();
// Remove the folded lines again.
var foldData = this.$foldData;
for (var i = 0; i < foldData.length; i++) {
foldLine = foldData[i];
screenRows -= foldLine.end.row - foldLine.start.row;
}
} else {
for (var row = 0; row < this.$wrapData.length; row++) {
screenRows += this.$wrapData[row].length + 1;
if (foldLine = this.getFoldLine(row, lastFoldLine)) {
row = foldLine.end.row;
screenRows += 1;
} else {
screenRows += this.$wrapData[row].length + 1;
}
}
}
var foldData = this.$foldData;
for (var i = 0; i < foldData.length; i++) {
var foldLine = foldData[i];
screenRows -= foldLine.end.row - foldLine.start.row;
}
return screenRows;
}