Skip to content

Commit

Permalink
package 02.07.17
Browse files Browse the repository at this point in the history
  • Loading branch information
nightwing committed Jul 2, 2017
1 parent 0b01260 commit 812e2c5
Show file tree
Hide file tree
Showing 166 changed files with 494 additions and 147 deletions.
3 changes: 3 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2017.07.02 Version 1.2.8
* Fixed small bugs in searchbox and autocompleter

2017.06.18 Version 1.2.7

* Added Support for arrow keys on external IPad keyboard (Emanuele Tamponi)
Expand Down
34 changes: 29 additions & 5 deletions demo/kitchen-sink/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -1694,17 +1694,38 @@ exports.detectIndentation = function(session) {
session.setTabSize(indent.length);
return indent;
};

exports.trimTrailingSpace = function(session, trimEmpty) {
exports.trimTrailingSpace = function(session, options) {
var doc = session.getDocument();
var lines = doc.getAllLines();

var min = trimEmpty ? -1 : 0;
var min = options && options.trimEmpty ? -1 : 0;
var cursors = [], ci = -1;
if (options && options.keepCursorPosition) {
if (session.selection.rangeCount) {
session.selection.rangeList.ranges.forEach(function(x, i, ranges) {
var next = ranges[i + 1];
if (next && next.cursor.row == x.cursor.row)
return;
cursors.push(x.cursor);
});
} else {
cursors.push(session.selection.getCursor());
}
ci = 0;
}
var cursorRow = cursors[ci] && cursors[ci].row;

for (var i = 0, l=lines.length; i < l; i++) {
var line = lines[i];
var index = line.search(/\s+$/);

if (i == cursorRow) {
if (index < cursors[ci].column && index > min)
index = cursors[ci].column;
ci++;
cursorRow = cursors[ci] ? cursors[ci].row : -1;
}

if (index > min)
doc.removeInLine(i, index, line.length);
}
Expand Down Expand Up @@ -10677,6 +10698,7 @@ var AcePopup = function(parentNode) {
popup.$blockScrolling = Infinity;
popup.isOpen = false;
popup.isTopdown = false;
popup.autoSelect = true;

popup.data = [];
popup.setData = function(list) {
Expand All @@ -10692,7 +10714,7 @@ var AcePopup = function(parentNode) {
return selectionMarker.start.row;
};
popup.setRow = function(line) {
line = Math.max(0, Math.min(this.data.length, line));
line = Math.max(this.autoSelect ? 0 : -1, Math.min(this.data.length, line));
if (selectionMarker.start.row != line) {
popup.selection.clearSelection();
selectionMarker.start.row = selectionMarker.end.row = line || 0;
Expand Down Expand Up @@ -10919,6 +10941,8 @@ var Autocomplete = function() {
if (!this.popup)
this.$init();

this.popup.autoSelect = this.autoSelect;

this.popup.setData(this.completions.filtered);

editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
Expand Down Expand Up @@ -10978,7 +11002,7 @@ var Autocomplete = function() {
this.blurListener = function(e) {
var el = document.activeElement;
var text = this.editor.textInput.getElement();
var fromTooltip = e.relatedTarget && this.tooltipNode.contains(e.relatedTarget);
var fromTooltip = e.relatedTarget && this.tooltipNode && this.tooltipNode.contains(e.relatedTarget);
var container = this.popup && this.popup.container;
if (el != text && el.parentNode != container && !fromTooltip
&& el != this.tooltipNode && e.relatedTarget != text
Expand Down
2 changes: 1 addition & 1 deletion kitchen-sink.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="author" content="Fabian Jakobs">
<!--
Ace
version 1.2.7
version 1.2.8
commit 9200b313b9923abc28c40cf597571106328de4a0
-->
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ace-builds",
"version": "1.2.7",
"version": "1.2.8",
"description": "Ace (Ajax.org Cloud9 Editor)",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down
2 changes: 1 addition & 1 deletion src-min-noconflict/ace.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/ext-language_tools.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/ext-searchbox.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/ext-whitespace.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-c9search.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-coldfusion.js

Large diffs are not rendered by default.

Loading

0 comments on commit 812e2c5

Please sign in to comment.