colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-14 14:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting and whitespace

Browse Source
This commit is contained in:
Andrew Hankinson
2013-03-26 18:40:22 -04:00
parent 4956218b10
commit de89eadcf2
1 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/_CPImageAndTextView.j
+47 -46
View File
@@ -126,16 +126,25 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
#if PLATFORM(DOM)
switch (_alignment)
{
case CPLeftTextAlignment: _DOMElement.style.textAlign = "left";
break;
case CPRightTextAlignment: _DOMElement.style.textAlign = "right";
break;
case CPCenterTextAlignment: _DOMElement.style.textAlign = "center";
break;
case CPJustifiedTextAlignment: _DOMElement.style.textAlign = "justify";
break;
case CPNaturalTextAlignment: _DOMElement.style.textAlign = "";
break;
case CPLeftTextAlignment:
_DOMElement.style.textAlign = "left";
break;
case CPRightTextAlignment:
_DOMElement.style.textAlign = "right";
break;
case CPCenterTextAlignment:
_DOMElement.style.textAlign = "center";
break;
case CPJustifiedTextAlignment:
_DOMElement.style.textAlign = "justify";
break;
case CPNaturalTextAlignment:
_DOMElement.style.textAlign = "";
break;
}
#endif
}
@@ -386,26 +395,20 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
if (hasDOMTextElement)
{
_DOMElement.removeChild(_DOMTextElement);
_DOMTextElement = nil;
hasDOMTextElement = NO;
}
else
{
_DOMTextElement = document.createElement("div");
var textStyle = _DOMTextElement.style;
textStyle.position = "absolute";
textStyle.whiteSpace = "pre";
textStyle.zIndex = 200;
textStyle.overflow = "hidden";
_DOMElement.appendChild(_DOMTextElement);
hasDOMTextElement = YES;
// We have to set all these values now.
@@ -507,41 +510,39 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
{
switch (_lineBreakMode)
{
case CPLineBreakByClipping: textStyle.overflow = "hidden";
textStyle.textOverflow = "clip";
textStyle.whiteSpace = "pre";
textStyle.wordWrap = "normal";
break;
case CPLineBreakByClipping:
textStyle.overflow = "hidden";
textStyle.textOverflow = "clip";
textStyle.whiteSpace = "pre";
textStyle.wordWrap = "normal";
break;
case CPLineBreakByTruncatingHead:
case CPLineBreakByTruncatingMiddle: // Don't have support for these (yet?), so just degrade to truncating tail.
case CPLineBreakByTruncatingTail: textStyle.textOverflow = "ellipsis";
textStyle.whiteSpace = "nowrap";
textStyle.overflow = "hidden";
textStyle.wordWrap = "normal";
break;
case CPLineBreakByTruncatingTail:
textStyle.textOverflow = "ellipsis";
textStyle.whiteSpace = "nowrap";
textStyle.overflow = "hidden";
textStyle.wordWrap = "normal";
break;
case CPLineBreakByCharWrapping:
case CPLineBreakByWordWrapping: textStyle.wordWrap = "break-word";
try {
textStyle.whiteSpace = "pre";
textStyle.whiteSpace = "-o-pre-wrap";
textStyle.whiteSpace = "-pre-wrap";
textStyle.whiteSpace = "-moz-pre-wrap";
textStyle.whiteSpace = "pre-wrap";
}
catch (e) {
//internet explorer doesn't like these properties
textStyle.whiteSpace = "pre";
}
textStyle.overflow = "hidden";
textStyle.textOverflow = "clip";
break;
case CPLineBreakByWordWrapping:
textStyle.wordWrap = "break-word";
try {
textStyle.whiteSpace = "pre";
textStyle.whiteSpace = "-o-pre-wrap";
textStyle.whiteSpace = "-pre-wrap";
textStyle.whiteSpace = "-moz-pre-wrap";
textStyle.whiteSpace = "pre-wrap";
}
catch (e) {
//internet explorer doesn't like these properties
textStyle.whiteSpace = "pre";
}
textStyle.overflow = "hidden";
textStyle.textOverflow = "clip";
break;
}
if (shadowStyle)