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

clenup

Browse source
This commit is contained in:
nightwing 2014-03-23 15:19:24 +04:00
commit 79f619364a
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/ace/autocomplete.js
View file

@ -181,11 +181,9 @@ var Autocomplete = function() {
"Esc": function(editor) { editor.completer.detach(); }, "Esc": function(editor) { editor.completer.detach(); },
"Space": function(editor) { editor.completer.detach(); editor.insert(" ");}, "Space": function(editor) { editor.completer.detach(); editor.insert(" ");},
"Return": function(editor) { "Return": function(editor) {
if (editor.completer.popup.getRow() > -1) { if (editor.completer.popup.getRow() == -1)
editor.completer.insertMatch(); return false;
} else { editor.completer.insertMatch();
editor.insert("\n");
}
}, },
"Shift-Return": function(editor) { editor.completer.insertMatch(true); }, "Shift-Return": function(editor) { editor.completer.insertMatch(true); },
"Tab": function(editor) { editor.completer.insertMatch(); }, "Tab": function(editor) { editor.completer.insertMatch(); },
@ -290,8 +288,7 @@ var Autocomplete = function() {
return doDetach(); return doDetach();
// Wrong prefix or wrong session -> ignore // Wrong prefix or wrong session -> ignore
if (prefix.indexOf(results.prefix) != 0 if (prefix.indexOf(results.prefix) != 0 || _id != this.gatherCompletionsId)
|| _id != this.gatherCompletionsId)
return; return;
this.completions = new FilteredList(matches); this.completions = new FilteredList(matches);

1
lib/ace/tokenizer.js
View file

@ -114,7 +114,6 @@ var Tokenizer = function(rules) {
// makes property access faster // makes property access faster
if (!rule.onMatch) if (!rule.onMatch)
rule.onMatch = null; rule.onMatch = null;
rule.__proto__ = null;
} }
splitterRurles.forEach(function(rule) { splitterRurles.forEach(function(rule) {