Skip to content

Commit f5fdb2d

Browse files
nightwingnightwing
committed
package 28.10.15
1 parent b082bcb commit f5fdb2d

File tree

170 files changed

+37030
-3803
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+37030
-3803
lines changed

‎ChangeLog.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2015.10.28 Version 1.2.1
2+
3+
* new language modes
4+
- Swift
5+
- JSX
6+
17
2015.07.11 Version 1.2.0
28

39
* New Features

‎demo/iframe.html

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
65
<title>ACE Editor Inside iframe</title>
76
<style type="text/css" media="screen">
8-
/*!important without this top: 0; bottom: 0 doesn't work */
9-
body, html {
10-
position: absolute;
11-
top: 0px; bottom: 0; left: 0; right: 0;
7+
body, html {
8+
height: 100%;
129
margin:0; padding:0;
13-
overflow:hidden
14-
}
15-
10+
}
1611
#editor {
17-
padding: 20px;
18-
position: absolute;
19-
width: 80%;
20-
height: 80%;
12+
padding: 20px; margin: 20px
13+
width: 80%; height: 80%;
2114
}
2215
</style>
2316
</head>
2417
<body>
25-
26-
<iframe id="editor" src="../kitchen-sink.html"></iframe>
27-
18+
<div style="height: 100%"></div>
19+
<div><textarea></textarea></div>
20+
<iframe id="editor-iframe" src='data:text/html,
21+
<pre id="editor" style="height:100%"></pre>
22+
<script src="https://ajaxorg.github.io/ace-builds/src/ace.js"></script>
23+
<script>
24+
var editor = ace.edit("editor");
25+
editor.setTheme("ace/theme/twilight");
26+
editor.session.setMode("ace/mode/javascript");
27+
</script>
28+
'></iframe>
2829
</body>
2930
</html>

