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

Stop trying to use workers and word highlighting.

Browse source
This commit is contained in:
Sergi Mansilla 2011-02-28 12:33:12 +01:00
commit fbdfaaf0fc
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/ace/edit_session.js
View file

@ -344,20 +344,20 @@ var EditSession = function(text, mode) {
return this.doc.getNewLineMode(); return this.doc.getNewLineMode();
}; };
this.$useWorker = true; this.$useWorker = false;
this.setUseWorker = function(useWorker) { this.setUseWorker = function(useWorker) {
if (this.$useWorker == useWorker) if (this.$useWorker == useWorker)
return; return;
if (useWorker && !this.$worker && window.Worker) if (useWorker && !this.$worker && window.Worker)
this.$worker = mode.createWorker(this); this.$worker = mode.createWorker(this);
if (!useWorker && this.$worker) { if (!useWorker && this.$worker) {
this.$worker.terminate(); this.$worker.terminate();
this.$worker = null; this.$worker = null;
} }
}; };
this.getUseWorker = function() { this.getUseWorker = function() {
return this.$useWorker; return this.$useWorker;
}; };
@ -601,7 +601,7 @@ var EditSession = function(text, mode) {
var actions = [{}]; var actions = [{}];
// collapse insert and remove operations // collapse insert and remove operations
for (var i=0; i<deltas.length; i++) { for (var i=0; i<deltas.length; i++) {
var delta = deltas[i]; var delta = deltas[i];
@ -615,7 +615,7 @@ var EditSession = function(text, mode) {
}) })
} }
else { else {
if (isInsert) if (isInsert)
action.end = delta.range.end; action.end = delta.range.end;
else else
action.start = delta.range.start; action.start = delta.range.start;
@ -625,12 +625,12 @@ var EditSession = function(text, mode) {
// update selection based on last operation // update selection based on last operation
this.selection.clearSelection(); this.selection.clearSelection();
var action = actions[actions.length-1]; var action = actions[actions.length-1];
if (action.isInsert) if (action.isInsert)
this.selection.setSelectionRange(Range.fromPoints(action.start, action.end)); this.selection.setSelectionRange(Range.fromPoints(action.start, action.end));
else else
this.selection.moveCursorToPosition(action.end); this.selection.moveCursorToPosition(action.end);
}, },
this.replace = function(range, text) { this.replace = function(range, text) {
return this.doc.replace(range, text); return this.doc.replace(range, text);
}; };
@ -988,7 +988,7 @@ var EditSession = function(text, mode) {
this.$getStringScreenWidth = function(str) { this.$getStringScreenWidth = function(str) {
var screenColumn = 0; var screenColumn = 0;
var tabSize = this.getTabSize(); var tabSize = this.getTabSize();
for (var i=0; i<str.length; i++) { for (var i=0; i<str.length; i++) {
var c = str.charCodeAt(i); var c = str.charCodeAt(i);
// tab // tab
@ -1008,7 +1008,7 @@ var EditSession = function(text, mode) {
screenColumn += 1; screenColumn += 1;
} }
} }
return screenColumn; return screenColumn;
} }

2
lib/ace/editor.js
View file

@ -529,7 +529,7 @@ var Editor =function(renderer, session) {
return this.$highlightActiveLine; return this.$highlightActiveLine;
}; };
this.$highlightSelectedWord = true; this.$highlightSelectedWord = false;
this.setHighlightSelectedWord = function(shouldHighlight) { this.setHighlightSelectedWord = function(shouldHighlight) {
if (this.$highlightSelectedWord == shouldHighlight) if (this.$highlightSelectedWord == shouldHighlight)
return; return;