Skip to content

Commit

Permalink
package 11.07.15
Browse files Browse the repository at this point in the history
  • Loading branch information
nightwing committed Jul 11, 2015
1 parent 9d12839 commit 0982db4
Show file tree
Hide file tree
Showing 431 changed files with 14,765 additions and 22,959 deletions.
15 changes: 15 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
2015.07.11 Version 1.2.0

* New Features
- Indented soft wrap (danyaPostfactum)
- Rounded borders on selections

* API Changes
- unified delta types `{start, end, action, lines}` (Alden Daniels https://github.com/ajaxorg/ace/pull/1745)
- "change" event listeners on session and editor get delta objects directly

* new language modes
- SQLServer (Morgan Yarbrough)

2015.04.03 Version 1.1.9

- Small Enhancements and Bugfixes

2014.11.08 Version 1.1.8

* API Changes
Expand Down
12 changes: 10 additions & 2 deletions demo/autoresize.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
<style type="text/css" media="screen">

.ace_editor {
position: relative !important;
border: 1px solid lightgray;
margin: auto;
height: 200px;
width: 80%;
}
.scrollmargin {
height: 100px;
height: 80px;
text-align: center;
}
</style>
Expand All @@ -24,6 +23,8 @@
<div class="scrollmargin"></div>
<pre id="editor2">minHeight = 2 lines</pre>
<div class="scrollmargin"></div>
<pre id="editor3" style="width: 40%;"></pre>
<div class="scrollmargin"></div>
<pre id="editor"></pre>

<!-- load ace -->
Expand All @@ -43,6 +44,13 @@
editor2.setOption("maxLines", 30);
editor2.setOption("minLines", 2);

var editor = ace.edit("editor3");
editor.setOptions({
autoScrollEditorIntoView: true,
maxLines: 8
});
editor.renderer.setScrollMargin(10, 10, 10, 10);

var editor = ace.edit("editor");
editor.setTheme("ace/theme/tomorrow");
editor.session.setMode("ace/mode/html");
Expand Down
Loading

0 comments on commit 0982db4

Please sign in to comment.