‎demo/kitchen-sink/demo.js

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,6 +1309,7 @@ var supportedModes = {
13091309
haXe: ["hx"],
13101310
HTML: ["html|htm|xhtml"],
13111311
HTML_Ruby: ["erb|rhtml|html.erb"],
1312+
HTML_Elixir: ["eex|html.eex"],
13121313
INI: ["ini|conf|cfg|prefs"],
13131314
Io: ["io"],
13141315
Jack: ["jack"],
@@ -1398,6 +1399,7 @@ var nameOverrides = {
13981399
C_Cpp: "C and C++",
13991400
coffee: "CoffeeScript",
14001401
HTML_Ruby: "HTML (Ruby)",
1402+
HTML_Elixir: "HTML (Elixir)",
14011403
FTL: "FreeMarker"
14021404
};
14031405
var modesByName = {};
@@ -3072,7 +3074,8 @@ oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
30723074
var iSearch = this.$iSearch;
30733075
HashHandler.call(this, exports.iSearchCommands, editor.commands.platform);
30743076
this.$commandExecHandler = editor.commands.addEventListener('exec', function(e) {
3075-
if (!e.command.isIncrementalSearchCommand) return undefined;
3077+
if (!e.command.isIncrementalSearchCommand)
3078+
return iSearch.deactivate();
30763079
e.stopPropagation();
30773080
e.preventDefault();
30783081
var scrollTop = editor.session.getScrollTop();
@@ -3099,7 +3102,7 @@ oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
30993102
var extendCmd = this.commands.extendSearchTerm;
31003103
if (extendCmd) { return {command: extendCmd, args: key}; }
31013104
}
3102-
return {command: "null", passEvent: hashId == 0 || hashId == 4};
3105+
return false;
31033106
};
31043107

31053108
}).call(IncrementalSearchKeyboardHandler.prototype);
@@ -5077,7 +5080,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
50775080
if (command === false) {
50785081
return undefined;
50795082
} else if (command === true) {
5080-
return function() {};
5083+
return function() { return true; };
50815084
} else {
50825085
return function() {
50835086
if ((command.operator || command.isEdit) && cm.getOption('readOnly'))
@@ -5862,12 +5865,14 @@ dom.importCssString(".normal-mode .ace_cursor{\
58625865
(line > last && cur.line == last)) {
58635866
return;
58645867
}
5865-
var fold = cm.ace.session.getFoldAt(line, endCh);
5868+
var fold = cm.ace.session.getFoldLine(line);
58665869
if (fold) {
5867-
if (motionArgs.forward)
5868-
line = fold.end.row + 1;
5869-
else
5870-
line = fold.start.row - 1;
5870+
if (motionArgs.forward) {
5871+
if (line > fold.start.row)
5872+
line = fold.end.row + 1;
5873+
} else {
5874+
line = fold.start.row;
5875+
}
58715876
}
58725877
if (motionArgs.toFirstChar){
58735878
endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
@@ -7401,8 +7406,17 @@ dom.importCssString(".normal-mode .ace_cursor{\
74017406
if (any) { return isEmpty(i) != isEmpty(i + dir); }
74027407
return !isEmpty(i) && isEmpty(i + dir);
74037408
}
7409+
function skipFold(i) {
7410+
dir = dir > 0 ? 1 : -1;
7411+
var foldLine = cm.ace.session.getFoldLine(i);
7412+
if (foldLine) {
7413+
if (i + dir > foldLine.start.row && i + dir < foldLine.end.row)
7414+
dir = (dir > 0 ? foldLine.end.row : foldLine.start.row) - i;
7415+
}
7416+
}
74047417
if (dir) {
74057418
while (min <= i && i <= max && repeat > 0) {
7419+
skipFold(i);
74067420
if (isBoundary(i, dir)) { repeat--; }
74077421
i += dir;
74087422
}
@@ -9162,13 +9176,11 @@ var StatusBar = function(editor, parentNode) {
91629176

91639177
var statusUpdate = lang.delayedCall(function(){
91649178
this.updateStatus(editor)
9165-
}.bind(this));
9166-
editor.on("changeStatus", function() {
9167-
statusUpdate.schedule(100);
9168-
});
9169-
editor.on("changeSelection", function() {
9170-
statusUpdate.schedule(100);
9171-
});
9179+
}.bind(this)).schedule.bind(null, 100);
9180+
9181+
editor.on("changeStatus", statusUpdate);
9182+
editor.on("changeSelection", statusUpdate);
9183+
editor.on("keyboardActivity", statusUpdate);
91729184
};
91739185

91749186
(function(){
@@ -9181,13 +9193,17 @@ var StatusBar = function(editor, parentNode) {
91819193
add(editor.keyBinding.getStatusText(editor));
91829194
if (editor.commands.recording)
91839195
add("REC");
9184-
9185-
var c = editor.selection.lead;
9186-
add(c.row + ":" + c.column, " ");
9187-
if (!editor.selection.isEmpty()) {
9196+
9197+
var sel = editor.selection;
9198+
var c = sel.lead;
9199+
9200+
if (!sel.isEmpty()) {
91889201
var r = editor.getSelectionRange();
9189-
add("(" + (r.end.row - r.start.row) + ":" +(r.end.column - r.start.column) + ")");
9202+
add("(" + (r.end.row - r.start.row) + ":" +(r.end.column - r.start.column) + ")", " ");
91909203
}
9204+
add(c.row + ":" + c.column, " ");
9205+
if (sel.rangeCount)
9206+
add("[" + sel.rangeCount + "]", " ");
91919207
status.pop();
91929208
this.element.textContent = status.join("");
91939209
};

‎demo/kitchen-sink/docs/html_elixir.eex

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<h1>Listing Books</h1>
2+
3+
<table>
4+
<tr>
5+
<th>Title</th>
6+
<th>Summary</th>
7+
<th></th>
8+
<th></th>
9+
<th></th>
10+
</tr>
11+
12+
<%= for book <- @books do %>
13+
<tr>
14+
<%# comment %>
15+
<td><%= book.title %></td>
16+
<td><%= book.content %></td>
17+
<td><%= link "Show", to: book_path(@conn, :show, book) %></td>
18+
<td><%= link "Edit", to: book_path(@conn, :edit, book) %></td>
19+
<td><%= link "Delete", to: book_path(@conn, :delete, book), method: :delete, data: [confirm: "Are you sure?"] %></td>
20+
</tr>
21+
<% end %>
22+
</table>
23+
24+
<br />
25+
26+
<%= link "New book", to: book_path(@conn, :new) %>

‎kitchen-sink.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="author" content="Fabian Jakobs">
88
<!--
99
Ace
10-
version 1.2.0
10+
version 1.2.1
1111
commit
1212
-->
1313

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ace-builds",
3-
"version": "1.2.0",
3+
"version": "[A[B1.2.1",
44
"description": "Ace (Ajax.org Cloud9 Editor)",
55
"scripts": {
66
"test": "echo \"Error: no test specified\" && exit 1"

‎src-min-noconflict/ace.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src-min-noconflict/ext-modelist.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)