Merge branch 'master' of git://github.com/ajaxorg/ace into praat

demo/autoresize.html

@@ -26,28 +26,32 @@
 <div class="scrollmargin"></div>
 <pre id="editor"></pre>
 
-<script src="../build/src/ace.js"></script>
+<script src="kitchen-sink/require.js"></script>
 <script>
+// setup paths
+require.config({paths: { "ace" : "../lib/ace"}});
+// load ace and extensions
+require(["ace/ace"], function(ace) {
 
-var editor1 = ace.edit("editor1");
-editor1.setTheme("ace/theme/tomorrow_night_eighties");
-editor1.session.setMode("ace/mode/html");
-editor1.setAutoScrollEditorIntoView(true);
-editor1.setOption("maxLines", 30);
+    var editor1 = ace.edit("editor1");
+    editor1.setTheme("ace/theme/tomorrow_night_eighties");
+    editor1.session.setMode("ace/mode/html");
+    editor1.setAutoScrollEditorIntoView(true);
+    editor1.setOption("maxLines", 30);
 
-var editor2 = ace.edit("editor2");
-editor2.setTheme("ace/theme/tomorrow_night_blue");
-editor2.session.setMode("ace/mode/html");
-editor2.setAutoScrollEditorIntoView(true);
-editor2.setOption("maxLines", 30);
-editor2.setOption("minLines", 2);
-
-var editor = ace.edit("editor");
-editor.setTheme("ace/theme/tomorrow");
-editor.session.setMode("ace/mode/html");
-editor.setAutoScrollEditorIntoView(true);
-editor.setOption("maxLines", 100);
+    var editor2 = ace.edit("editor2");
+    editor2.setTheme("ace/theme/tomorrow_night_blue");
+    editor2.session.setMode("ace/mode/html");
+    editor2.setAutoScrollEditorIntoView(true);
+    editor2.setOption("maxLines", 30);
+    editor2.setOption("minLines", 2);
 
+    var editor = ace.edit("editor");
+    editor.setTheme("ace/theme/tomorrow");
+    editor.session.setMode("ace/mode/html");
+    editor.setAutoScrollEditorIntoView(true);
+    editor.setOption("maxLines", 100);
+});
 </script>
 
 <script src="./show_own_source.js"></script>

demo/kitchen-sink/demo.js

@@ -592,7 +592,7 @@ env.editSnippets = function() {
 require("ace/ext/language_tools");
 env.editor.setOptions({
     enableBasicAutocompletion: true,
-    enableLiveAutocompletion: true,
+    enableLiveAutocompletion: false,
     enableSnippets: true
 });
 

demo/kitchen-sink/docs/.gitignore

@@ -0,0 +1,11 @@
+# A sample .gitignore file.
+
+.buildlog
+.DS_Store
+.svn
+
+# Negated patterns:
+!foo.bar
+
+# Also ignore user settings...
+/.settings

demo/kitchen-sink/docs/vala.vala

@@ -0,0 +1,21 @@
+using Gtk;
+ 
+int main (string[] args) {
+    Gtk.init (ref args);
+    var foo = new MyFoo<string[](), MyBar<string, int>>();
+
+    var window = new Window();
+    window.title = "Hello, World!";
+    window.border_width = 10;
+    window.window_position = WindowPosition.CENTER;
+    window.set_default_size(350, 70);
+    window.destroy.connect(Gtk.main_quit);
+ 
+    var label = new Label("Hello, World!");
+ 
+    window.add(label);
+    window.show_all();
+ 
+    Gtk.main();
+    return 0;
+}

demo/requirejs+build.html

@@ -29,14 +29,20 @@
 }</pre>
 
 <script src="../demo/kitchen-sink/require.js"></script>
-<script src="../build/src/ace.js" charset="utf-8"></script>
 <script>
-    var editor = ace.edit("editor");
-    editor.setTheme("ace/theme/twilight");
-    editor.session.setMode("ace/mode/javascript");
-    require(["ace/requirejs/text!src/ace"], function(e){
-        editor.setValue(e);
-    })
+    require.config({paths: {ace: "../build/src"}})
+    define('testace', ['ace/ace'],
+        function(ace, langtools) {
+            console.log("This is the testace module");
+            var editor = ace.edit("editor");
+            editor.setTheme("ace/theme/twilight");
+            editor.session.setMode("ace/mode/javascript");
+            require(["ace/requirejs/text!src/ace"], function(e){
+                editor.setValue(e);
+            })
+        }
+    );
+    require(['testace'])
 </script>
 
 </body>