diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j index 0a7d11612..5558ee60a 100644 --- a/AppKit/CPTextField.j +++ b/AppKit/CPTextField.j @@ -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 { diff --git a/AppKit/CPTextView/CPTextView.j b/AppKit/CPTextView/CPTextView.j index be05db296..38c140b94 100644 --- a/AppKit/CPTextView/CPTextView.j +++ b/AppKit/CPTextView/CPTextView.j @@ -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 { diff --git a/AppKit/CPTokenField.j b/AppKit/CPTokenField.j index db9d350f8..30fb5b58a 100644 --- a/AppKit/CPTokenField.j +++ b/AppKit/CPTokenField.j @@ -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 {