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

disabled validateDelta since it breaks autocompletion popup

Browse source
This commit is contained in:
nightwing 2014-07-02 22:00:51 +04:00
commit ad54d2c46c
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ace/apply_delta.js
View file

@ -52,7 +52,7 @@ function validateDelta(docLines, delta) {
// Validate range type. // Validate range type.
if (!delta.start || !delta.end) if (!delta.start || !delta.end)
throwDeltaError(delta, "delta.start/end must be an present"); throwDeltaError(delta, "delta.start/end must be an present");
// Validate that the start point is contained in the document. // Validate that the start point is contained in the document.
var start = delta.start; var start = delta.start;
@ -72,19 +72,19 @@ function validateDelta(docLines, delta) {
} }
exports.applyDelta = function(docLines, delta, doNotValidate) { exports.applyDelta = function(docLines, delta, doNotValidate) {
if (!doNotValidate) // disabled validation since it breaks autocompletion popup
validateDelta(docLines, delta); // if (!doNotValidate)
// validateDelta(docLines, delta);
var row = delta.start.row; var row = delta.start.row;
var startColumn = delta.start.column; var startColumn = delta.start.column;
var line = docLines[row]; var line = docLines[row] || "";
switch (delta.action) { switch (delta.action) {
case "insert": case "insert":
var lines = delta.lines; var lines = delta.lines;
if (lines.length === 1) { if (lines.length === 1) {
docLines[row] = line.substring(0, startColumn) + delta.lines[0] + line.substring(startColumn); docLines[row] = line.substring(0, startColumn) + delta.lines[0] + line.substring(startColumn);
} else { } else {
var line = docLines[row];
var args = [row, 1].concat(delta.lines); var args = [row, 1].concat(delta.lines);
docLines.splice.apply(docLines, args); docLines.splice.apply(docLines, args);
docLines[row] = line.substring(0, startColumn) + docLines[row]; docLines[row] = line.substring(0, startColumn) + docLines[row];

2
lib/ace/autocomplete/popup.js
View file

@ -213,8 +213,8 @@ var AcePopup = function(parentNode) {
popup.data = []; popup.data = [];
popup.setData = function(list) { popup.setData = function(list) {
popup.data = list || [];
popup.setValue(lang.stringRepeat("\n", list.length), -1); popup.setValue(lang.stringRepeat("\n", list.length), -1);
popup.data = list || [];
popup.setRow(0); popup.setRow(0);
}; };
popup.getData = function(row) { popup.getData = function(row) {