mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-15 11:13:50 +00:00
AppKit: first method-definition gates removed (Increment A)
- CPTextField, CPTokenField, CPTextView: the PLATFORM(DOM) gates around _inputElement (superclass and override) and _cumulativeOffset are removed; the methods now exist under both targets with runtime CPDOMAvailable guards returning nil (object methods) or a zero point (struct method) when no DOM is present - contract change: under CommonJS these methods change from absent to present-and-inert; all callers are browser event paths never exercised by the theme blender or nib2cib - zero preprocessor directives remain in these three files - work-in-progress towards complete removal of CPP directives
This commit is contained in:
1 parent
eda11e38ba
commit
5b852ca765
3 files changed
+6
-6
No files matched your search
@@ -279,9 +279,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
|
||||
|
||||
// MARK: -
|
||||
|
||||
#if PLATFORM(DOM)
|
||||
- (DOMElement)_inputElement
|
||||
{
|
||||
if (!CPDOMAvailable) return nil;
|
||||
|
||||
if (!CPTextFieldDOMTextAreaElement)
|
||||
{
|
||||
CPTextFieldDOMTextAreaElement = document.createElement("textarea");
|
||||
@@ -384,7 +385,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
|
||||
|
||||
return CPTextFieldDOMCurrentElement;
|
||||
}
|
||||
#endif
|
||||
|
||||
- (id)initWithFrame:(CGRect)aFrame
|
||||
{
|
||||
|
||||
@@ -1031,9 +1031,10 @@ Sets the selection to a range of characters in response to user action.
|
||||
[_CPNativeInputManager focusForClipboardOfTextView:self];
|
||||
}
|
||||
|
||||
#if PLATFORM(DOM)
|
||||
- (CGPoint)_cumulativeOffset
|
||||
{
|
||||
if (!CPDOMAvailable) return CGPointMake(0, 0);
|
||||
|
||||
var top = 0,
|
||||
left = 0,
|
||||
element = self._DOMElement;
|
||||
@@ -1048,7 +1049,6 @@ Sets the selection to a range of characters in response to user action.
|
||||
|
||||
return CGPointMake(left, top);
|
||||
}
|
||||
#endif
|
||||
|
||||
- (CPArray)selectedRanges
|
||||
{
|
||||
|
||||
@@ -745,9 +745,10 @@ CPTokenFieldDeleteButtonType = 1;
|
||||
// =============
|
||||
// = TEXTFIELD =
|
||||
// =============
|
||||
#if PLATFORM(DOM)
|
||||
- (DOMElement)_inputElement
|
||||
{
|
||||
if (!CPDOMAvailable) return nil;
|
||||
|
||||
if (!CPTokenFieldDOMInputElement)
|
||||
{
|
||||
CPTokenFieldDOMInputElement = document.createElement("input");
|
||||
@@ -788,7 +789,6 @@ CPTokenFieldDeleteButtonType = 1;
|
||||
|
||||
return CPTokenFieldDOMInputElement;
|
||||
}
|
||||
#endif
|
||||
|
||||
- (CPString)_editorValue
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user