diff --git a/.gitignore b/.gitignore index 59ec847b..c6a7ecc9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .DS_Store *.swp *.tmp -*~ # Project files that should not be in the repo .* diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 062af59c..c44edcb0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,9 +7,16 @@ Feel free to fork and improve/enhance Ace any way you want. If you feel that the There are two versions of the agreement: -1. [The Individual CLA](https://docs.google.com/a/c9.io/forms/d/1MfmfrxqD_PNlNsuK0lC2KSelRLxGLGfh_wEcG0ijVvo/viewform): use this version if you're working on the Cloud9 SDK or open source projects in your spare time, or can clearly claim ownership of copyright in what you'll be submitting. -2. [The Corporate CLA](https://docs.google.com/a/c9.io/forms/d/1vFejn4111GdnCNuQ6BfnJDaxdsUEMD4KCo1ayovAfu0/viewform): have your corporate lawyer review and submit this if your company is going to be contributing to the Cloud9 SDK and/or open source projects. +1. [The Individual CLA](https://github.com/ajaxorg/ace/raw/master/doc/Contributor_License_Agreement-v2.pdf): use this version if you're working on an ajax.org in your spare time, or can clearly claim ownership of copyright in what you'll be submitting. +2. [The Corporate CLA](https://github.com/ajaxorg/ace/raw/master/doc/Corporate_Contributor_License_Agreement-v2.pdf): have your corporate lawyer review and submit this if your company is going to be contributing to ajax.org projects -If you want to contribute to the Cloud9 SDK and/or open source projects please go to the online form, fill it out and submit it. +If you want to contribute to an ajax.org project please print the CLA and fill it out and sign it. Then either send it by snail mail or fax to us or send it back scanned (or as a photo) by email. -Happy coding, Cloud9 +Email: ace+cla@c9.io + +Fax: +31 (0) 206388953 + +Address: Ajax.org B.V. + Keizersgracht 241 + 1016 EA, Amsterdam + the Netherlands \ No newline at end of file diff --git a/ChangeLog.txt b/ChangeLog.txt index 3077d171..86399b5e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,17 +1,4 @@ -Version 1.2.0-pre -* New Features - - Indented soft wrap (danyaPostfactum) - -* 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 - -2015.04.03 Version 1.1.9 - - - Small Enhancements and Bugfixes - -2014.11.08 Version 1.1.8 * API Changes - `editor.commands.commandKeyBinding` now contains direct map from keys to commands instead of grouping them by hashid diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 0ce7c657..a40549ef 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -120,7 +120,6 @@ function demo() { function changeComments(data) { return (data - .replace("doc/site/images/ace-logo.png", "demo/kitchen-sink/ace-logo.png") .replace(//g, "") .replace(/PACKAGE\-\->| .ace_editor { + position: relative !important; border: 1px solid lightgray; margin: auto; height: 200px; width: 80%; } .scrollmargin { - height: 80px; + height: 100px; text-align: center; } @@ -23,8 +24,6 @@
minHeight = 2 lines- - @@ -47,13 +46,6 @@ require(["ace/ace"], function(ace) { 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"); diff --git a/demo/emmet.html b/demo/emmet.html index bd0d4abe..122085d9 100644 --- a/demo/emmet.html +++ b/demo/emmet.html @@ -23,7 +23,7 @@ - + - - - - - - - - -