diff --git a/Makefile.dryice.js b/Makefile.dryice.js index d0b7afa9..670ce5a4 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -108,7 +108,7 @@ var project = copy.createCommonJsProject(aceProject); function filterTextPlugin(text) { - return text.replace(/(['"])ace\/requirejs\/text\!/g, "$1text/"); + return text.replace(/(['"])ace\/requirejs\/text\!/g, "$1text!"); } var ace = copy.createDataObject(); diff --git a/demo/demo.js b/demo/demo.js index fec9ec67..9db66a17 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -40,44 +40,45 @@ define(function(require, exports, module) { +var net = require("ace/lib/net"); +var canon = require("pilot/canon"); +var event = require("pilot/event"); +var Range = require("ace/range").Range; +var Editor = require("ace/editor").Editor; +var Renderer = require("ace/virtual_renderer").VirtualRenderer; +var theme = require("ace/theme/textmate"); +var EditSession = require("ace/edit_session").EditSession; + +var JavaScriptMode = require("ace/mode/javascript").Mode; +var CssMode = require("ace/mode/css").Mode; +var ScssMode = require("ace/mode/scss").Mode; +var HtmlMode = require("ace/mode/html").Mode; +var XmlMode = require("ace/mode/xml").Mode; +var PythonMode = require("ace/mode/python").Mode; +var PhpMode = require("ace/mode/php").Mode; +var JavaMode = require("ace/mode/java").Mode; +var CSharpMode = require("ace/mode/csharp").Mode; +var RubyMode = require("ace/mode/ruby").Mode; +var CCPPMode = require("ace/mode/c_cpp").Mode; +var CoffeeMode = require("ace/mode/coffee").Mode; +var JsonMode = require("ace/mode/json").Mode; +var PerlMode = require("ace/mode/perl").Mode; +var ClojureMode = require("ace/mode/clojure").Mode; +var OcamlMode = require("ace/mode/ocaml").Mode; +var SvgMode = require("ace/mode/svg").Mode; +var TextileMode = require("ace/mode/textile").Mode; +var TextMode = require("ace/mode/text").Mode; +var GroovyMode = require("ace/mode/groovy").Mode; +var ScalaMode = require("ace/mode/scala").Mode; + +var UndoManager = require("ace/undomanager").UndoManager; + +var vim = require("ace/keyboard/keybinding/vim").Vim; +var emacs = require("ace/keyboard/keybinding/emacs").Emacs; +var HashHandler = require("ace/keyboard/hash_handler").HashHandler; + exports.launch = function(env) { - var canon = require("pilot/canon"); - var event = require("pilot/event"); - var net = require("ace/lib/net"); - var Range = require("ace/range").Range; - var Editor = require("ace/editor").Editor; - var Renderer = require("ace/virtual_renderer").VirtualRenderer; - var theme = require("ace/theme/textmate"); - var EditSession = require("ace/edit_session").EditSession; - - var JavaScriptMode = require("ace/mode/javascript").Mode; - var CssMode = require("ace/mode/css").Mode; - var ScssMode = require("ace/mode/scss").Mode; - var HtmlMode = require("ace/mode/html").Mode; - var XmlMode = require("ace/mode/xml").Mode; - var PythonMode = require("ace/mode/python").Mode; - var PhpMode = require("ace/mode/php").Mode; - var JavaMode = require("ace/mode/java").Mode; - var CSharpMode = require("ace/mode/csharp").Mode; - var RubyMode = require("ace/mode/ruby").Mode; - var CCPPMode = require("ace/mode/c_cpp").Mode; - var CoffeeMode = require("ace/mode/coffee").Mode; - var JsonMode = require("ace/mode/json").Mode; - var PerlMode = require("ace/mode/perl").Mode; - var ClojureMode = require("ace/mode/clojure").Mode; - var OcamlMode = require("ace/mode/ocaml").Mode; - var SvgMode = require("ace/mode/svg").Mode; - var TextileMode = require("ace/mode/textile").Mode; - var TextMode = require("ace/mode/text").Mode; - var GroovyMode = require("ace/mode/groovy").Mode; - var ScalaMode = require("ace/mode/scala").Mode; - - var UndoManager = require("ace/undomanager").UndoManager; - - var vim = require("ace/keyboard/keybinding/vim").Vim; - var emacs = require("ace/keyboard/keybinding/emacs").Emacs; - var HashHandler = require("ace/keyboard/hash_handler").HashHandler; - + var keybindings = { // Null = use "default" keymapping ace: null,