Stop trying to use workers and word highlighting.
This commit is contained in:
parent
1d05dc78be
commit
fbdfaaf0fc
2 changed files with 12 additions and 12 deletions
|
|
@ -344,20 +344,20 @@ var EditSession = function(text, mode) {
|
|||
return this.doc.getNewLineMode();
|
||||
};
|
||||
|
||||
this.$useWorker = true;
|
||||
this.$useWorker = false;
|
||||
this.setUseWorker = function(useWorker) {
|
||||
if (this.$useWorker == useWorker)
|
||||
return;
|
||||
|
||||
|
||||
if (useWorker && !this.$worker && window.Worker)
|
||||
this.$worker = mode.createWorker(this);
|
||||
|
||||
|
||||
if (!useWorker && this.$worker) {
|
||||
this.$worker.terminate();
|
||||
this.$worker = null;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
this.getUseWorker = function() {
|
||||
return this.$useWorker;
|
||||
};
|
||||
|
|
@ -601,7 +601,7 @@ var EditSession = function(text, mode) {
|
|||
|
||||
|
||||
var actions = [{}];
|
||||
|
||||
|
||||
// collapse insert and remove operations
|
||||
for (var i=0; i<deltas.length; i++) {
|
||||
var delta = deltas[i];
|
||||
|
|
@ -615,7 +615,7 @@ var EditSession = function(text, mode) {
|
|||
})
|
||||
}
|
||||
else {
|
||||
if (isInsert)
|
||||
if (isInsert)
|
||||
action.end = delta.range.end;
|
||||
else
|
||||
action.start = delta.range.start;
|
||||
|
|
@ -625,12 +625,12 @@ var EditSession = function(text, mode) {
|
|||
// update selection based on last operation
|
||||
this.selection.clearSelection();
|
||||
var action = actions[actions.length-1];
|
||||
if (action.isInsert)
|
||||
if (action.isInsert)
|
||||
this.selection.setSelectionRange(Range.fromPoints(action.start, action.end));
|
||||
else
|
||||
else
|
||||
this.selection.moveCursorToPosition(action.end);
|
||||
},
|
||||
|
||||
|
||||
this.replace = function(range, text) {
|
||||
return this.doc.replace(range, text);
|
||||
};
|
||||
|
|
@ -988,7 +988,7 @@ var EditSession = function(text, mode) {
|
|||
this.$getStringScreenWidth = function(str) {
|
||||
var screenColumn = 0;
|
||||
var tabSize = this.getTabSize();
|
||||
|
||||
|
||||
for (var i=0; i<str.length; i++) {
|
||||
var c = str.charCodeAt(i);
|
||||
// tab
|
||||
|
|
@ -1008,7 +1008,7 @@ var EditSession = function(text, mode) {
|
|||
screenColumn += 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return screenColumn;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -529,7 +529,7 @@ var Editor =function(renderer, session) {
|
|||
return this.$highlightActiveLine;
|
||||
};
|
||||
|
||||
this.$highlightSelectedWord = true;
|
||||
this.$highlightSelectedWord = false;
|
||||
this.setHighlightSelectedWord = function(shouldHighlight) {
|
||||
if (this.$highlightSelectedWord == shouldHighlight)
|
||||
return;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue