move pilot code back into Ace
Conflicts: .gitmodules Makefile.dryice.js build_support/editor_textarea.html demo/demo.js kitchen-sink.html lib/ace/edit_session_test.js lib/ace/mode/coffee.js lib/ace/mode/coffee_highlight_rules.js lib/ace/mode/css.js lib/ace/mode/javascript.js lib/ace/model/window.js lib/ace/mouse/default_handlers.js lib/ace/theme/clouds.js lib/ace/theme/clouds_midnight.js lib/ace/theme/cobalt.js lib/ace/theme/crimson_editor.js lib/ace/theme/dawn.js lib/ace/theme/eclipse.js lib/ace/theme/idle_fingers.js lib/ace/theme/kr_theme.js lib/ace/theme/merbivore.js lib/ace/theme/merbivore_soft.js lib/ace/theme/mono_industrial.js lib/ace/theme/monokai.js lib/ace/theme/pastel_on_dark.js lib/ace/theme/solarized_dark.js lib/ace/theme/solarized_light.js lib/ace/theme/textmate.js lib/ace/theme/twilight.js lib/ace/theme/vibrant_ink.js lib/ace/view/measure_text.js lib/ace/virtual_renderer.js package.json support/paths.js
This commit is contained in:
parent
c12cfb4788
commit
b063b96230
110 changed files with 1532 additions and 236 deletions
|
|
@ -40,11 +40,9 @@
|
|||
|
||||
var require = window.__ace_shadowed__.require;
|
||||
|
||||
require("pilot/index");
|
||||
|
||||
var Dom = require("pilot/dom");
|
||||
var Event = require("pilot/event");
|
||||
var UA = require("pilot/useragent")
|
||||
var Dom = require("ace/lib/dom");
|
||||
var Event = require("ace/lib/event");
|
||||
var UA = require("ace/lib/useragent")
|
||||
|
||||
var Editor = require("ace/editor").Editor;
|
||||
var EditSession = require("ace/edit_session").EditSession;
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ function inject() {
|
|||
load('ace.js', 'text!ace/css/editor.css', function() {
|
||||
var ace = window.__ace_shadowed__;
|
||||
ace.options.mode = "javascript";
|
||||
var Event = ace.require('pilot/event');
|
||||
var Event = ace.require("lib/ace/event");
|
||||
var areas = document.getElementsByTagName("textarea");
|
||||
for (var i = 0; i < areas.length; i++) {
|
||||
Event.addListener(areas[i], "click", function(e) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue