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

fix popup selection marker

Browse source
This commit is contained in:
nightwing 2013-09-04 18:37:08 +04:00
commit d6de4ee6aa
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,7 @@ var AcePopup = function(parentNode) {
popup.renderer.$maxLines = 8; popup.renderer.$maxLines = 8;
popup.renderer.$keepTextAreaAtCursor = false; popup.renderer.$keepTextAreaAtCursor = false;
popup.setHighlightActiveLine(true); popup.setHighlightActiveLine(false);
// set default highlight color // set default highlight color
popup.session.highlight(""); popup.session.highlight("");
popup.session.$searchHighlight.clazz = "ace_highlight-marker"; popup.session.$searchHighlight.clazz = "ace_highlight-marker";
@ -86,11 +86,14 @@ var AcePopup = function(parentNode) {
var pos = e.getDocumentPosition(); var pos = e.getDocumentPosition();
popup.moveCursorToPosition(pos); popup.moveCursorToPosition(pos);
popup.selection.clearSelection(); popup.selection.clearSelection();
selectionMarker.start.row = selectionMarker.end.row = pos.row;
e.stop(); e.stop();
}); });
var lastMouseEvent; var lastMouseEvent;
var hoverMarker = new Range(-1,0,-1,Infinity); var hoverMarker = new Range(-1,0,-1,Infinity);
var selectionMarker = new Range(-1,0,-1,Infinity);
selectionMarker.id = popup.session.addMarker(selectionMarker, "ace_active-line", "fullLine");
popup.setSelectOnHover = function(val) { popup.setSelectOnHover = function(val) {
if (!val) { if (!val) {
hoverMarker.id = popup.session.addMarker(hoverMarker, "ace_line-hover", "fullLine"); hoverMarker.id = popup.session.addMarker(hoverMarker, "ace_line-hover", "fullLine");
@ -186,14 +189,12 @@ var AcePopup = function(parentNode) {
}; };
popup.getRow = function() { popup.getRow = function() {
var line = this.getCursorPosition().row; return selectionMarker.start.row;
if (line == 0 && !this.getHighlightActiveLine())
line = -1;
return line;
}; };
popup.setRow = function(line) { popup.setRow = function(line) {
popup.setHighlightActiveLine(line != -1);
popup.selection.clearSelection(); popup.selection.clearSelection();
selectionMarker.start.row = selectionMarker.end.row = line || 0;
popup.session._emit("changeBackMarker");
popup.moveCursorTo(line || 0, 0); popup.moveCursorTo(line || 0, 0);
}; };
@ -229,6 +230,7 @@ var AcePopup = function(parentNode) {
dom.importCssString("\ dom.importCssString("\
.ace_autocomplete.ace-tm .ace_marker-layer .ace_active-line {\ .ace_autocomplete.ace-tm .ace_marker-layer .ace_active-line {\
background-color: #CAD6FA;\ background-color: #CAD6FA;\
z-index: 1;\
}\ }\
.ace_autocomplete.ace-tm .ace_line-hover {\ .ace_autocomplete.ace-tm .ace_line-hover {\
border: 1px solid #abbffe;\ border: 1px solid #abbffe;\