package
This commit is contained in:
Fabian Jakobs
parent
24eccde63e
commit
11eedc31f9
15 changed files with 2748 additions and 1259 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -2096,7 +2096,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -2162,6 +2162,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -2321,6 +2326,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2070,7 +2070,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -2136,6 +2136,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -2295,6 +2300,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2092,7 +2092,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -2158,6 +2158,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -2317,6 +2322,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2107,7 +2107,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -2173,6 +2173,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -2332,6 +2337,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
Ace
|
Ace
|
||||||
version 0.2.0
|
version 0.2.0
|
||||||
commit d020cf0e6621e410fa73d0b85b17953983a026bb
|
commit 24eccde63e4b569e0a88144f84965ad65bee981f
|
||||||
|
|
||||||
|
|
||||||
-->
|
-->
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -2996,7 +2996,7 @@ var Editor = function(renderer, session) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.getAnimatedScroll = function(){
|
this.getAnimatedScroll = function(){
|
||||||
this.renderer.getAnimatedScroll();
|
return this.renderer.getAnimatedScroll();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.setShowInvisibles = function(showInvisibles) {
|
this.setShowInvisibles = function(showInvisibles) {
|
||||||
|
|
@ -3628,16 +3628,19 @@ var Editor = function(renderer, session) {
|
||||||
this.selection.setSelectionRange(range);
|
this.selection.setSelectionRange(range);
|
||||||
this.$blockScrolling -= 1;
|
this.$blockScrolling -= 1;
|
||||||
|
|
||||||
|
if (this.getAnimatedScroll()) {
|
||||||
var cursor = this.getCursorPosition();
|
var cursor = this.getCursorPosition();
|
||||||
if (!this.isRowFullyVisible(cursor.row))
|
if (!this.isRowFullyVisible(cursor.row))
|
||||||
this.scrollToLine(cursor.row, true);
|
this.scrollToLine(cursor.row, true);
|
||||||
|
|
||||||
//@todo scroll X
|
//@todo scroll X
|
||||||
//if (!this.isRowFullyVisible(cursor.row))
|
//if (!this.isColumnFullyVisible(cursor.column))
|
||||||
//this.scrollToLine(cursor.row, true);
|
//this.scrollToRow(cursor.column);
|
||||||
|
}
|
||||||
|
else {
|
||||||
this.renderer.scrollSelectionIntoView(range.start, range.end);
|
this.renderer.scrollSelectionIntoView(range.start, range.end);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
this.undo = function() {
|
this.undo = function() {
|
||||||
|
|
@ -4344,7 +4347,7 @@ function DefaultHandlers(editor) {
|
||||||
if (!editor.$mouseHandler.$clickSelection) {
|
if (!editor.$mouseHandler.$clickSelection) {
|
||||||
if (!dragCursor) {
|
if (!dragCursor) {
|
||||||
editor.moveCursorToPosition(pos);
|
editor.moveCursorToPosition(pos);
|
||||||
editor.selection.clearSelection(pos.row, pos.column);
|
editor.selection.clearSelection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -4379,7 +4382,6 @@ function DefaultHandlers(editor) {
|
||||||
if (distance > DRAG_OFFSET) {
|
if (distance > DRAG_OFFSET) {
|
||||||
state = STATE_SELECT;
|
state = STATE_SELECT;
|
||||||
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
||||||
cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
|
|
||||||
onStartSelect(cursor);
|
onStartSelect(cursor);
|
||||||
}
|
}
|
||||||
else if ((time - mousedownTime) > editor.getDragDelay()) {
|
else if ((time - mousedownTime) > editor.getDragDelay()) {
|
||||||
|
|
@ -4406,7 +4408,7 @@ function DefaultHandlers(editor) {
|
||||||
else {
|
else {
|
||||||
if (!_self.$clickSelection) {
|
if (!_self.$clickSelection) {
|
||||||
editor.moveCursorToPosition(pos);
|
editor.moveCursorToPosition(pos);
|
||||||
editor.selection.clearSelection(pos.row, pos.column);
|
editor.selection.clearSelection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
state = STATE_SELECT;
|
state = STATE_SELECT;
|
||||||
|
|
@ -4415,7 +4417,6 @@ function DefaultHandlers(editor) {
|
||||||
var onUpdateSelectionInterval = function() {
|
var onUpdateSelectionInterval = function() {
|
||||||
var anchor;
|
var anchor;
|
||||||
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
||||||
cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
|
|
||||||
|
|
||||||
if (_self.$clickSelection) {
|
if (_self.$clickSelection) {
|
||||||
if (_self.$clickSelection.contains(cursor.row, cursor.column)) {
|
if (_self.$clickSelection.contains(cursor.row, cursor.column)) {
|
||||||
|
|
@ -4441,8 +4442,6 @@ function DefaultHandlers(editor) {
|
||||||
|
|
||||||
var onDragSelectionInterval = function() {
|
var onDragSelectionInterval = function() {
|
||||||
dragCursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
dragCursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
||||||
dragCursor.row = Math.max(0, Math.min(dragCursor.row, editor.session.getLength() - 1));
|
|
||||||
|
|
||||||
editor.moveCursorToPosition(dragCursor);
|
editor.moveCursorToPosition(dragCursor);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -4864,7 +4863,6 @@ var MouseEvent = exports.MouseEvent = function(domEvent, editor) {
|
||||||
var pageX = event.getDocumentX(this.domEvent);
|
var pageX = event.getDocumentX(this.domEvent);
|
||||||
var pageY = event.getDocumentY(this.domEvent);
|
var pageY = event.getDocumentY(this.domEvent);
|
||||||
this.$pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY);
|
this.$pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY);
|
||||||
this.$pos.row = Math.max(0, Math.min(this.$pos.row, this.editor.session.getLength()-1));
|
|
||||||
return this.$pos;
|
return this.$pos;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -4964,7 +4962,7 @@ function FoldHandler(editor) {
|
||||||
var position = e.getDocumentPosition();
|
var position = e.getDocumentPosition();
|
||||||
var session = editor.session;
|
var session = editor.session;
|
||||||
|
|
||||||
// If the user dclicked on a fold, then expand it.
|
// If the user clicked on a fold, then expand it.
|
||||||
var fold = session.getFoldAt(position.row, position.column, 1);
|
var fold = session.getFoldAt(position.row, position.column, 1);
|
||||||
if (fold) {
|
if (fold) {
|
||||||
if (e.getAccelKey())
|
if (e.getAccelKey())
|
||||||
|
|
@ -6951,8 +6949,8 @@ var EditSession = function(text, mode) {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.getScreenLastRowColumn = function(screenRow) {
|
this.getScreenLastRowColumn = function(screenRow) {
|
||||||
//return this.screenToDocumentColumn(screenRow, Number.MAX_VALUE / 10)
|
var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE)
|
||||||
return this.documentToScreenColumn(screenRow, this.doc.getLine(screenRow).length);
|
return this.documentToScreenColumn(pos.row, pos.column);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.getDocumentLastRowColumn = function(docRow, docColumn) {
|
this.getDocumentLastRowColumn = function(docRow, docColumn) {
|
||||||
|
|
@ -7067,17 +7065,11 @@ var EditSession = function(text, mode) {
|
||||||
|
|
||||||
docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
|
docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
|
||||||
|
|
||||||
// Need to do some clamping action here.
|
// We remove one character at the end so that the docColumn
|
||||||
if (this.$useWrapMode) {
|
// position returned is not associated to the next row on the screen.
|
||||||
if (docColumn >= column) {
|
if (this.$useWrapMode && docColumn >= column) {
|
||||||
// We remove one character at the end such that the docColumn
|
|
||||||
// position returned is not associated to the next row on the
|
|
||||||
// screen.
|
|
||||||
docColumn = column - 1;
|
docColumn = column - 1;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
docColumn = Math.min(docColumn, line.length);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (foldLine) {
|
if (foldLine) {
|
||||||
return foldLine.idxToPosition(docColumn);
|
return foldLine.idxToPosition(docColumn);
|
||||||
|
|
@ -7527,18 +7519,18 @@ var Selection = function(session) {
|
||||||
this.selectionLead = this.doc.createAnchor(0, 0);
|
this.selectionLead = this.doc.createAnchor(0, 0);
|
||||||
this.selectionAnchor = this.doc.createAnchor(0, 0);
|
this.selectionAnchor = this.doc.createAnchor(0, 0);
|
||||||
|
|
||||||
var _self = this;
|
var self = this;
|
||||||
this.selectionLead.on("change", function(e) {
|
this.selectionLead.on("change", function(e) {
|
||||||
_self._emit("changeCursor");
|
self._emit("changeCursor");
|
||||||
if (!_self.$isEmpty)
|
if (!self.$isEmpty)
|
||||||
_self._emit("changeSelection");
|
self._emit("changeSelection");
|
||||||
if (!_self.$preventUpdateDesiredColumnOnChange && e.old.column != e.value.column)
|
if (!self.$keepDesiredColumnOnChange && e.old.column != e.value.column)
|
||||||
_self.$updateDesiredColumn();
|
self.$desiredColumn = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.selectionAnchor.on("change", function() {
|
this.selectionAnchor.on("change", function() {
|
||||||
if (!_self.$isEmpty)
|
if (!self.$isEmpty)
|
||||||
_self._emit("changeSelection");
|
self._emit("changeSelection");
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -7648,12 +7640,7 @@ var Selection = function(session) {
|
||||||
this.setSelectionAnchor(range.start.row, range.start.column);
|
this.setSelectionAnchor(range.start.row, range.start.column);
|
||||||
this.selectTo(range.end.row, range.end.column);
|
this.selectTo(range.end.row, range.end.column);
|
||||||
}
|
}
|
||||||
this.$updateDesiredColumn();
|
this.$desiredColumn = null;
|
||||||
};
|
|
||||||
|
|
||||||
this.$updateDesiredColumn = function() {
|
|
||||||
var cursor = this.getCursor();
|
|
||||||
this.$desiredColumn = this.session.documentToScreenColumn(cursor.row, cursor.column);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.$moveSelection = function(mover) {
|
this.$moveSelection = function(mover) {
|
||||||
|
|
@ -7938,8 +7925,14 @@ var Selection = function(session) {
|
||||||
this.selectionLead.column
|
this.selectionLead.column
|
||||||
);
|
);
|
||||||
|
|
||||||
var screenCol = (chars === 0 && this.$desiredColumn) || screenPos.column;
|
if (chars === 0) {
|
||||||
var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenCol);
|
if (this.$desiredColumn)
|
||||||
|
screenPos.column = this.$desiredColumn;
|
||||||
|
else
|
||||||
|
this.$desiredColumn = screenPos.column;
|
||||||
|
}
|
||||||
|
|
||||||
|
var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenPos.column);
|
||||||
|
|
||||||
// move the cursor and update the desired column
|
// move the cursor and update the desired column
|
||||||
this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0);
|
this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0);
|
||||||
|
|
@ -7949,7 +7942,7 @@ var Selection = function(session) {
|
||||||
this.moveCursorTo(position.row, position.column);
|
this.moveCursorTo(position.row, position.column);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.moveCursorTo = function(row, column, preventUpdateDesiredColumn) {
|
this.moveCursorTo = function(row, column, keepDesiredColumn) {
|
||||||
// Ensure the row/column is not inside of a fold.
|
// Ensure the row/column is not inside of a fold.
|
||||||
var fold = this.session.getFoldAt(row, column, 1);
|
var fold = this.session.getFoldAt(row, column, 1);
|
||||||
if (fold) {
|
if (fold) {
|
||||||
|
|
@ -7957,21 +7950,47 @@ var Selection = function(session) {
|
||||||
column = fold.start.column;
|
column = fold.start.column;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.$preventUpdateDesiredColumnOnChange = true;
|
this.$keepDesiredColumnOnChange = true;
|
||||||
this.selectionLead.setPosition(row, column);
|
this.selectionLead.setPosition(row, column);
|
||||||
this.$preventUpdateDesiredColumnOnChange = false;
|
this.$keepDesiredColumnOnChange = false;
|
||||||
|
|
||||||
if (!preventUpdateDesiredColumn)
|
if (!keepDesiredColumn)
|
||||||
this.$updateDesiredColumn(this.selectionLead.column);
|
this.$desiredColumn = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
this.moveCursorToScreen = function(row, column, preventUpdateDesiredColumn) {
|
this.moveCursorToScreen = function(row, column, keepDesiredColumn) {
|
||||||
var pos = this.session.screenToDocumentPosition(row, column);
|
var pos = this.session.screenToDocumentPosition(row, column);
|
||||||
row = pos.row;
|
this.moveCursorTo(pos.row, pos.column, keepDesiredColumn);
|
||||||
column = pos.column;
|
|
||||||
this.moveCursorTo(row, column, preventUpdateDesiredColumn);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// remove listeners from document
|
||||||
|
this.detach = function() {
|
||||||
|
this.selectionLead.detach();
|
||||||
|
this.selectionAnchor.detach();
|
||||||
|
this.session = this.doc = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.fromOrientedRange = function(range) {
|
||||||
|
this.setSelectionRange(range, range.cursor == range.start);
|
||||||
|
this.$desiredColumn = range.desiredColumn || this.$desiredColumn;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.toOrientedRange = function(range) {
|
||||||
|
var r = this.getRange();
|
||||||
|
if (range) {
|
||||||
|
range.start.column = r.start.column;
|
||||||
|
range.start.row = r.start.row;
|
||||||
|
range.end.column = r.end.column;
|
||||||
|
range.end.row = r.end.row;
|
||||||
|
} else {
|
||||||
|
range = r;
|
||||||
|
}
|
||||||
|
|
||||||
|
range.cursor = this.isBackwards() ? range.start : range.end;
|
||||||
|
range.desiredColumn = this.$desiredColumn;
|
||||||
|
return range;
|
||||||
|
}
|
||||||
|
|
||||||
}).call(Selection.prototype);
|
}).call(Selection.prototype);
|
||||||
|
|
||||||
exports.Selection = Selection;
|
exports.Selection = Selection;
|
||||||
|
|
@ -8029,7 +8048,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -8095,6 +8114,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -8254,6 +8278,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
@ -10497,7 +10536,7 @@ function Folding() {
|
||||||
// sometimes singleline folds can be missed by the code above
|
// sometimes singleline folds can be missed by the code above
|
||||||
if (!range.isMultiLine()) {
|
if (!range.isMultiLine()) {
|
||||||
fold = this.getFoldAt(range.start.row, range.start.column, 1);
|
fold = this.getFoldAt(range.start.row, range.start.column, 1);
|
||||||
if (fold && range.isEequal(fold.range)) {
|
if (fold && range.isEqual(fold.range)) {
|
||||||
this.removeFold(fold);
|
this.removeFold(fold);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -10888,7 +10927,7 @@ var Fold = exports.Fold = function(range, placeholder) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.addSubFold = function(fold) {
|
this.addSubFold = function(fold) {
|
||||||
if (this.range.isEequal(fold))
|
if (this.range.isEqual(fold))
|
||||||
return this;
|
return this;
|
||||||
|
|
||||||
if (!this.range.containsRange(fold))
|
if (!this.range.containsRange(fold))
|
||||||
|
|
@ -11566,21 +11605,153 @@ Search.SELECTION = 2;
|
||||||
|
|
||||||
exports.Search = Search;
|
exports.Search = Search;
|
||||||
});
|
});
|
||||||
ace.define('ace/commands/command_manager', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
|
ace.define('ace/commands/command_manager', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/keyboard/hash_handler', 'ace/lib/event_emitter'], function(require, exports, module) {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
var keyUtil = require("../lib/keys");
|
var oop = require("../lib/oop");
|
||||||
|
var HashHandler = require("../keyboard/hash_handler").HashHandler;
|
||||||
|
var EventEmitter = require("../lib/event_emitter").EventEmitter;
|
||||||
|
|
||||||
var CommandManager = function(platform, commands) {
|
var CommandManager = function(platform, commands) {
|
||||||
if (typeof platform !== "string")
|
|
||||||
throw new TypeError("'platform' argument must be either 'mac' or 'win'");
|
|
||||||
|
|
||||||
this.platform = platform;
|
this.platform = platform;
|
||||||
this.commands = {};
|
this.commands = {};
|
||||||
this.commmandKeyBinding = {};
|
this.commmandKeyBinding = {};
|
||||||
|
|
||||||
if (commands)
|
this.addCommands(commands);
|
||||||
commands.forEach(this.addCommand, this);
|
|
||||||
|
this.setDefaultHandler("exec", function(e) {
|
||||||
|
e.command.exec(e.editor, e.args || {});
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
oop.inherits(CommandManager, HashHandler);
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
|
||||||
|
oop.implement(this, EventEmitter);
|
||||||
|
|
||||||
|
this.exec = function(command, editor, args) {
|
||||||
|
if (typeof command === 'string')
|
||||||
|
command = this.commands[command];
|
||||||
|
|
||||||
|
if (!command)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (editor && editor.$readOnly && !command.readOnly)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
this._emit("exec", {editor: editor, command: command, args: args});
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.toggleRecording = function() {
|
||||||
|
if (this.$inReplay)
|
||||||
|
return;
|
||||||
|
if (this.recording) {
|
||||||
|
this.macro.pop();
|
||||||
|
this.removeEventListener("exec", this.$addCommandToMacro);
|
||||||
|
|
||||||
|
if (!this.macro.length)
|
||||||
|
this.macro = this.oldMacro;
|
||||||
|
|
||||||
|
return this.recording = false;
|
||||||
|
}
|
||||||
|
if (!this.$addCommandToMacro) {
|
||||||
|
this.$addCommandToMacro = function(e) {
|
||||||
|
this.macro.push([e.command, e.args]);
|
||||||
|
}.bind(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.oldMacro = this.macro;
|
||||||
|
this.macro = [];
|
||||||
|
this.on("exec", this.$addCommandToMacro);
|
||||||
|
return this.recording = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.replay = function(editor) {
|
||||||
|
if (this.$inReplay || !this.macro)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (this.recording)
|
||||||
|
return this.toggleRecording();
|
||||||
|
|
||||||
|
try {
|
||||||
|
this.$inReplay = true;
|
||||||
|
this.macro.forEach(function(x) {
|
||||||
|
if (typeof x == "string")
|
||||||
|
this.exec(x, editor);
|
||||||
|
else
|
||||||
|
this.exec(x[0], editor, x[1]);
|
||||||
|
}, this);
|
||||||
|
} finally {
|
||||||
|
this.$inReplay = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
this.trimMacro = function(m) {
|
||||||
|
return m.map(function(x){
|
||||||
|
if (typeof x[0] != "string")
|
||||||
|
x[0] = x[0].name;
|
||||||
|
if (!x[1])
|
||||||
|
x = x[0];
|
||||||
|
return x;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
}).call(CommandManager.prototype);
|
||||||
|
|
||||||
|
exports.CommandManager = CommandManager;
|
||||||
|
|
||||||
|
});
|
||||||
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
* http://www.mozilla.org/MPL/
|
||||||
|
*
|
||||||
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
* for the specific language governing rights and limitations under the
|
||||||
|
* License.
|
||||||
|
*
|
||||||
|
* The Original Code is Mozilla Skywriter.
|
||||||
|
*
|
||||||
|
* The Initial Developer of the Original Code is
|
||||||
|
* Mozilla.
|
||||||
|
* Portions created by the Initial Developer are Copyright (C) 2009
|
||||||
|
* the Initial Developer. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Contributor(s):
|
||||||
|
* Fabian Jakobs <fabian AT ajax DOT org>
|
||||||
|
* Julian Viereck (julian.viereck@gmail.com)
|
||||||
|
*
|
||||||
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
* of those above. If you wish to allow use of your version of this file only
|
||||||
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
* use your version of this file under the terms of the MPL, indicate your
|
||||||
|
* decision by deleting the provisions above and replace them with the notice
|
||||||
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
* the provisions above, a recipient may use your version of this file under
|
||||||
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
ace.define('ace/keyboard/hash_handler', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var keyUtil = require("../lib/keys");
|
||||||
|
|
||||||
|
function HashHandler(config, platform) {
|
||||||
|
this.platform = platform;
|
||||||
|
this.commands = {};
|
||||||
|
this.commmandKeyBinding = {};
|
||||||
|
|
||||||
|
this.addCommands(config);
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
|
|
@ -11601,7 +11772,7 @@ var CommandManager = function(platform, commands) {
|
||||||
command = this.commands[name];
|
command = this.commands[name];
|
||||||
delete this.commands[name];
|
delete this.commands[name];
|
||||||
|
|
||||||
// exaustive search is brute force but since removeCommand is
|
// exhaustive search is brute force but since removeCommand is
|
||||||
// not a performance critical operation this should be OK
|
// not a performance critical operation this should be OK
|
||||||
var ckb = this.commmandKeyBinding;
|
var ckb = this.commmandKeyBinding;
|
||||||
for (var hashId in ckb) {
|
for (var hashId in ckb) {
|
||||||
|
|
@ -11613,7 +11784,7 @@ var CommandManager = function(platform, commands) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.addCommands = function(commands) {
|
this.addCommands = function(commands) {
|
||||||
Object.keys(commands).forEach(function(name) {
|
commands && Object.keys(commands).forEach(function(name) {
|
||||||
var command = commands[name];
|
var command = commands[name];
|
||||||
if (typeof command === "string")
|
if (typeof command === "string")
|
||||||
return this.bindKey(command, name);
|
return this.bindKey(command, name);
|
||||||
|
|
@ -11664,9 +11835,9 @@ var CommandManager = function(platform, commands) {
|
||||||
function parseKeys(keys, val, ret) {
|
function parseKeys(keys, val, ret) {
|
||||||
var key;
|
var key;
|
||||||
var hashId = 0;
|
var hashId = 0;
|
||||||
var parts = splitSafe(keys);
|
var parts = splitSafe(keys.toLowerCase());
|
||||||
|
|
||||||
for (var i=0, l = parts.length; i < l; i++) {
|
for (var i = 0, l = parts.length; i < l; i++) {
|
||||||
if (keyUtil.KEY_MODS[parts[i]])
|
if (keyUtil.KEY_MODS[parts[i]])
|
||||||
hashId = hashId | keyUtil.KEY_MODS[parts[i]];
|
hashId = hashId | keyUtil.KEY_MODS[parts[i]];
|
||||||
else
|
else
|
||||||
|
|
@ -11680,91 +11851,24 @@ var CommandManager = function(platform, commands) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function splitSafe(s) {
|
function splitSafe(s) {
|
||||||
return (s.toLowerCase()
|
return (s.trim()
|
||||||
.trim()
|
|
||||||
.split(new RegExp("[\\s ]*\\-[\\s ]*", "g"), 999));
|
.split(new RegExp("[\\s ]*\\-[\\s ]*", "g"), 999));
|
||||||
}
|
}
|
||||||
|
|
||||||
this.findKeyCommand = function findKeyCommand(hashId, textOrKey) {
|
this.findKeyCommand = function findKeyCommand(hashId, keyString) {
|
||||||
// Convert keyCode to the string representation.
|
|
||||||
if (typeof textOrKey == "number") {
|
|
||||||
textOrKey = keyUtil.keyCodeToString(textOrKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
var ckbr = this.commmandKeyBinding;
|
var ckbr = this.commmandKeyBinding;
|
||||||
return ckbr[hashId] && ckbr[hashId][textOrKey.toLowerCase()];
|
return ckbr[hashId] && ckbr[hashId][keyString.toLowerCase()];
|
||||||
};
|
|
||||||
|
|
||||||
this.exec = function(command, editor, args) {
|
|
||||||
if (typeof command === 'string')
|
|
||||||
command = this.commands[command];
|
|
||||||
|
|
||||||
if (!command)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (editor && editor.$readOnly && !command.readOnly)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
command.exec(editor, args || {});
|
|
||||||
return true;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.toggleRecording = function() {
|
|
||||||
if (this.$inReplay)
|
|
||||||
return;
|
|
||||||
if (this.recording) {
|
|
||||||
this.macro.pop();
|
|
||||||
this.exec = this.normal_exec;
|
|
||||||
|
|
||||||
if (!this.macro.length)
|
|
||||||
this.macro = this.oldMacro;
|
|
||||||
|
|
||||||
return this.recording = false;
|
|
||||||
}
|
}
|
||||||
this.oldMacro = this.macro;
|
|
||||||
this.macro = [];
|
this.handleKeyboard = function(data, hashId, keyString, keyCode) {
|
||||||
this.normal_exec = this.exec;
|
return {
|
||||||
this.exec = function(command, editor, args) {
|
command: this.findKeyCommand(hashId, keyString)
|
||||||
this.macro.push([command, args]);
|
|
||||||
return this.normal_exec(command, editor, args);
|
|
||||||
};
|
};
|
||||||
return this.recording = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.replay = function(editor) {
|
}).call(HashHandler.prototype)
|
||||||
if (this.$inReplay || !this.macro)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (this.recording)
|
|
||||||
return this.toggleRecording();
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.$inReplay = true;
|
|
||||||
this.macro.forEach(function(x) {
|
|
||||||
if (typeof x == "string")
|
|
||||||
this.exec(x, editor);
|
|
||||||
else
|
|
||||||
this.exec(x[0], editor, x[1]);
|
|
||||||
}, this);
|
|
||||||
} finally {
|
|
||||||
this.$inReplay = false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.trimMacro = function(m) {
|
|
||||||
return m.map(function(x){
|
|
||||||
if (typeof x[0] != "string")
|
|
||||||
x[0] = x[0].name;
|
|
||||||
if (!x[1])
|
|
||||||
x = x[0];
|
|
||||||
return x;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
}).call(CommandManager.prototype);
|
|
||||||
|
|
||||||
exports.CommandManager = CommandManager;
|
|
||||||
|
|
||||||
|
exports.HashHandler = HashHandler;
|
||||||
});
|
});
|
||||||
/* vim:ts=4:sts=4:sw=4:
|
/* vim:ts=4:sts=4:sw=4:
|
||||||
* ***** BEGIN LICENSE BLOCK *****
|
* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
@ -12149,7 +12253,7 @@ var VirtualRenderer = function(container, theme) {
|
||||||
this.$animatedScroll = shouldAnimate;
|
this.$animatedScroll = shouldAnimate;
|
||||||
};
|
};
|
||||||
|
|
||||||
this.getAnimatedScroll = function(){
|
this.getAnimatedScroll = function() {
|
||||||
return this.$animatedScroll;
|
return this.$animatedScroll;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -12656,6 +12760,19 @@ var VirtualRenderer = function(container, theme) {
|
||||||
// todo: handle horizontal scrolling
|
// todo: handle horizontal scrolling
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.pixelToScreenCoordinates = function(pageX, pageY) {
|
||||||
|
var canvasPos = this.scroller.getBoundingClientRect();
|
||||||
|
|
||||||
|
var col = Math.round(
|
||||||
|
(pageX + this.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft()) / this.characterWidth
|
||||||
|
);
|
||||||
|
var row = Math.floor(
|
||||||
|
(pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop()) / this.lineHeight
|
||||||
|
);
|
||||||
|
|
||||||
|
return {row: row, column: col};
|
||||||
|
};
|
||||||
|
|
||||||
this.screenToTextCoordinates = function(pageX, pageY) {
|
this.screenToTextCoordinates = function(pageX, pageY) {
|
||||||
var canvasPos = this.scroller.getBoundingClientRect();
|
var canvasPos = this.scroller.getBoundingClientRect();
|
||||||
|
|
||||||
|
|
@ -12747,7 +12864,7 @@ var VirtualRenderer = function(container, theme) {
|
||||||
return afterLoad(module);
|
return afterLoad(module);
|
||||||
|
|
||||||
_self._loadTheme(moduleName, function() {
|
_self._loadTheme(moduleName, function() {
|
||||||
require([theme], function(module) {
|
require([moduleName], function(module) {
|
||||||
if (_self.$themeValue !== theme)
|
if (_self.$themeValue !== theme)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
@ -13112,7 +13229,7 @@ var Marker = function(parentEl) {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Draws a marker, which spans a range of text in a single line
|
* Draws a marker, which spans a range of text on multiple lines
|
||||||
*/
|
*/
|
||||||
this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {
|
this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {
|
||||||
// selection start
|
// selection start
|
||||||
|
|
@ -13187,7 +13304,7 @@ var Marker = function(parentEl) {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Draws a marker which covers one single full line
|
* Draws a marker which covers part or whole width of a single screen line
|
||||||
*/
|
*/
|
||||||
this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, type) {
|
this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, type) {
|
||||||
var padding = type === "background" ? 0 : this.$padding;
|
var padding = type === "background" ? 0 : this.$padding;
|
||||||
|
|
@ -13521,16 +13638,16 @@ var Text = function(parentEl) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.$renderLinesFragment = function(config, firstRow, lastRow) {
|
this.$renderLinesFragment = function(config, firstRow, lastRow) {
|
||||||
var fragment = this.element.ownerDocument.createDocumentFragment(),
|
var fragment = this.element.ownerDocument.createDocumentFragment();
|
||||||
row = firstRow,
|
var row = firstRow;
|
||||||
fold = this.session.getNextFoldLine(row),
|
var foldLine = this.session.getNextFoldLine(row);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
var foldStart = foldLine ? foldLine.start.row : Infinity;
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
if (row > foldStart) {
|
if (row > foldStart) {
|
||||||
row = fold.end.row+1;
|
row = foldLine.end.row+1;
|
||||||
fold = this.session.getNextFoldLine(row, fold);
|
foldLine = this.session.getNextFoldLine(row, foldLine);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
foldStart = foldLine ? foldLine.start.row : Infinity;
|
||||||
}
|
}
|
||||||
if (row > lastRow)
|
if (row > lastRow)
|
||||||
break;
|
break;
|
||||||
|
|
@ -13569,15 +13686,15 @@ var Text = function(parentEl) {
|
||||||
var html = [];
|
var html = [];
|
||||||
var firstRow = config.firstRow, lastRow = config.lastRow;
|
var firstRow = config.firstRow, lastRow = config.lastRow;
|
||||||
|
|
||||||
var row = firstRow,
|
var row = firstRow;
|
||||||
fold = this.session.getNextFoldLine(row),
|
var foldLine = this.session.getNextFoldLine(row);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
var foldStart = foldLine ? foldLine.start.row : Infinity;
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
if (row > foldStart) {
|
if (row > foldStart) {
|
||||||
row = fold.end.row+1;
|
row = foldLine.end.row+1;
|
||||||
fold = this.session.getNextFoldLine(row, fold);
|
foldLine = this.session.getNextFoldLine(row, foldLine);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
foldStart = foldLine ? foldLine.start.row :Infinity;
|
||||||
}
|
}
|
||||||
if (row > lastRow)
|
if (row > lastRow)
|
||||||
break;
|
break;
|
||||||
|
|
@ -13878,11 +13995,10 @@ var Cursor = function(parentEl) {
|
||||||
this.element.className = "ace_layer ace_cursor-layer";
|
this.element.className = "ace_layer ace_cursor-layer";
|
||||||
parentEl.appendChild(this.element);
|
parentEl.appendChild(this.element);
|
||||||
|
|
||||||
this.cursor = dom.createElement("div");
|
|
||||||
this.cursor.className = "ace_cursor ace_hidden";
|
|
||||||
this.element.appendChild(this.cursor);
|
|
||||||
|
|
||||||
this.isVisible = false;
|
this.isVisible = false;
|
||||||
|
|
||||||
|
this.cursors = [];
|
||||||
|
this.cursor = this.addCursor();
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
|
|
@ -13896,30 +14012,54 @@ var Cursor = function(parentEl) {
|
||||||
this.session = session;
|
this.session = session;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.addCursor = function() {
|
||||||
|
var el = dom.createElement("div");
|
||||||
|
var className = "ace_cursor";
|
||||||
|
if (!this.isVisible)
|
||||||
|
className += " ace_hidden";
|
||||||
|
if (this.overwrite)
|
||||||
|
className += " ace_overwrite";
|
||||||
|
|
||||||
|
el.className = className;
|
||||||
|
this.element.appendChild(el);
|
||||||
|
this.cursors.push(el);
|
||||||
|
return el;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.removeCursor = function() {
|
||||||
|
if (this.cursors.length > 1) {
|
||||||
|
var el = this.cursors.pop();
|
||||||
|
el.parentNode.removeChild(el);
|
||||||
|
return el;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
this.hideCursor = function() {
|
this.hideCursor = function() {
|
||||||
this.isVisible = false;
|
this.isVisible = false;
|
||||||
dom.addCssClass(this.cursor, "ace_hidden");
|
for (var i = this.cursors.length; i--; )
|
||||||
|
dom.addCssClass(this.cursors[i], "ace_hidden");
|
||||||
clearInterval(this.blinkId);
|
clearInterval(this.blinkId);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.showCursor = function() {
|
this.showCursor = function() {
|
||||||
this.isVisible = true;
|
this.isVisible = true;
|
||||||
dom.removeCssClass(this.cursor, "ace_hidden");
|
for (var i = this.cursors.length; i--; )
|
||||||
this.cursor.style.visibility = "visible";
|
dom.removeCssClass(this.cursors[i], "ace_hidden");
|
||||||
|
|
||||||
|
this.element.style.visibility = "";
|
||||||
this.restartTimer();
|
this.restartTimer();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.restartTimer = function() {
|
this.restartTimer = function() {
|
||||||
clearInterval(this.blinkId);
|
clearInterval(this.blinkId);
|
||||||
if (!this.isVisible) {
|
if (!this.isVisible)
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
var cursor = this.cursor;
|
var element = this.element;
|
||||||
this.blinkId = setInterval(function() {
|
this.blinkId = setInterval(function() {
|
||||||
cursor.style.visibility = "hidden";
|
element.style.visibility = "hidden";
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
cursor.style.visibility = "visible";
|
element.style.visibility = "visible";
|
||||||
}, 400);
|
}, 400);
|
||||||
}, 1000);
|
}, 1000);
|
||||||
};
|
};
|
||||||
|
|
@ -13949,25 +14089,53 @@ var Cursor = function(parentEl) {
|
||||||
this.update = function(config) {
|
this.update = function(config) {
|
||||||
this.config = config;
|
this.config = config;
|
||||||
|
|
||||||
this.pixelPos = this.getPixelPosition(null, true);
|
if (this.session.selectionMarkerCount > 1) {
|
||||||
|
var selections = this.session.$selectionMarkers;
|
||||||
|
var i = 0, sel, cursorIndex = 0;
|
||||||
|
|
||||||
this.cursor.style.left = this.pixelPos.left + "px";
|
for (var i = selections.length; i--; ) {
|
||||||
this.cursor.style.top = this.pixelPos.top + "px";
|
sel = selections[i];
|
||||||
this.cursor.style.width = config.characterWidth + "px";
|
var pixelPos = this.getPixelPosition(sel.cursor, true);
|
||||||
this.cursor.style.height = config.lineHeight + "px";
|
|
||||||
|
|
||||||
var overwrite = this.session.getOverwrite()
|
var style = (this.cursors[cursorIndex++] || this.addCursor()).style;
|
||||||
if (overwrite != this.overwrite) {
|
|
||||||
this.overwrite = overwrite;
|
style.left = pixelPos.left + "px";
|
||||||
if (overwrite)
|
style.top = pixelPos.top + "px";
|
||||||
dom.addCssClass(this.cursor, "ace_overwrite");
|
style.width = config.characterWidth + "px";
|
||||||
else
|
style.height = config.lineHeight + "px";
|
||||||
dom.removeCssClass(this.cursor, "ace_overwrite");
|
}
|
||||||
|
if (cursorIndex > 1)
|
||||||
|
while (this.cursors.length > cursorIndex)
|
||||||
|
this.removeCursor();
|
||||||
|
} else {
|
||||||
|
var pixelPos = this.getPixelPosition(null, true);
|
||||||
|
var style = this.cursor.style;
|
||||||
|
style.left = pixelPos.left + "px";
|
||||||
|
style.top = pixelPos.top + "px";
|
||||||
|
style.width = config.characterWidth + "px";
|
||||||
|
style.height = config.lineHeight + "px";
|
||||||
|
|
||||||
|
while (this.cursors.length > 1)
|
||||||
|
this.removeCursor();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var overwrite = this.session.getOverwrite();
|
||||||
|
if (overwrite != this.overwrite)
|
||||||
|
this.$setOverite(overwrite);
|
||||||
|
|
||||||
this.restartTimer();
|
this.restartTimer();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.$setOverite = function(overwrite) {
|
||||||
|
this.overwrite = overwrite;
|
||||||
|
for (var i = this.cursors.length; i--; ) {
|
||||||
|
if (overwrite)
|
||||||
|
dom.addCssClass(this.cursors[i], "ace_overwrite");
|
||||||
|
else
|
||||||
|
dom.removeCssClass(this.cursors[i], "ace_overwrite");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
this.destroy = function() {
|
this.destroy = function() {
|
||||||
clearInterval(this.blinkId);
|
clearInterval(this.blinkId);
|
||||||
}
|
}
|
||||||
|
|
@ -14310,12 +14478,12 @@ ace.define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/cs
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_selection {\n" +
|
".ace_marker-layer .ace_selection {\n" +
|
||||||
" position: absolute;\n" +
|
" position: absolute;\n" +
|
||||||
" z-index: 4;\n" +
|
" z-index: 5;\n" +
|
||||||
"}\n" +
|
"}\n" +
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_bracket {\n" +
|
".ace_marker-layer .ace_bracket {\n" +
|
||||||
" position: absolute;\n" +
|
" position: absolute;\n" +
|
||||||
" z-index: 5;\n" +
|
" z-index: 6;\n" +
|
||||||
"}\n" +
|
"}\n" +
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_active_line {\n" +
|
".ace_marker-layer .ace_active_line {\n" +
|
||||||
|
|
@ -14329,7 +14497,7 @@ ace.define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/cs
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_selected_word {\n" +
|
".ace_marker-layer .ace_selected_word {\n" +
|
||||||
" position: absolute;\n" +
|
" position: absolute;\n" +
|
||||||
" z-index: 6;\n" +
|
" z-index: 4;\n" +
|
||||||
" box-sizing: border-box;\n" +
|
" box-sizing: border-box;\n" +
|
||||||
" -moz-box-sizing: border-box;\n" +
|
" -moz-box-sizing: border-box;\n" +
|
||||||
" -webkit-box-sizing: border-box;\n" +
|
" -webkit-box-sizing: border-box;\n" +
|
||||||
|
|
@ -14600,123 +14768,6 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
|
||||||
|
|
||||||
exports.WorkerClient = WorkerClient;
|
exports.WorkerClient = WorkerClient;
|
||||||
|
|
||||||
});
|
|
||||||
/* ***** BEGIN LICENSE BLOCK *****
|
|
||||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
||||||
*
|
|
||||||
* The contents of this file are subject to the Mozilla Public License Version
|
|
||||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
* http://www.mozilla.org/MPL/
|
|
||||||
*
|
|
||||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
|
||||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
||||||
* for the specific language governing rights and limitations under the
|
|
||||||
* License.
|
|
||||||
*
|
|
||||||
* The Original Code is Mozilla Skywriter.
|
|
||||||
*
|
|
||||||
* The Initial Developer of the Original Code is
|
|
||||||
* Mozilla.
|
|
||||||
* Portions created by the Initial Developer are Copyright (C) 2009
|
|
||||||
* the Initial Developer. All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Contributor(s):
|
|
||||||
* Fabian Jakobs <fabian AT ajax DOT org>
|
|
||||||
* Julian Viereck (julian.viereck@gmail.com)
|
|
||||||
*
|
|
||||||
* Alternatively, the contents of this file may be used under the terms of
|
|
||||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
|
||||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
||||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
|
||||||
* of those above. If you wish to allow use of your version of this file only
|
|
||||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
|
||||||
* use your version of this file under the terms of the MPL, indicate your
|
|
||||||
* decision by deleting the provisions above and replace them with the notice
|
|
||||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
|
||||||
* the provisions above, a recipient may use your version of this file under
|
|
||||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
|
||||||
*
|
|
||||||
* ***** END LICENSE BLOCK ***** */
|
|
||||||
|
|
||||||
ace.define('ace/keyboard/hash_handler', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
var keyUtil = require("../lib/keys");
|
|
||||||
|
|
||||||
function HashHandler(config) {
|
|
||||||
this.setConfig(config);
|
|
||||||
}
|
|
||||||
|
|
||||||
(function() {
|
|
||||||
function splitSafe(s, separator, limit, bLowerCase) {
|
|
||||||
return (bLowerCase && s.toLowerCase() || s)
|
|
||||||
.replace(/(?:^\s+|\n|\s+$)/g, "")
|
|
||||||
.split(new RegExp("[\\s ]*" + separator + "[\\s ]*", "g"), limit || 999);
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseKeys(keys, val, ret) {
|
|
||||||
var key,
|
|
||||||
hashId = 0,
|
|
||||||
parts = splitSafe(keys, "\\-", null, true),
|
|
||||||
i = 0,
|
|
||||||
l = parts.length;
|
|
||||||
|
|
||||||
for (; i < l; ++i) {
|
|
||||||
if (keyUtil.KEY_MODS[parts[i]])
|
|
||||||
hashId = hashId | keyUtil.KEY_MODS[parts[i]];
|
|
||||||
else
|
|
||||||
key = parts[i] || "-"; //when empty, the splitSafe removed a '-'
|
|
||||||
}
|
|
||||||
|
|
||||||
(ret[hashId] || (ret[hashId] = {}))[key] = val;
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
function objectReverse(obj, keySplit) {
|
|
||||||
var i, j, l, key,
|
|
||||||
ret = {};
|
|
||||||
for (i in obj) {
|
|
||||||
key = obj[i];
|
|
||||||
if (keySplit && typeof key == "string") {
|
|
||||||
key = key.split(keySplit);
|
|
||||||
for (j = 0, l = key.length; j < l; ++j)
|
|
||||||
parseKeys.call(this, key[j], i, ret);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
parseKeys.call(this, key, i, ret);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.setConfig = function(config) {
|
|
||||||
this.$config = config;
|
|
||||||
if (typeof this.$config.reverse == "undefined")
|
|
||||||
this.$config.reverse = objectReverse.call(this, this.$config, "|");
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This function is called by keyBinding.
|
|
||||||
*/
|
|
||||||
this.handleKeyboard = function(data, hashId, textOrKey, keyCode) {
|
|
||||||
// Figure out if a commandKey was pressed or just some text was insert.
|
|
||||||
if (hashId != 0 || keyCode != 0) {
|
|
||||||
return {
|
|
||||||
command: (this.$config.reverse[hashId] || {})[textOrKey]
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return {
|
|
||||||
command: "inserttext",
|
|
||||||
args: {
|
|
||||||
text: textOrKey
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).call(HashHandler.prototype)
|
|
||||||
|
|
||||||
exports.HashHandler = HashHandler;
|
|
||||||
});
|
});
|
||||||
/* ***** BEGIN LICENSE BLOCK *****
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
|
|
||||||
|
|
@ -2996,7 +2996,7 @@ var Editor = function(renderer, session) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.getAnimatedScroll = function(){
|
this.getAnimatedScroll = function(){
|
||||||
this.renderer.getAnimatedScroll();
|
return this.renderer.getAnimatedScroll();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.setShowInvisibles = function(showInvisibles) {
|
this.setShowInvisibles = function(showInvisibles) {
|
||||||
|
|
@ -3628,16 +3628,19 @@ var Editor = function(renderer, session) {
|
||||||
this.selection.setSelectionRange(range);
|
this.selection.setSelectionRange(range);
|
||||||
this.$blockScrolling -= 1;
|
this.$blockScrolling -= 1;
|
||||||
|
|
||||||
|
if (this.getAnimatedScroll()) {
|
||||||
var cursor = this.getCursorPosition();
|
var cursor = this.getCursorPosition();
|
||||||
if (!this.isRowFullyVisible(cursor.row))
|
if (!this.isRowFullyVisible(cursor.row))
|
||||||
this.scrollToLine(cursor.row, true);
|
this.scrollToLine(cursor.row, true);
|
||||||
|
|
||||||
//@todo scroll X
|
//@todo scroll X
|
||||||
//if (!this.isRowFullyVisible(cursor.row))
|
//if (!this.isColumnFullyVisible(cursor.column))
|
||||||
//this.scrollToLine(cursor.row, true);
|
//this.scrollToRow(cursor.column);
|
||||||
|
}
|
||||||
|
else {
|
||||||
this.renderer.scrollSelectionIntoView(range.start, range.end);
|
this.renderer.scrollSelectionIntoView(range.start, range.end);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
this.undo = function() {
|
this.undo = function() {
|
||||||
|
|
@ -4344,7 +4347,7 @@ function DefaultHandlers(editor) {
|
||||||
if (!editor.$mouseHandler.$clickSelection) {
|
if (!editor.$mouseHandler.$clickSelection) {
|
||||||
if (!dragCursor) {
|
if (!dragCursor) {
|
||||||
editor.moveCursorToPosition(pos);
|
editor.moveCursorToPosition(pos);
|
||||||
editor.selection.clearSelection(pos.row, pos.column);
|
editor.selection.clearSelection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -4379,7 +4382,6 @@ function DefaultHandlers(editor) {
|
||||||
if (distance > DRAG_OFFSET) {
|
if (distance > DRAG_OFFSET) {
|
||||||
state = STATE_SELECT;
|
state = STATE_SELECT;
|
||||||
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
||||||
cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
|
|
||||||
onStartSelect(cursor);
|
onStartSelect(cursor);
|
||||||
}
|
}
|
||||||
else if ((time - mousedownTime) > editor.getDragDelay()) {
|
else if ((time - mousedownTime) > editor.getDragDelay()) {
|
||||||
|
|
@ -4406,7 +4408,7 @@ function DefaultHandlers(editor) {
|
||||||
else {
|
else {
|
||||||
if (!_self.$clickSelection) {
|
if (!_self.$clickSelection) {
|
||||||
editor.moveCursorToPosition(pos);
|
editor.moveCursorToPosition(pos);
|
||||||
editor.selection.clearSelection(pos.row, pos.column);
|
editor.selection.clearSelection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
state = STATE_SELECT;
|
state = STATE_SELECT;
|
||||||
|
|
@ -4415,7 +4417,6 @@ function DefaultHandlers(editor) {
|
||||||
var onUpdateSelectionInterval = function() {
|
var onUpdateSelectionInterval = function() {
|
||||||
var anchor;
|
var anchor;
|
||||||
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
||||||
cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
|
|
||||||
|
|
||||||
if (_self.$clickSelection) {
|
if (_self.$clickSelection) {
|
||||||
if (_self.$clickSelection.contains(cursor.row, cursor.column)) {
|
if (_self.$clickSelection.contains(cursor.row, cursor.column)) {
|
||||||
|
|
@ -4441,8 +4442,6 @@ function DefaultHandlers(editor) {
|
||||||
|
|
||||||
var onDragSelectionInterval = function() {
|
var onDragSelectionInterval = function() {
|
||||||
dragCursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
dragCursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
||||||
dragCursor.row = Math.max(0, Math.min(dragCursor.row, editor.session.getLength() - 1));
|
|
||||||
|
|
||||||
editor.moveCursorToPosition(dragCursor);
|
editor.moveCursorToPosition(dragCursor);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -4864,7 +4863,6 @@ var MouseEvent = exports.MouseEvent = function(domEvent, editor) {
|
||||||
var pageX = event.getDocumentX(this.domEvent);
|
var pageX = event.getDocumentX(this.domEvent);
|
||||||
var pageY = event.getDocumentY(this.domEvent);
|
var pageY = event.getDocumentY(this.domEvent);
|
||||||
this.$pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY);
|
this.$pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY);
|
||||||
this.$pos.row = Math.max(0, Math.min(this.$pos.row, this.editor.session.getLength()-1));
|
|
||||||
return this.$pos;
|
return this.$pos;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -4964,7 +4962,7 @@ function FoldHandler(editor) {
|
||||||
var position = e.getDocumentPosition();
|
var position = e.getDocumentPosition();
|
||||||
var session = editor.session;
|
var session = editor.session;
|
||||||
|
|
||||||
// If the user dclicked on a fold, then expand it.
|
// If the user clicked on a fold, then expand it.
|
||||||
var fold = session.getFoldAt(position.row, position.column, 1);
|
var fold = session.getFoldAt(position.row, position.column, 1);
|
||||||
if (fold) {
|
if (fold) {
|
||||||
if (e.getAccelKey())
|
if (e.getAccelKey())
|
||||||
|
|
@ -6951,8 +6949,8 @@ var EditSession = function(text, mode) {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.getScreenLastRowColumn = function(screenRow) {
|
this.getScreenLastRowColumn = function(screenRow) {
|
||||||
//return this.screenToDocumentColumn(screenRow, Number.MAX_VALUE / 10)
|
var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE)
|
||||||
return this.documentToScreenColumn(screenRow, this.doc.getLine(screenRow).length);
|
return this.documentToScreenColumn(pos.row, pos.column);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.getDocumentLastRowColumn = function(docRow, docColumn) {
|
this.getDocumentLastRowColumn = function(docRow, docColumn) {
|
||||||
|
|
@ -7067,17 +7065,11 @@ var EditSession = function(text, mode) {
|
||||||
|
|
||||||
docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
|
docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
|
||||||
|
|
||||||
// Need to do some clamping action here.
|
// We remove one character at the end so that the docColumn
|
||||||
if (this.$useWrapMode) {
|
// position returned is not associated to the next row on the screen.
|
||||||
if (docColumn >= column) {
|
if (this.$useWrapMode && docColumn >= column) {
|
||||||
// We remove one character at the end such that the docColumn
|
|
||||||
// position returned is not associated to the next row on the
|
|
||||||
// screen.
|
|
||||||
docColumn = column - 1;
|
docColumn = column - 1;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
docColumn = Math.min(docColumn, line.length);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (foldLine) {
|
if (foldLine) {
|
||||||
return foldLine.idxToPosition(docColumn);
|
return foldLine.idxToPosition(docColumn);
|
||||||
|
|
@ -7527,18 +7519,18 @@ var Selection = function(session) {
|
||||||
this.selectionLead = this.doc.createAnchor(0, 0);
|
this.selectionLead = this.doc.createAnchor(0, 0);
|
||||||
this.selectionAnchor = this.doc.createAnchor(0, 0);
|
this.selectionAnchor = this.doc.createAnchor(0, 0);
|
||||||
|
|
||||||
var _self = this;
|
var self = this;
|
||||||
this.selectionLead.on("change", function(e) {
|
this.selectionLead.on("change", function(e) {
|
||||||
_self._emit("changeCursor");
|
self._emit("changeCursor");
|
||||||
if (!_self.$isEmpty)
|
if (!self.$isEmpty)
|
||||||
_self._emit("changeSelection");
|
self._emit("changeSelection");
|
||||||
if (!_self.$preventUpdateDesiredColumnOnChange && e.old.column != e.value.column)
|
if (!self.$keepDesiredColumnOnChange && e.old.column != e.value.column)
|
||||||
_self.$updateDesiredColumn();
|
self.$desiredColumn = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.selectionAnchor.on("change", function() {
|
this.selectionAnchor.on("change", function() {
|
||||||
if (!_self.$isEmpty)
|
if (!self.$isEmpty)
|
||||||
_self._emit("changeSelection");
|
self._emit("changeSelection");
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -7648,12 +7640,7 @@ var Selection = function(session) {
|
||||||
this.setSelectionAnchor(range.start.row, range.start.column);
|
this.setSelectionAnchor(range.start.row, range.start.column);
|
||||||
this.selectTo(range.end.row, range.end.column);
|
this.selectTo(range.end.row, range.end.column);
|
||||||
}
|
}
|
||||||
this.$updateDesiredColumn();
|
this.$desiredColumn = null;
|
||||||
};
|
|
||||||
|
|
||||||
this.$updateDesiredColumn = function() {
|
|
||||||
var cursor = this.getCursor();
|
|
||||||
this.$desiredColumn = this.session.documentToScreenColumn(cursor.row, cursor.column);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.$moveSelection = function(mover) {
|
this.$moveSelection = function(mover) {
|
||||||
|
|
@ -7938,8 +7925,14 @@ var Selection = function(session) {
|
||||||
this.selectionLead.column
|
this.selectionLead.column
|
||||||
);
|
);
|
||||||
|
|
||||||
var screenCol = (chars === 0 && this.$desiredColumn) || screenPos.column;
|
if (chars === 0) {
|
||||||
var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenCol);
|
if (this.$desiredColumn)
|
||||||
|
screenPos.column = this.$desiredColumn;
|
||||||
|
else
|
||||||
|
this.$desiredColumn = screenPos.column;
|
||||||
|
}
|
||||||
|
|
||||||
|
var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenPos.column);
|
||||||
|
|
||||||
// move the cursor and update the desired column
|
// move the cursor and update the desired column
|
||||||
this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0);
|
this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0);
|
||||||
|
|
@ -7949,7 +7942,7 @@ var Selection = function(session) {
|
||||||
this.moveCursorTo(position.row, position.column);
|
this.moveCursorTo(position.row, position.column);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.moveCursorTo = function(row, column, preventUpdateDesiredColumn) {
|
this.moveCursorTo = function(row, column, keepDesiredColumn) {
|
||||||
// Ensure the row/column is not inside of a fold.
|
// Ensure the row/column is not inside of a fold.
|
||||||
var fold = this.session.getFoldAt(row, column, 1);
|
var fold = this.session.getFoldAt(row, column, 1);
|
||||||
if (fold) {
|
if (fold) {
|
||||||
|
|
@ -7957,21 +7950,47 @@ var Selection = function(session) {
|
||||||
column = fold.start.column;
|
column = fold.start.column;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.$preventUpdateDesiredColumnOnChange = true;
|
this.$keepDesiredColumnOnChange = true;
|
||||||
this.selectionLead.setPosition(row, column);
|
this.selectionLead.setPosition(row, column);
|
||||||
this.$preventUpdateDesiredColumnOnChange = false;
|
this.$keepDesiredColumnOnChange = false;
|
||||||
|
|
||||||
if (!preventUpdateDesiredColumn)
|
if (!keepDesiredColumn)
|
||||||
this.$updateDesiredColumn(this.selectionLead.column);
|
this.$desiredColumn = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
this.moveCursorToScreen = function(row, column, preventUpdateDesiredColumn) {
|
this.moveCursorToScreen = function(row, column, keepDesiredColumn) {
|
||||||
var pos = this.session.screenToDocumentPosition(row, column);
|
var pos = this.session.screenToDocumentPosition(row, column);
|
||||||
row = pos.row;
|
this.moveCursorTo(pos.row, pos.column, keepDesiredColumn);
|
||||||
column = pos.column;
|
|
||||||
this.moveCursorTo(row, column, preventUpdateDesiredColumn);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// remove listeners from document
|
||||||
|
this.detach = function() {
|
||||||
|
this.selectionLead.detach();
|
||||||
|
this.selectionAnchor.detach();
|
||||||
|
this.session = this.doc = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.fromOrientedRange = function(range) {
|
||||||
|
this.setSelectionRange(range, range.cursor == range.start);
|
||||||
|
this.$desiredColumn = range.desiredColumn || this.$desiredColumn;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.toOrientedRange = function(range) {
|
||||||
|
var r = this.getRange();
|
||||||
|
if (range) {
|
||||||
|
range.start.column = r.start.column;
|
||||||
|
range.start.row = r.start.row;
|
||||||
|
range.end.column = r.end.column;
|
||||||
|
range.end.row = r.end.row;
|
||||||
|
} else {
|
||||||
|
range = r;
|
||||||
|
}
|
||||||
|
|
||||||
|
range.cursor = this.isBackwards() ? range.start : range.end;
|
||||||
|
range.desiredColumn = this.$desiredColumn;
|
||||||
|
return range;
|
||||||
|
}
|
||||||
|
|
||||||
}).call(Selection.prototype);
|
}).call(Selection.prototype);
|
||||||
|
|
||||||
exports.Selection = Selection;
|
exports.Selection = Selection;
|
||||||
|
|
@ -8029,7 +8048,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -8095,6 +8114,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -8254,6 +8278,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
@ -10497,7 +10536,7 @@ function Folding() {
|
||||||
// sometimes singleline folds can be missed by the code above
|
// sometimes singleline folds can be missed by the code above
|
||||||
if (!range.isMultiLine()) {
|
if (!range.isMultiLine()) {
|
||||||
fold = this.getFoldAt(range.start.row, range.start.column, 1);
|
fold = this.getFoldAt(range.start.row, range.start.column, 1);
|
||||||
if (fold && range.isEequal(fold.range)) {
|
if (fold && range.isEqual(fold.range)) {
|
||||||
this.removeFold(fold);
|
this.removeFold(fold);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -10888,7 +10927,7 @@ var Fold = exports.Fold = function(range, placeholder) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.addSubFold = function(fold) {
|
this.addSubFold = function(fold) {
|
||||||
if (this.range.isEequal(fold))
|
if (this.range.isEqual(fold))
|
||||||
return this;
|
return this;
|
||||||
|
|
||||||
if (!this.range.containsRange(fold))
|
if (!this.range.containsRange(fold))
|
||||||
|
|
@ -11566,21 +11605,153 @@ Search.SELECTION = 2;
|
||||||
|
|
||||||
exports.Search = Search;
|
exports.Search = Search;
|
||||||
});
|
});
|
||||||
define('ace/commands/command_manager', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
|
define('ace/commands/command_manager', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/keyboard/hash_handler', 'ace/lib/event_emitter'], function(require, exports, module) {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
var keyUtil = require("../lib/keys");
|
var oop = require("../lib/oop");
|
||||||
|
var HashHandler = require("../keyboard/hash_handler").HashHandler;
|
||||||
|
var EventEmitter = require("../lib/event_emitter").EventEmitter;
|
||||||
|
|
||||||
var CommandManager = function(platform, commands) {
|
var CommandManager = function(platform, commands) {
|
||||||
if (typeof platform !== "string")
|
|
||||||
throw new TypeError("'platform' argument must be either 'mac' or 'win'");
|
|
||||||
|
|
||||||
this.platform = platform;
|
this.platform = platform;
|
||||||
this.commands = {};
|
this.commands = {};
|
||||||
this.commmandKeyBinding = {};
|
this.commmandKeyBinding = {};
|
||||||
|
|
||||||
if (commands)
|
this.addCommands(commands);
|
||||||
commands.forEach(this.addCommand, this);
|
|
||||||
|
this.setDefaultHandler("exec", function(e) {
|
||||||
|
e.command.exec(e.editor, e.args || {});
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
oop.inherits(CommandManager, HashHandler);
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
|
||||||
|
oop.implement(this, EventEmitter);
|
||||||
|
|
||||||
|
this.exec = function(command, editor, args) {
|
||||||
|
if (typeof command === 'string')
|
||||||
|
command = this.commands[command];
|
||||||
|
|
||||||
|
if (!command)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (editor && editor.$readOnly && !command.readOnly)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
this._emit("exec", {editor: editor, command: command, args: args});
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.toggleRecording = function() {
|
||||||
|
if (this.$inReplay)
|
||||||
|
return;
|
||||||
|
if (this.recording) {
|
||||||
|
this.macro.pop();
|
||||||
|
this.removeEventListener("exec", this.$addCommandToMacro);
|
||||||
|
|
||||||
|
if (!this.macro.length)
|
||||||
|
this.macro = this.oldMacro;
|
||||||
|
|
||||||
|
return this.recording = false;
|
||||||
|
}
|
||||||
|
if (!this.$addCommandToMacro) {
|
||||||
|
this.$addCommandToMacro = function(e) {
|
||||||
|
this.macro.push([e.command, e.args]);
|
||||||
|
}.bind(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.oldMacro = this.macro;
|
||||||
|
this.macro = [];
|
||||||
|
this.on("exec", this.$addCommandToMacro);
|
||||||
|
return this.recording = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.replay = function(editor) {
|
||||||
|
if (this.$inReplay || !this.macro)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (this.recording)
|
||||||
|
return this.toggleRecording();
|
||||||
|
|
||||||
|
try {
|
||||||
|
this.$inReplay = true;
|
||||||
|
this.macro.forEach(function(x) {
|
||||||
|
if (typeof x == "string")
|
||||||
|
this.exec(x, editor);
|
||||||
|
else
|
||||||
|
this.exec(x[0], editor, x[1]);
|
||||||
|
}, this);
|
||||||
|
} finally {
|
||||||
|
this.$inReplay = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
this.trimMacro = function(m) {
|
||||||
|
return m.map(function(x){
|
||||||
|
if (typeof x[0] != "string")
|
||||||
|
x[0] = x[0].name;
|
||||||
|
if (!x[1])
|
||||||
|
x = x[0];
|
||||||
|
return x;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
}).call(CommandManager.prototype);
|
||||||
|
|
||||||
|
exports.CommandManager = CommandManager;
|
||||||
|
|
||||||
|
});
|
||||||
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
* http://www.mozilla.org/MPL/
|
||||||
|
*
|
||||||
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
* for the specific language governing rights and limitations under the
|
||||||
|
* License.
|
||||||
|
*
|
||||||
|
* The Original Code is Mozilla Skywriter.
|
||||||
|
*
|
||||||
|
* The Initial Developer of the Original Code is
|
||||||
|
* Mozilla.
|
||||||
|
* Portions created by the Initial Developer are Copyright (C) 2009
|
||||||
|
* the Initial Developer. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Contributor(s):
|
||||||
|
* Fabian Jakobs <fabian AT ajax DOT org>
|
||||||
|
* Julian Viereck (julian.viereck@gmail.com)
|
||||||
|
*
|
||||||
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
* of those above. If you wish to allow use of your version of this file only
|
||||||
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
* use your version of this file under the terms of the MPL, indicate your
|
||||||
|
* decision by deleting the provisions above and replace them with the notice
|
||||||
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
* the provisions above, a recipient may use your version of this file under
|
||||||
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
define('ace/keyboard/hash_handler', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var keyUtil = require("../lib/keys");
|
||||||
|
|
||||||
|
function HashHandler(config, platform) {
|
||||||
|
this.platform = platform;
|
||||||
|
this.commands = {};
|
||||||
|
this.commmandKeyBinding = {};
|
||||||
|
|
||||||
|
this.addCommands(config);
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
|
|
@ -11601,7 +11772,7 @@ var CommandManager = function(platform, commands) {
|
||||||
command = this.commands[name];
|
command = this.commands[name];
|
||||||
delete this.commands[name];
|
delete this.commands[name];
|
||||||
|
|
||||||
// exaustive search is brute force but since removeCommand is
|
// exhaustive search is brute force but since removeCommand is
|
||||||
// not a performance critical operation this should be OK
|
// not a performance critical operation this should be OK
|
||||||
var ckb = this.commmandKeyBinding;
|
var ckb = this.commmandKeyBinding;
|
||||||
for (var hashId in ckb) {
|
for (var hashId in ckb) {
|
||||||
|
|
@ -11613,7 +11784,7 @@ var CommandManager = function(platform, commands) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.addCommands = function(commands) {
|
this.addCommands = function(commands) {
|
||||||
Object.keys(commands).forEach(function(name) {
|
commands && Object.keys(commands).forEach(function(name) {
|
||||||
var command = commands[name];
|
var command = commands[name];
|
||||||
if (typeof command === "string")
|
if (typeof command === "string")
|
||||||
return this.bindKey(command, name);
|
return this.bindKey(command, name);
|
||||||
|
|
@ -11664,9 +11835,9 @@ var CommandManager = function(platform, commands) {
|
||||||
function parseKeys(keys, val, ret) {
|
function parseKeys(keys, val, ret) {
|
||||||
var key;
|
var key;
|
||||||
var hashId = 0;
|
var hashId = 0;
|
||||||
var parts = splitSafe(keys);
|
var parts = splitSafe(keys.toLowerCase());
|
||||||
|
|
||||||
for (var i=0, l = parts.length; i < l; i++) {
|
for (var i = 0, l = parts.length; i < l; i++) {
|
||||||
if (keyUtil.KEY_MODS[parts[i]])
|
if (keyUtil.KEY_MODS[parts[i]])
|
||||||
hashId = hashId | keyUtil.KEY_MODS[parts[i]];
|
hashId = hashId | keyUtil.KEY_MODS[parts[i]];
|
||||||
else
|
else
|
||||||
|
|
@ -11680,91 +11851,24 @@ var CommandManager = function(platform, commands) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function splitSafe(s) {
|
function splitSafe(s) {
|
||||||
return (s.toLowerCase()
|
return (s.trim()
|
||||||
.trim()
|
|
||||||
.split(new RegExp("[\\s ]*\\-[\\s ]*", "g"), 999));
|
.split(new RegExp("[\\s ]*\\-[\\s ]*", "g"), 999));
|
||||||
}
|
}
|
||||||
|
|
||||||
this.findKeyCommand = function findKeyCommand(hashId, textOrKey) {
|
this.findKeyCommand = function findKeyCommand(hashId, keyString) {
|
||||||
// Convert keyCode to the string representation.
|
|
||||||
if (typeof textOrKey == "number") {
|
|
||||||
textOrKey = keyUtil.keyCodeToString(textOrKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
var ckbr = this.commmandKeyBinding;
|
var ckbr = this.commmandKeyBinding;
|
||||||
return ckbr[hashId] && ckbr[hashId][textOrKey.toLowerCase()];
|
return ckbr[hashId] && ckbr[hashId][keyString.toLowerCase()];
|
||||||
};
|
|
||||||
|
|
||||||
this.exec = function(command, editor, args) {
|
|
||||||
if (typeof command === 'string')
|
|
||||||
command = this.commands[command];
|
|
||||||
|
|
||||||
if (!command)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (editor && editor.$readOnly && !command.readOnly)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
command.exec(editor, args || {});
|
|
||||||
return true;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.toggleRecording = function() {
|
|
||||||
if (this.$inReplay)
|
|
||||||
return;
|
|
||||||
if (this.recording) {
|
|
||||||
this.macro.pop();
|
|
||||||
this.exec = this.normal_exec;
|
|
||||||
|
|
||||||
if (!this.macro.length)
|
|
||||||
this.macro = this.oldMacro;
|
|
||||||
|
|
||||||
return this.recording = false;
|
|
||||||
}
|
}
|
||||||
this.oldMacro = this.macro;
|
|
||||||
this.macro = [];
|
this.handleKeyboard = function(data, hashId, keyString, keyCode) {
|
||||||
this.normal_exec = this.exec;
|
return {
|
||||||
this.exec = function(command, editor, args) {
|
command: this.findKeyCommand(hashId, keyString)
|
||||||
this.macro.push([command, args]);
|
|
||||||
return this.normal_exec(command, editor, args);
|
|
||||||
};
|
};
|
||||||
return this.recording = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.replay = function(editor) {
|
}).call(HashHandler.prototype)
|
||||||
if (this.$inReplay || !this.macro)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (this.recording)
|
|
||||||
return this.toggleRecording();
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.$inReplay = true;
|
|
||||||
this.macro.forEach(function(x) {
|
|
||||||
if (typeof x == "string")
|
|
||||||
this.exec(x, editor);
|
|
||||||
else
|
|
||||||
this.exec(x[0], editor, x[1]);
|
|
||||||
}, this);
|
|
||||||
} finally {
|
|
||||||
this.$inReplay = false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.trimMacro = function(m) {
|
|
||||||
return m.map(function(x){
|
|
||||||
if (typeof x[0] != "string")
|
|
||||||
x[0] = x[0].name;
|
|
||||||
if (!x[1])
|
|
||||||
x = x[0];
|
|
||||||
return x;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
}).call(CommandManager.prototype);
|
|
||||||
|
|
||||||
exports.CommandManager = CommandManager;
|
|
||||||
|
|
||||||
|
exports.HashHandler = HashHandler;
|
||||||
});
|
});
|
||||||
/* vim:ts=4:sts=4:sw=4:
|
/* vim:ts=4:sts=4:sw=4:
|
||||||
* ***** BEGIN LICENSE BLOCK *****
|
* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
@ -12149,7 +12253,7 @@ var VirtualRenderer = function(container, theme) {
|
||||||
this.$animatedScroll = shouldAnimate;
|
this.$animatedScroll = shouldAnimate;
|
||||||
};
|
};
|
||||||
|
|
||||||
this.getAnimatedScroll = function(){
|
this.getAnimatedScroll = function() {
|
||||||
return this.$animatedScroll;
|
return this.$animatedScroll;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -12656,6 +12760,19 @@ var VirtualRenderer = function(container, theme) {
|
||||||
// todo: handle horizontal scrolling
|
// todo: handle horizontal scrolling
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.pixelToScreenCoordinates = function(pageX, pageY) {
|
||||||
|
var canvasPos = this.scroller.getBoundingClientRect();
|
||||||
|
|
||||||
|
var col = Math.round(
|
||||||
|
(pageX + this.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft()) / this.characterWidth
|
||||||
|
);
|
||||||
|
var row = Math.floor(
|
||||||
|
(pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop()) / this.lineHeight
|
||||||
|
);
|
||||||
|
|
||||||
|
return {row: row, column: col};
|
||||||
|
};
|
||||||
|
|
||||||
this.screenToTextCoordinates = function(pageX, pageY) {
|
this.screenToTextCoordinates = function(pageX, pageY) {
|
||||||
var canvasPos = this.scroller.getBoundingClientRect();
|
var canvasPos = this.scroller.getBoundingClientRect();
|
||||||
|
|
||||||
|
|
@ -12747,7 +12864,7 @@ var VirtualRenderer = function(container, theme) {
|
||||||
return afterLoad(module);
|
return afterLoad(module);
|
||||||
|
|
||||||
_self._loadTheme(moduleName, function() {
|
_self._loadTheme(moduleName, function() {
|
||||||
require([theme], function(module) {
|
require([moduleName], function(module) {
|
||||||
if (_self.$themeValue !== theme)
|
if (_self.$themeValue !== theme)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
@ -13112,7 +13229,7 @@ var Marker = function(parentEl) {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Draws a marker, which spans a range of text in a single line
|
* Draws a marker, which spans a range of text on multiple lines
|
||||||
*/
|
*/
|
||||||
this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {
|
this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {
|
||||||
// selection start
|
// selection start
|
||||||
|
|
@ -13187,7 +13304,7 @@ var Marker = function(parentEl) {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Draws a marker which covers one single full line
|
* Draws a marker which covers part or whole width of a single screen line
|
||||||
*/
|
*/
|
||||||
this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, type) {
|
this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, type) {
|
||||||
var padding = type === "background" ? 0 : this.$padding;
|
var padding = type === "background" ? 0 : this.$padding;
|
||||||
|
|
@ -13521,16 +13638,16 @@ var Text = function(parentEl) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.$renderLinesFragment = function(config, firstRow, lastRow) {
|
this.$renderLinesFragment = function(config, firstRow, lastRow) {
|
||||||
var fragment = this.element.ownerDocument.createDocumentFragment(),
|
var fragment = this.element.ownerDocument.createDocumentFragment();
|
||||||
row = firstRow,
|
var row = firstRow;
|
||||||
fold = this.session.getNextFoldLine(row),
|
var foldLine = this.session.getNextFoldLine(row);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
var foldStart = foldLine ? foldLine.start.row : Infinity;
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
if (row > foldStart) {
|
if (row > foldStart) {
|
||||||
row = fold.end.row+1;
|
row = foldLine.end.row+1;
|
||||||
fold = this.session.getNextFoldLine(row, fold);
|
foldLine = this.session.getNextFoldLine(row, foldLine);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
foldStart = foldLine ? foldLine.start.row : Infinity;
|
||||||
}
|
}
|
||||||
if (row > lastRow)
|
if (row > lastRow)
|
||||||
break;
|
break;
|
||||||
|
|
@ -13569,15 +13686,15 @@ var Text = function(parentEl) {
|
||||||
var html = [];
|
var html = [];
|
||||||
var firstRow = config.firstRow, lastRow = config.lastRow;
|
var firstRow = config.firstRow, lastRow = config.lastRow;
|
||||||
|
|
||||||
var row = firstRow,
|
var row = firstRow;
|
||||||
fold = this.session.getNextFoldLine(row),
|
var foldLine = this.session.getNextFoldLine(row);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
var foldStart = foldLine ? foldLine.start.row : Infinity;
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
if (row > foldStart) {
|
if (row > foldStart) {
|
||||||
row = fold.end.row+1;
|
row = foldLine.end.row+1;
|
||||||
fold = this.session.getNextFoldLine(row, fold);
|
foldLine = this.session.getNextFoldLine(row, foldLine);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
foldStart = foldLine ? foldLine.start.row :Infinity;
|
||||||
}
|
}
|
||||||
if (row > lastRow)
|
if (row > lastRow)
|
||||||
break;
|
break;
|
||||||
|
|
@ -13878,11 +13995,10 @@ var Cursor = function(parentEl) {
|
||||||
this.element.className = "ace_layer ace_cursor-layer";
|
this.element.className = "ace_layer ace_cursor-layer";
|
||||||
parentEl.appendChild(this.element);
|
parentEl.appendChild(this.element);
|
||||||
|
|
||||||
this.cursor = dom.createElement("div");
|
|
||||||
this.cursor.className = "ace_cursor ace_hidden";
|
|
||||||
this.element.appendChild(this.cursor);
|
|
||||||
|
|
||||||
this.isVisible = false;
|
this.isVisible = false;
|
||||||
|
|
||||||
|
this.cursors = [];
|
||||||
|
this.cursor = this.addCursor();
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
|
|
@ -13896,30 +14012,54 @@ var Cursor = function(parentEl) {
|
||||||
this.session = session;
|
this.session = session;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.addCursor = function() {
|
||||||
|
var el = dom.createElement("div");
|
||||||
|
var className = "ace_cursor";
|
||||||
|
if (!this.isVisible)
|
||||||
|
className += " ace_hidden";
|
||||||
|
if (this.overwrite)
|
||||||
|
className += " ace_overwrite";
|
||||||
|
|
||||||
|
el.className = className;
|
||||||
|
this.element.appendChild(el);
|
||||||
|
this.cursors.push(el);
|
||||||
|
return el;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.removeCursor = function() {
|
||||||
|
if (this.cursors.length > 1) {
|
||||||
|
var el = this.cursors.pop();
|
||||||
|
el.parentNode.removeChild(el);
|
||||||
|
return el;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
this.hideCursor = function() {
|
this.hideCursor = function() {
|
||||||
this.isVisible = false;
|
this.isVisible = false;
|
||||||
dom.addCssClass(this.cursor, "ace_hidden");
|
for (var i = this.cursors.length; i--; )
|
||||||
|
dom.addCssClass(this.cursors[i], "ace_hidden");
|
||||||
clearInterval(this.blinkId);
|
clearInterval(this.blinkId);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.showCursor = function() {
|
this.showCursor = function() {
|
||||||
this.isVisible = true;
|
this.isVisible = true;
|
||||||
dom.removeCssClass(this.cursor, "ace_hidden");
|
for (var i = this.cursors.length; i--; )
|
||||||
this.cursor.style.visibility = "visible";
|
dom.removeCssClass(this.cursors[i], "ace_hidden");
|
||||||
|
|
||||||
|
this.element.style.visibility = "";
|
||||||
this.restartTimer();
|
this.restartTimer();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.restartTimer = function() {
|
this.restartTimer = function() {
|
||||||
clearInterval(this.blinkId);
|
clearInterval(this.blinkId);
|
||||||
if (!this.isVisible) {
|
if (!this.isVisible)
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
var cursor = this.cursor;
|
var element = this.element;
|
||||||
this.blinkId = setInterval(function() {
|
this.blinkId = setInterval(function() {
|
||||||
cursor.style.visibility = "hidden";
|
element.style.visibility = "hidden";
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
cursor.style.visibility = "visible";
|
element.style.visibility = "visible";
|
||||||
}, 400);
|
}, 400);
|
||||||
}, 1000);
|
}, 1000);
|
||||||
};
|
};
|
||||||
|
|
@ -13949,25 +14089,53 @@ var Cursor = function(parentEl) {
|
||||||
this.update = function(config) {
|
this.update = function(config) {
|
||||||
this.config = config;
|
this.config = config;
|
||||||
|
|
||||||
this.pixelPos = this.getPixelPosition(null, true);
|
if (this.session.selectionMarkerCount > 1) {
|
||||||
|
var selections = this.session.$selectionMarkers;
|
||||||
|
var i = 0, sel, cursorIndex = 0;
|
||||||
|
|
||||||
this.cursor.style.left = this.pixelPos.left + "px";
|
for (var i = selections.length; i--; ) {
|
||||||
this.cursor.style.top = this.pixelPos.top + "px";
|
sel = selections[i];
|
||||||
this.cursor.style.width = config.characterWidth + "px";
|
var pixelPos = this.getPixelPosition(sel.cursor, true);
|
||||||
this.cursor.style.height = config.lineHeight + "px";
|
|
||||||
|
|
||||||
var overwrite = this.session.getOverwrite()
|
var style = (this.cursors[cursorIndex++] || this.addCursor()).style;
|
||||||
if (overwrite != this.overwrite) {
|
|
||||||
this.overwrite = overwrite;
|
style.left = pixelPos.left + "px";
|
||||||
if (overwrite)
|
style.top = pixelPos.top + "px";
|
||||||
dom.addCssClass(this.cursor, "ace_overwrite");
|
style.width = config.characterWidth + "px";
|
||||||
else
|
style.height = config.lineHeight + "px";
|
||||||
dom.removeCssClass(this.cursor, "ace_overwrite");
|
}
|
||||||
|
if (cursorIndex > 1)
|
||||||
|
while (this.cursors.length > cursorIndex)
|
||||||
|
this.removeCursor();
|
||||||
|
} else {
|
||||||
|
var pixelPos = this.getPixelPosition(null, true);
|
||||||
|
var style = this.cursor.style;
|
||||||
|
style.left = pixelPos.left + "px";
|
||||||
|
style.top = pixelPos.top + "px";
|
||||||
|
style.width = config.characterWidth + "px";
|
||||||
|
style.height = config.lineHeight + "px";
|
||||||
|
|
||||||
|
while (this.cursors.length > 1)
|
||||||
|
this.removeCursor();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var overwrite = this.session.getOverwrite();
|
||||||
|
if (overwrite != this.overwrite)
|
||||||
|
this.$setOverite(overwrite);
|
||||||
|
|
||||||
this.restartTimer();
|
this.restartTimer();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.$setOverite = function(overwrite) {
|
||||||
|
this.overwrite = overwrite;
|
||||||
|
for (var i = this.cursors.length; i--; ) {
|
||||||
|
if (overwrite)
|
||||||
|
dom.addCssClass(this.cursors[i], "ace_overwrite");
|
||||||
|
else
|
||||||
|
dom.removeCssClass(this.cursors[i], "ace_overwrite");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
this.destroy = function() {
|
this.destroy = function() {
|
||||||
clearInterval(this.blinkId);
|
clearInterval(this.blinkId);
|
||||||
}
|
}
|
||||||
|
|
@ -14310,12 +14478,12 @@ define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?fa
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_selection {\n" +
|
".ace_marker-layer .ace_selection {\n" +
|
||||||
" position: absolute;\n" +
|
" position: absolute;\n" +
|
||||||
" z-index: 4;\n" +
|
" z-index: 5;\n" +
|
||||||
"}\n" +
|
"}\n" +
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_bracket {\n" +
|
".ace_marker-layer .ace_bracket {\n" +
|
||||||
" position: absolute;\n" +
|
" position: absolute;\n" +
|
||||||
" z-index: 5;\n" +
|
" z-index: 6;\n" +
|
||||||
"}\n" +
|
"}\n" +
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_active_line {\n" +
|
".ace_marker-layer .ace_active_line {\n" +
|
||||||
|
|
@ -14329,7 +14497,7 @@ define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?fa
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_selected_word {\n" +
|
".ace_marker-layer .ace_selected_word {\n" +
|
||||||
" position: absolute;\n" +
|
" position: absolute;\n" +
|
||||||
" z-index: 6;\n" +
|
" z-index: 4;\n" +
|
||||||
" box-sizing: border-box;\n" +
|
" box-sizing: border-box;\n" +
|
||||||
" -moz-box-sizing: border-box;\n" +
|
" -moz-box-sizing: border-box;\n" +
|
||||||
" -webkit-box-sizing: border-box;\n" +
|
" -webkit-box-sizing: border-box;\n" +
|
||||||
|
|
@ -14600,123 +14768,6 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
|
||||||
|
|
||||||
exports.WorkerClient = WorkerClient;
|
exports.WorkerClient = WorkerClient;
|
||||||
|
|
||||||
});
|
|
||||||
/* ***** BEGIN LICENSE BLOCK *****
|
|
||||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
||||||
*
|
|
||||||
* The contents of this file are subject to the Mozilla Public License Version
|
|
||||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
* http://www.mozilla.org/MPL/
|
|
||||||
*
|
|
||||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
|
||||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
||||||
* for the specific language governing rights and limitations under the
|
|
||||||
* License.
|
|
||||||
*
|
|
||||||
* The Original Code is Mozilla Skywriter.
|
|
||||||
*
|
|
||||||
* The Initial Developer of the Original Code is
|
|
||||||
* Mozilla.
|
|
||||||
* Portions created by the Initial Developer are Copyright (C) 2009
|
|
||||||
* the Initial Developer. All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Contributor(s):
|
|
||||||
* Fabian Jakobs <fabian AT ajax DOT org>
|
|
||||||
* Julian Viereck (julian.viereck@gmail.com)
|
|
||||||
*
|
|
||||||
* Alternatively, the contents of this file may be used under the terms of
|
|
||||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
|
||||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
||||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
|
||||||
* of those above. If you wish to allow use of your version of this file only
|
|
||||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
|
||||||
* use your version of this file under the terms of the MPL, indicate your
|
|
||||||
* decision by deleting the provisions above and replace them with the notice
|
|
||||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
|
||||||
* the provisions above, a recipient may use your version of this file under
|
|
||||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
|
||||||
*
|
|
||||||
* ***** END LICENSE BLOCK ***** */
|
|
||||||
|
|
||||||
define('ace/keyboard/hash_handler', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
var keyUtil = require("../lib/keys");
|
|
||||||
|
|
||||||
function HashHandler(config) {
|
|
||||||
this.setConfig(config);
|
|
||||||
}
|
|
||||||
|
|
||||||
(function() {
|
|
||||||
function splitSafe(s, separator, limit, bLowerCase) {
|
|
||||||
return (bLowerCase && s.toLowerCase() || s)
|
|
||||||
.replace(/(?:^\s+|\n|\s+$)/g, "")
|
|
||||||
.split(new RegExp("[\\s ]*" + separator + "[\\s ]*", "g"), limit || 999);
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseKeys(keys, val, ret) {
|
|
||||||
var key,
|
|
||||||
hashId = 0,
|
|
||||||
parts = splitSafe(keys, "\\-", null, true),
|
|
||||||
i = 0,
|
|
||||||
l = parts.length;
|
|
||||||
|
|
||||||
for (; i < l; ++i) {
|
|
||||||
if (keyUtil.KEY_MODS[parts[i]])
|
|
||||||
hashId = hashId | keyUtil.KEY_MODS[parts[i]];
|
|
||||||
else
|
|
||||||
key = parts[i] || "-"; //when empty, the splitSafe removed a '-'
|
|
||||||
}
|
|
||||||
|
|
||||||
(ret[hashId] || (ret[hashId] = {}))[key] = val;
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
function objectReverse(obj, keySplit) {
|
|
||||||
var i, j, l, key,
|
|
||||||
ret = {};
|
|
||||||
for (i in obj) {
|
|
||||||
key = obj[i];
|
|
||||||
if (keySplit && typeof key == "string") {
|
|
||||||
key = key.split(keySplit);
|
|
||||||
for (j = 0, l = key.length; j < l; ++j)
|
|
||||||
parseKeys.call(this, key[j], i, ret);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
parseKeys.call(this, key, i, ret);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.setConfig = function(config) {
|
|
||||||
this.$config = config;
|
|
||||||
if (typeof this.$config.reverse == "undefined")
|
|
||||||
this.$config.reverse = objectReverse.call(this, this.$config, "|");
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This function is called by keyBinding.
|
|
||||||
*/
|
|
||||||
this.handleKeyboard = function(data, hashId, textOrKey, keyCode) {
|
|
||||||
// Figure out if a commandKey was pressed or just some text was insert.
|
|
||||||
if (hashId != 0 || keyCode != 0) {
|
|
||||||
return {
|
|
||||||
command: (this.$config.reverse[hashId] || {})[textOrKey]
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return {
|
|
||||||
command: "inserttext",
|
|
||||||
args: {
|
|
||||||
text: textOrKey
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).call(HashHandler.prototype)
|
|
||||||
|
|
||||||
exports.HashHandler = HashHandler;
|
|
||||||
});
|
});
|
||||||
/* ***** BEGIN LICENSE BLOCK *****
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -2096,7 +2096,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -2162,6 +2162,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -2321,6 +2326,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2070,7 +2070,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -2136,6 +2136,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -2295,6 +2300,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2092,7 +2092,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -2158,6 +2158,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -2317,6 +2322,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2107,7 +2107,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -2173,6 +2173,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -2332,6 +2337,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -3563,7 +3563,7 @@ var Editor = function(renderer, session) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.getAnimatedScroll = function(){
|
this.getAnimatedScroll = function(){
|
||||||
this.renderer.getAnimatedScroll();
|
return this.renderer.getAnimatedScroll();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.setShowInvisibles = function(showInvisibles) {
|
this.setShowInvisibles = function(showInvisibles) {
|
||||||
|
|
@ -4195,16 +4195,19 @@ var Editor = function(renderer, session) {
|
||||||
this.selection.setSelectionRange(range);
|
this.selection.setSelectionRange(range);
|
||||||
this.$blockScrolling -= 1;
|
this.$blockScrolling -= 1;
|
||||||
|
|
||||||
|
if (this.getAnimatedScroll()) {
|
||||||
var cursor = this.getCursorPosition();
|
var cursor = this.getCursorPosition();
|
||||||
if (!this.isRowFullyVisible(cursor.row))
|
if (!this.isRowFullyVisible(cursor.row))
|
||||||
this.scrollToLine(cursor.row, true);
|
this.scrollToLine(cursor.row, true);
|
||||||
|
|
||||||
//@todo scroll X
|
//@todo scroll X
|
||||||
//if (!this.isRowFullyVisible(cursor.row))
|
//if (!this.isColumnFullyVisible(cursor.column))
|
||||||
//this.scrollToLine(cursor.row, true);
|
//this.scrollToRow(cursor.column);
|
||||||
|
}
|
||||||
|
else {
|
||||||
this.renderer.scrollSelectionIntoView(range.start, range.end);
|
this.renderer.scrollSelectionIntoView(range.start, range.end);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
this.undo = function() {
|
this.undo = function() {
|
||||||
|
|
@ -4911,7 +4914,7 @@ function DefaultHandlers(editor) {
|
||||||
if (!editor.$mouseHandler.$clickSelection) {
|
if (!editor.$mouseHandler.$clickSelection) {
|
||||||
if (!dragCursor) {
|
if (!dragCursor) {
|
||||||
editor.moveCursorToPosition(pos);
|
editor.moveCursorToPosition(pos);
|
||||||
editor.selection.clearSelection(pos.row, pos.column);
|
editor.selection.clearSelection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -4946,7 +4949,6 @@ function DefaultHandlers(editor) {
|
||||||
if (distance > DRAG_OFFSET) {
|
if (distance > DRAG_OFFSET) {
|
||||||
state = STATE_SELECT;
|
state = STATE_SELECT;
|
||||||
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
||||||
cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
|
|
||||||
onStartSelect(cursor);
|
onStartSelect(cursor);
|
||||||
}
|
}
|
||||||
else if ((time - mousedownTime) > editor.getDragDelay()) {
|
else if ((time - mousedownTime) > editor.getDragDelay()) {
|
||||||
|
|
@ -4973,7 +4975,7 @@ function DefaultHandlers(editor) {
|
||||||
else {
|
else {
|
||||||
if (!_self.$clickSelection) {
|
if (!_self.$clickSelection) {
|
||||||
editor.moveCursorToPosition(pos);
|
editor.moveCursorToPosition(pos);
|
||||||
editor.selection.clearSelection(pos.row, pos.column);
|
editor.selection.clearSelection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
state = STATE_SELECT;
|
state = STATE_SELECT;
|
||||||
|
|
@ -4982,7 +4984,6 @@ function DefaultHandlers(editor) {
|
||||||
var onUpdateSelectionInterval = function() {
|
var onUpdateSelectionInterval = function() {
|
||||||
var anchor;
|
var anchor;
|
||||||
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
||||||
cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
|
|
||||||
|
|
||||||
if (_self.$clickSelection) {
|
if (_self.$clickSelection) {
|
||||||
if (_self.$clickSelection.contains(cursor.row, cursor.column)) {
|
if (_self.$clickSelection.contains(cursor.row, cursor.column)) {
|
||||||
|
|
@ -5008,8 +5009,6 @@ function DefaultHandlers(editor) {
|
||||||
|
|
||||||
var onDragSelectionInterval = function() {
|
var onDragSelectionInterval = function() {
|
||||||
dragCursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
dragCursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
|
||||||
dragCursor.row = Math.max(0, Math.min(dragCursor.row, editor.session.getLength() - 1));
|
|
||||||
|
|
||||||
editor.moveCursorToPosition(dragCursor);
|
editor.moveCursorToPosition(dragCursor);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -5431,7 +5430,6 @@ var MouseEvent = exports.MouseEvent = function(domEvent, editor) {
|
||||||
var pageX = event.getDocumentX(this.domEvent);
|
var pageX = event.getDocumentX(this.domEvent);
|
||||||
var pageY = event.getDocumentY(this.domEvent);
|
var pageY = event.getDocumentY(this.domEvent);
|
||||||
this.$pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY);
|
this.$pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY);
|
||||||
this.$pos.row = Math.max(0, Math.min(this.$pos.row, this.editor.session.getLength()-1));
|
|
||||||
return this.$pos;
|
return this.$pos;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -5531,7 +5529,7 @@ function FoldHandler(editor) {
|
||||||
var position = e.getDocumentPosition();
|
var position = e.getDocumentPosition();
|
||||||
var session = editor.session;
|
var session = editor.session;
|
||||||
|
|
||||||
// If the user dclicked on a fold, then expand it.
|
// If the user clicked on a fold, then expand it.
|
||||||
var fold = session.getFoldAt(position.row, position.column, 1);
|
var fold = session.getFoldAt(position.row, position.column, 1);
|
||||||
if (fold) {
|
if (fold) {
|
||||||
if (e.getAccelKey())
|
if (e.getAccelKey())
|
||||||
|
|
@ -7518,8 +7516,8 @@ var EditSession = function(text, mode) {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.getScreenLastRowColumn = function(screenRow) {
|
this.getScreenLastRowColumn = function(screenRow) {
|
||||||
//return this.screenToDocumentColumn(screenRow, Number.MAX_VALUE / 10)
|
var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE)
|
||||||
return this.documentToScreenColumn(screenRow, this.doc.getLine(screenRow).length);
|
return this.documentToScreenColumn(pos.row, pos.column);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.getDocumentLastRowColumn = function(docRow, docColumn) {
|
this.getDocumentLastRowColumn = function(docRow, docColumn) {
|
||||||
|
|
@ -7634,17 +7632,11 @@ var EditSession = function(text, mode) {
|
||||||
|
|
||||||
docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
|
docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
|
||||||
|
|
||||||
// Need to do some clamping action here.
|
// We remove one character at the end so that the docColumn
|
||||||
if (this.$useWrapMode) {
|
// position returned is not associated to the next row on the screen.
|
||||||
if (docColumn >= column) {
|
if (this.$useWrapMode && docColumn >= column) {
|
||||||
// We remove one character at the end such that the docColumn
|
|
||||||
// position returned is not associated to the next row on the
|
|
||||||
// screen.
|
|
||||||
docColumn = column - 1;
|
docColumn = column - 1;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
docColumn = Math.min(docColumn, line.length);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (foldLine) {
|
if (foldLine) {
|
||||||
return foldLine.idxToPosition(docColumn);
|
return foldLine.idxToPosition(docColumn);
|
||||||
|
|
@ -8033,18 +8025,18 @@ var Selection = function(session) {
|
||||||
this.selectionLead = this.doc.createAnchor(0, 0);
|
this.selectionLead = this.doc.createAnchor(0, 0);
|
||||||
this.selectionAnchor = this.doc.createAnchor(0, 0);
|
this.selectionAnchor = this.doc.createAnchor(0, 0);
|
||||||
|
|
||||||
var _self = this;
|
var self = this;
|
||||||
this.selectionLead.on("change", function(e) {
|
this.selectionLead.on("change", function(e) {
|
||||||
_self._emit("changeCursor");
|
self._emit("changeCursor");
|
||||||
if (!_self.$isEmpty)
|
if (!self.$isEmpty)
|
||||||
_self._emit("changeSelection");
|
self._emit("changeSelection");
|
||||||
if (!_self.$preventUpdateDesiredColumnOnChange && e.old.column != e.value.column)
|
if (!self.$keepDesiredColumnOnChange && e.old.column != e.value.column)
|
||||||
_self.$updateDesiredColumn();
|
self.$desiredColumn = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.selectionAnchor.on("change", function() {
|
this.selectionAnchor.on("change", function() {
|
||||||
if (!_self.$isEmpty)
|
if (!self.$isEmpty)
|
||||||
_self._emit("changeSelection");
|
self._emit("changeSelection");
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -8154,12 +8146,7 @@ var Selection = function(session) {
|
||||||
this.setSelectionAnchor(range.start.row, range.start.column);
|
this.setSelectionAnchor(range.start.row, range.start.column);
|
||||||
this.selectTo(range.end.row, range.end.column);
|
this.selectTo(range.end.row, range.end.column);
|
||||||
}
|
}
|
||||||
this.$updateDesiredColumn();
|
this.$desiredColumn = null;
|
||||||
};
|
|
||||||
|
|
||||||
this.$updateDesiredColumn = function() {
|
|
||||||
var cursor = this.getCursor();
|
|
||||||
this.$desiredColumn = this.session.documentToScreenColumn(cursor.row, cursor.column);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.$moveSelection = function(mover) {
|
this.$moveSelection = function(mover) {
|
||||||
|
|
@ -8444,8 +8431,14 @@ var Selection = function(session) {
|
||||||
this.selectionLead.column
|
this.selectionLead.column
|
||||||
);
|
);
|
||||||
|
|
||||||
var screenCol = (chars === 0 && this.$desiredColumn) || screenPos.column;
|
if (chars === 0) {
|
||||||
var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenCol);
|
if (this.$desiredColumn)
|
||||||
|
screenPos.column = this.$desiredColumn;
|
||||||
|
else
|
||||||
|
this.$desiredColumn = screenPos.column;
|
||||||
|
}
|
||||||
|
|
||||||
|
var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenPos.column);
|
||||||
|
|
||||||
// move the cursor and update the desired column
|
// move the cursor and update the desired column
|
||||||
this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0);
|
this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0);
|
||||||
|
|
@ -8455,7 +8448,7 @@ var Selection = function(session) {
|
||||||
this.moveCursorTo(position.row, position.column);
|
this.moveCursorTo(position.row, position.column);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.moveCursorTo = function(row, column, preventUpdateDesiredColumn) {
|
this.moveCursorTo = function(row, column, keepDesiredColumn) {
|
||||||
// Ensure the row/column is not inside of a fold.
|
// Ensure the row/column is not inside of a fold.
|
||||||
var fold = this.session.getFoldAt(row, column, 1);
|
var fold = this.session.getFoldAt(row, column, 1);
|
||||||
if (fold) {
|
if (fold) {
|
||||||
|
|
@ -8463,21 +8456,47 @@ var Selection = function(session) {
|
||||||
column = fold.start.column;
|
column = fold.start.column;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.$preventUpdateDesiredColumnOnChange = true;
|
this.$keepDesiredColumnOnChange = true;
|
||||||
this.selectionLead.setPosition(row, column);
|
this.selectionLead.setPosition(row, column);
|
||||||
this.$preventUpdateDesiredColumnOnChange = false;
|
this.$keepDesiredColumnOnChange = false;
|
||||||
|
|
||||||
if (!preventUpdateDesiredColumn)
|
if (!keepDesiredColumn)
|
||||||
this.$updateDesiredColumn(this.selectionLead.column);
|
this.$desiredColumn = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
this.moveCursorToScreen = function(row, column, preventUpdateDesiredColumn) {
|
this.moveCursorToScreen = function(row, column, keepDesiredColumn) {
|
||||||
var pos = this.session.screenToDocumentPosition(row, column);
|
var pos = this.session.screenToDocumentPosition(row, column);
|
||||||
row = pos.row;
|
this.moveCursorTo(pos.row, pos.column, keepDesiredColumn);
|
||||||
column = pos.column;
|
|
||||||
this.moveCursorTo(row, column, preventUpdateDesiredColumn);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// remove listeners from document
|
||||||
|
this.detach = function() {
|
||||||
|
this.selectionLead.detach();
|
||||||
|
this.selectionAnchor.detach();
|
||||||
|
this.session = this.doc = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.fromOrientedRange = function(range) {
|
||||||
|
this.setSelectionRange(range, range.cursor == range.start);
|
||||||
|
this.$desiredColumn = range.desiredColumn || this.$desiredColumn;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.toOrientedRange = function(range) {
|
||||||
|
var r = this.getRange();
|
||||||
|
if (range) {
|
||||||
|
range.start.column = r.start.column;
|
||||||
|
range.start.row = r.start.row;
|
||||||
|
range.end.column = r.end.column;
|
||||||
|
range.end.row = r.end.row;
|
||||||
|
} else {
|
||||||
|
range = r;
|
||||||
|
}
|
||||||
|
|
||||||
|
range.cursor = this.isBackwards() ? range.start : range.end;
|
||||||
|
range.desiredColumn = this.$desiredColumn;
|
||||||
|
return range;
|
||||||
|
}
|
||||||
|
|
||||||
}).call(Selection.prototype);
|
}).call(Selection.prototype);
|
||||||
|
|
||||||
exports.Selection = Selection;
|
exports.Selection = Selection;
|
||||||
|
|
@ -8535,7 +8554,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
this.isEequal = function(range) {
|
this.isEqual = function(range) {
|
||||||
return this.start.row == range.start.row &&
|
return this.start.row == range.start.row &&
|
||||||
this.end.row == range.end.row &&
|
this.end.row == range.end.row &&
|
||||||
this.start.column == range.start.column &&
|
this.start.column == range.start.column &&
|
||||||
|
|
@ -8601,6 +8620,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intersectsRange = function(range) {
|
||||||
|
var cmp = this.compareRange(range);
|
||||||
|
return (cmp == -1 || cmp == 0 || cmp == 1);
|
||||||
|
}
|
||||||
|
|
||||||
this.isEnd = function(row, column) {
|
this.isEnd = function(row, column) {
|
||||||
return this.end.row == row && this.end.column == column;
|
return this.end.row == row && this.end.column == column;
|
||||||
}
|
}
|
||||||
|
|
@ -8760,6 +8784,21 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
|
||||||
return Range.fromPoints(start || this.start, end || this.end);
|
return Range.fromPoints(start || this.start, end || this.end);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.fixOrientation = function() {
|
||||||
|
if (
|
||||||
|
this.start.row < this.end.row
|
||||||
|
|| (this.start.row == this.end.row && this.start.column < this.end.column)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var temp = this.start;
|
||||||
|
this.end = this.start;
|
||||||
|
this.start = temp;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
this.isEmpty = function() {
|
this.isEmpty = function() {
|
||||||
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
return (this.start.row == this.end.row && this.start.column == this.end.column);
|
||||||
};
|
};
|
||||||
|
|
@ -11003,7 +11042,7 @@ function Folding() {
|
||||||
// sometimes singleline folds can be missed by the code above
|
// sometimes singleline folds can be missed by the code above
|
||||||
if (!range.isMultiLine()) {
|
if (!range.isMultiLine()) {
|
||||||
fold = this.getFoldAt(range.start.row, range.start.column, 1);
|
fold = this.getFoldAt(range.start.row, range.start.column, 1);
|
||||||
if (fold && range.isEequal(fold.range)) {
|
if (fold && range.isEqual(fold.range)) {
|
||||||
this.removeFold(fold);
|
this.removeFold(fold);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -11394,7 +11433,7 @@ var Fold = exports.Fold = function(range, placeholder) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.addSubFold = function(fold) {
|
this.addSubFold = function(fold) {
|
||||||
if (this.range.isEequal(fold))
|
if (this.range.isEqual(fold))
|
||||||
return this;
|
return this;
|
||||||
|
|
||||||
if (!this.range.containsRange(fold))
|
if (!this.range.containsRange(fold))
|
||||||
|
|
@ -12072,21 +12111,153 @@ Search.SELECTION = 2;
|
||||||
|
|
||||||
exports.Search = Search;
|
exports.Search = Search;
|
||||||
});
|
});
|
||||||
__ace_shadowed__.define('ace/commands/command_manager', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
|
__ace_shadowed__.define('ace/commands/command_manager', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/keyboard/hash_handler', 'ace/lib/event_emitter'], function(require, exports, module) {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
var keyUtil = require("../lib/keys");
|
var oop = require("../lib/oop");
|
||||||
|
var HashHandler = require("../keyboard/hash_handler").HashHandler;
|
||||||
|
var EventEmitter = require("../lib/event_emitter").EventEmitter;
|
||||||
|
|
||||||
var CommandManager = function(platform, commands) {
|
var CommandManager = function(platform, commands) {
|
||||||
if (typeof platform !== "string")
|
|
||||||
throw new TypeError("'platform' argument must be either 'mac' or 'win'");
|
|
||||||
|
|
||||||
this.platform = platform;
|
this.platform = platform;
|
||||||
this.commands = {};
|
this.commands = {};
|
||||||
this.commmandKeyBinding = {};
|
this.commmandKeyBinding = {};
|
||||||
|
|
||||||
if (commands)
|
this.addCommands(commands);
|
||||||
commands.forEach(this.addCommand, this);
|
|
||||||
|
this.setDefaultHandler("exec", function(e) {
|
||||||
|
e.command.exec(e.editor, e.args || {});
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
oop.inherits(CommandManager, HashHandler);
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
|
||||||
|
oop.implement(this, EventEmitter);
|
||||||
|
|
||||||
|
this.exec = function(command, editor, args) {
|
||||||
|
if (typeof command === 'string')
|
||||||
|
command = this.commands[command];
|
||||||
|
|
||||||
|
if (!command)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (editor && editor.$readOnly && !command.readOnly)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
this._emit("exec", {editor: editor, command: command, args: args});
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.toggleRecording = function() {
|
||||||
|
if (this.$inReplay)
|
||||||
|
return;
|
||||||
|
if (this.recording) {
|
||||||
|
this.macro.pop();
|
||||||
|
this.removeEventListener("exec", this.$addCommandToMacro);
|
||||||
|
|
||||||
|
if (!this.macro.length)
|
||||||
|
this.macro = this.oldMacro;
|
||||||
|
|
||||||
|
return this.recording = false;
|
||||||
|
}
|
||||||
|
if (!this.$addCommandToMacro) {
|
||||||
|
this.$addCommandToMacro = function(e) {
|
||||||
|
this.macro.push([e.command, e.args]);
|
||||||
|
}.bind(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.oldMacro = this.macro;
|
||||||
|
this.macro = [];
|
||||||
|
this.on("exec", this.$addCommandToMacro);
|
||||||
|
return this.recording = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.replay = function(editor) {
|
||||||
|
if (this.$inReplay || !this.macro)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (this.recording)
|
||||||
|
return this.toggleRecording();
|
||||||
|
|
||||||
|
try {
|
||||||
|
this.$inReplay = true;
|
||||||
|
this.macro.forEach(function(x) {
|
||||||
|
if (typeof x == "string")
|
||||||
|
this.exec(x, editor);
|
||||||
|
else
|
||||||
|
this.exec(x[0], editor, x[1]);
|
||||||
|
}, this);
|
||||||
|
} finally {
|
||||||
|
this.$inReplay = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
this.trimMacro = function(m) {
|
||||||
|
return m.map(function(x){
|
||||||
|
if (typeof x[0] != "string")
|
||||||
|
x[0] = x[0].name;
|
||||||
|
if (!x[1])
|
||||||
|
x = x[0];
|
||||||
|
return x;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
}).call(CommandManager.prototype);
|
||||||
|
|
||||||
|
exports.CommandManager = CommandManager;
|
||||||
|
|
||||||
|
});
|
||||||
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
* http://www.mozilla.org/MPL/
|
||||||
|
*
|
||||||
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
* for the specific language governing rights and limitations under the
|
||||||
|
* License.
|
||||||
|
*
|
||||||
|
* The Original Code is Mozilla Skywriter.
|
||||||
|
*
|
||||||
|
* The Initial Developer of the Original Code is
|
||||||
|
* Mozilla.
|
||||||
|
* Portions created by the Initial Developer are Copyright (C) 2009
|
||||||
|
* the Initial Developer. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Contributor(s):
|
||||||
|
* Fabian Jakobs <fabian AT ajax DOT org>
|
||||||
|
* Julian Viereck (julian.viereck@gmail.com)
|
||||||
|
*
|
||||||
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
* of those above. If you wish to allow use of your version of this file only
|
||||||
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
* use your version of this file under the terms of the MPL, indicate your
|
||||||
|
* decision by deleting the provisions above and replace them with the notice
|
||||||
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
* the provisions above, a recipient may use your version of this file under
|
||||||
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
__ace_shadowed__.define('ace/keyboard/hash_handler', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var keyUtil = require("../lib/keys");
|
||||||
|
|
||||||
|
function HashHandler(config, platform) {
|
||||||
|
this.platform = platform;
|
||||||
|
this.commands = {};
|
||||||
|
this.commmandKeyBinding = {};
|
||||||
|
|
||||||
|
this.addCommands(config);
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
|
|
@ -12107,7 +12278,7 @@ var CommandManager = function(platform, commands) {
|
||||||
command = this.commands[name];
|
command = this.commands[name];
|
||||||
delete this.commands[name];
|
delete this.commands[name];
|
||||||
|
|
||||||
// exaustive search is brute force but since removeCommand is
|
// exhaustive search is brute force but since removeCommand is
|
||||||
// not a performance critical operation this should be OK
|
// not a performance critical operation this should be OK
|
||||||
var ckb = this.commmandKeyBinding;
|
var ckb = this.commmandKeyBinding;
|
||||||
for (var hashId in ckb) {
|
for (var hashId in ckb) {
|
||||||
|
|
@ -12119,7 +12290,7 @@ var CommandManager = function(platform, commands) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.addCommands = function(commands) {
|
this.addCommands = function(commands) {
|
||||||
Object.keys(commands).forEach(function(name) {
|
commands && Object.keys(commands).forEach(function(name) {
|
||||||
var command = commands[name];
|
var command = commands[name];
|
||||||
if (typeof command === "string")
|
if (typeof command === "string")
|
||||||
return this.bindKey(command, name);
|
return this.bindKey(command, name);
|
||||||
|
|
@ -12170,9 +12341,9 @@ var CommandManager = function(platform, commands) {
|
||||||
function parseKeys(keys, val, ret) {
|
function parseKeys(keys, val, ret) {
|
||||||
var key;
|
var key;
|
||||||
var hashId = 0;
|
var hashId = 0;
|
||||||
var parts = splitSafe(keys);
|
var parts = splitSafe(keys.toLowerCase());
|
||||||
|
|
||||||
for (var i=0, l = parts.length; i < l; i++) {
|
for (var i = 0, l = parts.length; i < l; i++) {
|
||||||
if (keyUtil.KEY_MODS[parts[i]])
|
if (keyUtil.KEY_MODS[parts[i]])
|
||||||
hashId = hashId | keyUtil.KEY_MODS[parts[i]];
|
hashId = hashId | keyUtil.KEY_MODS[parts[i]];
|
||||||
else
|
else
|
||||||
|
|
@ -12186,91 +12357,24 @@ var CommandManager = function(platform, commands) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function splitSafe(s) {
|
function splitSafe(s) {
|
||||||
return (s.toLowerCase()
|
return (s.trim()
|
||||||
.trim()
|
|
||||||
.split(new RegExp("[\\s ]*\\-[\\s ]*", "g"), 999));
|
.split(new RegExp("[\\s ]*\\-[\\s ]*", "g"), 999));
|
||||||
}
|
}
|
||||||
|
|
||||||
this.findKeyCommand = function findKeyCommand(hashId, textOrKey) {
|
this.findKeyCommand = function findKeyCommand(hashId, keyString) {
|
||||||
// Convert keyCode to the string representation.
|
|
||||||
if (typeof textOrKey == "number") {
|
|
||||||
textOrKey = keyUtil.keyCodeToString(textOrKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
var ckbr = this.commmandKeyBinding;
|
var ckbr = this.commmandKeyBinding;
|
||||||
return ckbr[hashId] && ckbr[hashId][textOrKey.toLowerCase()];
|
return ckbr[hashId] && ckbr[hashId][keyString.toLowerCase()];
|
||||||
};
|
|
||||||
|
|
||||||
this.exec = function(command, editor, args) {
|
|
||||||
if (typeof command === 'string')
|
|
||||||
command = this.commands[command];
|
|
||||||
|
|
||||||
if (!command)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (editor && editor.$readOnly && !command.readOnly)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
command.exec(editor, args || {});
|
|
||||||
return true;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.toggleRecording = function() {
|
|
||||||
if (this.$inReplay)
|
|
||||||
return;
|
|
||||||
if (this.recording) {
|
|
||||||
this.macro.pop();
|
|
||||||
this.exec = this.normal_exec;
|
|
||||||
|
|
||||||
if (!this.macro.length)
|
|
||||||
this.macro = this.oldMacro;
|
|
||||||
|
|
||||||
return this.recording = false;
|
|
||||||
}
|
}
|
||||||
this.oldMacro = this.macro;
|
|
||||||
this.macro = [];
|
this.handleKeyboard = function(data, hashId, keyString, keyCode) {
|
||||||
this.normal_exec = this.exec;
|
return {
|
||||||
this.exec = function(command, editor, args) {
|
command: this.findKeyCommand(hashId, keyString)
|
||||||
this.macro.push([command, args]);
|
|
||||||
return this.normal_exec(command, editor, args);
|
|
||||||
};
|
};
|
||||||
return this.recording = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.replay = function(editor) {
|
}).call(HashHandler.prototype)
|
||||||
if (this.$inReplay || !this.macro)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (this.recording)
|
|
||||||
return this.toggleRecording();
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.$inReplay = true;
|
|
||||||
this.macro.forEach(function(x) {
|
|
||||||
if (typeof x == "string")
|
|
||||||
this.exec(x, editor);
|
|
||||||
else
|
|
||||||
this.exec(x[0], editor, x[1]);
|
|
||||||
}, this);
|
|
||||||
} finally {
|
|
||||||
this.$inReplay = false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.trimMacro = function(m) {
|
|
||||||
return m.map(function(x){
|
|
||||||
if (typeof x[0] != "string")
|
|
||||||
x[0] = x[0].name;
|
|
||||||
if (!x[1])
|
|
||||||
x = x[0];
|
|
||||||
return x;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
}).call(CommandManager.prototype);
|
|
||||||
|
|
||||||
exports.CommandManager = CommandManager;
|
|
||||||
|
|
||||||
|
exports.HashHandler = HashHandler;
|
||||||
});
|
});
|
||||||
/* vim:ts=4:sts=4:sw=4:
|
/* vim:ts=4:sts=4:sw=4:
|
||||||
* ***** BEGIN LICENSE BLOCK *****
|
* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
@ -12655,7 +12759,7 @@ var VirtualRenderer = function(container, theme) {
|
||||||
this.$animatedScroll = shouldAnimate;
|
this.$animatedScroll = shouldAnimate;
|
||||||
};
|
};
|
||||||
|
|
||||||
this.getAnimatedScroll = function(){
|
this.getAnimatedScroll = function() {
|
||||||
return this.$animatedScroll;
|
return this.$animatedScroll;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -13162,6 +13266,19 @@ var VirtualRenderer = function(container, theme) {
|
||||||
// todo: handle horizontal scrolling
|
// todo: handle horizontal scrolling
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.pixelToScreenCoordinates = function(pageX, pageY) {
|
||||||
|
var canvasPos = this.scroller.getBoundingClientRect();
|
||||||
|
|
||||||
|
var col = Math.round(
|
||||||
|
(pageX + this.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft()) / this.characterWidth
|
||||||
|
);
|
||||||
|
var row = Math.floor(
|
||||||
|
(pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop()) / this.lineHeight
|
||||||
|
);
|
||||||
|
|
||||||
|
return {row: row, column: col};
|
||||||
|
};
|
||||||
|
|
||||||
this.screenToTextCoordinates = function(pageX, pageY) {
|
this.screenToTextCoordinates = function(pageX, pageY) {
|
||||||
var canvasPos = this.scroller.getBoundingClientRect();
|
var canvasPos = this.scroller.getBoundingClientRect();
|
||||||
|
|
||||||
|
|
@ -13253,7 +13370,7 @@ var VirtualRenderer = function(container, theme) {
|
||||||
return afterLoad(module);
|
return afterLoad(module);
|
||||||
|
|
||||||
_self._loadTheme(moduleName, function() {
|
_self._loadTheme(moduleName, function() {
|
||||||
require([theme], function(module) {
|
require([moduleName], function(module) {
|
||||||
if (_self.$themeValue !== theme)
|
if (_self.$themeValue !== theme)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
@ -13618,7 +13735,7 @@ var Marker = function(parentEl) {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Draws a marker, which spans a range of text in a single line
|
* Draws a marker, which spans a range of text on multiple lines
|
||||||
*/
|
*/
|
||||||
this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {
|
this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {
|
||||||
// selection start
|
// selection start
|
||||||
|
|
@ -13693,7 +13810,7 @@ var Marker = function(parentEl) {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Draws a marker which covers one single full line
|
* Draws a marker which covers part or whole width of a single screen line
|
||||||
*/
|
*/
|
||||||
this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, type) {
|
this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, type) {
|
||||||
var padding = type === "background" ? 0 : this.$padding;
|
var padding = type === "background" ? 0 : this.$padding;
|
||||||
|
|
@ -14027,16 +14144,16 @@ var Text = function(parentEl) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.$renderLinesFragment = function(config, firstRow, lastRow) {
|
this.$renderLinesFragment = function(config, firstRow, lastRow) {
|
||||||
var fragment = this.element.ownerDocument.createDocumentFragment(),
|
var fragment = this.element.ownerDocument.createDocumentFragment();
|
||||||
row = firstRow,
|
var row = firstRow;
|
||||||
fold = this.session.getNextFoldLine(row),
|
var foldLine = this.session.getNextFoldLine(row);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
var foldStart = foldLine ? foldLine.start.row : Infinity;
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
if (row > foldStart) {
|
if (row > foldStart) {
|
||||||
row = fold.end.row+1;
|
row = foldLine.end.row+1;
|
||||||
fold = this.session.getNextFoldLine(row, fold);
|
foldLine = this.session.getNextFoldLine(row, foldLine);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
foldStart = foldLine ? foldLine.start.row : Infinity;
|
||||||
}
|
}
|
||||||
if (row > lastRow)
|
if (row > lastRow)
|
||||||
break;
|
break;
|
||||||
|
|
@ -14075,15 +14192,15 @@ var Text = function(parentEl) {
|
||||||
var html = [];
|
var html = [];
|
||||||
var firstRow = config.firstRow, lastRow = config.lastRow;
|
var firstRow = config.firstRow, lastRow = config.lastRow;
|
||||||
|
|
||||||
var row = firstRow,
|
var row = firstRow;
|
||||||
fold = this.session.getNextFoldLine(row),
|
var foldLine = this.session.getNextFoldLine(row);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
var foldStart = foldLine ? foldLine.start.row : Infinity;
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
if (row > foldStart) {
|
if (row > foldStart) {
|
||||||
row = fold.end.row+1;
|
row = foldLine.end.row+1;
|
||||||
fold = this.session.getNextFoldLine(row, fold);
|
foldLine = this.session.getNextFoldLine(row, foldLine);
|
||||||
foldStart = fold ?fold.start.row :Infinity;
|
foldStart = foldLine ? foldLine.start.row :Infinity;
|
||||||
}
|
}
|
||||||
if (row > lastRow)
|
if (row > lastRow)
|
||||||
break;
|
break;
|
||||||
|
|
@ -14384,11 +14501,10 @@ var Cursor = function(parentEl) {
|
||||||
this.element.className = "ace_layer ace_cursor-layer";
|
this.element.className = "ace_layer ace_cursor-layer";
|
||||||
parentEl.appendChild(this.element);
|
parentEl.appendChild(this.element);
|
||||||
|
|
||||||
this.cursor = dom.createElement("div");
|
|
||||||
this.cursor.className = "ace_cursor ace_hidden";
|
|
||||||
this.element.appendChild(this.cursor);
|
|
||||||
|
|
||||||
this.isVisible = false;
|
this.isVisible = false;
|
||||||
|
|
||||||
|
this.cursors = [];
|
||||||
|
this.cursor = this.addCursor();
|
||||||
};
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
|
|
@ -14402,30 +14518,54 @@ var Cursor = function(parentEl) {
|
||||||
this.session = session;
|
this.session = session;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.addCursor = function() {
|
||||||
|
var el = dom.createElement("div");
|
||||||
|
var className = "ace_cursor";
|
||||||
|
if (!this.isVisible)
|
||||||
|
className += " ace_hidden";
|
||||||
|
if (this.overwrite)
|
||||||
|
className += " ace_overwrite";
|
||||||
|
|
||||||
|
el.className = className;
|
||||||
|
this.element.appendChild(el);
|
||||||
|
this.cursors.push(el);
|
||||||
|
return el;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.removeCursor = function() {
|
||||||
|
if (this.cursors.length > 1) {
|
||||||
|
var el = this.cursors.pop();
|
||||||
|
el.parentNode.removeChild(el);
|
||||||
|
return el;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
this.hideCursor = function() {
|
this.hideCursor = function() {
|
||||||
this.isVisible = false;
|
this.isVisible = false;
|
||||||
dom.addCssClass(this.cursor, "ace_hidden");
|
for (var i = this.cursors.length; i--; )
|
||||||
|
dom.addCssClass(this.cursors[i], "ace_hidden");
|
||||||
clearInterval(this.blinkId);
|
clearInterval(this.blinkId);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.showCursor = function() {
|
this.showCursor = function() {
|
||||||
this.isVisible = true;
|
this.isVisible = true;
|
||||||
dom.removeCssClass(this.cursor, "ace_hidden");
|
for (var i = this.cursors.length; i--; )
|
||||||
this.cursor.style.visibility = "visible";
|
dom.removeCssClass(this.cursors[i], "ace_hidden");
|
||||||
|
|
||||||
|
this.element.style.visibility = "";
|
||||||
this.restartTimer();
|
this.restartTimer();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.restartTimer = function() {
|
this.restartTimer = function() {
|
||||||
clearInterval(this.blinkId);
|
clearInterval(this.blinkId);
|
||||||
if (!this.isVisible) {
|
if (!this.isVisible)
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
var cursor = this.cursor;
|
var element = this.element;
|
||||||
this.blinkId = setInterval(function() {
|
this.blinkId = setInterval(function() {
|
||||||
cursor.style.visibility = "hidden";
|
element.style.visibility = "hidden";
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
cursor.style.visibility = "visible";
|
element.style.visibility = "visible";
|
||||||
}, 400);
|
}, 400);
|
||||||
}, 1000);
|
}, 1000);
|
||||||
};
|
};
|
||||||
|
|
@ -14455,25 +14595,53 @@ var Cursor = function(parentEl) {
|
||||||
this.update = function(config) {
|
this.update = function(config) {
|
||||||
this.config = config;
|
this.config = config;
|
||||||
|
|
||||||
this.pixelPos = this.getPixelPosition(null, true);
|
if (this.session.selectionMarkerCount > 1) {
|
||||||
|
var selections = this.session.$selectionMarkers;
|
||||||
|
var i = 0, sel, cursorIndex = 0;
|
||||||
|
|
||||||
this.cursor.style.left = this.pixelPos.left + "px";
|
for (var i = selections.length; i--; ) {
|
||||||
this.cursor.style.top = this.pixelPos.top + "px";
|
sel = selections[i];
|
||||||
this.cursor.style.width = config.characterWidth + "px";
|
var pixelPos = this.getPixelPosition(sel.cursor, true);
|
||||||
this.cursor.style.height = config.lineHeight + "px";
|
|
||||||
|
|
||||||
var overwrite = this.session.getOverwrite()
|
var style = (this.cursors[cursorIndex++] || this.addCursor()).style;
|
||||||
if (overwrite != this.overwrite) {
|
|
||||||
this.overwrite = overwrite;
|
style.left = pixelPos.left + "px";
|
||||||
if (overwrite)
|
style.top = pixelPos.top + "px";
|
||||||
dom.addCssClass(this.cursor, "ace_overwrite");
|
style.width = config.characterWidth + "px";
|
||||||
else
|
style.height = config.lineHeight + "px";
|
||||||
dom.removeCssClass(this.cursor, "ace_overwrite");
|
}
|
||||||
|
if (cursorIndex > 1)
|
||||||
|
while (this.cursors.length > cursorIndex)
|
||||||
|
this.removeCursor();
|
||||||
|
} else {
|
||||||
|
var pixelPos = this.getPixelPosition(null, true);
|
||||||
|
var style = this.cursor.style;
|
||||||
|
style.left = pixelPos.left + "px";
|
||||||
|
style.top = pixelPos.top + "px";
|
||||||
|
style.width = config.characterWidth + "px";
|
||||||
|
style.height = config.lineHeight + "px";
|
||||||
|
|
||||||
|
while (this.cursors.length > 1)
|
||||||
|
this.removeCursor();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var overwrite = this.session.getOverwrite();
|
||||||
|
if (overwrite != this.overwrite)
|
||||||
|
this.$setOverite(overwrite);
|
||||||
|
|
||||||
this.restartTimer();
|
this.restartTimer();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.$setOverite = function(overwrite) {
|
||||||
|
this.overwrite = overwrite;
|
||||||
|
for (var i = this.cursors.length; i--; ) {
|
||||||
|
if (overwrite)
|
||||||
|
dom.addCssClass(this.cursors[i], "ace_overwrite");
|
||||||
|
else
|
||||||
|
dom.removeCssClass(this.cursors[i], "ace_overwrite");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
this.destroy = function() {
|
this.destroy = function() {
|
||||||
clearInterval(this.blinkId);
|
clearInterval(this.blinkId);
|
||||||
}
|
}
|
||||||
|
|
@ -14816,12 +14984,12 @@ __ace_shadowed__.define("text!ace/css/editor.css", [], "@import url(//fonts.goog
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_selection {\n" +
|
".ace_marker-layer .ace_selection {\n" +
|
||||||
" position: absolute;\n" +
|
" position: absolute;\n" +
|
||||||
" z-index: 4;\n" +
|
" z-index: 5;\n" +
|
||||||
"}\n" +
|
"}\n" +
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_bracket {\n" +
|
".ace_marker-layer .ace_bracket {\n" +
|
||||||
" position: absolute;\n" +
|
" position: absolute;\n" +
|
||||||
" z-index: 5;\n" +
|
" z-index: 6;\n" +
|
||||||
"}\n" +
|
"}\n" +
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_active_line {\n" +
|
".ace_marker-layer .ace_active_line {\n" +
|
||||||
|
|
@ -14835,7 +15003,7 @@ __ace_shadowed__.define("text!ace/css/editor.css", [], "@import url(//fonts.goog
|
||||||
"\n" +
|
"\n" +
|
||||||
".ace_marker-layer .ace_selected_word {\n" +
|
".ace_marker-layer .ace_selected_word {\n" +
|
||||||
" position: absolute;\n" +
|
" position: absolute;\n" +
|
||||||
" z-index: 6;\n" +
|
" z-index: 4;\n" +
|
||||||
" box-sizing: border-box;\n" +
|
" box-sizing: border-box;\n" +
|
||||||
" -moz-box-sizing: border-box;\n" +
|
" -moz-box-sizing: border-box;\n" +
|
||||||
" -webkit-box-sizing: border-box;\n" +
|
" -webkit-box-sizing: border-box;\n" +
|
||||||
|
|
@ -15106,123 +15274,6 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
|
||||||
|
|
||||||
exports.WorkerClient = WorkerClient;
|
exports.WorkerClient = WorkerClient;
|
||||||
|
|
||||||
});
|
|
||||||
/* ***** BEGIN LICENSE BLOCK *****
|
|
||||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
||||||
*
|
|
||||||
* The contents of this file are subject to the Mozilla Public License Version
|
|
||||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
* http://www.mozilla.org/MPL/
|
|
||||||
*
|
|
||||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
|
||||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
||||||
* for the specific language governing rights and limitations under the
|
|
||||||
* License.
|
|
||||||
*
|
|
||||||
* The Original Code is Mozilla Skywriter.
|
|
||||||
*
|
|
||||||
* The Initial Developer of the Original Code is
|
|
||||||
* Mozilla.
|
|
||||||
* Portions created by the Initial Developer are Copyright (C) 2009
|
|
||||||
* the Initial Developer. All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Contributor(s):
|
|
||||||
* Fabian Jakobs <fabian AT ajax DOT org>
|
|
||||||
* Julian Viereck (julian.viereck@gmail.com)
|
|
||||||
*
|
|
||||||
* Alternatively, the contents of this file may be used under the terms of
|
|
||||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
|
||||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
||||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
|
||||||
* of those above. If you wish to allow use of your version of this file only
|
|
||||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
|
||||||
* use your version of this file under the terms of the MPL, indicate your
|
|
||||||
* decision by deleting the provisions above and replace them with the notice
|
|
||||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
|
||||||
* the provisions above, a recipient may use your version of this file under
|
|
||||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
|
||||||
*
|
|
||||||
* ***** END LICENSE BLOCK ***** */
|
|
||||||
|
|
||||||
__ace_shadowed__.define('ace/keyboard/hash_handler', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
var keyUtil = require("../lib/keys");
|
|
||||||
|
|
||||||
function HashHandler(config) {
|
|
||||||
this.setConfig(config);
|
|
||||||
}
|
|
||||||
|
|
||||||
(function() {
|
|
||||||
function splitSafe(s, separator, limit, bLowerCase) {
|
|
||||||
return (bLowerCase && s.toLowerCase() || s)
|
|
||||||
.replace(/(?:^\s+|\n|\s+$)/g, "")
|
|
||||||
.split(new RegExp("[\\s ]*" + separator + "[\\s ]*", "g"), limit || 999);
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseKeys(keys, val, ret) {
|
|
||||||
var key,
|
|
||||||
hashId = 0,
|
|
||||||
parts = splitSafe(keys, "\\-", null, true),
|
|
||||||
i = 0,
|
|
||||||
l = parts.length;
|
|
||||||
|
|
||||||
for (; i < l; ++i) {
|
|
||||||
if (keyUtil.KEY_MODS[parts[i]])
|
|
||||||
hashId = hashId | keyUtil.KEY_MODS[parts[i]];
|
|
||||||
else
|
|
||||||
key = parts[i] || "-"; //when empty, the splitSafe removed a '-'
|
|
||||||
}
|
|
||||||
|
|
||||||
(ret[hashId] || (ret[hashId] = {}))[key] = val;
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
function objectReverse(obj, keySplit) {
|
|
||||||
var i, j, l, key,
|
|
||||||
ret = {};
|
|
||||||
for (i in obj) {
|
|
||||||
key = obj[i];
|
|
||||||
if (keySplit && typeof key == "string") {
|
|
||||||
key = key.split(keySplit);
|
|
||||||
for (j = 0, l = key.length; j < l; ++j)
|
|
||||||
parseKeys.call(this, key[j], i, ret);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
parseKeys.call(this, key, i, ret);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.setConfig = function(config) {
|
|
||||||
this.$config = config;
|
|
||||||
if (typeof this.$config.reverse == "undefined")
|
|
||||||
this.$config.reverse = objectReverse.call(this, this.$config, "|");
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This function is called by keyBinding.
|
|
||||||
*/
|
|
||||||
this.handleKeyboard = function(data, hashId, textOrKey, keyCode) {
|
|
||||||
// Figure out if a commandKey was pressed or just some text was insert.
|
|
||||||
if (hashId != 0 || keyCode != 0) {
|
|
||||||
return {
|
|
||||||
command: (this.$config.reverse[hashId] || {})[textOrKey]
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return {
|
|
||||||
command: "inserttext",
|
|
||||||
args: {
|
|
||||||
text: textOrKey
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).call(HashHandler.prototype)
|
|
||||||
|
|
||||||
exports.HashHandler = HashHandler;
|
|
||||||
});
|
});
|
||||||
/* ***** BEGIN LICENSE BLOCK *****
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue