Merge branch 'add/copypaste' of github.com:ajaxorg/ace into ui/navbar

This commit is contained in:
Ruben Daniels 2012-04-24 22:31:58 -07:00
commit 2e4d326b3f

View file

@ -134,9 +134,12 @@ var TextInput = function(parentNode, host) {
var onCopy = function(e) {
copied = true;
outsideCopyText = "";
var copyText = host.getCopyText();
if(copyText)
if(copyText) {
text.value = copyText;
host.onCopy();
}
else
e.preventDefault();
select();
@ -147,6 +150,7 @@ var TextInput = function(parentNode, host) {
var onCut = function(e) {
copied = true;
outsideCopyText = "";
var copyText = host.getCopyText();
if(copyText) {
text.value = copyText;
@ -159,6 +163,17 @@ var TextInput = function(parentNode, host) {
}, 0);
};
// these emit methods can be used for outside of the keyboard command context
this.emitCut = function() {
onCut();
outsideCopyText = text.value;
}
this.emitCopy = function() {
onCopy();
outsideCopyText = text.value;
}
event.addCommandKeyListener(text, host.onCommandKey.bind(host));
if (useragent.isOldIE) {
@ -184,7 +199,10 @@ var TextInput = function(parentNode, host) {
// Some browsers support the event.clipboardData API. Use this to get
// the pasted content which increases speed if pasting a lot of lines.
if (e.clipboardData && e.clipboardData.getData) {
sendText(e.clipboardData.getData("text/plain"));
if (outsideCopyText.length > 0)
sendText(outsideCopyText);
else
sendText(e.clipboardData.getData("text/plain"));
e.preventDefault();
}
else {