diff --git a/.gitignore b/.gitignore
index c6a7ecc9..59ec847b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
.DS_Store
*.swp
*.tmp
+*~
# Project files that should not be in the repo
.*
diff --git a/.gitmodules b/.gitmodules
index 4678c516..07bbe371 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "doc/wiki"]
path = doc/wiki
- url = git://github.com/ajaxorg/ace.wiki.git
+ url = https://github.com/ajaxorg/ace.wiki.git
[submodule "build"]
path = build
- url = git://github.com/ajaxorg/ace-builds.git
+ url = https://github.com/ajaxorg/ace-builds.git
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c44edcb0..062af59c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,16 +7,9 @@ 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://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
+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.
-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.
+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.
-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
+Happy coding, Cloud9
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 81168b8f..3077d171 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,80 @@
+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
+* New Features
+ - Improved autoindent for html and php modes (Adam Jimenez)
+ - Find All from searchbox (Colton Voege)
+
+* new language modes
+ - Elixir, Elm
+
+2014.09.21 Version 1.1.7
+
+* Bugfixes
+ - fix several bugs in autocompletion
+ - workaround for inaccurate getBoundingClientRect on chrome 37
+
+2014.08.17 Version 1.1.6
+
+* Bugfixes
+ - fix regression in double tap to highlight
+ - Improved Latex Mode (Daniel Felder)
+
+* API Changes
+ - editor.destroy destroys editor.session too (call editor.setSession(null) to prevent that)
+
+* new language modes
+ - Praat (José Joaquín Atria)
+ - Eiffel (Victorien Elvinger)
+ - G-code (Adam Joseph Cook)
+
+2014.07.09 Version 1.1.5
+
+* Bugfixes
+ - fix regression in autocomplete popup
+
+* new language modes
+ - gitignore (Devon Carew)
+
+2014.07.01 Version 1.1.4
+
+* New Features
+ - Highlight matching tags (Adam Jimenez)
+ - Improved jump to matching command (Adam Jimenez)
+
+* new language modes
+ - AppleScript (Yaogang Lian)
+ - Vala
+
+2014.03.08 Version 1.1.3
+
+* New Features
+ - Allow syntax checkers to be loaded from CDN (Derk-Jan Hartman)
+ - Add ColdFusion behavior (Abram Adams)
+ - add showLineNumbers option
+ - Add html syntax checker (danyaPostfactum)
+
+* new language modes
+ - Gherkin (Patrick Nevels)
+ - Smarty
+
+2013.12.02 Version 1.1.2
+
* New Features
- Accessibility Theme for Ace (Peter Xiao)
- use snipetManager for expanding emmet snippets
@@ -10,7 +86,6 @@
- add support for autocompletion and snippets (gjtorikyan danyaPostfactum and others)
- add option to merge similar changes in undo history
- add scrollPastEnd option
- - 6a87d97 Merge pull request #1494 from danyaPostfactum/snippetcompleter
- use html5 dragndrop for text dragging (danyaPostfactum)
* API Changes
@@ -21,9 +96,8 @@
- Protobuf (Zef Hemel)
- Soy
- Handlebars
- -
-2013.06.04 Version 1.1.01
+2013.06.04 Version 1.1.1
- Improved emacs keybindings (Robert Krahn)
- Added markClean, isClean methods to UndoManager (Joonsoo Jeon)
diff --git a/Makefile b/Makefile
index 95dcf964..29cf0495 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,6 @@ pre_build:
build: pre_build
./Makefile.dryice.js normal
./Makefile.dryice.js demo
- ./Makefile.dryice.js bm
# Minimal build: call Makefile.dryice.js only if our sources changed
basic: build/src/ace.js
diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 4f73c87a..0ce7c657 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -31,22 +31,23 @@
var fs = require("fs");
var path = require("path");
-if (!fs.existsSync)
- fs.existsSync = path.existsSync;
-else
- path.existsSync = fs.existsSync;
-var copy = require('dryice').copy;
+var copy = require('architect-build/copy');
+var build = require('architect-build/build');
var ACE_HOME = __dirname;
var BUILD_DIR = ACE_HOME + "/build";
+var CACHE = {};
function main(args) {
+ if (args.indexOf("updateModes") !== -1) {
+ return updateModes();
+ }
var type = "minimal";
args = args.map(function(x) {
if (x[0] == "-" && x[1] != "-")
return "-" + x;
return x;
- });
+ }).filter(Boolean);
if (args[2] && (args[2][0] != "-" || args[2].indexOf("h") != -1))
type = args[2];
@@ -66,36 +67,22 @@ function main(args) {
ace();
} else if (type == "demo") {
demo();
- } else if (type == "bm") {
- bookmarklet();
} else if (type == "full") {
- demo(ace());
- bookmarklet();
+ ace();
+ demo();
} else if (type == "highlighter") {
- var project = buildAce({
- coreOnly: true,
- exportModule: "ace/ext/static_highlight",
- requires: ["ace/ext/static_highlight", "ace/theme/textmate"],
- readFilters: [copy.filter.moduleDefines, function(a) {
- console.log(a.substring(0, 2500))
- return a
- }]
- })
- copy({
- source: project.result,
- filter: getWriteFilters(project.options, "main"),
- dest: BUILD_DIR + "/static_highlight.js"
- });
+ // TODO
}
}
+}
+function showHelp(type) {
console.log("--- Ace Dryice Build Tool ---");
console.log("");
console.log("Options:");
console.log(" minimal Places necessary Ace files out in build dir; uses configuration flags below [default]");
console.log(" normal Runs four Ace builds--minimal, minimal-noconflict, minimal-min, and minimal-noconflict-min");
console.log(" demo Runs demo build of Ace");
- console.log(" bm Runs bookmarklet build of Ace");
console.log(" full all of above");
console.log(" highlighter ");
console.log("args:");
@@ -106,94 +93,34 @@ function main(args) {
console.log(" --nc namespace require");
console.log(" --s shrinkwrap (combines all output files into one)");
console.log("");
- if (BUILD_DIR)
- console.log(" output generated in " + type + __dirname + "/" + BUILD_DIR)
-}
-
-function bookmarklet() {
- var targetDir = BUILD_DIR + "/textarea";
- copy({
- source: "build_support/editor_textarea.html",
- dest: targetDir + '/editor.html'
- });
- copy({
- source: "build_support/style.css",
- dest: targetDir + '/style.css'
- });
-
- buildAce({
- targetDir: targetDir + "/src",
- ns: "__ace_shadowed__",
- exportModule: "ace/ext/textarea",
- compress: false,
- noconflict: true,
- suffix: "",
- name: "ace-bookmarklet",
- workers: [],
- keybindings: []
- });
+ if (type)
+ console.log(" output for " + type + " generated in " + BUILD_DIR);
}
function ace() {
- console.log('# ace ---------');
-
- // uncompressed
- var project = buildAce({
- compress: false,
- noconflict: false
- });
- buildAce({
- compress: false,
- noconflict: true
- });
-
- // compressed
- buildAce({
- compress: true,
- noconflict: false
- });
- buildAce({
- compress: true,
- noconflict: true
- });
-
console.log('# ace License | Readme | Changelog ---------');
- copy({
- source: ACE_HOME + "/build_support/editor.html",
- dest: BUILD_DIR + "/editor.html"
- });
- copy({
- source: ACE_HOME + "/LICENSE",
- dest: BUILD_DIR + "/LICENSE"
- });
- copy({
- source: ACE_HOME + "/ChangeLog.txt",
- dest: BUILD_DIR + "/ChangeLog.txt"
- });
-
- return project;
+ copy.file(ACE_HOME + "/build_support/editor.html", BUILD_DIR + "/editor.html");
+ copy.file(ACE_HOME + "/LICENSE", BUILD_DIR + "/LICENSE");
+ copy.file(ACE_HOME + "/ChangeLog.txt", BUILD_DIR + "/ChangeLog.txt");
+
+ console.log('# ace ---------');
+ for (var i = 0; i < 4; i++)
+ buildAce({compress: i & 2, noconflict: i & 1});
}
-function demo(project) {
- project = project || buildAce({
- compress: false,
- noconflict: false,
- coreOnly: true
- });
+function demo() {
console.log('# kitchen sink ---------');
- var version, ref;
+ var version = "", ref = "";
try {
version = JSON.parse(fs.readFileSync(ACE_HOME + "/package.json")).version;
ref = fs.readFileSync(ACE_HOME + "/.git-ref").toString();
- } catch(e) {
- ref = "";
- version = "";
- }
+ } catch(e) {}
function changeComments(data) {
return (data
+ .replace("doc/site/images/ace-logo.png", "demo/kitchen-sink/ace-logo.png")
.replace(//g, "")
.replace(/PACKAGE\-\->|")}
+ function script(str) {result.push('')}
+ scripts.forEach(function(s) {
+ s = s.replace(/"/g, "");
+ if (s == "ace/ace") {
+ comment("load ace");
+ script("ace");
+ } else {
+ var extName = s.match(/[^/]*$/)[0];
+ comment("load ace " + extName + " extension");
+ script("ext-" + extName);
+ }
+ });
+ result.push("
-
\ No newline at end of file
+
diff --git a/build b/build
index 995de31e..a4e495d8 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit 995de31e6513ddfd5e9f66b8216f5b316fcd2253
+Subproject commit a4e495d8901876c6bafe3870a35cb8e32c827e97
diff --git a/build_support/editor_textarea.html b/build_support/bookmarklet.html
similarity index 63%
rename from build_support/editor_textarea.html
rename to build_support/bookmarklet.html
index bb691c11..88355f78 100644
--- a/build_support/editor_textarea.html
+++ b/build_support/bookmarklet.html
@@ -20,7 +20,7 @@ function foo() {
var bar = true;
}
SourceUrl:
-
+
@@ -49,63 +49,60 @@ function foo() {
diff --git a/demo/autoresize.html b/demo/autoresize.html
index cc1dc5e3..b0464ecd 100644
--- a/demo/autoresize.html
+++ b/demo/autoresize.html
@@ -7,42 +7,62 @@
-autoresizing editor
+autoresizing editor
minHeight = 2 lines
+
+
+
+
-
+
+
+