colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-11 11:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed: are double typing issue in webkit browsers

Browse Source
This commit is contained in:
daboe01 committed 2016-07-29 16:28:17 +02:00
1 parent 27b0f531d7
commit 99f63ab64d
1 file changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextView/CPTextView.j
+7 -6
View File
@@ -2245,7 +2245,6 @@ var CPTextViewAllowsUndoKey = @"CPTextViewAllowsUndoKey",
var _CPNativeInputField,
_CPNativeInputFieldLastValue,
_CPNativeInputFieldKeyDownCalled,
_CPNativeInputFieldKeyUpCalled,
_CPNativeInputFieldKeyPressedCalled,
@@ -2298,7 +2297,7 @@ var _CPCopyPlaceholder = '-';
[currentFirstResponder setSelectedRange:placeholderRange];
[currentFirstResponder insertText:aStr];
_CPNativeInputField.innerHTML = _CPNativeInputFieldLastValue = '';
_CPNativeInputField.innerHTML = '';
[self hideInputElement];
@@ -2353,8 +2352,8 @@ var _CPCopyPlaceholder = '-';
return;
}
// chrome-trigger: keypressed is omitted for deadkeys and cursor keys
if (!_CPNativeInputFieldActive && _CPNativeInputFieldKeyPressedCalled == NO && _CPNativeInputField.innerHTML.length && _CPNativeInputField.innerHTML != _CPCopyPlaceholder && _CPNativeInputField.innerHTML.length < 3 && _CPNativeInputFieldLastValue !== _CPNativeInputField.innerHTML)
// chrome-trigger: keypressed is omitted for deadkeys
if (!_CPNativeInputFieldActive && _CPNativeInputFieldKeyPressedCalled == NO && _CPNativeInputField.innerHTML.length && _CPNativeInputField.innerHTML != _CPCopyPlaceholder && _CPNativeInputField.innerHTML.length < 3)
{
_CPNativeInputFieldActive = YES;
[currentFirstResponder _activateNativeInputElement:_CPNativeInputField];
@@ -2370,8 +2369,6 @@ var _CPCopyPlaceholder = '-';
_CPNativeInputField.innerHTML = '';
}
_CPNativeInputFieldLastValue = _CPNativeInputField.innerHTML;
return false; // prevent the default behaviour
}, true);
@@ -2386,6 +2383,10 @@ var _CPCopyPlaceholder = '-';
_CPNativeInputFieldKeyPressedCalled = NO;
var currentFirstResponder = [[CPApp keyWindow] firstResponder];
// webkit-browsers: cursor keys do not emit keypressed and would otherwise activate deadkey mode
if (!CPBrowserIsEngine(CPGeckoBrowserEngine) && e.which >= 37 && e.which <= 40)
_CPNativeInputFieldKeyPressedCalled = YES;
if (![currentFirstResponder respondsToSelector:@selector(_activateNativeInputElement:)])
return;