diff --git a/.gitignore b/.gitignore
index 59ec847b..b78137a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,20 +2,19 @@
.DS_Store
*.swp
*.tmp
-*~
# Project files that should not be in the repo
-.*
-\#*
-!/.gitignore
+.project
+.settings/
+.settings.xml
+.c9settings.xml
+.settings.xml.old
.*.gz
-*.tmTheme.js
# A handy place to put stuff that git should ignore:
/ignore/
node_modules/
-jam/
-* *
+tool/node_modules/
.git-ref
npm-debug.log
diff --git a/.gitmodules b/.gitmodules
index 07bbe371..0e3f48e0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "doc/wiki"]
path = doc/wiki
- url = https://github.com/ajaxorg/ace.wiki.git
-[submodule "build"]
- path = build
- url = https://github.com/ajaxorg/ace-builds.git
+ url = git://github.com/ajaxorg/ace.wiki.git
\ No newline at end of file
diff --git a/CNAME b/CNAME
deleted file mode 100644
index 75431b15..00000000
--- a/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-ace.c9.io
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 062af59c..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Contributing
-------------
-
-Ace is a community project and wouldn't be what it is without contributions! We actively encourage and support contributions. The Ace source code is released under the BSD License. This license is very simple, and is friendly to all kinds of projects, whether open source or not. Take charge of your editor and add your favorite language highlighting and keybindings!
-
-Feel free to fork and improve/enhance Ace any way you want. If you feel that the editor or the Ace community will benefit from your changes, please open a pull request. To protect the interests of the Ace contributors and users we require contributors to sign a Contributors License Agreement (CLA) before we pull the changes into the main repository. Our CLA is the simplest of agreements, requiring that the contributions you make to an ajax.org project are only those you're allowed to make. This helps us significantly reduce future legal risk for everyone involved. It is easy, helps everyone, takes ten minutes, and only needs to be completed once.
-
-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.
-
-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.
-
-Happy coding, Cloud9
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3077d171..76b2313b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,229 +1,3 @@
-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
- - update jshint to 2.1.4
- - improve php syntax checker (jdalegonzalez)
- - add option for autoresizing
- - add option for autohiding vertical scrollbar
- - improvements to highlighting of xml like languages (danyaPostfactum)
- - add support for autocompletion and snippets (gjtorikyan danyaPostfactum and others)
- - add option to merge similar changes in undo history
- - add scrollPastEnd option
- - use html5 dragndrop for text dragging (danyaPostfactum)
-
-* API Changes
- - fixed typo in HashHandler commmandManager
-
-* new language modes
- - Nix (Zef Hemel)
- - Protobuf (Zef Hemel)
- - Soy
- - Handlebars
-
-2013.06.04 Version 1.1.1
-
- - Improved emacs keybindings (Robert Krahn)
- - Added markClean, isClean methods to UndoManager (Joonsoo Jeon)
- - Do not allow `Toggle comments` command to remove spaces from indentation
- - Softer colors for indent guides in dark themes
-
-* new language modes
- - Ada
- - Assembly_x86
- - Cobol
- - D
- - ejs
- - MATLAB
- - MySQL
- - Twig
- - Verilog
-
-2013.05.01, Version 1.1.0
-
-* API Changes
- - Default position of the editor container is changed to relative. Add `.ace_editor {position: absolute}` css rule to restore old behavior
- - Changed default line-height to `normal` to not conflict with bootstrap. Use `line-height: inherit` for old behavior.
- - Changed marker types accepted by session.addMarker. It now accepts "text"|"line"|"fullLine"|"screenLine"
- - Internal classnames used by editor were made more consistent
- - Introduced `editor.setOption/getOption/setOptions/getOptions` methods
- - Introduced positionToIndex, indexToPosition methods
-
-* New Features
- - Improved emacs mode (chetstone)
- with Incremental search and Occur modes (Robert Krahn)
-
- - Improved ime handling
- - Searchbox (Vlad Zinculescu)
-
- - Added elastic tabstops lite extension (Garen Torikian)
- - Added extension for whitespace manipulation
- - Added extension for enabling spellchecking from contextmenu
- - Added extension for displaying available keyboard shortcuts (Matthew Christopher Kastor-Inare III)
- - Added extension for displaying options panel (Matthew Christopher Kastor-Inare III)
- - Added modelist extension (Matthew Christopher Kastor-Inare III)
-
- - Improved toggleCommentLines and added ToggleCommentBlock command
- - `:;` pairing in CSS mode (danyaPostfactum)
-
- - Added suppoert for Delete and SelectAll from context menu (danyaPostfactum)
-
- - Make wrapping behavior optional
- - Selective bracket insertion/skipping
-
- - Added commands for increase/decrease numbers, sort lines (Vlad Zinculescu)
- - Folding for Markdown, Lua, LaTeX
- - Selective bracket insertion/skipping for C-like languages
-
-* Many new languages
- - Scheme (Mu Lei)
- - Dot (edwardsp)
- - FreeMarker (nguillaumin)
- - Tiny Mushcode (h3rb)
- - Velocity (Ryan Griffith)
- - TOML (Garen Torikian)
- - LSL (Nemurimasu Neiro, Builders Brewery)
- - Curly (Libo Cannici)
- - vbScript (Jan Jongboom)
- - R (RStudio)
- - ABAP
- - Lucene (Graham Scott)
- - Haml (Garen Torikian)
- - Objective-C (Garen Torikian)
- - Makefile (Garen Torikian)
- - TypeScript (Garen Torikian)
- - Lisp (Garen Torikian)
- - Stylus (Garen Torikian)
- - Dart (Garen Torikian)
-
-* Live syntax checks
- - PHP (danyaPostfactum)
- - Lua
-
-* New Themes
- - Chaos
- - Terminal
-
-2012.09.17, Version 1.0.0
-
-* New Features
- - Multiple cursors and selections (https://c9.io/site/blog/2012/08/be-an-armenian-warrior-with-block-selection-on-steroids/)
- - Fold buttons displayed in the gutter
- - Indent Guides
- - Completely reworked vim mode (Sergi Mansilla)
- - Improved emacs keybindings
- - Autoclosing of html tags (danyaPostfactum)
-
-* 20 New language modes
- - Coldfusion (Russ)
- - Diff
- - GLSL (Ed Mackey)
- - Go (Davide Saurino)
- - Haxe (Jason O'Neil)
- - Jade (Garen Torikian)
- - jsx (Syu Kato)
- - LaTeX (James Allen)
- - Less (John Roepke)
- - Liquid (Bernie Telles)
- - Lua (Lee Gao)
- - LuaPage (Choonster)
- - Markdown (Chris Spencer)
- - PostgreSQL (John DeSoi)
- - Powershell (John Kane)
- - Sh (Richo Healey)
- - SQL (Jonathan Camile)
- - Tcl (Cristoph Hochreiner)
- - XQuery (William Candillion)
- - Yaml (Meg Sharkey)
-
- * Live syntax checks
- - for XQuery and JSON
-
-* New Themes
- - Ambiance (Irakli Gozalishvili)
- - Dreamweaver (Adam Jimenez)
- - Github (bootstraponline)
- - Tommorrow themes (https://github.com/chriskempson/tomorrow-theme)
- - XCode
-
-* Many Small Enhancements and Bugfixes
-
2011.08.02, Version 0.2.0
* Split view (Julian Viereck)
@@ -253,14 +27,15 @@ Version 1.2.0-pre
- SCAD (Jacob Hansson)
* Live syntax checks
- - Lint for CSS using CSS Lint
+ - Lint for Css using CSS Lint
- CoffeeScript
* New Themes
- Crimson Editor (iebuggy)
- Merbivore (Michael Schwartz)
- Merbivore soft (Michael Schwartz)
- - Solarized dark/light (David Alan Hjelle)
+ - Solarized dark/light (David Alan
+ Hjelle)
- Vibrant Ink (Michael Schwartz)
* Small Features/Enhancements
@@ -273,8 +48,10 @@ Version 1.2.0-pre
highlight are not affected (Irakli Gozalishvili)
- Added setFontSize method
- Improved vi keybindings (Trent Ogren)
- - When unfocused make cursor transparent instead of removing it (Harutyun Amirjanyan)
- - Support for matching groups in tokenizer with arrays of tokens (Chris Spencer)
+ - When unfocused make cursor transparent instead of removing it (Harutyun
+ Amirjanyan)
+ - Support for matching groups in tokenizer with arrays of tokens (Chris
+ Spencer)
* Bug fixes
- Add support for the new OSX scroll bars
@@ -282,7 +59,8 @@ Version 1.2.0-pre
- Proper handling of unicode characters in JavaScript identifiers
- Fix remove lines command on last line (Harutyun Amirjanyan)
- Fix scroll wheel sluggishness in Safari
- - Make keyboard infrastructure route keys like []^$ the right way (Julian Viereck)
+ - Make keyboard infrastructure route keys like []^$ the right way (Julian
+ Viereck)
2011.02.14, Version 0.1.6
@@ -335,4 +113,4 @@ Version 1.2.0-pre
* Add Ruby mode contributed by Shlomo Zalman Heigh
* Add Java mode contributed by Tom Tasche
* Fix annotation bug
-* Changing a document added a new empty line at the end
+* Changing a document added a new empty line at the end
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 4760be2a..853e4fd5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,24 +1,476 @@
-Copyright (c) 2010, Ajax.org B.V.
-All rights reserved.
+Licensed under the tri-license MPL/LGPL/GPL.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of Ajax.org B.V. nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
+ MOZILLA PUBLIC LICENSE
+ Version 1.1
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ---------------
+
+1. Definitions.
+
+ 1.0.1. "Commercial Use" means distribution or otherwise making the
+ Covered Code available to a third party.
+
+ 1.1. "Contributor" means each entity that creates or contributes to
+ the creation of Modifications.
+
+ 1.2. "Contributor Version" means the combination of the Original
+ Code, prior Modifications used by a Contributor, and the Modifications
+ made by that particular Contributor.
+
+ 1.3. "Covered Code" means the Original Code or Modifications or the
+ combination of the Original Code and Modifications, in each case
+ including portions thereof.
+
+ 1.4. "Electronic Distribution Mechanism" means a mechanism generally
+ accepted in the software development community for the electronic
+ transfer of data.
+
+ 1.5. "Executable" means Covered Code in any form other than Source
+ Code.
+
+ 1.6. "Initial Developer" means the individual or entity identified
+ as the Initial Developer in the Source Code notice required by Exhibit
+ A.
+
+ 1.7. "Larger Work" means a work which combines Covered Code or
+ portions thereof with code not governed by the terms of this License.
+
+ 1.8. "License" means this document.
+
+ 1.8.1. "Licensable" means having the right to grant, to the maximum
+ extent possible, whether at the time of the initial grant or
+ subsequently acquired, any and all of the rights conveyed herein.
+
+ 1.9. "Modifications" means any addition to or deletion from the
+ substance or structure of either the Original Code or any previous
+ Modifications. When Covered Code is released as a series of files, a
+ Modification is:
+ A. Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+
+ B. Any new file that contains any part of the Original Code or
+ previous Modifications.
+
+ 1.10. "Original Code" means Source Code of computer software code
+ which is described in the Source Code notice required by Exhibit A as
+ Original Code, and which, at the time of its release under this
+ License is not already Covered Code governed by this License.
+
+ 1.10.1. "Patent Claims" means any patent claim(s), now owned or
+ hereafter acquired, including without limitation, method, process,
+ and apparatus claims, in any patent Licensable by grantor.
+
+ 1.11. "Source Code" means the preferred form of the Covered Code for
+ making modifications to it, including all modules it contains, plus
+ any associated interface definition files, scripts used to control
+ compilation and installation of an Executable, or source code
+ differential comparisons against either the Original Code or another
+ well known, available Covered Code of the Contributor's choice. The
+ Source Code can be in a compressed or archival form, provided the
+ appropriate decompression or de-archiving software is widely available
+ for no charge.
+
+ 1.12. "You" (or "Your") means an individual or a legal entity
+ exercising rights under, and complying with all of the terms of, this
+ License or a future version of this License issued under Section 6.1.
+ For legal entities, "You" includes any entity which controls, is
+ controlled by, or is under common control with You. For purposes of
+ this definition, "control" means (a) the power, direct or indirect,
+ to cause the direction or management of such entity, whether by
+ contract or otherwise, or (b) ownership of more than fifty percent
+ (50%) of the outstanding shares or beneficial ownership of such
+ entity.
+
+2. Source Code License.
+
+ 2.1. The Initial Developer Grant.
+ The Initial Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer to use, reproduce,
+ modify, display, perform, sublicense and distribute the Original
+ Code (or portions thereof) with or without Modifications, and/or
+ as part of a Larger Work; and
+
+ (b) under Patents Claims infringed by the making, using or
+ selling of Original Code, to make, have made, use, practice,
+ sell, and offer for sale, and/or otherwise dispose of the
+ Original Code (or portions thereof).
+
+ (c) the licenses granted in this Section 2.1(a) and (b) are
+ effective on the date Initial Developer first distributes
+ Original Code under the terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is
+ granted: 1) for code that You delete from the Original Code; 2)
+ separate from the Original Code; or 3) for infringements caused
+ by: i) the modification of the Original Code or ii) the
+ combination of the Original Code with other software or devices.
+
+ 2.2. Contributor Grant.
+ Subject to third party intellectual property claims, each Contributor
+ hereby grants You a world-wide, royalty-free, non-exclusive license
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Contributor, to use, reproduce, modify,
+ display, perform, sublicense and distribute the Modifications
+ created by such Contributor (or portions thereof) either on an
+ unmodified basis, with other Modifications, as Covered Code
+ and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or
+ selling of Modifications made by that Contributor either alone
+ and/or in combination with its Contributor Version (or portions
+ of such combination), to make, use, sell, offer for sale, have
+ made, and/or otherwise dispose of: 1) Modifications made by that
+ Contributor (or portions thereof); and 2) the combination of
+ Modifications made by that Contributor with its Contributor
+ Version (or portions of such combination).
+
+ (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+ effective on the date Contributor first makes Commercial Use of
+ the Covered Code.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is
+ granted: 1) for any code that Contributor has deleted from the
+ Contributor Version; 2) separate from the Contributor Version;
+ 3) for infringements caused by: i) third party modifications of
+ Contributor Version or ii) the combination of Modifications made
+ by that Contributor with other software (except as part of the
+ Contributor Version) or other devices; or 4) under Patent Claims
+ infringed by Covered Code in the absence of Modifications made by
+ that Contributor.
+
+3. Distribution Obligations.
+
+ 3.1. Application of License.
+ The Modifications which You create or to which You contribute are
+ governed by the terms of this License, including without limitation
+ Section 2.2. The Source Code version of Covered Code may be
+ distributed only under the terms of this License or a future version
+ of this License released under Section 6.1, and You must include a
+ copy of this License with every copy of the Source Code You
+ distribute. You may not offer or impose any terms on any Source Code
+ version that alters or restricts the applicable version of this
+ License or the recipients' rights hereunder. However, You may include
+ an additional document offering the additional rights described in
+ Section 3.5.
+
+ 3.2. Availability of Source Code.
+ Any Modification which You create or to which You contribute must be
+ made available in Source Code form under the terms of this License
+ either on the same media as an Executable version or via an accepted
+ Electronic Distribution Mechanism to anyone to whom you made an
+ Executable version available; and if made available via Electronic
+ Distribution Mechanism, must remain available for at least twelve (12)
+ months after the date it initially became available, or at least six
+ (6) months after a subsequent version of that particular Modification
+ has been made available to such recipients. You are responsible for
+ ensuring that the Source Code version remains available even if the
+ Electronic Distribution Mechanism is maintained by a third party.
+
+ 3.3. Description of Modifications.
+ You must cause all Covered Code to which You contribute to contain a
+ file documenting the changes You made to create that Covered Code and
+ the date of any change. You must include a prominent statement that
+ the Modification is derived, directly or indirectly, from Original
+ Code provided by the Initial Developer and including the name of the
+ Initial Developer in (a) the Source Code, and (b) in any notice in an
+ Executable version or related documentation in which You describe the
+ origin or ownership of the Covered Code.
+
+ 3.4. Intellectual Property Matters
+ (a) Third Party Claims.
+ If Contributor has knowledge that a license under a third party's
+ intellectual property rights is required to exercise the rights
+ granted by such Contributor under Sections 2.1 or 2.2,
+ Contributor must include a text file with the Source Code
+ distribution titled "LEGAL" which describes the claim and the
+ party making the claim in sufficient detail that a recipient will
+ know whom to contact. If Contributor obtains such knowledge after
+ the Modification is made available as described in Section 3.2,
+ Contributor shall promptly modify the LEGAL file in all copies
+ Contributor makes available thereafter and shall take other steps
+ (such as notifying appropriate mailing lists or newsgroups)
+ reasonably calculated to inform those who received the Covered
+ Code that new knowledge has been obtained.
+
+ (b) Contributor APIs.
+ If Contributor's Modifications include an application programming
+ interface and Contributor has knowledge of patent licenses which
+ are reasonably necessary to implement that API, Contributor must
+ also include this information in the LEGAL file.
+
+ (c) Representations.
+ Contributor represents that, except as disclosed pursuant to
+ Section 3.4(a) above, Contributor believes that Contributor's
+ Modifications are Contributor's original creation(s) and/or
+ Contributor has sufficient rights to grant the rights conveyed by
+ this License.
+
+ 3.5. Required Notices.
+ You must duplicate the notice in Exhibit A in each file of the Source
+ Code. If it is not possible to put such notice in a particular Source
+ Code file due to its structure, then You must include such notice in a
+ location (such as a relevant directory) where a user would be likely
+ to look for such a notice. If You created one or more Modification(s)
+ You may add your name as a Contributor to the notice described in
+ Exhibit A. You must also duplicate this License in any documentation
+ for the Source Code where You describe recipients' rights or ownership
+ rights relating to Covered Code. You may choose to offer, and to
+ charge a fee for, warranty, support, indemnity or liability
+ obligations to one or more recipients of Covered Code. However, You
+ may do so only on Your own behalf, and not on behalf of the Initial
+ Developer or any Contributor. You must make it absolutely clear than
+ any such warranty, support, indemnity or liability obligation is
+ offered by You alone, and You hereby agree to indemnify the Initial
+ Developer and every Contributor for any liability incurred by the
+ Initial Developer or such Contributor as a result of warranty,
+ support, indemnity or liability terms You offer.
+
+ 3.6. Distribution of Executable Versions.
+ You may distribute Covered Code in Executable form only if the
+ requirements of Section 3.1-3.5 have been met for that Covered Code,
+ and if You include a notice stating that the Source Code version of
+ the Covered Code is available under the terms of this License,
+ including a description of how and where You have fulfilled the
+ obligations of Section 3.2. The notice must be conspicuously included
+ in any notice in an Executable version, related documentation or
+ collateral in which You describe recipients' rights relating to the
+ Covered Code. You may distribute the Executable version of Covered
+ Code or ownership rights under a license of Your choice, which may
+ contain terms different from this License, provided that You are in
+ compliance with the terms of this License and that the license for the
+ Executable version does not attempt to limit or alter the recipient's
+ rights in the Source Code version from the rights set forth in this
+ License. If You distribute the Executable version under a different
+ license You must make it absolutely clear that any terms which differ
+ from this License are offered by You alone, not by the Initial
+ Developer or any Contributor. You hereby agree to indemnify the
+ Initial Developer and every Contributor for any liability incurred by
+ the Initial Developer or such Contributor as a result of any such
+ terms You offer.
+
+ 3.7. Larger Works.
+ You may create a Larger Work by combining Covered Code with other code
+ not governed by the terms of this License and distribute the Larger
+ Work as a single product. In such a case, You must make sure the
+ requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Code due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description
+ must be included in the LEGAL file described in Section 3.4 and must
+ be included with all distributions of the Source Code. Except to the
+ extent prohibited by statute or regulation, such description must be
+ sufficiently detailed for a recipient of ordinary skill to be able to
+ understand it.
+
+5. Application of this License.
+
+ This License applies to code to which the Initial Developer has
+ attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+ 6.1. New Versions.
+ Netscape Communications Corporation ("Netscape") may publish revised
+ and/or new versions of the License from time to time. Each version
+ will be given a distinguishing version number.
+
+ 6.2. Effect of New Versions.
+ Once Covered Code has been published under a particular version of the
+ License, You may always continue to use it under the terms of that
+ version. You may also choose to use such Covered Code under the terms
+ of any subsequent version of the License published by Netscape. No one
+ other than Netscape has the right to modify the terms applicable to
+ Covered Code created under this License.
+
+ 6.3. Derivative Works.
+ If You create or use a modified version of this License (which you may
+ only do in order to apply it to code which is not already Covered Code
+ governed by this License), You must (a) rename Your license so that
+ the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+ "MPL", "NPL" or any confusingly similar phrase do not appear in your
+ license (except to note that your license differs from this License)
+ and (b) otherwise make it clear that Your version of the license
+ contains terms which differ from the Mozilla Public License and
+ Netscape Public License. (Filling in the name of the Initial
+ Developer, Original Code or Contributor in the notice described in
+ Exhibit A shall not of themselves be deemed to be modifications of
+ this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+ DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+ THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+ IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+ YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+ COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+ OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+ 8.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure
+ such breach within 30 days of becoming aware of the breach. All
+ sublicenses to the Covered Code which are properly granted shall
+ survive any termination of this License. Provisions which, by their
+ nature, must remain in effect beyond the termination of this License
+ shall survive.
+
+ 8.2. If You initiate litigation by asserting a patent infringement
+ claim (excluding declatory judgment actions) against Initial Developer
+ or a Contributor (the Initial Developer or Contributor against whom
+ You file such action is referred to as "Participant") alleging that:
+
+ (a) such Participant's Contributor Version directly or indirectly
+ infringes any patent, then any and all rights granted by such
+ Participant to You under Sections 2.1 and/or 2.2 of this License
+ shall, upon 60 days notice from Participant terminate prospectively,
+ unless if within 60 days after receipt of notice You either: (i)
+ agree in writing to pay Participant a mutually agreeable reasonable
+ royalty for Your past and future use of Modifications made by such
+ Participant, or (ii) withdraw Your litigation claim with respect to
+ the Contributor Version against such Participant. If within 60 days
+ of notice, a reasonable royalty and payment arrangement are not
+ mutually agreed upon in writing by the parties or the litigation claim
+ is not withdrawn, the rights granted by Participant to You under
+ Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+ the 60 day notice period specified above.
+
+ (b) any software, hardware, or device, other than such Participant's
+ Contributor Version, directly or indirectly infringes any patent, then
+ any rights granted to You by such Participant under Sections 2.1(b)
+ and 2.2(b) are revoked effective as of the date You first made, used,
+ sold, distributed, or had made, Modifications made by that
+ Participant.
+
+ 8.3. If You assert a patent infringement claim against Participant
+ alleging that such Participant's Contributor Version directly or
+ indirectly infringes any patent where such claim is resolved (such as
+ by license or settlement) prior to the initiation of patent
+ infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections 2.1 or 2.2 shall be taken
+ into account in determining the amount or value of any payment or
+ license.
+
+ 8.4. In the event of termination under Sections 8.1 or 8.2 above,
+ all end user license agreements (excluding distributors and resellers)
+ which have been validly granted by You or any distributor hereunder
+ prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+ DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+ OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+ ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+ CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+ WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+ COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+ RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+ PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+ THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+ The Covered Code is a "commercial item," as that term is defined in
+ 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+ software" and "commercial computer software documentation," as such
+ terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+ C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+ all U.S. Government End Users acquire Covered Code with only those
+ rights set forth herein.
+
+11. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. This License shall be governed by
+ California law provisions (except to the extent applicable law, if
+ any, provides otherwise), excluding its conflict-of-law provisions.
+ With respect to disputes in which at least one party is a citizen of,
+ or an entity chartered or registered to do business in the United
+ States of America, any litigation relating to this License shall be
+ subject to the jurisdiction of the Federal Courts of the Northern
+ District of California, with venue lying in Santa Clara County,
+ California, with the losing party responsible for costs, including
+ without limitation, court costs and reasonable attorneys' fees and
+ expenses. The application of the United Nations Convention on
+ Contracts for the International Sale of Goods is expressly excluded.
+ Any law or regulation which provides that the language of a contract
+ shall be construed against the drafter shall not apply to this
+ License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or indirectly,
+ out of its utilization of rights under this License and You agree to
+ work with Initial Developer and Contributors to distribute such
+ responsibility on an equitable basis. Nothing herein is intended or
+ shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+ Initial Developer may designate portions of the Covered Code as
+ "Multiple-Licensed". "Multiple-Licensed" means that the Initial
+ Developer permits you to utilize portions of the Covered Code under
+ Your choice of the NPL or the alternative licenses, if any, specified
+ by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+ ``The contents of this file are subject to the Mozilla Public License
+ Version 1.1 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+
+ The Original Code is ______________________________________.
+
+ The Initial Developer of the Original Code is ________________________.
+ Portions created by ______________________ are Copyright (C) ______
+ _______________________. All Rights Reserved.
+
+ Contributor(s): ______________________________________.
+
+ Alternatively, the contents of this file may be used under the terms
+ of the _____ license (the "[___] License"), in which case the
+ provisions of [______] License are applicable instead of those
+ above. If you wish to allow use of your version of this file only
+ under the terms of the [____] License and not to allow others to use
+ your version of this file under the MPL, indicate your decision by
+ deleting the provisions above and replace them with the notice and
+ other provisions required by the [___] License. If you do not delete
+ the provisions above, a recipient may use your version of this file
+ under either the MPL or the [___] License."
+
+ [NOTE: The text of this Exhibit A may differ slightly from the text of
+ the notices in the Source Code files of the Original Code. You should
+ use the text of this Exhibit A rather than the text found in the
+ Original Code Source Code for Your Modifications.]
+
+
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 29cf0495..54312a73 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
.PHONY : doc build clean dist
-pre_build:
+build:
git rev-parse HEAD > .git-ref
mkdir -p build/src
mkdir -p build/demo/kitchen-sink
@@ -9,26 +9,13 @@ pre_build:
cp -r demo/kitchen-sink/styles.css build/demo/kitchen-sink/styles.css
cp demo/kitchen-sink/logo.png build/demo/kitchen-sink/logo.png
cp -r doc/site/images build/textarea
-
-build: pre_build
+
./Makefile.dryice.js normal
./Makefile.dryice.js demo
-
-# Minimal build: call Makefile.dryice.js only if our sources changed
-basic: build/src/ace.js
-
-build/src/ace.js : ${wildcard lib/*} \
- ${wildcard lib/*/*} \
- ${wildcard lib/*/*/*} \
- ${wildcard lib/*/*/*/*} \
- ${wildcard lib/*/*/*/*/*} \
- ${wildcard lib/*/*/*/*/*/*}
- ./Makefile.dryice.js
+ ./Makefile.dryice.js bm
doc:
- cd doc;\
- (test -d node_modules && npm update) || npm install;\
- node build.js
+ cd doc; node build.js
clean:
rm -rf build
diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 0ce7c657..f3345648 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -1,516 +1,439 @@
#!/usr/bin/env node
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ * Julian Viereck
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
var fs = require("fs");
-var path = require("path");
-var copy = require('architect-build/copy');
-var build = require('architect-build/build');
+var copy = require('dryice').copy;
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];
-
- var i = args.indexOf("--target");
- if (i != -1 && args[i+1])
- BUILD_DIR = args[i+1];
-
- if (args.indexOf("--h") == -1) {
- if (type == "minimal") {
- buildAce({
- compress: args.indexOf("--m") != -1,
- noconflict: args.indexOf("--nc") != -1,
- shrinkwrap: args.indexOf("--s") != -1
- });
- } else if (type == "normal") {
- ace();
- } else if (type == "demo") {
- demo();
- } else if (type == "full") {
- ace();
- demo();
- } else if (type == "highlighter") {
- // TODO
+ var target;
+ if (args.length == 3) {
+ target = args[2];
+ // Check if 'target' contains some allowed value.
+ if (target != "normal" && target != "bm" && target != "demo") {
+ target = null;
}
}
+
+ if (!target) {
+ console.log("--- Ace Dryice Build Tool ---");
+ console.log("");
+ console.log("Options:");
+ console.log(" normal Runs embedded build of Ace");
+ console.log(" demo Runs demo build of Ace");
+ console.log(" bm Runs bookmarklet build of Ace");
+ process.exit(0);
+ }
+
+ var aceProject = {
+ roots: [
+ ACE_HOME + '/lib',
+ ACE_HOME + '/demo'
+ ],
+ textPluginPattern: /^ace\/requirejs\/text!/
+ };
+
+ if (target == "normal") {
+ ace(aceProject);
+ }
+ else if (target == "demo") {
+ demo(aceProject);
+ }
+ else if (target == "bm") {
+ bookmarklet(aceProject);
+ }
}
-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(" full all of above");
- console.log(" highlighter ");
- console.log("args:");
- console.log(" --target ./path path to build folder");
- console.log("flags:");
- console.log(" --h print this help");
- console.log(" --m minify");
- console.log(" --nc namespace require");
- console.log(" --s shrinkwrap (combines all output files into one)");
- console.log("");
- if (type)
- console.log(" output for " + type + " generated in " + BUILD_DIR);
+function bookmarklet(aceProject) {
+ var targetDir = "build/textarea";
+ copy({
+ source: "build_support/editor_textarea.html",
+ dest: targetDir + '/editor.html'
+ });
+ copy({
+ source: "build_support/style.css",
+ dest: targetDir + '/style.css'
+ });
+
+ buildAce(aceProject, {
+ targetDir: targetDir + "/src",
+ ns: "__ace_shadowed__",
+ exportModule: "ace/ext/textarea",
+ compress: false,
+ noconflict: true,
+ suffix: ".js",
+ compat: false,
+ name: "ace-bookmarklet",
+ workers: [],
+ keybindings: []
+ });
}
-function ace() {
+function ace(aceProject) {
+ console.log('# ace ---------');
+
+ // uncompressed
+ buildAce(aceProject, {
+ compress: false,
+ noconflict: false,
+ suffix: "-uncompressed.js",
+ compat: true,
+ name: "ace"
+ });
+ buildAce(aceProject, {
+ compress: false,
+ noconflict: true,
+ suffix: "-uncompressed-noconflict.js",
+ compat: true,
+ name: "ace",
+ workers: []
+ });
+
+ // compressed
+ buildAce(aceProject, {
+ compress: true,
+ noconflict: false,
+ suffix: ".js",
+ compat: true,
+ name: "ace",
+ workers: []
+ });
+ buildAce(aceProject, {
+ compress: true,
+ noconflict: true,
+ suffix: "-noconflict.js",
+ compat: true,
+ name: "ace",
+ workers: []
+ });
+
console.log('# ace License | Readme | Changelog ---------');
- 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});
+ copy({
+ source: "build_support/editor.html",
+ dest: "build/editor.html"
+ });
+ copy({
+ source: ACE_HOME + "/LICENSE",
+ dest: "build/LICENSE"
+ });
+ copy({
+ source: ACE_HOME + "/Readme.md",
+ dest: "build/Readme.md"
+ });
+ copy({
+ source: ACE_HOME + "/ChangeLog.txt",
+ dest: "build/ChangeLog.txt"
+ });
}
-function demo() {
+function demo(aceProject) {
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) {}
-
- 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("
+
+
+
+
+
+
+
+
+