colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 21:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

harmonize capp and system pasteboards

Browse Source
This commit is contained in:
daboe01
2015-06-20 13:23:33 +02:00
parent c5c3698f43
commit f216e0198f
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextView/CPTextView.j
+24 -8
View File
@@ -216,6 +216,7 @@ var kDelegateRespondsTo_textShouldBeginEditing
- (void)copy:(id)sender
{
[_CPNativeInputManager setLastCopyWasNative:[sender isKindOfClass:[_CPNativeInputManager class]]];
_copySelectionGranularity = _previousSelectionGranularity;
[super copy:sender];
}
@@ -2092,21 +2093,32 @@ var _CPNativeInputField,
_CPNativeInputFieldKeyUpCalled,
_CPNativeInputFieldKeyPressedCalled,
_CPNativeInputFieldActive,
_CPNativeInputFieldWasCopyPaste;
_CPNativeInputFieldWasCopyPaste,
_CPNativeInputFieldLastCopyWasNative;
var _CPCopyPlaceholder = '-';
@implementation _CPNativeInputManager : CPObject
+ (BOOL) isNativeInputFieldActive
+ (BOOL)lastCopyWasNative
{
return _CPNativeInputFieldLastCopyWasNative;
}
+ (void)setLastCopyWasNative:(BOOL)flag
{
_CPNativeInputFieldLastCopyWasNative = flag;
}
+ (BOOL)isNativeInputFieldActive
{
return _CPNativeInputFieldActive;
}
+ (void) cancelCurrentNativeInputSession
+ (void)cancelCurrentNativeInputSession
{
[self _endInputSessionWithString:_CPNativeInputField.innerHTML];
}
+ (void) cancelCurrentInputSessionIfNeeded
+ (void)cancelCurrentInputSessionIfNeeded
{
if (!_CPNativeInputFieldActive)
return;
@@ -2235,10 +2247,14 @@ var _CPCopyPlaceholder = '-';
var pasteboard = [CPPasteboard generalPasteboard];
[pasteboard declareTypes:[CPStringPboardType] owner:nil];
var data = e.clipboardData.getData('text/plain');
[pasteboard setString:data forType:CPStringPboardType];
if (_CPNativeInputFieldLastCopyWasNative)
{
var data = e.clipboardData.getData('text/plain');
[pasteboard setString:data forType:CPStringPboardType];
}
var currentFirstResponder = [[CPApp mainWindow] firstResponder];
[currentFirstResponder paste:currentFirstResponder];
[currentFirstResponder paste:self];
e.preventDefault();
e.stopPropagation();
@@ -2253,7 +2269,7 @@ var _CPCopyPlaceholder = '-';
string,
currentFirstResponder = [[CPApp mainWindow] firstResponder];
[currentFirstResponder copy:currentFirstResponder];
[currentFirstResponder copy:self];
// dataForPasting = [pasteboard dataForType:CPRichStringPboardType],
stringForPasting = [pasteboard stringForType:CPStringPboardType];