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

Conflicts:
	build/demo/kitchen-sink-uncompressed.js
	build/demo/kitchen-sink.js
	build/src/ace-uncompressed.js
	build/src/ace.js

build_support/mini_require.js

@@ -47,6 +47,9 @@ var global = (function() {
     return this;
 })();
 
+if (typeof requirejs !== "undefined")
+    return;
+
 var _define = function(module, deps, payload) {
     if (typeof module !== 'string') {
         if (_define.original)
@@ -119,7 +122,6 @@ global.require = _require;
 var lookup = function(moduleName) {
     var module = define.modules[moduleName];
     if (module == null) {
-        console.error('Missing module: ' + moduleName);
         return null;
     }
 

lib/ace/commands/default_commands.js

@@ -95,7 +95,7 @@ canon.addCommand({
     name: "find",
     bindKey: bindKey("Ctrl-F", "Command-F"),
     exec: function(env, args, request) {
-        var needle = prompt("Find:");
+        var needle = prompt("Find:", env.editor.getCopyText());
         env.editor.find(needle);
     }
 });
@@ -103,7 +103,7 @@ canon.addCommand({
     name: "replace",
     bindKey: bindKey("Ctrl-R", "Command-Option-F"),
     exec: function(env, args, request) {
-        var needle = prompt("Find:");
+        var needle = prompt("Find:", env.editor.getCopyText());
         if (!needle)
             return;
         var replacement = prompt("Replacement:");

lib/ace/keyboard/textinput.js

@@ -46,6 +46,8 @@ var dom = require("pilot/dom");
 var TextInput = function(parentNode, host) {
 
     var text = dom.createElement("textarea");
+    if (useragent.isTouchPad)
+    	text.setAttribute('x-palm-disable-auto-cap',true);
     text.style.left = "-10000px";
     parentNode.appendChild(text);
 
@@ -183,7 +185,7 @@ var TextInput = function(parentNode, host) {
         }
     });
 
-    if ("onbeforecopy" in text) {
+    if ("onbeforecopy" in text && typeof clipboardData !== "undefined") {
         event.addListener(text, "beforecopy", function(e) {
             var copyText = host.getCopyText();
             if(copyText)

lib/ace/scrollbar.js

@@ -54,8 +54,10 @@ var ScrollBar = function(parent) {
     // in OSX lion the scrollbars appear to have no width. In this case resize
     // the to show the scrollbar but still pretend that the scrollbar has a width
     // of 0px
+    // in Firefox 6+ scrollbar is hidden if element has the same width as scrollbar
+    // make element a little bit wider to retain scrollbar when page is zoomed 
     this.width = dom.scrollbarWidth();
-    this.element.style.width = (this.width || 15) + "px";
+    this.element.style.width = (this.width || 15) + 5 + "px";
 
     event.addListener(this.element, "scroll", this.onScroll.bind(this));
 };

support/pilot

@@ -1 +1 @@
-Subproject commit 26272d95b68ca4e1ca3d71188cee544a5806c58d
+Subproject commit 66a432147f78dd8f813de2c519d9c3218aa65b56