jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #847 from ajaxorg/gh-pages

Browse source 
Miscellaneous small bugfixes
This commit is contained in:
Lennart Kats 2012-07-30 01:27:39 -07:00
commit 4e020ed6e4
6 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -3,4 +3,4 @@
url = git://github.com/ajaxorg/ace.wiki.git
[submodule "build"]
path = build
url = https://github.com/ajaxorg/ace-builds.git
url = git://github.com/ajaxorg/ace-builds.git

6
Readme.md
View file

@ -25,9 +25,9 @@ Features
Take Ace for a spin!
--------------------
Check out the Ace live [demo](http://ajaxorg.github.com/ace-builds/kitchen-sink.html) or get a [Cloud9 IDE account](http://c9.io) to experience Ace while editing one of your own GitHub projects.
Check out the Ace live [demo](http://ajaxorg.github.com/ace/build/kitchen-sink.html) or get a [Cloud9 IDE account](http://c9.io) to experience Ace while editing one of your own GitHub projects.
If you want, you can use Ace as a textarea replacement thanks to the [Ace Bookmarklet](http://ajaxorg.github.com/ace-builds/textarea/editor.html).
If you want, you can use Ace as a textarea replacement thanks to the [Ace Bookmarklet](http://ajaxorg.github.com/ace/build/textarea/editor.html).
Getting the code
----------------
@ -123,7 +123,7 @@ The editor can then be opened at http://localhost:8888/kitchen-sink.html.
Package Ace
-----------
To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. (see the [wiki](https://github.com/ajaxorg/ace/wiki/Building-ace) more for details)
To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. (see the [wiki](https://github.com/ajaxorg/ace/wiki/Building-ace) for more details)
```bash
npm install

2
index.html
View file

@ -116,7 +116,7 @@
<h2>Take Ace for a spin!</h2>
<div class="divider"></div>
<p>Check out the <a href="http://ajaxorg.github.com/ace-builds/kitchen-sink.html">Ace live demo</a> or get a <a href="http://c9.io">Cloud9 IDE account</a> to experience Ace while editing one of your own GitHub projects.</p>
<p>Check out the <a href="./build/kitchen-sink.html">Ace live demo</a> or get a <a href="http://c9.io">Cloud9 IDE account</a> to experience Ace while editing one of your own GitHub projects.</p>
<h2>History</h2>
<div class="divider"></div>

2
lib/ace/keyboard/textinput.js
View file

@ -206,7 +206,7 @@ var TextInput = function(parentNode, host) {
});
event.addListener(text, "cut", onCut); // for ie9 context menu
}
else if (useragent.isOpera) {
else if (useragent.isOpera && !("KeyboardEvent" in window)) {
event.addListener(parentNode, "keydown", function(e) {
if ((useragent.isMac && !e.metaKey) || !e.ctrlKey)
return;

3
lib/ace/lib/event_emitter.js
View file

@ -54,7 +54,8 @@ EventEmitter._dispatchEvent = function(eventName, e) {
return;
e = e || {};
e.type = eventName;
if (!e.type)
e.type = eventName;
if (!e.stopPropagation) {
e.stopPropagation = function() {

5
package.json
View file

@ -3,7 +3,7 @@
"description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
"version": "0.2.0",
"homepage" : "http://github.com/ajaxorg/ace",
"engines": {"node": ">= 0.4.0"},
"engines": {"node": ">= 0.6.0"},
"author": "Fabian Jakobs <fabian@ajax.org>",
"main": "lib/ace",
"repository" : {
@ -19,9 +19,6 @@
"dryice": "",
"panino" : "~1.0.15"
},
"engines": {
"node": "~0.6.0"
},
"mappings": {
"ace": "."
},