From 952fe0091b99ee9548b37299cf0cc3ce45f89c6b Mon Sep 17 00:00:00 2001 From: Ross Boucher Date: Wed, 19 Nov 2008 16:31:31 -0800 Subject: [PATCH] Compatibilty update to the whitespace commit. --- AppKit/CPTextField.j | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j index c0ba50bed..e71c71f78 100644 --- a/AppKit/CPTextField.j +++ b/AppKit/CPTextField.j @@ -576,20 +576,31 @@ var _CPTextFieldSquareBezelColor = nil, #if PLATFORM(DOM) switch (aLineBreakMode) { - case CPLineBreakByTruncatingTail: _DOMTextElement.style.textOverflow = "ellipsis"; - _DOMTextElement.style.whiteSpace = "nowrap"; - _DOMTextElement.style.overflow = "hidden"; - _DOMTextElement.style.wordWrap = "normal"; + case CPLineBreakByTruncatingTail: _DOMTextElement.style.textOverflow = "ellipsis"; + _DOMTextElement.style.whiteSpace = "nowrap"; + _DOMTextElement.style.overflow = "hidden"; + + if (document.attachEvent) + _DOMTextElement.style.wordWrap = "normal"; + break; - case CPLineBreakByWordWrapping: _DOMTextElement.style.whiteSpace = "pre"; - _DOMTextElement.style.whiteSpace = "-o-pre-wrap"; - _DOMTextElement.style.whiteSpace = "-pre-wrap"; - _DOMTextElement.style.whiteSpace = "-moz-pre-wrap"; - _DOMTextElement.style.whiteSpace = "pre-wrap"; - _DOMTextElement.style.overflow = "hidden"; - _DOMTextElement.style.textOverflow = "clip"; - _DOMTextElement.style.wordWrap = "break-word"; + case CPLineBreakByWordWrapping: if (document.attachEvent) + { + _DOMTextElement.style.whiteSpace = "pre"; + _DOMTextElement.style.wordWrap = "break-word"; + } + else + { + _DOMTextElement.style.whiteSpace = "-o-pre-wrap"; + _DOMTextElement.style.whiteSpace = "-pre-wrap"; + _DOMTextElement.style.whiteSpace = "-moz-pre-wrap"; + _DOMTextElement.style.whiteSpace = "pre-wrap"; + } + + _DOMTextElement.style.overflow = "hidden"; + _DOMTextElement.style.textOverflow = "clip"; + break; } #endif