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

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

Browse source 
Conflicts:
	build/demo/kitchen-sink-uncompressed.js
	build/demo/kitchen-sink.js
	build/src/ace-uncompressed.js
	build/src/ace.js
This commit is contained in:
Lee Gao 2011-08-19 18:54:25 -04:00
commit 68f3a31b8e
14 changed files with 4052 additions and 5428 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/commands/default_commands.js
View file

@ -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:");

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

@ -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)

4
lib/ace/scrollbar.js
View file

@ -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));
};