Merge branch 'master' into coretext

Still needs a lot of work; there are bugs,
performance issues, and missing features.

.gitignore

@@ -9,4 +9,3 @@ WebSite
 *.xcodeproj/*.perspectivev3
 xcuserdata/
 !*.xcodeproj/project.pbxproj
-*.xCodeSupport/

AppKit/AppKit.j

@@ -25,6 +25,7 @@
 @import "CPAnimation.j"
 @import "CPApplication.j"
 @import "CPArrayController.j"
+@import "CPAttributedString+Additions.j"
 @import "CPBezierPath.j"
 @import "CPBox.j"
 @import "CPBrowser.j"
@@ -42,7 +43,6 @@
 @import "CPCollectionViewItem.j"
 @import "CPColor.j"
 @import "CPColorPanel.j"
-@import "CPColorSpace.j"
 @import "CPColorWell.j"
 @import "CPCompatibility.j"
 @import "CPControl.j"
@@ -56,7 +56,6 @@
 @import "CPFont.j"
 @import "CPFontManager.j"
 @import "CPGeometry.j"
-@import "CPGradient.j"
 @import "CPGraphics.j"
 @import "CPImage.j"
 @import "CPImageView.j"
@@ -68,7 +67,6 @@
 @import "CPOutlineView.j"
 @import "CPPanel.j"
 @import "CPPasteboard.j"
-@import "CPPopover.j"
 @import "CPPopUpButton.j"
 @import "CPPredicateEditor.j"
 @import "CPPredicateEditorRowTemplate.j"
@@ -86,6 +84,7 @@
 @import "CPSound.j"
 @import "CPSplitView.j"
 @import "CPStepper.j"
+@import "CPString+Additions.j"
 @import "CPTableColumn.j"
 @import "CPTableView.j"
 @import "CPTabView.j"
@@ -101,6 +100,5 @@
 @import "CPViewAnimation.j"
 @import "CPViewController.j"
 @import "CPWebView.j"
-@import "CPWorkspace.j"
 @import "CPWindow.j"
 @import "CPWindowController.j"

AppKit/CPAlert.j

@@ -117,7 +117,7 @@ CPCriticalAlertStyle        = 2;
 */
 + (CPAlert)alertWithMessageText:(CPString)aMessage defaultButton:(CPString)defaultButtonTitle alternateButton:(CPString)alternateButtonTitle otherButton:(CPString)otherButtonTitle informativeTextWithFormat:(CPString)informativeText
 {
-    var alert = [[self alloc] init];
+    var alert = [[CPAlert alloc] init];
 
     [alert setMessageText:aMessage];
     [alert addButtonWithTitle:defaultButtonTitle];
@@ -142,7 +142,7 @@ CPCriticalAlertStyle        = 2;
 */
 + (CPAlert)alertWithError:(CPString)anErrorMessage
 {
-    var alert = [[self alloc] init];
+    var alert = [[CPAlert alloc] init];
 
     [alert setMessageText:anErrorMessage];
     [alert setAlertStyle:CPCriticalAlertStyle];
@@ -371,8 +371,8 @@ CPCriticalAlertStyle        = 2;
     [_informativeLabel setAlignment:[self currentValueForThemeAttribute:@"informative-text-alignment"]];
     [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];
 
-    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
-    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin;
+    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
+    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin,
     informativeLabelTextSize = [[_informativeLabel stringValue] sizeWithFont:[_informativeLabel font] inWidth:informativeLabelWidth];
 
     [_informativeLabel setFrame:CGRectMake(inset.left, informativeLabelOriginY, informativeLabelTextSize.width, informativeLabelTextSize.height + sizeWithFontCorrection)];

AppKit/CPAnimation.j

@@ -306,9 +306,6 @@ ACTUAL_FRAME_RATE = 0;
 
     if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
         return [_delegate animation:self valueForProgress:t];
-    
-    if (_animationCurve == CPAnimationLinear)
-        return t;
 
     var c1 = [],
         c2 = [];

AppKit/CPApplication.j

@@ -338,7 +338,7 @@ CPRunContinuesResponse  = -1002;
     Copyright - Human readable copyright information.
     </pre>
 
-    If you choose not the include any of the above keys, they will default
+    If you choose not the include any of the above keys, they will default 
     to the following respective keys in your info.plist file.
 
     <pre>
@@ -1003,7 +1003,7 @@ CPRunContinuesResponse  = -1002;
 }
 
 /*!
-    Sets the arguments of your application.
+    Sets the arguments of your application. 
     That is, set the slash seperated values of an array as the window location hash.
 
     For example if you pass an array:
@@ -1166,12 +1166,12 @@ CPRunContinuesResponse  = -1002;
 var _CPModalSessionMake = function(aWindow, aStopCode)
 {
     return { _window:aWindow, _state:CPRunContinuesResponse , _previous:nil };
-};
+}
 
 var _CPEventListenerMake = function(anEventMask, aCallback)
 {
     return { _mask:anEventMask, _callback:aCallback };
-};
+}
 
 // Make this a global for use in CPPlatformWindow+DOM.j.
 _CPRunModalLoop = function(anEvent)
@@ -1183,7 +1183,7 @@ _CPRunModalLoop = function(anEvent)
 
     if (theWindow == modalSession._window || [theWindow worksWhenModal])
         [theWindow sendEvent:anEvent];
-};
+}
 
 /*!
     Starts the GUI and Cappuccino frameworks. This function should be
@@ -1340,8 +1340,8 @@ var _CPAppBootstrapperActions = nil;
     [editMenu addItem:undoMenuItem];
     [editMenu addItem:redoMenuItem];
 
-    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]];
-    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]];
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]],
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]],
     [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Paste" action:@selector(paste:) keyEquivalent:@"v"]];
 
     [editMenuItem setSubmenu:editMenu];

AppKit/CPArrayController.j

@@ -564,9 +564,8 @@
 - (BOOL)setSelectionIndexes:(CPIndexSet)indexes
 {
     [self _selectionWillChange]
-    var r = [self __setSelectionIndexes:indexes avoidEmpty:NO];
+    [self __setSelectionIndexes:indexes];
     [self _selectionDidChange];
-    return r;
 }
 
 /*
@@ -575,7 +574,7 @@
 */
 - (BOOL)__setSelectionIndex:(int)theIndex
 {
-    return [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:theIndex]];
+    [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:theIndex]];
 }
 
 /*
@@ -584,43 +583,28 @@
 */
 - (BOOL)__setSelectionIndexes:(CPIndexSet)indexes
 {
-    [self __setSelectionIndexes:indexes avoidEmpty:_avoidsEmptySelection];
-}
+    if (!indexes)
+        indexes = [CPIndexSet indexSet];
 
-- (BOOL)__setSelectionIndexes:(CPIndexSet)indexes avoidEmpty:(BOOL)avoidEmpty
-{
-    var newIndexes = indexes;
-
-    if (!newIndexes)
-        newIndexes = [CPIndexSet indexSet];
-
-    if (![newIndexes count])
+    if (![indexes count])
     {
-        if (avoidEmpty && [[self arrangedObjects] count])
-            newIndexes = [CPIndexSet indexSetWithIndex:0];
+        if (_avoidsEmptySelection && [[self arrangedObjects] count])
+            indexes = [CPIndexSet indexSetWithIndex:0];
     }
     else
     {
         var objectsCount = [[self arrangedObjects] count];
-
-        // Don't trash the input - the caller might depend on it or we might have been
-        // given _selectionIndexes as the input in which case the equality test below
-        // would always succeed despite our change below.
-        newIndexes = [newIndexes copy];
-
         // Remove out of bounds indexes.
-        [newIndexes removeIndexesInRange:CPMakeRange(objectsCount, [newIndexes lastIndex] + 1)];
+        [indexes removeIndexesInRange:CPMakeRange(objectsCount, [indexes lastIndex] + 1)];
         // When avoiding empty selection and the deleted selection was at the bottom, select the last item.
-        if (![newIndexes count] && avoidEmpty && objectsCount)
-            newIndexes = [CPIndexSet indexSetWithIndex:objectsCount - 1];
+        if (![indexes count] && _avoidsEmptySelection && objectsCount)
+            indexes = [CPIndexSet indexSetWithIndex:objectsCount - 1];
     }
 
-    if ([_selectionIndexes isEqualToIndexSet:newIndexes])
+    if ([_selectionIndexes isEqualToIndexSet:indexes])
         return NO;
 
-    // If we haven't already created our own index instance, make sure to copy it here so that
-    // the copy the user sent in is decoupled from our internal copy.
-    _selectionIndexes = indexes === newIndexes ? [indexes copy] : newIndexes;
+    _selectionIndexes = [indexes copy];
 
     // Push back the new selection to the model for selectionIndexes if we have one.
     // There won't be an infinite loop because of the equality check above.
@@ -652,11 +636,10 @@
     [self willChangeValueForKey:@"selectionIndexes"];
     [self _selectionWillChange];
 
-    var r = [self __setSelectedObjects:objects avoidEmpty:NO];
+    [self __setSelectedObjects:objects];
 
     [self didChangeValueForKey:@"selectionIndexes"];
     [self _selectionDidChange];
-    return r;
 }
 
 /*
@@ -664,11 +647,6 @@
     @ignore
 */
 - (BOOL)__setSelectedObjects:(CPArray)objects
-{
-    [self __setSelectedObjects:objects avoidEmpty:_avoidsEmptySelection];
-}
-
-- (BOOL)__setSelectedObjects:(CPArray)objects avoidEmpty:(BOOL)avoidEmpty
 {
     var set = [CPIndexSet indexSet],
         count = [objects count],
@@ -682,7 +660,7 @@
             [set addIndex:index];
     }
 
-    [self __setSelectionIndexes:set avoidEmpty:avoidEmpty];
+    [self __setSelectionIndexes:set];
     return YES;
 }
 
@@ -1076,45 +1054,22 @@
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
         options = [_info objectForKey:CPOptionsKey],
-        isCompound = [self handlesContentAsCompoundValue],
-        dotIndex = keyPath.lastIndexOf("."),
-        firstPart = dotIndex !== CPNotFound ? keyPath.substring(0, dotIndex) : nil,
-        isSelectionProxy = firstPart && [[destination valueForKeyPath:firstPart] isKindOfClass:CPControllerSelectionProxy];
+        isCompound = [self handlesContentAsCompoundValue];
 
-    if (!isCompound && !isSelectionProxy)
+    if (!isCompound)
     {
         newValue = [destination mutableArrayValueForKeyPath:keyPath];
     }
     else
     {
-        // 1. If handlesContentAsCompoundValue we cannot just set up a proxy.
+        // handlesContentAsCompoundValue == YES so we cannot just set up a proxy.
         // Every read and every write must go through transformValue and
         // reverseTransformValue, and the resulting object cannot be described by
         // a key path.
-
-        // 2. If isSelectionProxy, we don't want to proxy a proxy - that's bad
-        // for performance and won't work with markers.
-
         newValue = [destination valueForKeyPath:keyPath];
     }
 
-    var isPlaceholder = CPIsControllerMarker(newValue);
-    if (isPlaceholder)
-    {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-        {
-           [CPException raise:CPGenericException
-                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
-        }
-
-        newValue = [self _placeholderForMarker:newValue];
-
-        // This seems to be what Cocoa does.
-        if (!newValue)
-            newValue = [CPMutableArray array];
-    }
-    else
-        newValue = [self transformValue:newValue withOptions:options];
+    newValue = [self transformValue:newValue withOptions:options];
 
     if (isCompound)
     {

AppKit/CPAttributedString+Additions.j

@@ -0,0 +1,62 @@
+/*
+ * CPAttributedString+Additions.j
+ * AppKit
+ *
+ * Created by Randy Luecke
+ * Copyright 2011, RCLConcepts, LLC.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+/*
+    AppKit adds two methods to the CPAttributedString class to support drawing string directly in an CPView.
+
+    AppKit also adds similar methods to CPString.
+*/
+@implementation CPAttributedString (AppKitAdditions)
+/*!
+    Draws a string in the current graphics context.
+    This method and draws the reciver on a single "infinately long" line.
+
+    @param aPoint - The starting point to draw the string
+*/
+- (void)drawAtPoint:(CGPoint)aPoint
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        line = CTLineCreateWithAttributedString([self copy]);
+
+    CGContextSetTextPosition(context, aPoint.x, aPoint.y);
+    CTLineDraw(line, context);
+}
+
+/*!
+    Draws a string in the current graphics context.
+
+    @param aRect - The rect for which the string should be drawn into
+*/
+- (void)drawInRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        frameSetter = CTFramesetterCreateWithAttributedString([self copy]),
+        path = CGPathCreateMutable();
+
+    CGPathAddRect(path, nil, aRect);
+    
+    var frame = CTFramesetterCreateFrame(frameSetter, CPMakeRange(0, [self length]), path, nil);
+
+    CTFrameDraw(frame, context);
+}
+@end

AppKit/CPBezierPath.j

@@ -20,6 +20,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  * Copyright 2009 280 North, Inc.
+
  */
 
 @import <Foundation/CPObject.j>
@@ -275,7 +276,7 @@ var DefaultLineWidth = 1.0;
 /*!
     Append the contents of a CPBezierPath object.
 */
-- (void)appendBezierPath:(CPBezierPath)other
+- (void)appendBezierPath:(NSBezierPath *)other
 {
     CGPathAddPath(_path, nil, other._path);
 }

AppKit/CPBox.j

@@ -35,16 +35,6 @@ CPLineBorder    = 1;
 CPBezelBorder   = 2;
 CPGrooveBorder  = 3;
 
-// CPTitlePosition
-CPNoTitle     = 0;
-CPAboveTop    = 1;
-CPAtTop       = 2;
-CPBelowTop    = 3;
-CPAboveBottom = 4;
-CPAtBottom    = 5;
-CPBelowBottom = 6;
-
-
 /*!
     @ingroup appkit
     @class CPBox
@@ -64,10 +54,6 @@ CPBelowBottom = 6;
 
     CPSize          _contentMargin;
     CPView          _contentView;
-
-    CPString        _title @accessors(getter=title);
-    int             _titlePosition @accessors(getter=titlePosition);
-    CPTextField     _titleView;
 }
 
 + (id)boxEnclosingView:(CPView)aView
@@ -75,7 +61,6 @@ CPBelowBottom = 6;
     var box = [[self alloc] initWithFrame:CGRectMakeZero()],
         enclosingView = [aView superview];
 
-    [box setAutoresizingMask:[aView autoresizingMask]];
     [box setFrameFromContentFrame:[aView frame]];
 
     [enclosingView replaceSubview:aView with:box];
@@ -98,9 +83,6 @@ CPBelowBottom = 6;
         _borderWidth = 1.0;
         _contentMargin = CGSizeMake(0.0, 0.0);
 
-        _titlePosition = CPNoTitle;
-        _titleView = [CPTextField labelWithTitle:@""];
-
         _contentView = [[CPView alloc] initWithFrame:[self bounds]];
         [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 
@@ -295,100 +277,18 @@ CPBelowBottom = 6;
 
 - (void)setFrameFromContentFrame:(CPRect)aRect
 {
-    var offset = [self _titleHeightOffset];
-
-    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + offset[0] + _borderWidth))];
-
-    [self setNeedsDisplay:YES];
-}
-
-- (void)setTitle:(CPString)aTitle
-{
-    if (aTitle == _title)
-        return;
-
-    _title = aTitle;
-
-    [self _manageTitlePositioning];
-}
-
-- (void)setTitlePosition:(int)aTitlePotisition
-{
-    if (aTitlePotisition == _titlePosition)
-        return;
-
-    _titlePosition = aTitlePotisition;
-
-    [self _manageTitlePositioning];
-}
-
-- (void)_manageTitlePositioning
-{
-    if (_titlePosition == CPNoTitle)
-    {
-        [_titleView removeFromSuperview];
-        [self setNeedsDisplay:YES];
-        return;
-    }
-
-    [_titleView setStringValue:_title];
-    [_titleView sizeToFit];
-    [self addSubview:_titleView];
-
-    switch (_titlePosition)
-    {
-        case CPAtTop:
-        case CPAboveTop:
-        case CPBelowTop:
-            [_titleView setFrameOrigin:CPPointMake(5.0, 0.0)];
-            [_titleView setAutoresizingMask:CPViewNotSizable];
-            break;
-
-        case CPAboveBottom:
-        case CPAtBottom:
-        case CPBelowBottom:
-            var h = [_titleView frameSize].height;
-            [_titleView setFrameOrigin:CPPointMake(5.0, [self frameSize].height - h)];
-            [_titleView setAutoresizingMask:CPViewMinYMargin];
-            break;
-    }
-
-    [self sizeToFit];
+    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + _borderWidth))];
     [self setNeedsDisplay:YES];
 }
 
 - (void)sizeToFit
 {
-    var contentFrame = [_contentView frame],
-        offset = [self _titleHeightOffset];
+    var contentFrame = [_contentView frame];
 
-    if (!contentFrame)
-        return;
-
-    [_contentView setAutoresizingMask:CPViewNotSizable];
     [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2,
-                                  contentFrame.size.height + _contentMargin.height * 2 + offset[0])];
-    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+                                  contentFrame.size.height + _contentMargin.height * 2)];
 
-    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height + offset[1])];
-}
-
-- (float)_titleHeightOffset
-{
-    if (_titlePosition == CPNoTitle)
-        return [0.0, 0.0];
-
-    switch (_titlePosition)
-    {
-        case CPAtTop:
-            return [[_titleView frameSize].height, [_titleView frameSize].height];
-
-        case CPAtBottom:
-            return [[_titleView frameSize].height, 0.0];
-
-        default:
-            return [0.0, 0.0];
-    }
+    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height)];
 }
 
 - (void)drawRect:(CPRect)rect
@@ -396,7 +296,7 @@ CPBelowBottom = 6;
     if (_borderType === CPNoBorder)
         return;
 
-    var bounds = CGRectMakeCopy([self bounds]);
+    var bounds = [self bounds];
 
     switch (_boxType)
     {
@@ -411,16 +311,6 @@ CPBelowBottom = 6;
             break;
     }
 
-    if (_titlePosition == CPAtTop)
-    {
-        bounds.origin.y += [_titleView frameSize].height;
-        bounds.size.height -= [_titleView frameSize].height;
-    }
-    if (_titlePosition == CPAtBottom)
-    {
-        bounds.size.height -= [_titleView frameSize].height;
-    }
-
     switch (_borderType)
     {
         case CPBezelBorder:
@@ -495,10 +385,7 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
     CPBoxFillColorKey     = @"CPBoxFillColorKey",
     CPBoxCornerRadiusKey  = @"CPBoxCornerRadiusKey",
     CPBoxBorderWidthKey   = @"CPBoxBorderWidthKey",
-    CPBoxContentMarginKey = @"CPBoxContentMarginKey",
-    CPBoxTitle            = @"CPBoxTitle",
-    CPBoxTitlePosition    = @"CPBoxTitlePosition",
-    CPBoxTitleView        = @"CPBoxTitleView";
+    CPBoxContentMarginKey = @"CPBoxContentMarginKey";
 
 @implementation CPBox (CPCoding)
 
@@ -519,16 +406,10 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
 
         _contentMargin = [aCoder decodeSizeForKey:CPBoxContentMarginKey];
 
-        _title         = [aCoder decodeObjectForKey:CPBoxTitle];
-        _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
-        _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];
-
         _contentView   = [self subviews][0];
 
         [self setAutoresizesSubviews:YES];
         [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-        [self _manageTitlePositioning];
     }
 
     return self;
@@ -547,10 +428,6 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
     [aCoder encodeFloat:_cornerRadius forKey:CPBoxCornerRadiusKey];
     [aCoder encodeFloat:_borderWidth forKey:CPBoxBorderWidthKey];
 
-    [aCoder encodeObject:_title forKey:CPBoxTitle];
-    [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePosition];
-    [aCoder encodeObject:_titleView forKey:CPBoxTitleView];
-
     [aCoder encodeSize:_contentMargin forKey:CPBoxContentMarginKey];
 }
 

AppKit/CPBrowser.j

@@ -901,12 +901,6 @@ var _CPBrowserResizeControlBackgroundImage = nil;
     [_browser _column:_index clickedRow:[selectedIndexes count] === 1 ? [selectedIndexes firstIndex] : -1];
 }
 
-- (void)tableViewSelectionDidChange:(CPNotification)aNotification
-{
-    var selectedIndexes = [[aNotification object] selectedRowIndexes];
-    [_browser selectRowIndexes:selectedIndexes inColumn:_index];
-}
-
 - (id)childAtIndex:(unsigned)index
 {
     return [_delegate browser:_browser child:index ofItem:_item];

AppKit/CPCheckBox.j

@@ -100,16 +100,6 @@ CPCheckBoxImageOffset = 4.0;
 {
 }
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:CPMixedState forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNullMarker isDefault:YES];
-}
-
 - (void)setValueFor:(CPString)theBinding
 {
     var destination = [_info objectForKey:CPObservedObjectKey],
@@ -120,13 +110,23 @@ CPCheckBoxImageOffset = 4.0;
 
     if (isPlaceholder)
     {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+        switch (newValue)
         {
-           [CPException raise:CPGenericException
-                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
-        }
+            case CPMultipleValuesMarker:
+                newValue = CPMixedState;
+                break;
 
-        newValue = [self _placeholderForMarker:newValue];
+            case CPNoSelectionMarker:
+                newValue = CPOffState;
+                break;
+
+            case CPNotApplicableMarker:
+                if ([options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+                    [CPException raise:CPGenericException reason:@"can't transform non applicable key on: "+_source+" value: "+newValue];
+
+                newValue = CPOffState;
+                break;
+        }
 
         if (newValue === CPMixedState)
         {

AppKit/CPCollectionView.j

@@ -40,23 +40,23 @@
 
     @par Delegate Methods
 
-    @delegate - (void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
+    @delegate -(void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
     Called when the selection in the collection view has changed.
     @param collectionView the collection view who's selection changed
 
-    @delegate - (void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
+    @delegate -(void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
     Called when the user double-clicks on an item in the collection view.
     @param collectionView the collection view that received the double-click
     @param index the index of the item that received the double-click
 
-    @delegate - (CPData)collectionView:(CPCollectionView)collectionView dataForItemsAtIndexes:(CPIndexSet)indices forType:(CPString)aType;
+    @delegate -(CPData)collectionView:(CPCollectionView)collectionView dataForItemsAtIndexes:(CPIndexSet)indices forType:(CPString)aType;
     Invoked to obtain data for a set of indices.
     @param collectionView the collection view to obtain data for
     @param indices the indices to return data for
     @param aType the data type
     @return a data object containing the index items
 
-    @delegate - (CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
+    @delegate -(CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
     Invoked to obtain the data types supported by the specified indices for placement on the pasteboard.
     @param collectionView the collection view the items reside in
     @param indices the indices to obtain drag types
@@ -340,21 +340,19 @@
 */
 - (void)setSelectionIndexes:(CPIndexSet)anIndexSet
 {
-    if (!anIndexSet)
-        anIndexSet = [CPIndexSet indexSet];
-    if (!_isSelectable || [_selectionIndexes isEqual:anIndexSet])
+    if ([_selectionIndexes isEqual:anIndexSet] || !_isSelectable)
         return;
 
     var index = CPNotFound;
 
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) !== CPNotFound)
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
         [_items[index] setSelected:NO];
 
     _selectionIndexes = anIndexSet;
 
     var index = CPNotFound;
 
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) !== CPNotFound)
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
         [_items[index] setSelected:YES];
 
     var binderClass = [[self class] _binderClassForBinding:@"selectionIndexes"];
@@ -475,7 +473,7 @@
     }
 
     var superview = [self superview],
-        proposedHeight = y + itemSize.height + _verticalMargin;
+        proposedHeight =  y + itemSize.height + _verticalMargin;
 
     if ([superview isKindOfClass:[CPClipView class]])
     {
@@ -561,8 +559,6 @@
 */
 - (void)setMinItemSize:(CGSize)aSize
 {
-    if (aSize === nil || aSize === undefined)
-        [CPException raise:CPInvalidArgumentException reason:"Invalid value provided for minimum size"];
     if (CGSizeEqualToSize(_minItemSize, aSize))
         return;
 
@@ -969,15 +965,14 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK
 {
     [super awakeFromCib];
 
-    var prototypeView = [_itemPrototype view];
-    if (prototypeView && (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()) || CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero())))
+    if (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()) || CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
     {
         var item = _itemPrototype;
 
         if (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()))
-            _minItemSize = [prototypeView frameSize];
+            _minItemSize = [[item view] frameSize];
         else if (CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
-            _maxItemSize = [prototypeView frameSize];
+            _maxItemSize = [[item view] frameSize];
     }
 }
 

AppKit/CPColor.j

@@ -27,7 +27,6 @@
 @import "CPCompatibility.j"
 @import "CPImage.j"
 
-/// @cond IGNORE
 
 var _redComponent        = 0,
     _greenComponent      = 1,
@@ -55,66 +54,6 @@ var cachedBlackColor,
     cachedShadowColor,
     cachedClearColor;
 
-/// @endcond
-
-/*!
-    Orientation to use with \c CPColorPattern for vertical patterns.
-*/
-CPColorPatternIsVertical = YES;
-
-/*!
-    Orientation to use with \c CPColorPattern for horizontal patterns.
-*/
-CPColorPatternIsHorizontal = NO;
-
-/*!
-    To create a simple color with a pattern image:
-
-    <code>CPColorWithImages(name, width, height{, bundle})</code>
-
-    To create a color with a three part pattern image:
-
-    <code>CPColorWithImages(slices{, orientation})</code>
-
-    where slices is an array of three [name, width, height{, bundle}] arrays,
-    and orientation is \c CPColorPatternIsVertical or \ref CPColorPatternIsHorizontal.
-    If orientatation is not passed, it defaults to \ref CPColorPatternIsHorizontal.
-
-    To create a color with a nine part pattern image:
-
-    <code>CPColorWithImages(slices);</code>
-
-    where slices is an array of nine [name, width, height{, bundle}] arrays.
-*/
-function CPColorWithImages()
-{
-    if (arguments.length < 3)
-    {
-        var slices = arguments[0],
-            imageSlices = [];
-
-        for (var i = 0; i < slices.length; ++i)
-        {
-            var slice = slices[i];
-
-            imageSlices.push(slice ? CPImageInBundle(slice[0], CGSizeMake(slice[1], slice[2]), slice[3]) : nil);
-        }
-
-        if (imageSlices.length === 3)
-            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:arguments[1] || CPColorPatternIsHorizontal]];
-        else
-            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
-    }
-    else if (arguments.length === 3 || arguments.length === 4)
-    {
-        return [CPColor colorWithPatternImage:CPImageInBundle(arguments[0], CGSizeMake(arguments[1], arguments[2]), arguments[3])];
-    }
-    else
-    {
-        return nil;
-    }
-}
-
 /*!
     @ingroup appkit
 
@@ -133,7 +72,7 @@ function CPColorWithImages()
 }
 
 /*!
-    Creates a color in the RGB colorspace, with an alpha value.
+    Creates a color in the RGB color space, with an alpha value.
     Each component should be between the range of 0.0 to 1.0. For
     the alpha component, a value of 1.0 is opaque, and 0.0 means
     completely transparent.
@@ -147,13 +86,13 @@ function CPColorWithImages()
 */
 + (CPColor)colorWithRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
 {
-    return [[CPColor alloc] _initWithRGBA:[MAX(0.0, MIN(1.0, red)), MAX(0.0, MIN(1.0, green)), MAX(0.0, MIN(1.0, blue)), MAX(0.0, MIN(1.0, alpha))]];
+    return [[CPColor alloc] _initWithRGBA:[red, green, blue, alpha]];
 }
 
 /*!
     @deprecated in favor of colorWithRed:green:blue:alpha:
 
-    Creates a color in the RGB colorspace, with an alpha value.
+    Creates a color in the RGB color space, with an alpha value.
     Each component should be between the range of 0.0 to 1.0. For
     the alpha component, a value of 1.0 is opaque, and 0.0 means
     completely transparent.
@@ -228,12 +167,12 @@ function CPColorWithImages()
 
     switch (FLOOR(hue / 60))
     {
-        case 0: return [CPColor colorWithCalibratedRed:b green:t blue:p alpha:alpha];
-        case 1: return [CPColor colorWithCalibratedRed:q green:b blue:p alpha:alpha];
-        case 2: return [CPColor colorWithCalibratedRed:p green:b blue:t alpha:alpha];
-        case 3: return [CPColor colorWithCalibratedRed:p green:q blue:b alpha:alpha];
-        case 4: return [CPColor colorWithCalibratedRed:t green:p blue:b alpha:alpha];
-        case 5: return [CPColor colorWithCalibratedRed:b green:p blue:q alpha:alpha];
+        case 0: return [CPColor colorWithCalibratedRed: b green: t blue: p alpha: alpha];
+        case 1: return [CPColor colorWithCalibratedRed: q green: b blue: p alpha: alpha];
+        case 2: return [CPColor colorWithCalibratedRed: p green: b blue: t alpha: alpha];
+        case 3: return [CPColor colorWithCalibratedRed: p green: q blue: b alpha: alpha];
+        case 4: return [CPColor colorWithCalibratedRed: t green: p blue: b alpha: alpha];
+        case 5: return [CPColor colorWithCalibratedRed: b green: p blue: q alpha: alpha];
     }
 }
 
@@ -253,17 +192,6 @@ function CPColorWithImages()
     return rgba ? [[CPColor alloc] _initWithRGBA: rgba] : null;
 }
 
-/*!
-    Creates a color in the sRGB colorspace with the given components and alpha values.
-    Values below 0.0 are treated as 0.0 and values above 1.0 are treated as 1.0.
-*/
-+ (CPColor)colorWithSRGBRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
-{
-    // TODO If Cappuccino is ported to a colorspace aware platform, this color should be in
-    // sRGBColorSpace.
-    return [self colorWithRed:red green:green blue:blue alpha:alpha];
-}
-
 /*!
     Returns a black color object. (RGBA=[0.0, 0.0, 0.0, 1.0])
 */
@@ -491,9 +419,7 @@ function CPColorWithImages()
         parts[3] ? parseFloat(parts[3], 10) : 1.0
     ];
 
-    // We can't reuse aString as _cssString because the browser might not support the `rgba` syntax, and aString might
-    // use it (issue #1413.)
-    [self _initCSSStringFromComponents];
+    _cssString = aString;
 
     return self;
 }
@@ -507,23 +433,18 @@ function CPColorWithImages()
     {
         _components = components;
 
-        [self _initCSSStringFromComponents];
+        var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
+
+        _cssString = (hasAlpha ? "rgba(" : "rgb(") +
+            parseInt(_components[0] * 255.0) + ", " +
+            parseInt(_components[1] * 255.0) + ", " +
+            parseInt(_components[2] * 255.0) +
+            (hasAlpha ?  (", " + _components[3]) : "") + ")";
     }
 
     return self;
 }
 
-- (void)_initCSSStringFromComponents
-{
-    var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
-
-    _cssString = (hasAlpha ? "rgba(" : "rgb(") +
-        parseInt(_components[0] * 255.0) + ", " +
-        parseInt(_components[1] * 255.0) + ", " +
-        parseInt(_components[2] * 255.0) +
-        (hasAlpha ?  (", " + _components[3]) : "") + ")";
-}
-
 /* @ignore */
 - (id)_initWithPatternImage:(CPImage)anImage
 {
@@ -712,36 +633,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 - (CPString)description
 {
-    var description = [super description],
-        patternImage = [self patternImage];
-
-    if (!patternImage)
-        return description + " " + [self cssString];
-
-    description += " {\n";
-
-    if ([patternImage isThreePartImage] || [patternImage isNinePartImage])
-    {
-        var slices = [patternImage imageSlices];
-
-        if ([patternImage isThreePartImage])
-            description += "    orientation: " + ([patternImage isVertical] ? "vertical" : "horizontal") + ",\n";
-
-        description += "    patternImage (" + slices.length + " part): [\n";
-
-        for (var i = 0; i < slices.length; ++i)
-        {
-            var imgDescription = [slices[i] description];
-
-            description += imgDescription.replace(/^/mg, "        ") + ",\n";
-        }
-
-        description = description.substr(0, description.length - 2) + "\n    ]\n}";
-    }
-    else
-        description += [patternImage description].replace(/^/mg, "    ") + "\n}";
-
-    return description;
+    return [super description]+" "+[self cssString];
 }
 
 @end
@@ -786,10 +678,8 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @end
 
-/// @cond IGNORE
 var CPColorComponentsKey    = @"CPColorComponentsKey",
     CPColorPatternImageKey  = @"CPColorPatternImageKey";
-/// @endcond
 
 @implementation CPColor (CPCoding)
 
@@ -820,12 +710,13 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 @end
 
 
-/// @cond IGNORE
 var hexCharacters = "0123456789ABCDEF";
 
-/*
-    Used for the CPColor +colorWithHexString: implementation.
-    Returns an array of rgb components.
+/*!
+    Used for the CPColor \c +colorWithHexString: implementation
+    @ignore
+    @class CPColor
+    @return an array of rgb components
 */
 var hexToRGB = function(hex)
 {
@@ -863,5 +754,3 @@ var byteToHex = function(n)
     return hexCharacters.charAt((n - n % 16) / 16) +
            hexCharacters.charAt(n % 16);
 };
-
-/// @endcond

AppKit/CPColorPanel.j

@@ -51,7 +51,7 @@ CPWheelColorPickerMode = 1;
 */
 CPSliderColorPickerMode = 2;
 
-CPColorPickerViewWidth  = 265;
+CPColorPickerViewWidth  = 265,
 CPColorPickerViewHeight = 370;
 
 /*!

AppKit/CPColorSpace.j

@@ -1,62 +0,0 @@
-/*
- * CPColorSpace.j
- * AppKit
- *
- * Created by Alexander Ljungberg.
- * Copyright 2012, SlevenBits Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-var sRGBColorSpace = nil;
-
-/*!
-    Represent color spaces.
-*/
-@implementation CPColorSpace : CPObject
-{
-    CGColorSpace _cgColorSpace;
-}
-
-/*!
-    Return an object representing the standard sRGB color space.
-*/
-+ (CPColorSpace)sRGBColorSpace
-{
-    if (!sRGBColorSpace)
-        sRGBColorSpace = [[self alloc] initWithCGColorSpace:CGColorSpaceCreateDeviceRGB()];
-    return sRGBColorSpace;
-}
-
-- (id)initWithCGColorSpace:(CGColorSpace)cgColorSpace
-{
-    if (self = [super init])
-    {
-        _cgColorSpace = cgColorSpace;
-    }
-
-    return self;
-}
-
-/*!
-    Return a Core Graphics color space representing the receiver.
-*/
-- (CGColorSpace)CGColorSpace
-{
-    return _cgColorSpace;
-}
-
-@end
-

AppKit/CPColorWell.j

@@ -46,22 +46,6 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     CPView  _wellView;
 }
 
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding == CPValueBinding)
-        return [CPColorWellValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
-- (void)_reverseSetBinding
-{
-    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
-        theBinding = [binderClass getBinding:CPValueBinding forObject:self];
-
-    [theBinding reverseSetValueFor:@"color"];
-}
-
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
@@ -278,48 +262,6 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
 @end
 
-@implementation CPColorWellValueBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    var placeholderColor = [CPColor blueColor];
-
-    [self _setPlaceholder:placeholderColor forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setValueFor:(CPString)theBinding
-{
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath],
-        isPlaceholder = CPIsControllerMarker(newValue);
-
-    if (isPlaceholder)
-    {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-        {
-           [CPException raise:CPGenericException
-                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
-        }
-
-        newValue = [self _placeholderForMarker:newValue];
-    }
-    else
-    {
-        newValue = [self transformValue:newValue withOptions:options];
-    }
-
-    [_source setColor:newValue];
-}
-
-@end
-
 var CPColorWellColorKey     = "CPColorWellColorKey",
     CPColorWellBorderedKey  = "CPColorWellBorderedKey";
 

AppKit/CPControl.j

@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "../Foundation/Ref.h"
-
-@import "../Foundation/CPFormatter.j"
 @import "CPFont.j"
 @import "CPShadow.j"
 @import "CPView.j"
@@ -85,7 +82,6 @@ var CPControlBlackColor = [CPColor blackColor];
 @implementation CPControl : CPView
 {
     id                  _value;
-    CPFormatter         _formatter @accessors(property=formatter);
 
     // Target-Action Support
     id                  _target;
@@ -225,11 +221,10 @@ var CPControlBlackColor = [CPColor blackColor];
     @param anAction the action to send
     @param anObject the object to which the action will be sent
 */
-- (BOOL)sendAction:(SEL)anAction to:(id)anObject
+- (void)sendAction:(SEL)anAction to:(id)anObject
 {
     [self _reverseSetBinding];
-
-    return [CPApp sendAction:anAction to:anObject from:self];
+    [CPApp sendAction:anAction to:anObject from:self];
 }
 
 - (int)sendActionOn:(int)mask
@@ -507,46 +502,15 @@ var CPControlBlackColor = [CPColor blackColor];
 */
 - (CPString)stringValue
 {
-    if (_formatter && _value !== undefined && _value !== nil)
-    {
-        var formattedValue = [self hasThemeState:CPThemeStateEditing] ? [_formatter editingStringForObjectValue:_value] : [_formatter stringForObjectValue:_value];
-
-        if (formattedValue !== nil && formattedValue !== undefined)
-            return formattedValue;
-    }
-
     return (_value === undefined || _value === nil) ? "" : String(_value);
 }
 
 /*!
     Sets the receiver's string value.
 */
-- (void)setStringValue:(CPString)aString
+- (void)setStringValue:(CPString)anObject
 {
-    // Cocoa raises an invalid parameter assertion and returns if you pass nil.
-    if (aString === nil || aString === undefined)
-    {
-        CPLog.warn("nil sent to CPControl -setStringValue");
-        return;
-    }
-
-    var value;
-
-    if (_formatter)
-    {
-        value = nil;
-
-        if ([_formatter getObjectValue:AT_REF(value) forString:aString errorDescription:nil] === NO)
-        {
-            // If the given string is non-empty and doesn't work, Cocoa tries an empty string.
-            if (!aString || [_formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
-                value = undefined;  // Means the value is invalid
-        }
-    }
-    else
-        value = aString;
-
-    [self setObjectValue:value];
+    [self setObjectValue:anObject];
 }
 
 - (void)takeDoubleValueFrom:(id)sender
@@ -562,18 +526,21 @@ var CPControlBlackColor = [CPColor blackColor];
         [self setFloatValue:[sender floatValue]];
 }
 
+
 - (void)takeIntegerValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(integerValue)])
         [self setIntegerValue:[sender integerValue]];
 }
 
+
 - (void)takeIntValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(intValue)])
         [self setIntValue:[sender intValue]];
 }
 
+
 - (void)takeObjectValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(objectValue)])
@@ -915,7 +882,7 @@ var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
     if (_target !== nil)
         [aCoder encodeConditionalObject:_target forKey:CPControlTargetKey];
 
-    if (_action !== nil)
+    if (_action !== NULL)
         [aCoder encodeObject:_action forKey:CPControlActionKey];
 
     [aCoder encodeInt:_sendActionOn forKey:CPControlSendActionOnKey];

AppKit/CPDocument.j

@@ -922,9 +922,9 @@ var CPDocumentUntitledCount = 0;
 var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
 {
     return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };
-};
+}
 
 var _CPSaveSessionMake = function(anAbsoluteURL, aSaveOperation, aChangeCount, aDelegate, aDidSaveSelector, aContextInfo, aConnection)
 {
     return { absoluteURL:anAbsoluteURL, saveOperation:aSaveOperation, changeCount:aChangeCount, delegate:aDelegate, didSaveSelector:aDidSaveSelector, contextInfo:aContextInfo, connection:aConnection };
-};
+}

AppKit/CPEvent.j

@@ -571,27 +571,31 @@ var _CPEventPeriodicEventPeriod         = 0,
     if (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask))
         return YES;
 
-    // Cocoa allows almost any key as a key equivalent unless the first responder is a
-    // text field (presumably a subclass of NSText.)
-    var firstResponderIsText = [[_window firstResponder] isKindOfClass:[CPTextField class]];
-
-    // Some keys are accepted as key equivalents even if the first responder is a text
-    // field.
     for (var i = 0; i < characterCount; i++)
     {
-        var c = _characters.charAt(i);
-
-        if ((c >= CPUpArrowFunctionKey && c <= CPModeSwitchFunctionKey) ||
-            c === CPEnterCharacter ||
-            c === CPNewlineCharacter ||
-            c === CPCarriageReturnCharacter ||
-            c === CPEscapeFunctionKey)
+        switch (_characters.charAt(i))
         {
-            return YES;
+            case CPBackspaceCharacter:
+            case CPDeleteCharacter:
+            case CPDeleteFunctionKey:
+            case CPTabCharacter:
+            case CPCarriageReturnCharacter:
+            case CPNewlineCharacter:
+            case CPSpaceFunctionKey:
+            case CPEscapeFunctionKey:
+            case CPPageUpFunctionKey:
+            case CPPageDownFunctionKey:
+            case CPLeftArrowFunctionKey:
+            case CPUpArrowFunctionKey:
+            case CPRightArrowFunctionKey:
+            case CPDownArrowFunctionKey:
+            case CPEndFunctionKey:
+            case CPHomeFunctionKey:
+                return YES;
         }
     }
-
-    return !firstResponderIsText;
+    // FIXME: More cases?
+    return NO;
 }
 
 /*!
@@ -647,3 +651,4 @@ function _CPEventFromNativeMouseEvent(aNativeEvent, anEventType, aPoint, modifie
 
     return aNativeEvent;
 }
+

AppKit/CPFont.j

@@ -142,7 +142,7 @@ var _CPFonts                        = {},
 */
 + (CPFont)fontWithName:(CPString)aName size:(float)aSize
 {
-    return [CPFont fontWithName:aName size:aSize bold:NO italic:NO];
+    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO italic:NO];
 }
 
 /*!
@@ -154,7 +154,7 @@ var _CPFonts                        = {},
 */
 + (CPFont)fontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
 {
-    return [CPFont fontWithName:aName size:aSize bold:NO italic:italic];
+    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO italic:italic];
 }
 
 /*!
@@ -165,7 +165,7 @@ var _CPFonts                        = {},
 */
 + (CPFont)boldFontWithName:(CPString)aName size:(float)aSize
 {
-    return [CPFont fontWithName:aName size:aSize bold:YES italic:NO];
+    return _CPCachedFont(aName, aSize, YES, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES italic:NO];
 }
 
 /*!
@@ -177,7 +177,7 @@ var _CPFonts                        = {},
 */
 + (CPFont)boldFontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
 {
-    return [CPFont fontWithName:aName size:aSize bold:YES italic:italic];
+    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES italic:italic];
 }
 
 /*!
@@ -187,7 +187,7 @@ var _CPFonts                        = {},
 */
 + (CPFont)systemFontOfSize:(CPSize)aSize
 {
-    return [CPFont fontWithName:_CPFontSystemFontFace size:aSize bold:NO italic:NO];
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, NO, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:NO italic:NO];
 }
 
 /*!
@@ -197,15 +197,15 @@ var _CPFonts                        = {},
 */
 + (CPFont)boldSystemFontOfSize:(CPSize)aSize
 {
-    return [CPFont fontWithName:_CPFontSystemFontFace size:aSize bold:YES italic:NO];
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, YES, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:YES italic:NO];
 }
 
 /*  FIXME Font Descriptor
     @ignore
 */
-+ (CPFont)fontWithName:(CPString)aName size:(float)aSize bold:(BOOL)bold italic:(BOOL)italic
+- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold
 {
-    return _CPCachedFont(aName, aSize, bold, italic) || [[CPFont alloc] _initWithName:aName size:aSize bold:bold italic:italic];
+    return [self _initWithName:aName size:aSize bold:isBold italic:NO];
 }
 
 - (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold italic:(BOOL)isItalic

AppKit/CPFontManager.j

@@ -143,7 +143,7 @@ var _CPFontDetectFontAvailable = function(font)
         if (_CPFontDetectCompareFonts(_CPFontDetectReferenceFonts[i], font))
             return true;
     return false;
-};
+}
 
 var _CPFontDetectCache = {};
 
@@ -165,7 +165,7 @@ var _CPFontDetectCompareFonts = function(fontA, fontB)
         bHeight = _CPFontDetectSpan.offsetHeight;
 
     return (a.w != bWidth || a.h != bHeight);
-};
+}
 
 // Test the candidate fonts pairwise until we find two that are different. Otherwise return the first.
 var _CPFontDetectPickTwoDifferentFonts = function(candidates)
@@ -175,6 +175,6 @@ var _CPFontDetectPickTwoDifferentFonts = function(candidates)
             if (_CPFontDetectCompareFonts(candidates[i], candidates[j]))
                 return [candidates[i], candidates[j]];
     return [candidates[0]];
-};
+}
 
 [CPFontManager setFontManagerFactory:[CPFontManager class]];

AppKit/CPGradient.j

@@ -1,123 +0,0 @@
-/*
- * CPGradient.j
- * AppKit
- *
- * Created by Alexander Ljungberg.
- * Copyright 2012, SlevenBits Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-CPGradientDrawsBeforeStartingLocation   = kCGGradientDrawsBeforeStartLocation;
-CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
-
-/*!
-    A class for drawing linear and radial gradients with a convenient API.
-*/
-@implementation CPGradient : CPObject
-{
-    CGGradient _gradient;
-}
-
-- (id)initWithColors:(CPArray)someColors
-{
-    var count = [someColors count];
-
-    if (count < 2)
-        [CPException raise:CPInvalidArgumentException reason:@"at least 2 colors required"];
-
-    var distance = 1.0 / (count - 1),
-        locations = [CPMutableArray array],
-        location = 0.0;
-
-    for (var i = 0; i < count; i++)
-    {
-        [locations addObject:location];
-        location += distance;
-    }
-
-    return [self initWithColors:someColors atLocations:locations colorSpace:nil];
-}
-
-- (id)initWithColors:(CPArray)someColors atLocations:(CPArray)someLocations colorSpace:(CPColorSpace)aColorSpace
-{
-    if (self = [super init])
-    {
-        var cgColors = [],
-            count = [someColors count],
-            colorSpace = [aColorSpace CGColorSpace] || CGColorSpaceCreateDeviceRGB;
-        for (var i = 0; i < count; i++)
-            cgColors.push(CGColorCreate(colorSpace, [someColors[i] components]));
-        _gradient = CGGradientCreateWithColors(colorSpace, cgColors, someLocations);
-    }
-
-    return self;
-}
-
-- (void)drawInRect:(CGRect)rect angle:(float)angle
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextSaveGState(ctx);
-    CGContextClipToRect(ctx, rect);
-    CGContextAddRect(ctx, rect);
-
-    var startPoint,
-        endPoint;
-
-    // Modulo of negative values doesn't work as expected in JS.
-    angle = ((angle % 360.0) + 360.0) % 360.0;
-
-    if (angle < 90.0)
-        startPoint = _CGPointMake(_CGRectGetMinX(rect), _CGRectGetMinY(rect));
-    else if (angle < 180.0)
-        startPoint = _CGPointMake(_CGRectGetMaxX(rect), _CGRectGetMinY(rect));
-    else if (angle < 270.0)
-        startPoint = _CGPointMake(_CGRectGetMaxX(rect), _CGRectGetMaxY(rect));
-    else
-        startPoint = _CGPointMake(_CGRectGetMinX(rect), _CGRectGetMaxY(rect));
-
-    // A line segment comes out of the starting point at the given angle, with the first colour
-    // at the starting point and the last at the end. To do what drawInRect: is supposed to do
-    // we want the opposite corner of the starting corner to just reach the final colour stop.
-    // So when the angle isn't a right angle, the segment has to extend beyond the edge of the
-    // rectangle just far enough. This is hard to describe without a picture but if we place
-    // another line through the opposite corner at -90 degrees, it'll help form some triangles
-    // from which we can derive this formula:
-    //
-    // length = cos(angle) * (rectWidth + rectHeight * tan(angle))
-    //
-    // This simplifies down to (in the first quadrant) rectWidth * cos(a) + rectHeight * sin(a).
-
-    var radians = PI * angle / 180.0,
-        length = ABS(_CGRectGetWidth(rect) * COS(radians)) + ABS(_CGRectGetHeight(rect) * SIN(radians));
-
-    endPoint = _CGPointMake(startPoint.x + length * COS(radians),
-                           startPoint.y + length * SIN(radians));
-
-    [self drawFromPoint:startPoint toPoint:endPoint options:CPGradientDrawsBeforeStartingLocation | CPGradientDrawsAfterEndingLocation];
-    CGContextRestoreGState(ctx);
-}
-
-- (void)drawFromPoint:(NSPoint)startingPoint toPoint:(NSPoint)endingPoint options:(NSGradientDrawingOptions)options
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    // TODO kCGGradientDrawsBeforeStartLocation and kCGGradientDrawsAfterEndLocation are not actually supported
-    // by CGContextDrawLinearGradient yet.
-    CGContextDrawLinearGradient(ctx, _gradient, startingPoint, endingPoint, options);
-}
-
-@end

AppKit/CPGraphicsContext.j

@@ -86,17 +86,4 @@ var CPGraphicsContextCurrent = nil;
     return _graphicsPort;
 }
 
-/*!
-    (Not implemented. Always returns Cappuccino's default, `YES`.)
-
-    Return `isFlipped` of the receiver's focused view, unless no view is focused in which case the receiver's
-    `flipped` flag, as set by `graphicsContextWithGraphicsPort:flipped:`, is returned.
-
-    Note: Cappuccino is flipped by default.
-*/
-- (BOOL)isFlipped
-{
-    return YES;
-}
-
 @end

AppKit/CPImage.j

@@ -44,8 +44,7 @@ CPImageNameColorPanel               = @"CPImageNameColorPanel";
 CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";
 
 var imagesForNames = { },
-    AppKitImageForNames = { },
-    ImageDescriptionFormat = "%s {\n   filename: \"%s\",\n   size: { width:%f, height:%f }\n}";
+    AppKitImageForNames = { };
 
 AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
 AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
@@ -281,7 +280,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.onerror = function ()
         {
@@ -293,7 +292,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.onabort = function ()
         {
@@ -305,7 +304,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.src = _filename;
 
@@ -325,24 +324,6 @@ function CPAppKitImage(aFilename, aSize)
     return NO;
 }
 
-- (CPString)description
-{
-    var filename = [self filename],
-        size = [self size];
-
-    if (filename.indexOf("data:") === 0)
-    {
-        var index = filename.indexOf(",");
-
-        if (index > 0)
-            filename = [CPString stringWithFormat:@"%s,%s...%s", filename.substr(0, index), filename.substr(index + 1, 10), filename.substr(filename.length - 10)];
-        else
-            filename = "data:<unknown type>";
-    }
-
-    return [CPString stringWithFormat:ImageDescriptionFormat, [super description], filename, size.width, size.height];
-}
-
 /* @ignore */
 - (void)_derefFromImage
 {

AppKit/CPImageView.j

@@ -41,7 +41,15 @@ CPImageAlignBottomLeft  = 6;
 CPImageAlignBottomRight = 7;
 CPImageAlignRight       = 8;
 
-var CPImageViewEmptyPlaceholderImage = nil;
+var CPImageViewShadowBackgroundColor = nil,
+    CPImageViewEmptyPlaceholderImage = nil;
+
+var LEFT_SHADOW_INSET       = 3.0,
+    RIGHT_SHADOW_INSET      = 3.0,
+    TOP_SHADOW_INSET        = 3.0,
+    BOTTOM_SHADOW_INSET     = 5.0,
+    VERTICAL_SHADOW_INSET   = TOP_SHADOW_INSET + BOTTOM_SHADOW_INSET,
+    HORIZONTAL_SHADOW_INSET = LEFT_SHADOW_INSET + RIGHT_SHADOW_INSET;
 
 /*!
     @ingroup appkit
@@ -289,8 +297,8 @@ var CPImageViewEmptyPlaceholderImage = nil;
         imageScaling = [self currentValueForThemeAttribute:@"image-scaling"],
         x = 0.0,
         y = 0.0,
-        insetWidth = (_hasShadow ? [_shadowView horizontalInset] : 0.0),
-        insetHeight = (_hasShadow ? [_shadowView verticalInset] : 0.0),
+        insetWidth = (_hasShadow ? HORIZONTAL_SHADOW_INSET : 0.0),
+        insetHeight = (_hasShadow ? VERTICAL_SHADOW_INSET : 0.0),
         boundsWidth = _CGRectGetWidth(bounds),
         boundsHeight = _CGRectGetHeight(bounds),
         width = boundsWidth - insetWidth,
@@ -398,7 +406,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
     _imageRect = _CGRectMake(x, y, width, height);
 
     if (_hasShadow)
-        [_shadowView setFrame:_CGRectMake(x - [_shadowView leftInset], y - [_shadowView topInset], width + insetWidth, height + insetHeight)];
+        [_shadowView setFrame:_CGRectMake(x - LEFT_SHADOW_INSET, y - TOP_SHADOW_INSET, width + insetWidth, height + insetHeight)];
 }
 
 - (void)mouseDown:(CPEvent)anEvent

AppKit/CPKeyValueBinding.j

@@ -41,7 +41,6 @@ var CPBindingOperationAnd = 0,
     id              _source;
 
     JSObject        _suppressedNotifications;
-    JSObject        _placeholderForMarker;
 }
 
 + (void)exposeBinding:(CPString)aBinding forClass:(Class)aClass
@@ -126,13 +125,10 @@ var CPBindingOperationAnd = 0,
         _source = aSource;
         _info   = [CPDictionary dictionaryWithObjects:[aDestination, aKeyPath] forKeys:[CPObservedObjectKey, CPObservedKeyPathKey]];
         _suppressedNotifications = {};
-        _placeholderForMarker = {};
 
         if (options)
             [_info setObject:options forKey:CPOptionsKey];
 
-        [self _updatePlaceholdersWithOptions:options];
-
         [aDestination addObserver:self forKeyPath:aKeyPath options:CPKeyValueObservingOptionNew context:aBinding];
 
         var bindings = [bindingsMap objectForKey:[_source UID]];
@@ -208,13 +204,14 @@ var CPBindingOperationAnd = 0,
     if (valueTransformer)
         aValue = [valueTransformer transformedValue:aValue];
 
+
     if (aValue === undefined || aValue === nil || aValue === [CPNull null])
         aValue = [options objectForKey:CPNullPlaceholderBindingOption] || nil;
 
     return aValue;
 }
 
-- (id)reverseTransformValue:(id)aValue withOptions:(CPDictionary)options
+- (id)reverseTransformValue:(id)aValue withOptions: (CPDictionary)options
 {
     var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
         valueTransformer;
@@ -274,42 +271,6 @@ var CPBindingOperationAnd = 0,
     delete objectSuppressions[aKeyPath];
 }
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    var count = [CPBinderPlaceholderMarkers count];
-
-    while (count--)
-    {
-        var marker = CPBinderPlaceholderMarkers[count],
-            optionName = CPBinderPlaceholderOptions[count],
-            isExplicit = [options containsKey:optionName],
-            placeholder = isExplicit ? [options objectForKey:optionName] : nil;
-        [self _setPlaceholder:placeholder forMarker:marker isDefault:!isExplicit];
-    }
-}
-
-- (void)_placeholderForMarker:aMarker
-{
-    var placeholder = _placeholderForMarker[aMarker];
-    if (placeholder)
-        return placeholder['value'];
-    return nil;
-}
-
-- (void)_setPlaceholder:(id)aPlaceholder forMarker:(id)aMarker isDefault:(BOOL)isDefault
-{
-    if (isDefault)
-    {
-        var existingPlaceholder = _placeholderForMarker[aMarker];
-
-        // Don't overwrite an explicitly set placeholder with a default.
-        if (existingPlaceholder && !existingPlaceholder['isDefault'])
-            return;
-    }
-
-    _placeholderForMarker[aMarker] = { 'isDefault': isDefault, 'value': aPlaceholder };
-}
-
 @end
 
 @implementation CPObject (KeyValueBindingCreation)
@@ -350,10 +311,10 @@ var CPBindingOperationAnd = 0,
 - (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
 {
     if (!anObject || !aKeyPath)
-        return CPLog.error("Invalid object or path on " + self + " for " + aBinding);
+        return CPLog.error("Invalid object or path on "+self+" for "+aBinding);
 
     //if (![[self exposedBindings] containsObject:aBinding])
-    //    CPLog.warn("No binding exposed on " + self + " for " + aBinding);
+    //    CPLog.warn("No binding exposed on "+self+" for "+aBinding);
 
     var binderClass = [[self class] _binderClassForBinding:aBinding];
 
@@ -465,7 +426,7 @@ var resolveMultipleValues = function resolveMultipleValues(/*CPString*/key, /*CP
     }
 
     return !operation;
-};
+}
 
 var invokeAction = function invokeAction(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
 {
@@ -502,7 +463,7 @@ var invokeAction = function invokeAction(/*CPString*/targetKey, /*CPString*/argu
     }
 
     [invocation invoke];
-};
+}
 
 // Keys in options dictionary
 
@@ -557,8 +518,4 @@ CPValueTransformerBindingOption                     = @"CPValueTransformer";
 CPIsControllerMarker = function(/*id*/anObject)
 {
     return anObject === CPMultipleValuesMarker || anObject === CPNoSelectionMarker || anObject === CPNotApplicableMarker || anObject === CPNullMarker;
-};
-
-var CPBinderPlaceholderMarkers = [CPMultipleValuesMarker, CPNoSelectionMarker, CPNotApplicableMarker, CPNullMarker],
-    CPBinderPlaceholderOptions = [CPMultipleValuesPlaceholderBindingOption, CPNoSelectionPlaceholderBindingOption, CPNotApplicablePlaceholderBindingOption, CPNullPlaceholderBindingOption];
-
+}

AppKit/CPLevelIndicator.j

@@ -149,9 +149,9 @@ var _CPLevelIndicatorBezelColor = nil,
     var filledColor = _CPLevelIndicatorSegmentNormalColor,
         value = [self doubleValue];
 
-    if (value <= _criticalValue)
+    if (value < _criticalValue)
         filledColor = _CPLevelIndicatorSegmentCriticalColor;
-    else if (value <= _warningValue)
+    else if (value < _warningValue)
         filledColor = _CPLevelIndicatorSegmentWarningColor;
 
     for (var i = 0; i < segmentCount; i++)

AppKit/CPMenu/CPMenu.j

@@ -352,12 +352,8 @@ var _CPMenuBarVisible               = NO,
     while (count--)
         [_items[count] setMenu:nil];
 
-    _highlightedIndex = CPNotFound;
-
-    // Because we are changing _items directly, be sure to notify KVO
-    [self willChangeValueForKey:@"items"];
     _items = [CPMutableArray array];
-    [self didChangeValueForKey:@"items"];
+    _highlightedIndex = CPNotFound;
 }
 
 /*!
@@ -626,11 +622,11 @@ var _CPMenuBarVisible               = NO,
         var validator = [CPApp targetForAction:[item action] to:[item target] from:item];
 
         if (!validator || ![validator respondsToSelector:[item action]])
-            [item setEnabled:NO];
+            [item _setEnabled:NO];
         else if ([validator respondsToSelector:@selector(validateMenuItem:)])
-            [item setEnabled:[validator validateMenuItem:item]];
+            [item _setEnabled:[validator validateMenuItem:item]];
         else if ([validator respondsToSelector:@selector(validateUserInterfaceItem:)])
-            [item setEnabled:[validator validateUserInterfaceItem:item]];
+            [item _setEnabled:[validator validateUserInterfaceItem:item]];
     }
 
     [[_menuWindow _menuView] tile];
@@ -715,7 +711,10 @@ var _CPMenuBarVisible               = NO,
     if (aView && !theWindow)
         throw "In call to popUpMenuPositioningItem:atLocation:inView:callback:, view is not in any window.";
 
-    [self _menuWillOpen];
+    var delegate = [self delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:self];
 
     // Convert location to global coordinates if not already in them.
     if (aView)
@@ -803,7 +802,10 @@ var _CPMenuBarVisible               = NO,
 
 + (void)popUpContextMenu:(CPMenu)aMenu withEvent:(CPEvent)anEvent forView:(CPView)aView withFont:(CPFont)aFont
 {
-    [aMenu _menuWillOpen];
+    var delegate = [aMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:aMenu];
 
     if (!aFont)
         aFont = [CPFont systemFontOfSize:12.0];
@@ -873,15 +875,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (CPMenuItem)highlightedItem
 {
-    if (_highlightedIndex < 0)
-        return nil;
-
-    var highlightedItem = _items[_highlightedIndex];
-
-    if ([highlightedItem isSeparatorItem])
-        return nil;
-
-    return highlightedItem;
+    return _highlightedIndex >= 0 ? _items[_highlightedIndex] : nil;
 }
 
 // Managing the Delegate
@@ -896,22 +890,6 @@ var _CPMenuBarVisible               = NO,
     return _delegate;
 }
 
-- (void)_menuWillOpen
-{
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
-        [delegate menuWillOpen:self];
-}
-
-- (void)_menuDidClose
-{
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuDidClose:)])
-        [delegate menuDidClose:self];
-}
-
 // Handling Tracking
 /*!
     Cancels tracking.

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -257,7 +257,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
         items = [_menu itemArray],
         count = items.length;
 
-    for (var index = 0; index < count; ++index)
+    for (index = 0; index < count; ++index)
     {
         var item = items[index],
             menuItemView = [item _menuItemView];

AppKit/CPMenu/_CPMenuManager.j

@@ -1,8 +1,8 @@
 @import <Foundation/CPObject.j>
 
 
-_CPMenuManagerScrollingStateUp      = -1;
-_CPMenuManagerScrollingStateDown    = 1;
+_CPMenuManagerScrollingStateUp      = -1,
+_CPMenuManagerScrollingStateDown    = 1,
 _CPMenuManagerScrollingStateNone    = 0;
 
 var STICKY_TIME_INTERVAL            = 500,
@@ -11,7 +11,6 @@ var STICKY_TIME_INTERVAL            = 500,
 @implementation _CPMenuManager: CPObject
 {
     CPTimeInterval      _startTime;
-    BOOL                _hasMouseGoneUpAfterStartedTracking;
     int                 _scrollingState;
     CGPoint             _lastGlobalLocation;
 
@@ -61,9 +60,6 @@ var STICKY_TIME_INTERVAL            = 500,
 {
     var menu = [aMenuContainer menu];
 
-    if ([menu numberOfItems] <= 0)
-        return;
-
     CPApp._activeMenu = menu;
 
     _startTime = [anEvent timestamp];//new Date();
@@ -91,8 +87,6 @@ var STICKY_TIME_INTERVAL            = 500,
             return [self trackMenuBarButtonEvent:anEvent];
     }
 
-    _hasMouseGoneUpAfterStartedTracking = NO;
-
     [self trackEvent:anEvent];
 }
 
@@ -105,7 +99,7 @@ var STICKY_TIME_INTERVAL            = 500,
     if (type === CPAppKitDefined)
         return [self completeTracking];
 
-    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPRightMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
+    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
 
     if (type === CPKeyDown)
     {
@@ -227,20 +221,8 @@ var STICKY_TIME_INTERVAL            = 500,
                     [CPEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.04];
             }
         }
-        else if (type === CPLeftMouseUp || type === CPRightMouseUp)
-        {
-            if (_hasMouseGoneUpAfterStartedTracking)
-            {
-                // Don't close the menu if the current item has a submenu
-                // and did not override it's default action
-                if ([activeItem action] === @selector(submenuAction:))
-                    return;
-
-                [trackingMenu cancelTracking];
-            }
-            else
-                _hasMouseGoneUpAfterStartedTracking = YES;
-        }
+        else if (type === CPLeftMouseUp && ([anEvent timestamp] - _startTime > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] * 5)))
+            [trackingMenu cancelTracking];
     }
 
     // Prevent previous selected menu items from opening by stopping the timer if a
@@ -324,7 +306,11 @@ var STICKY_TIME_INTERVAL            = 500,
 
     // Hide all submenus.
     [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-    [trackingMenu _menuDidClose];
+
+    var delegate = [trackingMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuDidClose:)])
+        [delegate menuDidClose:trackingMenu];
 
     if (_trackingCallback)
         _trackingCallback([self trackingMenuContainer], trackingMenu);
@@ -393,8 +379,6 @@ var STICKY_TIME_INTERVAL            = 500,
     var count = _menuContainerStack.length,
         index = count;
 
-    [newMenu _menuWillOpen];
-
     // Hide all menus up to the base menu...
     while (index--)
     {
@@ -414,8 +398,6 @@ var STICKY_TIME_INTERVAL            = 500,
 
         [_CPMenuWindow poolMenuWindow:menuContainer];
         [_menuContainerStack removeObjectAtIndex:index];
-
-        [menu _menuDidClose];
     }
 
     if (!newMenu)

AppKit/CPMenuItem/CPMenuItem.j

@@ -148,6 +148,14 @@ var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionary];
     @param isEnabled \c YES enables the item. \c NO disables it.
 */
 - (void)setEnabled:(BOOL)isEnabled
+{
+    if ([_menu autoenablesItems])
+        return;
+
+    [self _setEnabled:isEnabled];
+}
+
+- (void)_setEnabled:(BOOL)isEnabled
 {
     if (_isEnabled === isEnabled)
         return;
@@ -488,7 +496,6 @@ CPOffState
     if (_submenu)
     {
         [_submenu setSupermenu:_menu];
-        [_submenu setTitle:[self title]]
 
         [self setTarget:_menu];
         [self setAction:@selector(submenuAction:)];

AppKit/CPObjectController.j

@@ -131,8 +131,8 @@
 
     _contentObject = aContent;
 
-    [self _selectionDidChange];
     [self didChangeValueForKey:@"contentObject"];
+    [self _selectionDidChange];
 }
 
 /*!
@@ -663,8 +663,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (id)_controllerMarkerForValues:(CPArray)theValues
 {
-    var count = [theValues count],
-        value;
+    var count = [theValues count];
 
     if (!count)
         value = CPNoSelectionMarker;
@@ -678,7 +677,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
         {
             value = [theValues objectAtIndex:0];
 
-            for (var i = 0, count = [theValues count]; i < count && value != CPMultipleValuesMarker; i++)
+            for (var i = 0, count= [theValues count]; i < count && value != CPMultipleValuesMarker; i++)
             {
                 if (![value isEqual:[theValues objectAtIndex:i]])
                     value = CPMultipleValuesMarker;
@@ -694,8 +693,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (id)valueForKeyPath:(CPString)theKeyPath
 {
-    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath],
-        value = [self _controllerMarkerForValues:values];
+    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath];
+    value = [self _controllerMarkerForValues:values];
 
     [_cachedValues setObject:value forKey:theKeyPath];
 

AppKit/CPOutlineView.j

@@ -62,7 +62,7 @@ var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_
     CPOutlineViewDelegate_outlineView_shouldReorderColumn_toColumn_                                 = 1 << 12,
     CPOutlineViewDelegate_outlineView_shouldSelectItem_                                             = 1 << 13,
     CPOutlineViewDelegate_outlineView_shouldSelectTableColumn_                                      = 1 << 14,
-    CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_                    = 1 << 15,
+    CPOutlineViewDelegate_outlineView_shouldShowOutlineViewForItem_                                 = 1 << 15,
     CPOutlineViewDelegate_outlineView_shouldShowViewExpansionForTableColumn_item_                   = 1 << 16,
     CPOutlineViewDelegate_outlineView_shouldTrackView_forTableColumn_item_                          = 1 << 17,
     CPOutlineViewDelegate_outlineView_shouldTypeSelectForEvent_withCurrentSearchString_             = 1 << 18,
@@ -80,10 +80,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     CPOutlineViewCoalesceSelectionNotificationStateOn   = 1,
     CPOutlineViewCoalesceSelectionNotificationStateDid  = 2;
 
-#define SELECTION_SHOULD_CHANGE(anOutlineView) (!((anOutlineView)._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_selectionShouldChangeInOutlineView_) || [(anOutlineView)._outlineViewDelegate selectionShouldChangeInOutlineView:(anOutlineView)])
-
-#define SHOULD_SELECT_ITEM(anOutlineView, anItem) (!((anOutlineView)._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_) || [(anOutlineView)._outlineViewDelegate outlineView:(anOutlineView) shouldSelectItem:(anItem)])
-
 /*!
     @ingroup appkit
     @class CPOutlineView
@@ -140,7 +136,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         _selectionHighlightStyle = CPTableViewSelectionHighlightStyleSourceList;
 
         // The root item has weight "0", thus represents the weight solely of its descendants.
-        _rootItemInfo = { isExpanded:YES, isExpandable:NO, shouldShowOutlineDisclosureControl:NO, level:-1, row:-1, children:[], weight:0 };
+        _rootItemInfo = { isExpanded:YES, isExpandable:NO, level:-1, row:-1, children:[], weight:0 };
 
         _itemsForRows = [];
         _itemInfosForItems = { };
@@ -298,19 +294,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     return itemInfo.isExpandable;
 }
 
-- (BOOL)_shouldShowOutlineDisclosureControlForItem:(id)anItem
-{
-    if (!anItem)
-        return YES;
-
-    var itemInfo = _itemInfosForItems[[anItem UID]];
-
-    if (!itemInfo)
-        return YES;
-
-    return itemInfo.shouldShowOutlineDisclosureControl;
-}
-
 /*!
     Used to find if an item is already expanded.
 
@@ -707,8 +690,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 */
 - (CGRect)frameOfOutlineDisclosureControlAtRow:(CPInteger)aRow
 {
-    var theItem = [self itemAtRow:aRow];
-    if (![self isExpandable:theItem] || ![self _shouldShowOutlineDisclosureControlForItem:theItem])
+    if (![self isExpandable:[self itemAtRow:aRow]])
         return _CGRectMakeZero();
 
     var dataViewFrame = [self _frameOfOutlineDataViewAtRow:aRow],
@@ -840,24 +822,29 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
                           name:CPOutlineViewSelectionIsChangingNotification
                         object:self];
 
+
+
         if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemWillExpand:)])
             [defaultCenter
                 removeObserver:_outlineViewDelegate
                           name:CPOutlineViewItemWillExpandNotification
                         object:self];
 
+
         if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemDidExpand:)])
             [defaultCenter
                 removeObserver:_outlineViewDelegate
                           name:CPOutlineViewItemDidExpandNotification
                         object:self];
 
+
         if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemWillCollapse:)])
             [defaultCenter
                 removeObserver:_outlineViewDelegate
                           name:CPOutlineViewItemWillCollapseNotification
                         object:self];
 
+
         if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemDidCollapse:)])
             [defaultCenter
                 removeObserver:_outlineViewDelegate
@@ -883,7 +870,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             CPOutlineViewDelegate_outlineView_shouldReorderColumn_toColumn_                      , @selector(outlineView:shouldReorderColumn:toColumn:),
             CPOutlineViewDelegate_outlineView_shouldSelectItem_                                  , @selector(outlineView:shouldSelectItem:),
             CPOutlineViewDelegate_outlineView_shouldSelectTableColumn_                           , @selector(outlineView:shouldSelectTableColumn:),
-            CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_         , @selector(outlineView:shouldShowOutlineDisclosureControlForItem:),
+            CPOutlineViewDelegate_outlineView_shouldShowOutlineViewForItem_                      , @selector(outlineView:shouldShowOutlineViewForItem:),
             CPOutlineViewDelegate_outlineView_shouldShowViewExpansionForTableColumn_item_        , @selector(outlineView:shouldShowViewExpansionForTableColumn:item:),
             CPOutlineViewDelegate_outlineView_shouldTrackView_forTableColumn_item_               , @selector(outlineView:shouldTrackView:forTableColumn:item:),
             CPOutlineViewDelegate_outlineView_shouldTypeSelectForEvent_withCurrentSearchString_  , @selector(outlineView:shouldTypeSelectForEvent:withCurrentSearchString:),
@@ -934,6 +921,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             name:CPOutlineViewSelectionIsChangingNotification
             object:self];
 
+
     if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemWillExpand:)])
         [defaultCenter
             addObserver:_outlineViewDelegate
@@ -996,7 +984,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     _disclosureControlData = nil;
     _disclosureControlQueue = [];
 
-    // FIXME: really?
+    // fIXME: really?
     [self reloadData];
 }
 
@@ -1132,14 +1120,13 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         if (_dragHoverTimer)
             [_dragHoverTimer invalidate];
 
-        var autoExpandCallBack = function()
-        {
+        var autoExpandCallBack = function(){
             if (_dropItem)
             {
                 [_dropOperationFeedbackView blink];
                 [CPTimer scheduledTimerWithTimeInterval:.3 callback:objj_msgSend(self, "expandItem:", _dropItem) repeats:NO];
             }
-        };
+        }
 
         _dragHoverTimer = [CPTimer scheduledTimerWithTimeInterval:.8 callback:autoExpandCallBack repeats:NO];
     }
@@ -1297,12 +1284,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             item = _itemsForRows[row],
             isExpandable = [self isExpandable:item];
 
-        if (!isExpandable)
-            continue;
-
-        var disclosureControlFrame = [self frameOfOutlineDisclosureControlAtRow:row];
-
-        if (_CGRectIsEmpty(disclosureControlFrame))
+       if (!isExpandable)
             continue;
 
         var control = [self _dequeueDisclosureControl];
@@ -1312,7 +1294,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         [control setState:[self isItemExpanded:item] ? CPOnState : CPOffState];
         var selector = [self isRowSelected:row] ? @"setThemeState:" : @"unsetThemeState:";
         [control performSelector:CPSelectorFromString(selector) withObject:CPThemeStateSelected];
-        [control setFrame:disclosureControlFrame];
+        [control setFrame:[self frameOfOutlineDisclosureControlAtRow:row]];
 
         [self addSubview:control];
     }
@@ -1476,62 +1458,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
                     userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
-- (void)keyDown:(CPEvent)anEvent
-{
-    var character = [anEvent charactersIgnoringModifiers],
-        modifierFlags = [anEvent modifierFlags];
-
-    // Check for the key events manually, as opposed to waiting for CPWindow to sent the actual action message
-    // in _processKeyboardUIKey:, because we might not want to handle the arrow events.
-
-    if (character !== CPRightArrowFunctionKey && character !== CPLeftArrowFunctionKey)
-        return [super keyDown:anEvent];
-
-    var rows = [self selectedRowIndexes],
-        indexes = [],
-        items = [];
-
-    [rows getIndexes:indexes maxCount:-1 inIndexRange:nil];
-
-    var i = 0,
-        c = [indexes count];
-
-    for (; i < c; i++)
-        items.push([self itemAtRow:indexes[i]]);
-
-    if (character === CPRightArrowFunctionKey)
-    {
-        for (var i = 0; i < c; i++)
-            [self expandItem:items[i]];
-    }
-    else if (character === CPLeftArrowFunctionKey)
-    {
-        // When a single, collapsed item is selected and the left arrow key is pressed, the parent
-        // should be selected if possible.
-        if (c == 1)
-        {
-            var theItem = items[0];
-            if (![self isItemExpanded:theItem])
-            {
-                var parent = [self parentForItem:theItem],
-                    shouldSelect = parent && SELECTION_SHOULD_CHANGE(self) && SHOULD_SELECT_ITEM(self, parent);
-                if (shouldSelect)
-                {
-                    var rowIndex = [self rowForItem:parent];
-                    [self selectRowIndexes:[CPIndexSet indexSetWithIndex:rowIndex] byExtendingSelection:NO];
-                    [self scrollRowToVisible:rowIndex];
-                    return;
-                }
-            }
-        }
-
-        for (var i = 0; i < c; i++)
-            [self collapseItem:items[i]];
-    }
-
-    [super keyDown:anEvent];
-}
-
 @end
 
 // FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
@@ -1570,9 +1496,8 @@ var _reloadItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem)
 
         itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:newItem];
         itemInfo.isExpanded = itemInfo.isExpandable && itemInfo.isExpanded;
-        itemInfo.shouldShowOutlineDisclosureControl = !(_implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_) || [_outlineViewDelegate outlineView:self shouldShowOutlineDisclosureControlForItem:newItem];
     }
-};
+}
 
 // FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
 var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem,  /*BOOL*/ isIntermediate)
@@ -1596,7 +1521,6 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
                 return [];
 
             itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:anItem];
-            itemInfo.shouldShowOutlineDisclosureControl = !(_implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_) || [_outlineViewDelegate outlineView:self shouldShowOutlineDisclosureControlForItem:anItem];
 
             // If we were previously expanded, but now no longer expandable, "de-expand".
             // NOTE: we are *not* collapsing, thus no notification is posted.
@@ -1627,7 +1551,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 
                 if (!childItemInfo)
                 {
-                    childItemInfo = { isExpanded:NO, isExpandable:NO, shouldShowOutlineDisclosureControl:YES, children:[], weight:1 };
+                    childItemInfo = { isExpanded:NO, isExpandable:NO, children:[], weight:1 };
                     itemInfosForItems[[childItem UID]] = childItemInfo;
                 }
 
@@ -1678,7 +1602,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
         }
     }//end of with
     return descendants;
-};
+}
 
 @implementation _CPOutlineViewTableViewDataSource : CPObject
 {
@@ -1830,9 +1754,9 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     var dataView = nil;
 
     if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
-        dataView = [_outlineView._outlineViewDelegate outlineView:_outlineView
-                                       dataViewForTableColumn:theTableColumn
-                                                         item:[_outlineView itemAtRow:theRow]];
+            dataView = [_outlineView._outlineViewDelegate outlineView:_outlineView
+                                           dataViewForTableColumn:theTableColumn
+                                                             item:[_outlineView itemAtRow:theRow]];
 
     if (!dataView)
         dataView = [theTableColumn dataViewForRow:theRow];
@@ -1842,12 +1766,10 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 
 - (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(int)theRow
 {
-    return SHOULD_SELECT_ITEM(_outlineView, [_outlineView itemAtRow:theRow]);
-}
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView shouldSelectItem:[_outlineView itemAtRow:theRow]];
 
-- (BOOL)selectionShouldChangeInTableView:(CPTableView)theTableView
-{
-    return SELECTION_SHOULD_CHANGE(_outlineView);
+    return YES;
 }
 
 - (BOOL)tableView:(CPTableView)aTableView shouldEditTableColumn:(CPTableColumn)aColumn row:(int)aRow
@@ -1925,22 +1847,16 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 - (void)drawRect:(CGRect)aRect
 {
     var bounds = [self bounds],
-        context = [[CPGraphicsContext currentContext] graphicsPort],
-        width = _CGRectGetWidth(bounds),
-        height = _CGRectGetHeight(bounds);
+        context = [[CPGraphicsContext currentContext] graphicsPort];
 
     CGContextBeginPath(context);
 
-    if (_angle)
-    {
-        var centre = _CGPointMake(FLOOR(width / 2.0), FLOOR(height / 2.0));
-        CGContextTranslateCTM(context, centre.x, centre.y);
-        CGContextRotateCTM(context, _angle);
-        CGContextTranslateCTM(context, -centre.x, -centre.y);
-    }
+    CGContextTranslateCTM(context, _CGRectGetWidth(bounds) / 2.0, _CGRectGetHeight(bounds) / 2.0);
+    CGContextRotateCTM(context, _angle);
+    CGContextTranslateCTM(context, -_CGRectGetWidth(bounds) / 2.0, -_CGRectGetHeight(bounds) / 2.0);
 
     // Center, but crisp.
-    CGContextTranslateCTM(context, FLOOR((width - 9.0) / 2.0), FLOOR((height - 8.0) / 2.0));
+    CGContextTranslateCTM(context, FLOOR((_CGRectGetWidth(bounds) - 9.0) / 2.0), FLOOR((_CGRectGetHeight(bounds) - 8.0) / 2.0));
 
     CGContextMoveToPoint(context, 0.0, 0.0);
     CGContextAddLineToPoint(context, 9.0, 0.0);
@@ -1953,14 +1869,20 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
             [self hasThemeState:CPThemeStateHighlighted]));
     CGContextFillPath(context);
 
+
     CGContextBeginPath(context);
     CGContextMoveToPoint(context, 0.0, 0.0);
 
-    CGContextAddLineToPoint(context, 4.5, 8.0);
     if (_angle === 0.0)
+    {
+        CGContextAddLineToPoint(context, 4.5, 8.0);
         CGContextAddLineToPoint(context, 9.0, 0.0);
+    }
 
-    CGContextSetStrokeColor(context, [CPColor colorWithCalibratedWhite:1.0 alpha: 0.7]);
+    else
+        CGContextAddLineToPoint(context, 4.5, 8.0);
+
+    CGContextSetStrokeColor(context, [CPColor colorWithCalibratedWhite:1.0 alpha: 0.8]);
     CGContextStrokePath(context);
 }
 
@@ -2024,8 +1946,7 @@ var CPOutlineViewIndentationPerLevelKey = @"CPOutlineViewIndentationPerLevelKey"
 @end
 
 
-var colorForDisclosureTriangle = function(isSelected, isHighlighted)
-{
+var colorForDisclosureTriangle = function(isSelected, isHighlighted) {
     return isSelected
         ? (isHighlighted
             ? [CPColor colorWithCalibratedWhite:0.9 alpha: 1.0]
@@ -2033,4 +1954,4 @@ var colorForDisclosureTriangle = function(isSelected, isHighlighted)
         : (isHighlighted
             ? [CPColor colorWithCalibratedWhite:0.4 alpha: 1.0]
             : [CPColor colorWithCalibratedWhite:0.5 alpha: 1.0]);
-};
+}

AppKit/CPPopUpButton.j

@@ -86,7 +86,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
         [self setPullsDown:shouldPullDown];
 
-        var options = CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld; // | CPKeyValueObservingOptionInitial;
+        var options = CPKeyValueObservingOptionNew |CPKeyValueObservingOptionOld;/* |CPKeyValueObservingOptionInitial;*/
         [self addObserver:self forKeyPath:@"menu.items" options:options context:nil];
         [self addObserver:self forKeyPath:@"_firstItem.changeCount" options:options context:nil];
         [self addObserver:self forKeyPath:@"selectedItem.changeCount" options:options context:nil];
@@ -193,7 +193,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 - (void)removeAllItems
 {
     [[self menu] removeAllItems];
-    [self synchronizeTitleAndSelectedItem];
 }
 
 /*!
@@ -249,7 +248,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 /*!
     @ignore
 */
-- (int)_selectedTag
+- (int)selectedTag
 {
     return [[self selectedItem] tag];
 }
@@ -776,16 +775,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
             [[self selectedItem] setState:CPOffState];
 }
 
-- (void)_reverseSetBinding
-{
-    var binderClass = [[self class] _binderClassForBinding:CPSelectedIndexBinding],
-        theBinding = [binderClass getBinding:CPSelectedIndexBinding forObject:self];
-
-    [theBinding reverseSetValueFor:@"objectValue"];
-
-    [super _reverseSetBinding];
-}
-
 @end
 
 var DEPRECATED_CPPopUpButtonMenuKey             = @"CPPopUpButtonMenuKey",

AppKit/CPPopover.j

@@ -1,332 +0,0 @@
-/*
- * CPPopover.j
- * AppKit
- *
- * Created by Antoine Mercadal.
- * Copyright 2011 Antoine Mercadal.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-
-@import "CPButton.j"
-@import "CPColor.j"
-@import "CPImage.j"
-@import "CPImageView.j"
-@import "CPResponder.j"
-@import "CPView.j"
-@import "_CPAttachedWindow.j"
-
-
-CPPopoverBehaviorApplicationDefined = 0;
-CPPopoverBehaviorTransient          = 1;
-CPPopoverBehaviorSemitransient      = 2;
-
-var CPPopoverDelegate_popover_willShow_     = 1 << 0,
-    CPPopoverDelegate_popover_didShow_      = 1 << 1,
-    CPPopoverDelegate_popover_shouldClose_  = 1 << 2,
-    CPPopoverDelegate_popover_willClose_    = 1 << 3,
-    CPPopoverDelegate_popover_didClose_     = 1 << 4;
-
-
-/*! @ingroup appkit
-    @class CPPopover
-
-    This class represent a widget that displays a attached
-    view relative to another one.
-
-    Delegate can implement:
-
-    @code
-    – popoverShouldClose:(CPPopover)aPopOver
-    – popoverWillShow:(CPPopover)aPopOver
-    – popoverDidShow:(CPPopover)aPopOver
-    – popoverWillClose:(CPPopover)aPopOver
-    – popoverDidClose:(CPPopover)aPopOver
-    @endcode
-*/
-@implementation CPPopover : CPResponder
-{
-    @outlet CPViewController    _contentViewController  @accessors(property=contentViewController);
-    @outlet id                  _delegate               @accessors(getter=delegate);
-
-    BOOL                        _animates               @accessors(property=animates);
-    int                         _appearance             @accessors(property=appearance);
-    int                         _behavior               @accessors(getter=behavior);
-
-    _CPAttachedWindow           _attachedWindow;
-    BOOL                        _needsNewAttachedWindow;
-    int                         _implementedDelegateMethods;
-}
-
-
-#pragma mark -
-#pragma mark Initialization
-
-/*!
-    Initialize the CPPopover witn default values
-
-    @returns anInitialized CPPopover
-*/
-- (CPPopover)init
-{
-    if (self = [super init])
-    {
-        _animates               = YES;
-        _appearance             = CPPopoverAppearanceMinimal;
-        _behavior               = CPPopoverBehaviorApplicationDefined;
-        _needsNewAttachedWindow = YES;
-    }
-
-    return self;
-}
-
-
-#pragma mark -
-#pragma mark Getters / Setters
-
-/*!
-    Returns the current rect of the popover
-
-    @return CGRect representing the frame of the popover
-*/
-- (CGRect)positioningRect
-{
-    if (![_attachedWindow isVisible])
-        return nil;
-    return [_attachedWindow frame];
-}
-
-/*! Sets the frame of the popover
-    @param aRect the desired frame
-*/
-- (void)setPositioningRect:(CGRect)aRect
-{
-    if (![_attachedWindow isVisible])
-        return;
-    [_attachedWindow setFrame:aRect];
-}
-
-/*!
-    Returns the size of the popover's view
-
-    @return CGSize representing the size of the popover's view
-*/
-- (CGSize)contentSize
-{
-    if (![_attachedWindow isVisible])
-        return nil;
-    return [[_contentViewController view] frameSize];
-}
-
-/*!
-    Sets the size of of the popover's view
-
-    @param aSize the desired size
-*/
-- (void)setContentSize:(CPSize)aSize
-{
-    [[_contentViewController view] setFrameSize:aSize];
-}
-
-/*!
-    Indicates if CPPopover is visible
-
-    @returns \c YES if visible
-*/
-- (BOOL)shown
-{
-    return [_attachedWindow isVisible];
-}
-
-/*!
-Set the behaviour of the CPPopover. It can be:
-
-- \c CPPopoverBehaviorTransient: the popover will close if another control outside the popover becomes the responder
-- \c CPPopoverBehaviorApplicationDefined: (DEFAULT) the application is responsible for closing the popover
-
-@param aBehaviour the desired behaviour
-*/
-- (void)setBehaviour:(int)aBehaviour
-{
-    if (_behavior == aBehaviour)
-        return;
-
-    _behavior = aBehaviour;
-    _needsNewAttachedWindow = YES;
-}
-
-- (void)setDelegate:(id)aDelegate
-{
-    if (_delegate === aDelegate)
-        return;
-
-    _delegate = aDelegate;
-    _implementedDelegateMethods = 0;
-
-    if ([_delegate respondsToSelector:@selector(popoverWillShow:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_willShow_;
-
-    if ([_delegate respondsToSelector:@selector(popoverDidShow:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_didShow_;
-
-    if ([_delegate respondsToSelector:@selector(popoverShouldClose:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_shouldClose_;
-
-    if ([_delegate respondsToSelector:@selector(popoverWillClose:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_willClose_;
-
-    if ([_delegate respondsToSelector:@selector(popoverDidClose:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_didClose_;
-}
-
-#pragma mark -
-#pragma mark Positioning
-
-/*!
-    Show the popover
-
-    @param positioningRect if set, the popover will be positionned to a random rect relative to the window
-    @param positioningView if set, the popover will be positioned relative to this view
-    @param preferredEdge: \c CPRectEdge representing the preferred positioning.
-*/
-- (void)showRelativeToRect:(CGRect)positioningRect ofView:(CPView)positioningView preferredEdge:(CPRectEdge)preferredEdge
-{
-    if (!_contentViewController)
-         [CPException raise:CPInternalInconsistencyException reason:@"contentViewController must not be nil"];
-
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
-        [_delegate popoverWillShow:self];
-
-    if (!_attachedWindow || _needsNewAttachedWindow || [_attachedWindow isVisible])
-    {
-        var styleMask = (_behavior == CPPopoverBehaviorTransient) ? CPClosableOnBlurWindowMask : nil;
-        _attachedWindow = [[_CPAttachedWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:styleMask];
-        _needsNewAttachedWindow = NO;
-    }
-
-    [_attachedWindow setAppearance:_appearance];
-    [_attachedWindow setAnimates:_animates];
-    [_attachedWindow setDelegate:self];
-    [_attachedWindow setMovableByWindowBackground:NO];
-    [_attachedWindow setFrame:[_attachedWindow frameRectForContentRect:[[_contentViewController view] frame]]];
-    [_attachedWindow setContentView:[_contentViewController view]];
-
-    if (positioningRect)
-        [_attachedWindow positionRelativeToRect:positioningRect preferredEdge:preferredEdge];
-    else if (positioningView)
-        [_attachedWindow positionRelativeToView:positioningView preferredEdge:preferredEdge];
-    else
-        [CPException raise:CPInvalidArgumentException reason:@"a value must be passed for positioningRect or positioningView"];
-
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
-        [_delegate popoverDidShow:self];
-}
-
-/*!
-    Closes the popover
-*/
-- (void)close
-{
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
-        if (![_delegate popoverShouldClose:self])
-            return;
-
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
-        [_delegate popoverWillClose:self];
-
-    [_attachedWindow close];
-
-    // popoverDidClose will be sent from attachedWindowDidClose, since
-    // the attached window will close asynchronously when animating.
-}
-
-
-#pragma mark -
-#pragma mark Action
-
-/*!
-    Close the popover
-
-    @param aSender the sender of the action
-*/
-- (IBAction)performClose:(id)aSender
-{
-    [self close];
-}
-
-
-#pragma mark -
-#pragma mark Delegates
-
-/*! @ignore */
-- (BOOL)attachedWindowShouldClose:(_CPAttachedWindow)anAttachedWindow
-{
-    [self close];
-
-    // We return NO, because we want the CPPopover to determine
-    // if the attached window can be closed and to give us a chance
-    // to send delegate messages.
-    return NO;
-}
-
-/*! @ignore */
-- (void)attachedWindowDidClose:(_CPAttachedWindow)anAttachedWindow
-{
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_)
-        [_delegate popoverDidClose:self];
-}
-
-@end
-
-var CPPopoverNeedsNewAttachedWindowKey = @"CPPopoverNeedsNewAttachedWindowKey",
-    CPPopoverAppearanceKey = @"CPPopoverAppearanceKey",
-    CPPopoverAnimatesKey = @"CPPopoverAnimatesKey",
-    CPPopoverContentViewControllerKey = @"CPPopoverContentViewControllerKey",
-    CPPopoverDelegateKey = @"CPPopoverDelegateKey",
-    CPPopoverBehaviorKey = @"CPPopoverBehaviorKey";
-
-@implementation CPPopover (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _needsNewAttachedWindow = [aCoder decodeBoolForKey:CPPopoverNeedsNewAttachedWindowKey];
-        _appearance = [aCoder decodeIntForKey:CPPopoverAppearanceKey];
-        _animates = [aCoder decodeBoolForKey:CPPopoverAnimatesKey];
-        _contentViewController = [aCoder decodeObjectForKey:CPPopoverContentViewControllerKey];
-        [self setDelegate:[aCoder decodeObjectForKey:CPPopoverDelegateKey]];
-        [self setBehaviour:[aCoder decodeIntForKey:CPPopoverBehaviorKey]];
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeBool:_needsNewAttachedWindow forKey:CPPopoverNeedsNewAttachedWindowKey];
-    [aCoder encodeInt:_appearance forKey:CPPopoverAppearanceKey];
-    [aCoder encodeBool:_animates forKey:CPPopoverAnimatesKey];
-    [aCoder encodeObject:_contentViewController forKey:CPPopoverContentViewControllerKey];
-    [aCoder encodeObject:_delegate forKey:CPPopoverDelegateKey];
-    [aCoder encodeInt:_behavior forKey:CPPopoverBehaviorKey];
-}
-
-@end

AppKit/CPProgressIndicator.j

@@ -477,7 +477,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
         _doubleValue                = [aCoder decodeObjectForKey:@"_doubleValue"];
         _controlSize                = [aCoder decodeObjectForKey:@"_controlSize"];
         _isIndeterminate            = [aCoder decodeObjectForKey:@"_isIndeterminate"];
-        _style                      = [aCoder decodeIntForKey:@"_style"];
+        _style                      = [aCoder decodeObjectForKey:@"_style"];
         _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
         _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
         _isDisplayedWhenStopped     = [aCoder decodeObjectForKey:@"_isDisplayedWhenStopped"];
@@ -495,7 +495,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     [aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
     [aCoder encodeObject:_controlSize forKey:@"_controlSize"];
     [aCoder encodeObject:_isIndeterminate forKey:@"_isIndeterminate"];
-    [aCoder encodeInt:_style forKey:@"_style"];
+    [aCoder encodeObject:_style forKey:@"_style"];
     [aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
     [aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
     [aCoder encodeObject:_isDisplayedWhenStopped forKey:@"_isDisplayedWhenStopped"];

AppKit/CPRadio.j

@@ -150,14 +150,6 @@ CPRadioImageOffset = 4.0;
         [_radioGroup _setSelectedRadio:self];
 }
 
-- (void)sendAction:(SEL)anAction to:(id)anObject
-{
-    [super sendAction:anAction to:anObject];
-
-    if (_radioGroup)
-        [CPApp sendAction:[_radioGroup action] to:[_radioGroup target] from:_radioGroup];
-}
-
 @end
 
 var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
@@ -228,6 +220,8 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
 
     [_selectedRadio setState:CPOffState];
     _selectedRadio = aRadio;
+
+    [CPApp sendAction:_action to:_target from:self];
 }
 
 - (CPRadio)selectedRadio

AppKit/CPRuleEditor/CPPredicateEditor.j

@@ -200,7 +200,7 @@
         if (isPopup)
         {
             itemArray = [[templateView itemArray] valueForKey:@"title"];
-            itemsCount = [itemArray count];
+            itemsCount = [itemArray count],
             menuIndex = 0;
         }
 
@@ -501,4 +501,4 @@ var CPPredicateTemplatesKey = @"CPPredicateTemplates";
 
 @end
 
-/*! @endcond */
+/*! @endcond */

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

@@ -20,17 +20,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-CPUndefinedAttributeType     = 0;
-CPInteger16AttributeType     = 100;
-CPInteger32AttributeType     = 200;
-CPInteger64AttributeType     = 300;
-CPDecimalAttributeType       = 400;
-CPDoubleAttributeType        = 500;
-CPFloatAttributeType         = 600;
-CPStringAttributeType        = 700;
-CPBooleanAttributeType       = 800;
-CPDateAttributeType          = 900;
-CPBinaryDataAttributeType    = 1000;
+CPUndefinedAttributeType     = 0,
+CPInteger16AttributeType     = 100,
+CPInteger32AttributeType     = 200,
+CPInteger64AttributeType     = 300,
+CPDecimalAttributeType       = 400,
+CPDoubleAttributeType        = 500,
+CPFloatAttributeType         = 600,
+CPStringAttributeType        = 700,
+CPBooleanAttributeType       = 800,
+CPDateAttributeType          = 900,
+CPBinaryDataAttributeType    = 1000,
 CPTransformableAttributeType = 1800;
 
 @implementation CPPredicateEditorRowTemplate : CPObject
@@ -785,4 +785,4 @@ var CPPredicateTemplateTypeKey = @"CPPredicateTemplateType",
 }
 
 @end
-/*! @endcond */
+/*! @endcond */

AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j

@@ -16,12 +16,12 @@ var GRADIENT_NORMAL,
 {
     if (CPBrowserIsEngine(CPWebKitBrowserEngine))
     {
-        GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(rgb(252, 252, 252)), to(rgb(223, 223, 223)))";
+        GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(rgb(252, 252, 252)), to(rgb(223, 223, 223)))",
         GRADIENT_HIGHLIGHTED = "-webkit-gradient(linear, left top, left bottom, from(rgb(223, 223, 223)), to(rgb(252, 252, 252)))";
     }
     else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
     {
-        GRADIENT_NORMAL = "-moz-linear-gradient(top,  rgb(252, 252, 252),  rgb(223, 223, 223))";
+        GRADIENT_NORMAL = "-moz-linear-gradient(top,  rgb(252, 252, 252),  rgb(223, 223, 223))",
         GRADIENT_HIGHLIGHTED = "-moz-linear-gradient(top,  rgb(223, 223, 223),  rgb(252, 252, 252))";
     }
 }
@@ -35,7 +35,7 @@ var GRADIENT_NORMAL,
         style.border = "1px solid rgb(189, 189, 189)";
         style.filter = IE_FILTER;
 
-        [self setTextColor:[CPColor colorWithWhite:101 / 255 alpha:1]];
+        [self setTextColor:[CPColor colorWithWhite:101/255 alpha:1]];
         [self setBordered:NO];
      }
 

AppKit/CPScroller.j

@@ -5,9 +5,6 @@
  * Created by Francisco Tolmasky.
  * Copyright 2008, 280 North, Inc.
  *
- * Modified to match Lion style by Antoine Mercadal 2011
- * <antoine.mercadal@archipelproject.org>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -23,10 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../Foundation/Foundation.h"
-
 @import "CPControl.j"
 
+
 // CPScroller Constants
 CPScrollerNoPart            = 0;
 CPScrollerDecrementPage     = 1;
@@ -58,17 +54,6 @@ NAMES_FOR_PARTS[CPScrollerKnobSlot]         = @"knob-slot";
 NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 
 
-CPScrollerStyleLegacy           = 0;
-CPScrollerStyleOverlay          = 1;
-
-CPScrollerKnobStyleDefault      = 0;
-CPScrollerKnobStyleDark         = 1;
-CPScrollerKnobStyleLight        = 2;
-
-CPThemeStateScrollViewLegacy    = CPThemeState("scroller-style-legacy");
-CPThemeStateScrollerKnobLight   = CPThemeState("scroller-knob-light");
-CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
-
 @implementation CPScroller : CPControl
 {
     CPControlSize           _controlSize;
@@ -83,19 +68,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     CPScrollerPart          _trackingPart;
     float                   _trackingFloatValue;
     CGPoint                 _trackingStartPoint;
-
-    CPViewAnimation         _animationScroller;
-
-    BOOL                    _allowFadingOut @accessors(getter=allowFadingOut);
-    int                     _style;
-    CPTimer                 _timerFadeOut;
-    BOOL                    _isMouseOver;
 }
 
-
-#pragma mark -
-#pragma mark Class methods
-
 + (CPString)defaultThemeClass
 {
     return "scroller";
@@ -104,43 +78,49 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 + (id)themeAttributes
 {
     return [CPDictionary dictionaryWithJSObject:{
-        @"scroller-width": 7.0,
-        @"knob-slot-color": [CPNull null],
+        @"scroller-width": 15.0,
+        @"knob-slot-color": [CPColor lightGrayColor],
         @"decrement-line-color": [CPNull null],
         @"increment-line-color": [CPNull null],
-        @"knob-color": [CPNull null],
+        @"knob-color": [CPColor grayColor],
         @"decrement-line-size":_CGSizeMakeZero(),
         @"increment-line-size":_CGSizeMakeZero(),
         @"track-inset":_CGInsetMakeZero(),
         @"knob-inset": _CGInsetMakeZero(),
-        @"minimum-knob-length":21.0,
-        @"track-border-overlay": 9.0
-    }];
+        @"minimum-knob-length":21.0
+    }]
 }
 
-+ (float)scrollerWidth
+
+// Calculating Layout
+
+- (id)initWithFrame:(CGRect)aFrame
 {
-    return [self scrollerWidthInStyle:CPScrollerStyleLegacy];
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _controlSize = CPRegularControlSize;
+        _partRects = [];
+
+        [self setFloatValue:0.0];
+        [self setKnobProportion:1.0];
+
+        _hitPart = CPScrollerNoPart;
+
+        [self _calculateIsVertical];
+    }
+
+    return self;
 }
 
+// Determining CPScroller Size
 /*!
     Returns the CPScroller's width for a CPRegularControlSize.
 */
-+ (float)scrollerWidthInStyle:(int)aStyle
++ (float)scrollerWidth
 {
-    var scroller = [[self alloc] init];
-
-    if (aStyle == CPScrollerStyleLegacy)
-        return [scroller valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
-    return [scroller currentValueForThemeAttribute:@"scroller-width"];
-}
-
-/*!
-    Returns the CPScroller's overlay value.
-*/
-+ (float)scrollerOverlay
-{
-    return [[[self alloc] init] currentValueForThemeAttribute:@"track-border-overlay"];
+    return [[[CPScroller alloc] init] currentValueForThemeAttribute:@"scroller-width"];
 }
 
 /*!
@@ -152,87 +132,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return [self scrollerWidth];
 }
 
-
-#pragma mark -
-#pragma mark Initialization
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _controlSize = CPRegularControlSize;
-        _partRects = [];
-
-        [self setFloatValue:0.0];
-        [self setKnobProportion:1.0];
-
-        _hitPart = CPScrollerNoPart;
-        _allowFadingOut = YES;
-        _isMouseOver = NO;
-        _style = CPScrollerStyleOverlay;
-        var paramAnimFadeOut   = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
-                                                          forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
-
-        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
-        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
-        [_animationScroller setDelegate:self];
-        [self setAlphaValue:0.0];
-        [self _calculateIsVertical];
-    }
-
-    return self;
-}
-
-
-#pragma mark -
-#pragma mark Getters / Setters
-
-/*!
-    Returns the scroller's style
-*/
-- (void)style
-{
-    return _style;
-}
-
-/*!
-    Set the scroller's control size
-    @param aStyle the scroller style: CPScrollerStyleLegacy or CPScrollerStyleOverlay
-*/
-- (void)setStyle:(id)aStyle
-{
-    if (_style != nil && _style === aStyle)
-        return;
-
-    _style = aStyle;
-
-    if (_style === CPScrollerStyleLegacy)
-    {
-        [self fadeIn];
-        [self setThemeState:CPThemeStateScrollViewLegacy];
-    }
-    else
-    {
-        _allowFadingOut = YES;
-        [self unsetThemeState:CPThemeStateScrollViewLegacy];
-    }
-
-    [self _adjustScrollerSize];
-}
-
-- (void)setObjectValue:(id)aValue
-{
-    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
-}
-
-/*!
-    Returns the scroller's control size
-*/
-- (CPControlSize)controlSize
-{
-    return _controlSize;
-}
-
 /*!
     Sets the scroller's size.
     @param aControlSize the scroller's size
@@ -248,6 +147,27 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [self setNeedsDisplay:YES];
 }
 
+/*!
+    Returns the scroller's control size
+*/
+- (CPControlSize)controlSize
+{
+    return _controlSize;
+}
+
+- (void)setObjectValue:(id)aValue
+{
+    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
+}
+
+- (void)setKnobProportion:(float)aProportion
+{
+    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
+
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
+}
+
 /*!
     Return's the knob's proportion
 */
@@ -256,50 +176,17 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return _knobProportion;
 }
 
-/*!
-    Set the knob's proportion
-    @param aProportion the desired proportion
-*/
-- (void)setKnobProportion:(float)aProportion
+- (id)currentValueForThemeAttribute:(CPString)anAttributeName
 {
-    if (!_IS_NUMERIC(aProportion))
-        [CPException raise:CPInvalidArgumentException reason:"aProportion must be numeric"];
+    var themeState = _themeState;
 
-    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
+    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
+        themeState &= ~CPThemeStateHighlighted;
 
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
+    return [self valueForThemeAttribute:anAttributeName inState:themeState];
 }
 
-
-#pragma mark -
-#pragma mark Privates
-
-/*! @ignore */
-- (void)_adjustScrollerSize
-{
-    var frame = [self frame],
-        scrollerWidth = [self currentValueForThemeAttribute:@"scroller-width"];
-
-    if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
-        frame.size.width = scrollerWidth;
-
-    if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
-        frame.size.height = scrollerWidth;
-
-    [self setFrame:frame];
-}
-
-/*! @ignore */
-- (void)_performFadeOut:(CPTimer)aTimer
-{
-    [self fadeOut];
-    _timerFadeOut = nil;
-}
-
-
-#pragma mark -
-#pragma mark Utilities
+// Calculating Layout
 
 - (CGRect)rectForPart:(CPScrollerPart)aPart
 {
@@ -321,9 +208,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     // The ordering of these tests is important.  We check the knob and
     // page rects first since they may overlap with the arrows.
 
-    if (![self hasThemeState:CPThemeStateSelected])
-        return CPScrollerNoPart;
-
     if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint))
         return CPScrollerKnob;
 
@@ -446,35 +330,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return _usableParts;
 }
 
-/*!
-    Display the scroller
-*/
-- (void)fadeIn
-{
-    if (_isMouseOver && _knobProportion != 1.0)
-        [self setThemeState:CPThemeStateSelected];
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    [self setAlphaValue:1.0];
-}
-
-/*!
-    Start the fade out anination
-*/
-- (void)fadeOut
-{
-    if ([self hasThemeState:CPThemeStateScrollViewLegacy])
-        return;
-
-    [_animationScroller startAnimation];
-}
-
-
-#pragma mark -
-#pragma mark  Drawing
-
+// Drawing the Parts
 /*!
     Draws the specified arrow and sets the highlight.
     @param anArrow the arrow to draw
@@ -526,8 +382,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [self checkSpaceForParts];
 
     var index = 0,
-        count = PARTS_ARRANGEMENT.length,
-        view;
+        count = PARTS_ARRANGEMENT.length;
 
     for (; index < count; ++index)
     {
@@ -603,8 +458,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
     [CPApp setTarget:self selector:@selector(trackKnob:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 
-    if (type === CPLeftMouseDragged)
-        [self sendAction:[self action] to:[self target]];
+    [self sendAction:[self action] to:[self target]];
 }
 
 /*!
@@ -710,20 +564,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [self setNeedsLayout];
 }
 
-
-#pragma mark -
-#pragma mark Overrides
-
-- (id)currentValueForThemeAttribute:(CPString)anAttributeName
-{
-    var themeState = _themeState;
-
-    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
-        themeState &= ~CPThemeStateHighlighted;
-
-    return [self valueForThemeAttribute:anAttributeName inState:themeState];
-}
-
 - (void)mouseDown:(CPEvent)anEvent
 {
     if (![self isEnabled])
@@ -742,52 +582,10 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     }
 }
 
-- (void)mouseEntered:(CPEvent)anEvent
-{
-    [super mouseEntered:anEvent];
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    if (![self isEnabled])
-        return;
-
-    _allowFadingOut = NO;
-    _isMouseOver = YES;
-
-    if ([self alphaValue] > 0 && _knobProportion != 1.0)
-        [self setThemeState:CPThemeStateSelected];
-}
-
-- (void)mouseExited:(CPEvent)anEvent
-{
-    [super mouseExited:anEvent];
-
-    if ([self isHidden] || ![self isEnabled] || !_isMouseOver)
-        return;
-
-    _allowFadingOut = YES;
-    _isMouseOver = NO;
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-    _timerFadeOut = [CPTimer scheduledTimerWithTimeInterval:1.2 target:self selector:@selector(_performFadeOut:) userInfo:nil repeats:NO];
-}
-
-
-#pragma mark -
-#pragma mark Delegates
-
-- (void)animationDidEnd:(CPAnimation)animation
-{
-    [self unsetThemeState:CPThemeStateSelected];
-}
-
 @end
 
-var CPScrollerControlSizeKey = @"CPScrollerControlSize",
-    CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
-    CPScrollerStyleKey = @"CPScrollerStyleKey";
+var CPScrollerControlSizeKey = "CPScrollerControlSize",
+    CPScrollerKnobProportionKey = "CPScrollerKnobProportion";
 
 @implementation CPScroller (CPCoding)
 
@@ -807,18 +605,20 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
 
         _hitPart = CPScrollerNoPart;
 
-        _allowFadingOut = YES;
-        _isMouseOver = NO;
-        var paramAnimFadeOut   = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
-                                                          forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
-        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
-        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
-        [_animationScroller setDelegate:self];
-        [self setAlphaValue:0.0];
-
         [self _calculateIsVertical];
 
-        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
+        // Adjust the size of the scroller if the size from cib
+        // isn't equal to the scrollerWidth
+        var frame = [self frame],
+            scrollerWidth = [CPScroller scrollerWidth];
+
+        if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
+            frame.size.width = scrollerWidth;
+
+        if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
+            frame.size.height = scrollerWidth;
+
+        [self setFrame:frame];
     }
 
     return self;
@@ -830,7 +630,6 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
 
     [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
     [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
-    [aCoder encodeInt:_style forKey:CPScrollerStyleKey];
 }
 
 @end

AppKit/CPShadowView.j

@@ -47,6 +47,7 @@ var LIGHT_LEFT_INSET    = 3.0,
 /*!
     @ingroup appkit
 */
+
 @implementation CPShadowView : CPView
 {
     CPShadowWeight  _weight;
@@ -59,33 +60,35 @@ var LIGHT_LEFT_INSET    = 3.0,
 
     var bundle = [CPBundle bundleForClass:[self class]];
 
-    CPShadowViewLightBackgroundColor = CPColorWithImages([
-        [@"CPShadowView/CPShadowViewLightTopLeft.png", 9.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightTop.png", 1.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightTopRight.png", 9.0, 9.0, bundle],
+    CPShadowViewLightBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopLeft.png"] size:CGSizeMake(9.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTop.png"] size:CGSizeMake(1.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopRight.png"] size:CGSizeMake(9.0, 9.0)],
 
-        [@"CPShadowView/CPShadowViewLightLeft.png", 9.0, 1.0, bundle],
-        nil,
-        [@"CPShadowView/CPShadowViewLightRight.png", 9.0, 1.0, bundle],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightLeft.png"] size:CGSizeMake(9.0, 1.0)],
+            nil,
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightRight.png"] size:CGSizeMake(9.0, 1.0)],
 
-        [@"CPShadowView/CPShadowViewLightBottomLeft.png", 9.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightBottom.png", 1.0, 9.0, bundle],
-        [@"CPShadowView/CPShadowViewLightBottomRight.png", 9.0, 9.0, bundle]
-    ]);
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomLeft.png"] size:CGSizeMake(9.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottom.png"] size:CGSizeMake(1.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomRight.png"] size:CGSizeMake(9.0, 9.0)]
+        ]]];
 
-    CPShadowViewHeavyBackgroundColor = CPColorWithImages([
-        [@"CPShadowView/CPShadowViewHeavyTopLeft.png", 17.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyTop.png", 1.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyTopRight.png", 17.0, 17.0, bundle],
+    CPShadowViewHeavyBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopLeft.png"] size:CGSizeMake(17.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTop.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopRight.png"] size:CGSizeMake(17.0, 17.0)],
 
-        [@"CPShadowView/CPShadowViewHeavyLeft.png", 17.0, 1.0, bundle],
-        nil,
-        [@"CPShadowView/CPShadowViewHeavyRight.png", 17.0, 1.0, bundle],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyLeft.png"] size:CGSizeMake(17.0, 1.0)],
+            nil,
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyRight.png"] size:CGSizeMake(17.0, 1.0)],
 
-        [@"CPShadowView/CPShadowViewHeavyBottomLeft.png", 17.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyBottom.png", 1.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyBottomRight.png", 17.0, 17.0, bundle]
-    ]);
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomLeft.png"] size:CGSizeMake(17.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottom.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomRight.png"] size:CGSizeMake(17.0, 17.0)]
+        ]]];
 }
 
 + (id)shadowViewEnclosingView:(CPView)aView
@@ -95,24 +98,20 @@ var LIGHT_LEFT_INSET    = 3.0,
 
 + (id)shadowViewEnclosingView:(CPView)aView withWeight:(CPShadowWeight)aWeight
 {
-    var shadowView = [[self alloc] initWithFrame:[aView frame]];
+    var shadowView = [[CPShadowView alloc] initWithFrame:[aView frame]];
+    [shadowView setWeight:aWeight];
 
-    if (shadowView)
-    {
-        [shadowView setWeight:aWeight];
+    var size = [shadowView frame].size,
+        width = size.width - [shadowView leftInset] - [shadowView rightInset],
+        height = size.height - [shadowView topInset] - [shadowView bottomInset],
+        enclosingView = [aView superview];
 
-        var size = [shadowView frame].size,
-            width = size.width - [shadowView leftInset] - [shadowView rightInset],
-            height = size.height - [shadowView topInset] - [shadowView bottomInset],
-            enclosingView = [aView superview];
-
-        [shadowView setHitTests:[aView hitTests]];
-        [shadowView setAutoresizingMask:[aView autoresizingMask]];
-        [aView removeFromSuperview];
-        [shadowView addSubview:aView];
-        [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
-        [enclosingView addSubview:shadowView];
-    }
+    [shadowView setHitTests:[aView hitTests]];
+    [shadowView setAutoresizingMask:[aView autoresizingMask]];
+    [aView removeFromSuperview];
+    [shadowView addSubview:aView];
+    [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
+    [enclosingView addSubview:shadowView];
 
     return shadowView;
 }

AppKit/CPSound.j

@@ -45,7 +45,6 @@ CPSoundPlayBackStatePause   = 2;
     CPString            _name       @accessors(property=name);
     id                  _delegate   @accessors(property=delegate);
 
-    BOOL                _playRequestBeforeLoad;
     HTMLAudioElement    _audioTag;
     int                 _loadStatus;
     int                 _playBackStatus;
@@ -62,7 +61,6 @@ CPSoundPlayBackStatePause   = 2;
         _loops = NO;
         _audioTag = document.createElement("audio");
         _audioTag.preload = YES;
-        _playRequestBeforeLoad = NO;
 
         _audioTag.addEventListener("canplay", function()
         {
@@ -140,12 +138,6 @@ CPSoundPlayBackStatePause   = 2;
 - (void)_soundDidload
 {
     _loadStatus = CPSoundLoadStateCanBePlayed;
-
-    if (_playRequestBeforeLoad)
-    {
-        _playRequestBeforeLoad = NO;
-        [self play];
-    }
 }
 
 /*! @ignore
@@ -175,12 +167,6 @@ CPSoundPlayBackStatePause   = 2;
 */
 - (BOOL)play
 {
-    if (_loadStatus === CPSoundLoadStateLoading)
-    {
-        _playRequestBeforeLoad = YES;
-        return YES;
-    }
-
     if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
         || (_playBackStatus === CPSoundPlayBackStatePlay))
         return NO;

AppKit/CPSplitView.j

@@ -20,43 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../Foundation/Foundation.h"
-
 @import "CPButtonBar.j"
 @import "CPImage.j"
 @import "CPView.j"
 
-#define SPLIT_VIEW_MAYBE_POST_WILL_RESIZE() \
-    if ((_suppressResizeNotificationsMask & DidPostWillResizeNotification) === 0) \
-    { \
-        [self _postNotificationWillResize]; \
-        _suppressResizeNotificationsMask |= DidPostWillResizeNotification; \
-    }
-
-#define SPLIT_VIEW_MAYBE_POST_DID_RESIZE() \
-    if ((_suppressResizeNotificationsMask & ShouldSuppressResizeNotifications) !== 0) \
-        _suppressResizeNotificationsMask |= DidSuppressResizeNotification; \
-    else \
-        [self _postNotificationDidResize];
-
-#define SPLIT_VIEW_DID_SUPPRESS_RESIZE_NOTIFICATION() \
-    ((_suppressResizeNotificationsMask & DidSuppressResizeNotification) !== 0)
-
-#define SPLIT_VIEW_SUPPRESS_RESIZE_NOTIFICATIONS(shouldSuppress) \
-    if (shouldSuppress) \
-        _suppressResizeNotificationsMask |= ShouldSuppressResizeNotifications; \
-    else \
-        _suppressResizeNotificationsMask = 0;
 
 CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification";
 CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification";
 
 var CPSplitViewHorizontalImage = nil,
-    CPSplitViewVerticalImage = nil,
-
-    ShouldSuppressResizeNotifications   = 1,
-    DidPostWillResizeNotification       = 1 << 1,
-    DidSuppressResizeNotification       = 1 << 2;
+    CPSplitViewVerticalImage = nil;
 
 /*!
     @ingroup appkit
@@ -72,29 +45,24 @@ var CPSplitViewHorizontalImage = nil,
 
 @implementation CPSplitView : CPView
 {
-    id              _delegate;
-    BOOL            _isVertical;
-    BOOL            _isPaneSplitter;
+    id          _delegate;
+    BOOL        _isVertical;
+    BOOL        _isPaneSplitter;
 
-    int             _currentDivider;
-    float           _initialOffset;
-    CPDictionary    _preCollapsePositions;
+    int         _currentDivider;
+    float       _initialOffset;
+    float       _preCollapsePosition;
 
-    CPString        _originComponent;
-    CPString        _sizeComponent;
+    CPString    _originComponent;
+    CPString    _sizeComponent;
 
-    CPArray         _DOMDividerElements;
-    CPString        _dividerImagePath;
-    int             _drawingDivider;
+    CPArray     _DOMDividerElements;
+    CPString    _dividerImagePath;
+    int         _drawingDivider;
 
-    CPString        _autosaveName;
-    BOOL            _shouldAutosave;
-    BOOL            _needsRestoreFromAutosave;
+    BOOL        _needsResizeSubviews;
 
-    BOOL            _needsResizeSubviews;
-    int             _suppressResizeNotificationsMask;
-
-    CPArray         _buttonBars;
+    CPArray     _buttonBars;
 }
 
 + (CPString)defaultThemeClass
@@ -125,15 +93,11 @@ var CPSplitViewHorizontalImage = nil,
 {
     if (self = [super initWithFrame:aFrame])
     {
-        _suppressResizeNotificationsMask = 0;
-        _preCollapsePositions = [CPMutableDictionary new];
         _currentDivider = CPNotFound;
 
         _DOMDividerElements = [];
         _buttonBars = [];
 
-        _shouldAutosave = YES;
-
         [self _setVertical:YES];
     }
 
@@ -448,6 +412,7 @@ var CPSplitViewHorizontalImage = nil,
         {
             _currentDivider = CPNotFound;
             [self _updateResizeCursor:anEvent];
+            [self _postNotificationDidResize];
         }
 
         return;
@@ -471,8 +436,7 @@ var CPSplitViewHorizontalImage = nil,
                     [_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
                 {
                     var minPosition = [self minPossiblePositionOfDividerAtIndex:i],
-                        maxPosition = [self maxPossiblePositionOfDividerAtIndex:i],
-                        _preCollapsePosition = [_preCollapsePositions objectForKey:"" + i] || 0;
+                        maxPosition = [self maxPossiblePositionOfDividerAtIndex:i];
 
                     if ([_delegate splitView:self canCollapseSubview:_subviews[i]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i] forDoubleClickOnDividerAtIndex:i])
                     {
@@ -562,34 +526,20 @@ var CPSplitViewHorizontalImage = nil,
         // If we are currently tracking, keep the resize cursor active even outside of hit areas.
         if (_currentDivider === i || (_currentDivider == CPNotFound && [self cursorAtPoint:point hitDividerAtIndex:i]))
         {
-            var frameA = [_subviews[i] frame],
-                sizeA = frameA.size[_sizeComponent],
-                startPosition = frameA.origin[_originComponent] + sizeA,
-                frameB = [_subviews[i + 1] frame],
-                sizeB = frameB.size[_sizeComponent],
+            var frame = [_subviews[i] frame],
+                size = frame.size[_sizeComponent],
+                startPosition = frame.origin[_originComponent] + size,
                 canShrink = [self _realPositionForPosition:startPosition - 1 ofDividerAtIndex:i] < startPosition,
                 canGrow = [self _realPositionForPosition:startPosition + 1 ofDividerAtIndex:i] > startPosition,
                 cursor = [CPCursor arrowCursor];
 
-            if (sizeA === 0)
+            if (size === 0)
                 canGrow = YES; // Subview is collapsed.
             else if (!canShrink &&
                 [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
                 [_delegate splitView:self canCollapseSubview:_subviews[i]])
                 canShrink = YES; // Subview is collapsible.
 
-            if (sizeB === 0)
-            {
-                // Right/lower subview is collapsed.
-                canGrow = NO;
-                // It's safe to assume it can always be uncollapsed.
-                canShrink = YES;
-            }
-            else if (!canGrow &&
-                [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
-                [_delegate splitView:self canCollapseSubview:_subviews[i + 1]])
-                canGrow = YES; // Right/lower subview is collapsible.
-
             if (_isVertical && canShrink && canGrow)
                 cursor = [CPCursor resizeLeftRightCursor];
             else if (_isVertical && canShrink)
@@ -647,15 +597,7 @@ var CPSplitViewHorizontalImage = nil,
 {
     // not sure where this should override other positions?
     if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
-    {
-        var proposedPosition = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
-
-        // Silently ignore bad positions which could result from odd delegate responses. We don't want these
-        // bad results to go into the system and cause havoc with frame sizes as the split view tries to resize
-        // its subviews.
-        if (_IS_NUMERIC(proposedPosition))
-            position = proposedPosition;
-    }
+        position = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
 
     var proposedMax = [self maxPossiblePositionOfDividerAtIndex:dividerIndex],
         proposedMin = [self minPossiblePositionOfDividerAtIndex:dividerIndex],
@@ -663,33 +605,18 @@ var CPSplitViewHorizontalImage = nil,
         actualMin = proposedMin;
 
     if ([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
-    {
-        var proposedActualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
-        if (_IS_NUMERIC(proposedActualMin))
-            actualMin = proposedActualMin;
-    }
+        actualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
 
     if ([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
-    {
-        var proposedActualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
-        if (_IS_NUMERIC(proposedActualMax))
-            actualMax = proposedActualMax;
-    }
+        actualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
 
     var viewA = _subviews[dividerIndex],
-        viewB = _subviews[dividerIndex + 1],
         realPosition = MAX(MIN(position, actualMax), actualMin);
 
-    // Is this position past the halfway point to collapse?
-    if (position < proposedMin + (actualMin - proposedMin) / 2)
+    if (position <  proposedMin + (actualMin - proposedMin) / 2)
         if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
             if ([_delegate splitView:self canCollapseSubview:viewA])
                 realPosition = proposedMin;
-    // We can also collapse to the right.
-    if (position > proposedMax - (proposedMax - actualMax) / 2)
-        if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
-            if ([_delegate splitView:self canCollapseSubview:viewB])
-                realPosition = proposedMax;
 
     return realPosition;
 }
@@ -701,7 +628,6 @@ var CPSplitViewHorizontalImage = nil,
 */
 - (void)setPosition:(float)position ofDividerAtIndex:(int)dividerIndex
 {
-    SPLIT_VIEW_SUPPRESS_RESIZE_NOTIFICATIONS(YES);
     [self _adjustSubviewsWithCalculatedSize];
 
     var realPosition = [self _realPositionForPosition:position ofDividerAtIndex:dividerIndex];
@@ -709,59 +635,32 @@ var CPSplitViewHorizontalImage = nil,
     var viewA = _subviews[dividerIndex],
         frameA = [viewA frame],
         viewB = _subviews[dividerIndex + 1],
-        frameB = [viewB frame],
-        _preCollapsePosition = 0;
+        frameB = [viewB frame];
+
+    _preCollapsePosition = 0;
 
     var preSize = frameA.size[_sizeComponent];
     frameA.size[_sizeComponent] = realPosition - frameA.origin[_originComponent];
     if (preSize !== 0 && frameA.size[_sizeComponent] === 0)
         _preCollapsePosition = preSize;
-    if (preSize !== frameA.size[_sizeComponent])
-    {
-        SPLIT_VIEW_MAYBE_POST_WILL_RESIZE();
-        [_subviews[dividerIndex] setFrame:frameA];
-        SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
-    }
+    [_subviews[dividerIndex] setFrame:frameA];
 
     preSize = frameB.size[_sizeComponent];
-    var preOrigin = frameB.origin[_originComponent];
     frameB.size[_sizeComponent] = frameB.origin[_originComponent] + frameB.size[_sizeComponent] - realPosition - [self dividerThickness];
     if (preSize !== 0 && frameB.size[_sizeComponent] === 0)
-        _preCollapsePosition = frameB.origin[_originComponent];
+        _preCollapsePosition = preSize;
     frameB.origin[_originComponent] = realPosition + [self dividerThickness];
-    if (preSize !== frameB.size[_sizeComponent] || preOrigin !== frameB.origin[_originComponent])
-    {
-        SPLIT_VIEW_MAYBE_POST_WILL_RESIZE();
-        [_subviews[dividerIndex + 1] setFrame:frameB];
-        SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
-    }
-
-    if (_preCollapsePosition)
-        [_preCollapsePositions setObject:_preCollapsePosition forKey:"" + dividerIndex];
+    [_subviews[dividerIndex + 1] setFrame:frameB];
 
     [self setNeedsDisplay:YES];
-
-    if (SPLIT_VIEW_DID_SUPPRESS_RESIZE_NOTIFICATION())
-        [self _postNotificationDidResize];
-    SPLIT_VIEW_SUPPRESS_RESIZE_NOTIFICATIONS(NO);
 }
 
 - (void)setFrameSize:(CGSize)aSize
 {
-    if (_needsRestoreFromAutosave)
-        _shouldAutosave = NO;
-    else
-        [self _adjustSubviewsWithCalculatedSize];
+    [self _adjustSubviewsWithCalculatedSize];
 
     [super setFrameSize:aSize];
 
-    if (_needsRestoreFromAutosave)
-    {
-        _needsRestoreFromAutosave = NO;
-        [self _restoreFromAutosave];
-        _shouldAutosave = YES;
-    }
-
     [self setNeedsDisplay:YES];
 }
 
@@ -773,100 +672,67 @@ var CPSplitViewHorizontalImage = nil,
         return;
     }
 
-    var count = [_subviews count];
-
-    if (!count)
-        return;
-
-    SPLIT_VIEW_MAYBE_POST_WILL_RESIZE();
     [self _postNotificationWillResize];
 
     var index = 0,
+        count = [_subviews count],
         bounds = [self bounds],
-        boundsSize = bounds.size[_sizeComponent],
         dividerThickness = [self dividerThickness],
         totalDividers = count - 1,
-        oldFlexibleSpace = 0,
+        totalSizableSpace = 0,
+        nonSizableSpace = 0,
+        lastSizableIndex = -1,
         totalSizablePanes = 0,
-        isSizableMap = {},
-        viewSizes = [],
-        delegateRespondsToShouldAdjust = [_delegate respondsToSelector:@selector(splitView:shouldAdjustSizeOfSubview:)];
+        isVertical = [self isVertical];
 
-    // What we want to do is to preserve non resizable sizes first, and then to preserve the ratio of size to available
-    // non fixed space for every other subview. E.g. assume fixed space was 20 pixels initially, view 1 was 20 and
-    // view 2 was 30 pixels, for a total of 70 pixels. Then the new total size becomes 140 pixels. Now we want the fixed
-    // space to still be 20 pixels, view 1 to be 48 pixels and view 2 to be 72 pixels. This way the relative size of
-    // view 1 to view 2 remains the same - view 1 was 66% of view 2 initially and after the resize view 1 is still
-    // 66% of view 2's size.
-    //
-    // For this calculation, we can consider the dividers themselves to also be fixed size areas - they should remain
-    // the same size before and after.
-
-    // How much flexible size do we have in pre-resize pixels?
     for (index = 0; index < count; ++index)
     {
         var view = _subviews[index],
-            isSizable = !delegateRespondsToShouldAdjust || [_delegate splitView:self shouldAdjustSizeOfSubview:view],
-            size = [view frame].size[_sizeComponent];
+            isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
 
-        isSizableMap[index] = isSizable;
-
-        viewSizes.push(size);
         if (isSizable)
         {
-            oldFlexibleSpace += size;
+            totalSizableSpace += [view frame].size[_sizeComponent];
+            lastSizableIndex = index;
             totalSizablePanes++;
         }
     }
 
-    // nonSizableSpace is the number of fixed pixels in pre-resize terms and the desired number post-resize.
-    var nonSizableSpace = oldSize[_sizeComponent] - oldFlexibleSpace,
-        newFlexibleSpace = boundsSize - nonSizableSpace,
-        remainingFixedPixelsToRemove = 0;
+    if (totalSizablePanes === count)
+        totalSizableSpace = 0;
 
-    if (newFlexibleSpace < 0)
-    {
-        remainingFixedPixelsToRemove = -newFlexibleSpace;
-        newFlexibleSpace = 0;
-    }
+    var nonSizableSpace = totalSizableSpace ? bounds.size[_sizeComponent] - totalSizableSpace : 0,
+        remainingFlexibleSpace = bounds.size[_sizeComponent] - oldSize[_sizeComponent],
+        oldDimension = (oldSize[_sizeComponent] - totalDividers * dividerThickness - nonSizableSpace),
+        ratio = oldDimension <= 0 ? 0 : (bounds.size[_sizeComponent] - totalDividers * dividerThickness - nonSizableSpace) / oldDimension;
 
-    var remainingFixedPanes = count - totalSizablePanes;
     for (index = 0; index < count; ++index)
     {
         var view = _subviews[index],
             viewFrame = CGRectMakeCopy(bounds),
-            isSizable = isSizableMap[index],
-            targetSize = 0;
+            isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
 
-        // The last area must take up exactly the remaining space, fixed or not.
         if (index + 1 === count)
-            targetSize = boundsSize - viewFrame.origin[_originComponent];
-        // Try to keep fixed size areas the same size.
-        else if (!isSizable)
+            viewFrame.size[_sizeComponent] = bounds.size[_sizeComponent] - viewFrame.origin[_originComponent];
+
+        else if (totalSizableSpace && isSizable && lastSizableIndex === index)
+            viewFrame.size[_sizeComponent] = MAX(0, ROUND([view frame].size[_sizeComponent] + remainingFlexibleSpace))
+
+        else if (isSizable || !totalSizableSpace)
         {
-            var removedFixedPixels = MIN(remainingFixedPixelsToRemove / remainingFixedPanes, viewSizes[index]);
-            targetSize = viewSizes[index] - removedFixedPixels;
-            remainingFixedPixelsToRemove -= removedFixedPixels;
-            remainingFixedPanes--;
+            viewFrame.size[_sizeComponent] = MAX(0, ROUND(ratio * [view frame].size[_sizeComponent]));
+            remainingFlexibleSpace -= (viewFrame.size[_sizeComponent] - [view frame].size[_sizeComponent]);
         }
-        // (new size / flexible size available) == (old size / old flexible size available)
-        else if (oldFlexibleSpace > 0)
-            targetSize = newFlexibleSpace * viewSizes[index] / oldFlexibleSpace;
-        // oldFlexibleSpace <= 0 so all flexible areas were crushed. When we get space, allocate it evenly.
-        // totalSizablePanes cannot be 0 since isSizable.
-        else
-            targetSize = newFlexibleSpace / totalSizablePanes;
 
-        targetSize = MAX(0, ROUND(targetSize));
+        else if (totalSizableSpace && !isSizable)
+            viewFrame.size[_sizeComponent] = [view frame].size[_sizeComponent];
 
-        viewFrame.size[_sizeComponent] = targetSize;
+        bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;
 
         [view setFrame:viewFrame];
-
-        bounds.origin[_originComponent] += targetSize + dividerThickness;
     }
 
-    SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
+    [self _postNotificationDidResize];
 }
 
 /*!
@@ -883,11 +749,6 @@ Notifies the delegate when the subviews will be resized.
 - (void)splitViewWillResizeSubviews:(CPNotification)aNotification;
 @endcode
 
-Allows the delegate to specify which of the CPSplitView's subviews should adjust if the window is resized.
-@code
-- (BOOL)splitView:(CPSplitView)aSplitView shouldAdjustSizeOfSubview:(CPView)aSubView
-@endcode
-
 Lets the delegate specify a different rect for which the user can drag the splitView divider.
 @code
 - (CGRect)splitView:(CPSplitView)aSplitView effectiveRect:(CGRect)aRect forDrawnRect:(CGRect)aDrawnRect ofDividerAtIndex:(int)aDividerIndex;
@@ -970,7 +831,6 @@ The sum of the views and the sum of the dividers should be equal to the size of
     @param CPButtonBar - The supplied button bar.
     @param unsigned int - The divider index the button bar will be assigned to.
 */
-// FIXME Should be renamed to setButtonBar:ofDividerAtIndex:.
 - (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(unsigned)dividerIndex
 {
     if (!aButtonBar)
@@ -1007,125 +867,15 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
 - (void)_postNotificationDidResize
 {
-    [self _autosave];
     [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification object:self];
 }
 
-/*!
-    Set the name under which the split view divider positions is automatically saved to CPUserDefaults.
-
-    @param autosaveName the name to save under or nil to not save
-*/
-- (void)setAutosaveName:(CPString)autosaveName
-{
-    if (_autosaveName == autosaveName)
-        return;
-    _autosaveName = autosaveName;
-}
-
-/*!
-    Get the name under which the split view divider position is automatically saved to CPUserDefaults.
-
-    @return the name to save under or nil if no auto save is active
-*/
-- (CPString)autosaveName
-{
-    return _autosaveName;
-}
-
-/*!
-    @ignore
-*/
-- (void)_autosave
-{
-    if (!_shouldAutosave || !autosaveName)
-        return;
-
-    var userDefaults = [CPUserDefaults standardUserDefaults],
-        autosaveName = [self _framesKeyForAutosaveName:[self autosaveName]],
-        autosavePrecollapseName = [self _precollapseKeyForAutosaveName:[self autosaveName]],
-        count = [_subviews count],
-        positions = [CPMutableArray new],
-        preCollapseArray = [CPMutableArray new];
-
-    for (var i = 0; i < count; i++)
-    {
-        var frame = [_subviews[i] frame];
-        [positions addObject:CPStringFromRect(frame)];
-        [preCollapseArray addObject:[_preCollapsePositions objectForKey:"" + i]];
-    }
-
-    [userDefaults setObject:positions forKey:autosaveName];
-    [userDefaults setObject:preCollapseArray forKey:autosavePrecollapseName];
-}
-
-/*!
-    @ignore
-*/
-- (void)_restoreFromAutosave
-{
-    if (!_autosaveName)
-        return;
-
-    var autosaveName = [self _framesKeyForAutosaveName:[self autosaveName]],
-        autosavePrecollapseName = [self _precollapseKeyForAutosaveName:[self autosaveName]],
-        userDefaults = [CPUserDefaults standardUserDefaults],
-        frames = [userDefaults objectForKey:autosaveName],
-        preCollapseArray = [userDefaults objectForKey:autosavePrecollapseName];
-
-    if (frames)
-    {
-        var dividerThickness = [self dividerThickness],
-            position = 0;
-
-        _shouldAutosave = NO;
-        for (var i = 0, count = [frames count] - 1; i < count; i++)
-        {
-            var frame = CPRectFromString(frames[i]);
-            position += frame.size[_sizeComponent];
-
-            [self setPosition:position ofDividerAtIndex:i];
-
-            position += dividerThickness;
-        }
-        _shouldAutosave = YES;
-    }
-
-    if (preCollapseArray)
-    {
-        _preCollapsePositions = [CPMutableDictionary new];
-        for (var i = 0, count = [preCollapseArray count]; i < count; i++)
-            [_preCollapsePositions setObject:preCollapseArray[i] forKey:i + ""];
-    }
-}
-
-/*!
-    @ignore
-*/
-- (CPString)_framesKeyForAutosaveName:(CPString)theAutosaveName
-{
-    if (!theAutosaveName)
-        return nil;
-    return @"CPSplitView Subview Frames " + theAutosaveName;
-}
-
-/*!
-    @ignore
-*/
-- (CPString)_precollapseKeyForAutosaveName:(CPString)theAutosaveName
-{
-    if (!theAutosaveName)
-        return nil;
-    return @"CPSplitView Subview Precollapse Positions " + theAutosaveName;
-}
-
 @end
 
 var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
     CPSplitViewIsVerticalKey        = "CPSplitViewIsVerticalKey",
     CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey",
-    CPSplitViewButtonBarsKey        = "CPSplitViewButtonBarsKey",
-    CPSplitViewAutosaveNameKey      = "CPSplitViewAutosaveNameKey";
+    CPSplitViewButtonBarsKey        = "CPSplitViewButtonBarsKey";
 
 @implementation CPSplitView (CPCoding)
 
@@ -1139,11 +889,7 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 
     if (self)
     {
-        _suppressResizeNotificationsMask = 0;
-        _preCollapsePositions = [CPMutableDictionary new];
-
         _currentDivider = CPNotFound;
-        _shouldAutosave = YES;
 
         _DOMDividerElements = [];
 
@@ -1153,13 +899,6 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 
         _isPaneSplitter = [aCoder decodeBoolForKey:CPSplitViewIsPaneSplitterKey];
         [self _setVertical:[aCoder decodeBoolForKey:CPSplitViewIsVerticalKey]];
-
-        [self setAutosaveName:[aCoder decodeObjectForKey:CPSplitViewAutosaveNameKey]];
-
-        // We have to wait until we know our frame size before restoring, or the frame resize later will throw
-        // away the restored size.
-        if (_autosaveName)
-            _needsRestoreFromAutosave = YES;
     }
 
     return self;
@@ -1180,8 +919,6 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 
     [aCoder encodeBool:_isVertical forKey:CPSplitViewIsVerticalKey];
     [aCoder encodeBool:_isPaneSplitter forKey:CPSplitViewIsPaneSplitterKey];
-
-    [aCoder encodeObject:_autosaveName forKey:CPSplitViewAutosaveNameKey];
 }
 
 @end

AppKit/CPStepper.j

@@ -25,16 +25,15 @@
 @import <AppKit/CPTextField.j>
 
 
+var CPStepperButtonsSize = CPSizeMake(19, 13);
 
-/*!
-    CPStepper is an implementation of Cocoa NSStepper.
+/*! CPStepper is an  implementation of Cocoa NSStepper.
 
-    This control displays a two part button that can be used to increase or decrease a value with a given interval.
+    This control display a two part button that can be used to increase or decrease a value with a given interval.
 */
 @implementation CPStepper: CPControl
 {
     BOOL        _valueWraps     @accessors(property=valueWraps);
-    BOOL        _autorepeat     @accessors(getter=autorepeat);
     int         _increment      @accessors(property=increment);
     int         _maxValue       @accessors(property=maxValue);
     int         _minValue       @accessors(property=minValue);
@@ -46,8 +45,7 @@
 #pragma mark -
 #pragma mark Initialization
 
-/*!
-    Initializes a CPStepper with given values.
+/*! Initializes a CPStepper with given values
     @param aValue the initial value of the CPStepper
     @param minValue the minimal acceptable value of the stepper
     @param maxValue the maximal acceptable value of the stepper
@@ -55,7 +53,7 @@
 */
 + (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
 {
-    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMake(0, 0, 19, 25)];
+    var stepper = [[CPStepper alloc] initWithFrame:CPRectMake(0, 0, 19, 25)];
     [stepper setDoubleValue:aValue];
     [stepper setMinValue:aMinValue];
     [stepper setMaxValue:aMaxValue];
@@ -63,12 +61,10 @@
     return stepper;
 }
 
-/*!
-    Initializes a CPStepper with default values:
+/*! Initializes a CPStepper with default values:
         - minValue = 0.0
         - maxValue = 59.0
         - value = 0.0
-
     @return Initialized CPStepper
 */
 + (CPStepper)stepper
@@ -76,8 +72,7 @@
     return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
 }
 
-/*!
-    Initializes a CPStepper.
+/*! Initializes the CPStepper
     @param aFrame the frame of the control
     @return initialized CPStepper
 */
@@ -89,43 +84,33 @@
         _minValue       = 0.0;
         _increment      = 1.0;
         _valueWraps     = YES;
-        _autorepeat     = YES;
 
         [self setDoubleValue:0.0];
-        [self _init];
+
+        _buttonUp = [[CPButton alloc] initWithFrame:CPRectMake(aFrame.size.width - CPStepperButtonsSize.width, 0, CPStepperButtonsSize.width, CPStepperButtonsSize.height)];
+        [_buttonUp setContinuous:YES];
+        [_buttonUp setTarget:self];
+        [_buttonUp setAction:@selector(_buttonDidClick:)];
+        [_buttonUp setAutoresizingMask:CPViewNotSizable];
+        [self addSubview:_buttonUp];
+
+        _buttonDown = [[CPButton alloc] initWithFrame:CPRectMake(aFrame.size.width - CPStepperButtonsSize.width, CPStepperButtonsSize.height, CPStepperButtonsSize.width, CPStepperButtonsSize.height - 1)];
+        [_buttonDown setContinuous:YES];
+        [_buttonDown setTarget:self];
+        [_buttonDown setAction:@selector(_buttonDidClick:)];
+        [_buttonDown setAutoresizingMask:CPViewNotSizable];
+        [self addSubview:_buttonDown];
+
+        [self setNeedsLayout];
     }
 
     return self;
 }
 
-/*! @ignore */
-
-- (void)_init
-{
-    _buttonUp = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
-    [_buttonUp setContinuous:_autorepeat];
-    [_buttonUp setTarget:self];
-    [_buttonUp setAction:@selector(_buttonDidClick:)];
-    [_buttonUp setAutoresizingMask:CPViewNotSizable];
-    [self addSubview:_buttonUp];
-
-    _buttonDown = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
-    [_buttonDown setContinuous:_autorepeat];
-    [_buttonDown setTarget:self];
-    [_buttonDown setAction:@selector(_buttonDidClick:)];
-    [_buttonDown setAutoresizingMask:CPViewNotSizable];
-
-    [self setContinuous:_autorepeat];
-    [self addSubview:_buttonDown];
-
-    [self setNeedsLayout];
-}
-
 #pragma mark -
 #pragma mark Superclass overrides
 
-/*!
-    Set if the CPStepper is enabled or not.
+/*! set if the CPStepper is enabled or not
     @param shouldEnabled BOOL that define if stepper is enabled or not.
 */
 - (void)setEnabled:(BOOL)shouldEnabled
@@ -136,30 +121,19 @@
     [_buttonDown setEnabled:shouldEnabled];
 }
 
-
+/*! set the frame of the CPStepper and check if width is not smaller than theme min-size
+    @param aFrame the frame
+*/
 - (void)setFrame:(CGRect)aFrame
 {
-    var upSize = [self valueForThemeAttribute:@"up-button-size"],
-        downSize = [self valueForThemeAttribute:@"down-button-size"],
-        minSize = _CGSizeMake(upSize.width, upSize.height + downSize.height),
-        frame = _CGRectMakeCopy(aFrame);
-
-    frame.size.width = Math.max(minSize.width, frame.size.width);
-    frame.size.height = Math.max(minSize.height, frame.size.height);
-    [super setFrame:frame];
+    if (aFrame.size.width >= CGRectGetWidth(aFrame))
+        [super setFrame:aFrame];
 }
 
-/*! @ignore */
+/*! @ignore
+*/
 - (void)layoutSubviews
 {
-    var aFrame = [self frame],
-        upSize = [self valueForThemeAttribute:@"up-button-size"],
-        downSize = [self valueForThemeAttribute:@"down-button-size"],
-        upFrame = _CGRectMake(aFrame.size.width - upSize.width, 0, upSize.width, upSize.height),
-        downFrame = _CGRectMake(aFrame.size.width - downSize.width, upSize.height, downSize.width, downSize.height);
-    [_buttonUp setFrame:upFrame];
-    [_buttonDown setFrame:downFrame];
-
     [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
     [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
     [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
@@ -168,23 +142,16 @@
     [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
 }
 
-/*!
-    Set if CPStepper should autorepeat.
+/*! set if CPStepper should autorepeat
     @param shouldAutoRepeat if YES, the first mouse down does one increment (decrement) and, after each delay of 0.5 seconds
 */
 - (void)setAutorepeat:(BOOL)shouldAutoRepeat
 {
-    if (shouldAutoRepeat !== _autorepeat)
-    {
-        [_buttonUp setContinuous:shouldAutoRepeat];
-        [_buttonDown setContinuous:shouldAutoRepeat];
-    }
-
-    [self setContinuous:shouldAutoRepeat];
+    [_buttonUp setContinuous:shouldAutoRepeat];
+    [_buttonDown setContinuous:shouldAutoRepeat];
 }
 
-/*!
-    Set the current value of the stepper.
+/*! set the current value of the stepper
     @param aValue a float containing the value
 */
 - (void)setDoubleValue:(float)aValue
@@ -200,7 +167,8 @@
 #pragma mark -
 #pragma mark Actions
 
-/*! @ignore */
+/*! @ignore
+*/
 - (IBAction)_buttonDidClick:(id)aSender
 {
     if (![self isEnabled])
@@ -215,8 +183,7 @@
         [self sendAction:_action to:_target];
 }
 
-/*!
-    Perform a programatic click on up button.
+/*! @perform a programatic click on up button
     @param aSender sender of the action
 */
 - (IBAction)performClickUp:(id)aSender
@@ -224,8 +191,7 @@
     [_buttonUp performClick:aSender];
 }
 
-/*!
-    Perform a programatic click on down button.
+/*! @perform a programatic click on down button
     @param aSender sender of the action
 */
 - (IBAction)performClickDown:(id)aSender
@@ -244,33 +210,25 @@
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], _CGSizeMakeZero(), _CGSizeMakeZero()]
-                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button", @"up-button-size", @"down-button-size"]];
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null]]
+                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button"]];
 }
 
 @end
 
-var CPStepperMinValue   = @"CPStepperMinValue",
-    CPStepperMaxValue   = @"CPStepperMaxValue",
-    CPStepperValueWraps = @"CPStepperValueWraps",
-    CPStepperAutorepeat = @"CPStepperAutorepeat",
-    CPStepperIncrement  = @"CPStepperIncrement";
 
-@implementation CPStepper (CPCoding)
+@implementation CPStepper (CPCodingCompliance)
 
 - (id)initWithCoder:(CPCoder)aCoder
 {
     if (self = [super initWithCoder:aCoder])
     {
-        _increment  = [aCoder decodeIntForKey:CPStepperIncrement];
-        _minValue   = [aCoder decodeIntForKey:CPStepperMinValue] || 0;
-        _maxValue   = [aCoder decodeIntForKey:CPStepperMaxValue] || 0;
-        _valueWraps = [aCoder decodeBoolForKey:CPStepperValueWraps] || NO;
-        _autorepeat = [aCoder decodeBoolForKey:CPStepperAutorepeat] || NO;
-
-        [self _init];
+        _maxValue   = [aCoder decodeObjectForKey:@"_maxValue"];
+        _minValue   = [aCoder decodeObjectForKey:@"_minValue"];
+        _increment  = [aCoder decodeObjectForKey:@"_increment"];
+        _buttonUp   = [aCoder decodeObjectForKey:@"_buttonUp"];
+        _buttonDown = [aCoder decodeObjectForKey:@"_buttonDown"];
     }
-
     return self;
 }
 
@@ -278,16 +236,11 @@ var CPStepperMinValue   = @"CPStepperMinValue",
 {
     [super encodeWithCoder:aCoder];
 
-    [aCoder encodeInt:_increment forKey:CPStepperIncrement];
-
-    if (_minValue)
-        [aCoder encodeInt:_minValue forKey:CPStepperMinValue];
-    if (_maxValue)
-        [aCoder encodeInt:_maxValue forKey:CPStepperMaxValue];
-    if (_valueWraps)
-        [aCoder encodeBool:_valueWraps forKey:CPStepperValueWraps];
-    if (_autorepeat)
-        [aCoder encodeBool:_autorepeat forKey:CPStepperAutorepeat];
+    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
+    [aCoder encodeObject:_minValue forKey:@"_minValue"];
+    [aCoder encodeObject:_increment forKey:@"_increment"];
+    [aCoder encodeObject:_buttonUp forKey:@"_buttonUp"];
+    [aCoder encodeObject:_buttonDown forKey:@"_buttonDown"];
 }
 
 @end

AppKit/CPString+Additions.j

@@ -0,0 +1,72 @@
+/*
+ * CPString+Additions.j
+ * AppKit
+ *
+ * Created by Randy Luecke
+ * Copyright 2011, RCLConcepts, LLC.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+/*
+    AppKit adds two methods to the CPString class to support drawing string directly in an CPView.
+
+    AppKit also adds similar methods to CPAttributedString.
+    The two drawing methods draw a string object with a single set of attributes that apply to the entire string.
+    To draw a string with multiple attributes, such as multiple text fonts, you must use an attributed string.
+*/
+@implementation CPString (AppKitAdditions)
+
+/*!
+    Draws a string in the current graphics context.
+    This method applies the attributes to the entier string
+    and displays it on a single "infinately long" line.
+
+    @param aPoint - The starting point to draw the string
+    @param attributes - the dictionary of attributes to apply to the string
+*/
+- (void)drawAtPoint:(CGPoint)aPoint withAttributes:(CPDictionary)attributes
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        run = _CTRunCreate([self copy], attributes);
+
+    CGContextSetTextPosition(context, aPoint.x, aPoint.y);
+    CTRunDraw(run, context, nil);
+}
+
+/*!
+    Draws a string in the current graphics context.
+    This method applies the attributes to the entier string
+    and displays it within the given rect.
+
+    @param aRect - The rect for which the string should be drawn into
+    @param attributes - the dictionary of attributes to apply to the string
+*/
+- (void)drawInRect:(CGRect)aRect withAttributes:(CPDictionary)attributes
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        string = [[CPAttributedString alloc] initWithString:self attributes:attributes];
+        frameSetter = CTFramesetterCreateWithAttributedString(string),
+        path = CGPathCreateMutable();
+
+    CGPathAddRect(path, nil, aRect);
+    
+    var frame = CTFramesetterCreateFrame(frameSetter, CPMakeRange(0, [string length]), path, nil);
+
+    CTFrameDraw(frame, context);
+}
+
+@end

AppKit/CPTabView.j

@@ -1,25 +1,3 @@
-/*
- * CPTabView.j
- * AppKit
- *
- * Created by Derek Hammer.
- * Copyright 2010, Derek Hammer.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
 @import "CPBox.j"
 @import "CPSegmentedControl.j"
 @import "CPTabViewItem.j"
@@ -67,6 +45,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     if (self = [super initWithFrame:aFrame])
     {
         _items = [CPArray array];
+        _selectedIndex = CPNotFound;
 
         [self _init];
         [self setTabViewType:CPTopTabsBezelBorder];
@@ -77,8 +56,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 
 - (void)_init
 {
-    _selectedIndex = CPNotFound;
-
     _tabs = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
     [_tabs setHitTests:NO];
 
@@ -275,6 +252,8 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (void)selectTabViewItemAtIndex:(unsigned)anIndex
 {
+    var aTabViewItem = [_items objectAtIndex:anIndex];
+
     if (anIndex === _selectedIndex)
         return;
 
@@ -299,10 +278,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (CPTabViewItem)selectedTabViewItem
 {
-    if (_selectedIndex != CPNotFound)
-        return [_items objectAtIndex:_selectedIndex];
-
-    return nil;
+    return [_items objectAtIndex:_selectedIndex];
 }
 
 // Modifying the font
@@ -452,12 +428,8 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 - (void)_setSelectedIndex:(CPNumber)index
 {
     _selectedIndex = index;
-    [self _setContentViewForItem:[_items objectAtIndex:_selectedIndex]];
-}
 
-- (void)_setContentViewForItem:(CPTabViewItem)anItem
-{
-    [_box setContentView:[anItem view]];
+    [_box setContentView:[[_items objectAtIndex:_selectedIndex] view]];
 }
 
 - (void)_updateItems
@@ -497,17 +469,17 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
         [_tabs setFont:_font];
 
         _items = [aCoder decodeObjectForKey:CPTabViewItemsKey];
-        [_items makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
 
         [self _updateItems];
         [self _repositionTabs];
 
-        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
-
         var selected = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
+
         if (selected)
             [self selectTabViewItem:selected];
 
+        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
+
         [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
     }
 
@@ -519,10 +491,7 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
     [super encodeWithCoder:aCoder];
 
     [aCoder encodeObject:_items forKey:CPTabViewItemsKey];
-
-    var selected = [self selectedTabViewItem];
-    if (selected)
-        [aCoder encodeObject:selected forKey:CPTabViewSelectedItemKey];
+    [aCoder encodeObject:[self selectedTabViewItem] forKey:CPTabViewSelectedItemKey];
 
     [aCoder encodeInt:_type forKey:CPTabViewTypeKey];
     [aCoder encodeObject:_font forKey:CPTabViewFontKey];

AppKit/CPTabViewItem.j

@@ -132,13 +132,7 @@ CPPressedTab    = 2;
 */
 - (void)setView:(CPView)aView
 {
-    if (_view == aView)
-        return;
-
     _view = aView;
-
-    if ([_tabView selectedTabViewItem] == self)
-        [_tabView _setContentViewForItem:self];
 }
 
 /*!

AppKit/CPTableColumn.j

@@ -132,7 +132,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 {
     var min = [self minWidth],
         max = [self maxWidth],
-        newWidth = ROUND(MIN(MAX(width, min), max));
+        newWidth = MIN(MAX(width, min), max);
 
     [self setWidth:newWidth];
 
@@ -594,22 +594,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
 
     if (![aBinding isEqual:@"someListOfExceptedBindings(notAcceptedBindings)"])
-    {
-        // Bind the table to the array controller this column is bound to.
-        // Note that anObject might not be the array controller. E.g. the keypath could be something like
-        // somePathTo.anArrayController.arrangedObjects.aKey. Cocoa doesn't support this but it is consistent
-        // and it makes sense.
-        var acIndex = aKeyPath.lastIndexOf("arrangedObjects."),
-            arrayController = anObject;
-
-        if (acIndex > 1)
-        {
-            var firstPart = aKeyPath.substring(0, acIndex - 1);
-            arrayController = [anObject valueForKeyPath:firstPart];
-        }
-
-        [[self tableView] _establishBindingsIfUnbound:arrayController];
-    }
+        [[self tableView] _establishBindingsIfUnbound:anObject];
 }
 
 /*!
@@ -734,6 +719,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
         [self setIdentifier:[aCoder decodeObjectForKey:CPTableColumnIdentifierKey]];
         [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
         [self setDataView:[aCoder decodeObjectForKey:CPTableColumnDataViewKey]];
+        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
 
         _resizingMask  = [aCoder decodeIntForKey:CPTableColumnResizingMaskKey];
         _isHidden = [aCoder decodeBoolForKey:CPTableColumnIsHiddenKey];

AppKit/CPTableHeaderView.j

@@ -643,7 +643,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         columnMaxX = _CGRectGetMaxX(columnToStroke);
 
         CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)) - 1.0);
+        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)));
     }
     CGContextClosePath(context);
     CGContextStrokePath(context);

AppKit/CPTableView.j

@@ -87,9 +87,9 @@ CPTableViewSelectionHighlightStyleNone = -1;
 CPTableViewSelectionHighlightStyleRegular = 0;
 CPTableViewSelectionHighlightStyleSourceList = 1;
 
-CPTableViewGridNone                     = 0;
-CPTableViewSolidVerticalGridLineMask    = 1 << 0;
-CPTableViewSolidHorizontalGridLineMask  = 1 << 1;
+CPTableViewGridNone                    = 0;
+CPTableViewSolidVerticalGridLineMask   = 1 << 0;
+CPTableViewSolidHorizontalGridLineMask = 1 << 1;
 
 CPTableViewNoColumnAutoresizing = 0;
 CPTableViewUniformColumnAutoresizingStyle = 1; // FIX ME: This is FUBAR
@@ -509,11 +509,6 @@ NOT YET IMPLEMENTED
     _objectValues = { };
     _cachedRowHeights = [];
 
-    // Otherwise, if we have a row marked as group with a
-    // index greater than the new number or rows
-    // it keeps the the graphical group style.
-    [_groupRows removeAllIndexes];
-
     // This updates the size too.
     [self noteNumberOfRowsChanged];
 
@@ -683,7 +678,6 @@ NOT YET IMPLEMENTED
 */
 - (void)setRowHeight:(unsigned)aRowHeight
 {
-    // Accept row heights such as "0".
     aRowHeight = +aRowHeight;
 
     if (_rowHeight === aRowHeight)
@@ -769,6 +763,10 @@ NOT YET IMPLEMENTED
 */
 - (void)setSelectionHighlightStyle:(unsigned)aSelectionHighlightStyle
 {
+    //early return for IE.
+    if (aSelectionHighlightStyle == CPTableViewSelectionHighlightStyleSourceList && !CPFeatureIsCompatible(CPHTMLCanvasFeature))
+        return;
+
     _selectionHighlightStyle = aSelectionHighlightStyle;
     [self setNeedsDisplay:YES];
 
@@ -955,7 +953,6 @@ NOT YET IMPLEMENTED
 */
 - (void)_moveColumn:(unsigned)fromIndex toColumn:(unsigned)toIndex
 {
-    // Convert parameters such as "0" to 0.
     fromIndex = +fromIndex;
     toIndex = +toIndex;
 
@@ -1513,8 +1510,6 @@ NOT YET IMPLEMENTED
 
     if ([scrollView isKindOfClass:[CPScrollView class]] && [scrollView documentView] === self)
         [scrollView _updateCornerAndHeaderView];
-
-    [self setNeedsLayout];
 }
 
 // Complexity:
@@ -1566,7 +1561,6 @@ NOT YET IMPLEMENTED
 */
 - (CGRect)rectOfColumn:(CPInteger)aColumnIndex
 {
-    // Convert e.g. "0" to 0.
     aColumnIndex = +aColumnIndex;
 
     if (aColumnIndex < 0 || aColumnIndex >= NUMBER_OF_COLUMNS())
@@ -1796,7 +1790,7 @@ NOT YET IMPLEMENTED
 {
     if (_implementedDelegateMethods & CPTableViewDelegate_tableView_heightOfRow_)
     {
-            return [_cachedRowHeights indexOfObject:aPoint
+            return idx = [_cachedRowHeights indexOfObject:aPoint
                                             inSortedRange:nil
                                                   options:0
                                           usingComparator:function(aPoint, rowCache)
@@ -1990,7 +1984,7 @@ NOT YET IMPLEMENTED
     // so we should size the last resized to fit
 
     // find the last visisble column
-    while (count-- && [_tableColumns[count] isHidden]);
+    while (count-- && [_tableColumns[count] isHidden]) ;
 
     // find the max x, but subtract a single pixel since the spacing isn't applicable here.
     var delta = superviewWidth - _CGRectGetMaxX([self rectOfColumn:count]) - ([self intercellSpacing].width || 1),
@@ -2776,7 +2770,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes atPoint:(CGPoint)mouseDownPoint
 {
-    return [rowIndexes count] > 0 && [self numberOfRows] > 0;
+    return YES;
 }
 
 /*!
@@ -3050,6 +3044,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     return _sortDescriptors;
 }
 
+
 /*!
     @ignore
 */
@@ -3430,6 +3425,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         [aTableColumn setDataView:dataView];
     }
 
+
     return [aTableColumn _newDataViewForRow:aRow];
 }
 
@@ -3501,20 +3497,8 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 {
     [super setNeedsDisplay:aFlag];
     [_tableDrawView setNeedsDisplay:aFlag];
-
-    [[self headerView] setNeedsDisplay:YES];
 }
 
-/*!
-    @ignore
-*/
-- (void)setNeedsLayout
-{
-    [super setNeedsLayout];
-    [[self headerView] setNeedsLayout];
-}
-
-
 /*!
     @ignore
 */
@@ -3560,16 +3544,16 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     }
 
     var exposedRows = [self _unboundedRowsInRect:aRect],
-        firstRow = FLOOR(exposedRows.location / colorCount) * colorCount,
         lastRow = CPMaxRange(exposedRows),
         colorIndex = 0,
-        groupRowRects = [];
+        groupRowRects = [],
+        row = exposedRows.location;
 
     //loop through each color so we only draw once for each color
     while (colorIndex < colorCount)
     {
         CGContextBeginPath(context);
-        for (var row = firstRow + colorIndex; row <= lastRow; row += colorCount)
+        for (var row = colorIndex; row <= lastRow; row += colorCount)
         {
             // if it's not a group row draw it otherwise we draw it later
             if (![_groupRows containsIndex:row])
@@ -3701,7 +3685,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     if (!count)
         return;
 
-    var drawGradient = (CPFeatureIsCompatible(CPHTMLCanvasFeature) && _selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList && [_selectedRowIndexes count] >= 1),
+    var drawGradient = (_selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList && [_selectedRowIndexes count] >= 1),
         deltaHeight = 0.5 * (_gridStyleMask & CPTableViewSolidHorizontalGridLineMask);
 
     CGContextBeginPath(context);
@@ -3721,7 +3705,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     {
         var topGroupLineColor = [CPColor colorWithCalibratedWhite:212.0 / 255.0 alpha:1.0],
             bottomGroupLineColor = [CPColor colorWithCalibratedWhite:185.0 / 255.0 alpha:1.0],
-            gradientGroupColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [212.0 / 255.0, 212.0 / 255.0, 212.0 / 255.0, 1.0, 197.0 / 255.0, 197.0 / 255.0, 197.0 / 255.0, 1.0], [0, 1], 2);
+            gradientGroupColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [212.0 / 255.0, 212.0 / 255.0, 212.0 / 255.0,1.0, 197.0 / 255.0, 197.0 / 255.0, 197.0 / 255.0,1.0], [0,1], 2);
     }
 
     while (count--)
@@ -3828,7 +3812,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (void)_drawGroupRowsForRects:(CPArray)rects
 {
-    if ((CPFeatureIsCompatible(CPHTMLCanvasFeature) && _selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList) || !rects.length)
+    if (_selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList || !rects.length)
         return;
 
     var context = [[CPGraphicsContext currentContext] graphicsPort],
@@ -3839,8 +3823,8 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     var gradientCache = [self selectionGradientColors],
         topLineColor = [CPColor colorWithHexString:"d3d3d3"],
         bottomLineColor = [CPColor colorWithHexString:"bebebd"],
-        gradientColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [220.0 / 255.0, 220.0 / 255.0, 220.0 / 255.0, 1.0,
-                                                                                            199.0 / 255.0, 199.0 / 255.0, 199.0 / 255.0, 1.0], [0, 1], 2),
+        gradientColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [220.0 / 255.0, 220.0 / 255.0, 220.0 / 255.0,1.0,
+                                                                                            199.0 / 255.0, 199.0 / 255.0, 199.0 / 255.0,1.0], [0,1], 2),
         drawGradient = YES;
 
     while (i--)
@@ -3988,7 +3972,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 {
     var row = [self rowAtPoint:aPoint];
 
-    // If the user clicks outside a row then deselect everything.
+    //if the user clicks outside a row then deselect everything
     if (row < 0 && _allowsEmptySelection)
         [self selectRowIndexes:[CPIndexSet indexSet] byExtendingSelection:NO];
 
@@ -4625,7 +4609,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
             }
             _wasSelectionBroken = true;
         }
-        else if (_wasSelectionBroken && ((shouldGoUpward && i !== [selectedIndexes firstIndex]) || (!shouldGoUpward && i !== [selectedIndexes lastIndex])))
+        else if (_wasSelectionBroken && ((shouldGoUpward && i !== [selectedIndexes firstIndex]) || (!shouldGoUpward && i !== [selectedIndexes lastindex])))
         {
             shouldGoUpward ? i = [selectedIndexes firstIndex] - 1 : i = [selectedIndexes lastIndex];
             _wasSelectionBroken = false;
@@ -4653,19 +4637,19 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         while (![_delegate tableView:self shouldSelectRow:i] && (i < [self numberOfRows] || i > 0))
             shouldGoUpward ? i-- : i++; //check to see if the row can be selected if it can't be then see if the next row can be selected
 
-        // If the index still can be selected after the loop then just return.
-        if (![_delegate tableView:self shouldSelectRow:i])
-            return;
+        //if the index still can be selected after the loop then just return
+         if (![_delegate tableView:self shouldSelectRow:i])
+             return;
     }
 
-    // If we go upward and see that this row is already selected we should deselect the row below.
-    if (extend && [selectedIndexes containsIndex:i])
+    // if we go upward and see that this row is already selected we should deselect the row below
+    if ([selectedIndexes containsIndex:i] && extend)
     {
-        // The row we're on is the last to be selected.
+        // the row we're on is the last to be selected
         var differedLastSelectedRow = i;
 
         // no remove the one before/after it
-        shouldGoUpward ? i++ : i--;
+        shouldGoUpward ? i++  : i--;
 
         [selectedIndexes removeIndex:i];
 
@@ -4677,7 +4661,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         if ([selectedIndexes containsIndex:i])
         {
             i = shouldGoUpward ? [selectedIndexes firstIndex] -1 : [selectedIndexes lastIndex] + 1;
-            i = MIN(MAX(i, 0), [self numberOfRows] - 1);
+            i = MIN(MAX(i,0), [self numberOfRows] - 1);
         }
 
         [selectedIndexes addIndex:i];
@@ -4954,17 +4938,15 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
 
     isBlinking = YES;
 
-    var showCallback = function()
-    {
+    var showCallback = function() {
         objj_msgSend(self, "setHidden:", NO)
         isBlinking = NO;
-    };
+    }
 
-    var hideCallback = function()
-    {
+    var hideCallback = function() {
         objj_msgSend(self, "setHidden:", YES)
         isBlinking = YES;
-    };
+    }
 
     objj_msgSend(self, "setHidden:", YES);
     [CPTimer scheduledTimerWithTimeInterval:0.1 callback:showCallback repeats:NO];

AppKit/CPTextField.j

@@ -1,3 +1,4 @@
+
 /*
  * CPTextField.j
  * AppKit
@@ -20,15 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "../Foundation/Ref.h"
-
 @import "CPControl.j"
 @import "CPStringDrawing.j"
 @import "CPCompatibility.j"
 @import "_CPImageAndTextView.j"
 
 
-CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with squared corners. */
+CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with a squared corners. */
 CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corners. */
 
 CPTextFieldDidFocusNotification = @"CPTextFieldDidFocusNotification";
@@ -84,11 +83,12 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     CPColor                 _textFieldBackgroundColor;
 
-    CPString                _placeholderString;
-    CPString                _stringValue;
+    id                      _placeholderString;
 
     id                      _delegate;
 
+    CPString                _textDidChangeValue;
+
     // NS-style Display Properties
     CPTextFieldBezelStyle   _bezelStyle;
     BOOL                    _isBordered;
@@ -202,14 +202,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             CPTextFieldInputDidBlur = YES;
 
             return true;
-        };
+        }
 
         CPTextFieldHandleBlur = function(anEvent)
         {
             CPTextFieldInputOwner = nil;
 
             [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-        };
+        }
 
         //FIXME make this not onblur
         CPTextFieldDOMInputElement.onblur = CPTextFieldBlurFunction;
@@ -481,17 +481,17 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [self setNeedsLayout];
 
     _isEditing = NO;
-    _stringValue = [self stringValue];
 
 #if PLATFORM(DOM)
 
-    var element = [self _inputElement],
+    var string = [self stringValue],
+        element = [self _inputElement],
         font = [self currentValueForThemeAttribute:@"font"];
 
     // generate the font metric
     [font _getMetrics];
 
-    element.value = _stringValue;
+    element.value = string;
     element.style.color = [[self currentValueForThemeAttribute:@"text-color"] cssString];
     element.style.font = [font cssString];
     element.style.zIndex = 1000;
@@ -548,6 +548,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         CPTextFieldInputOwner = self;
     }, 0.0);
 
+    element.value = [self stringValue];
+
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 
     CPTextFieldInputIsActive = YES;
@@ -570,39 +572,17 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 {
     [self unsetThemeState:CPThemeStateEditing];
 
-#if PLATFORM(DOM)
-
-    var element = [self _inputElement],
-        newValue = element.value,
-        error = @"";
-
-    if (newValue !== _stringValue)
-    {
-        [self _setStringValue:newValue];
-    }
-
-    // If there is a formatter, always give it a chance to reject the resignation,
-    // even if the value has not changed.
-    if ([self _valueIsValid:newValue] === NO)
-    {
-        [self setThemeState:CPThemeStateEditing];
-        element.focus();
-        return NO;
-    }
-
-#endif
-
-    // Cache the formatted string
-    _stringValue = [self stringValue];
-
-    _willBecomeFirstResponderByClick = NO;
-
     [self _updatePlaceholderState];
 
     [self setNeedsLayout];
 
 #if PLATFORM(DOM)
 
+    var element = [self _inputElement];
+
+    if ([self stringValue] !== element.value)
+        [self _setStringValue:element.value];
+
     CPTextFieldInputResigning = YES;
 
     if (CPTextFieldInputIsActive)
@@ -630,7 +610,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 #endif
 
-    // post CPControlTextDidEndEditingNotification
+    //post CPControlTextDidEndEditingNotification
     if (_isEditing)
     {
         _isEditing = NO;
@@ -645,28 +625,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return YES;
 }
 
-- (BOOL)_valueIsValid:(CPString)aValue
-{
-#if PLATFORM(DOM)
-
-    var error = @"";
-
-    if ([self _setStringValue:aValue isNewValue:NO errorDescription:AT_REF(error)] === NO)
-    {
-        var acceptInvalidValue = NO;
-
-        if ([_delegate respondsToSelector:@selector(control:didFailToFormatString:errorDescription:)])
-            acceptInvalidValue = [_delegate control:self didFailToFormatString:[self _inputElement] errorDescription:error];
-
-        if (acceptInvalidValue === NO)
-            return NO;
-    }
-
-#endif
-
-    return YES;
-}
-
 /*!
     Text fields require panels to become key window, so this returns \c YES.
 */
@@ -727,14 +685,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)keyUp:(CPEvent)anEvent
 {
-#if PLATFORM(DOM)
+    var oldValue = [self stringValue];
+    [self _setStringValue:[self _inputElement].value];
 
-    var newValue = [self _inputElement].value;
-
-    if (newValue !== _stringValue)
+    if (oldValue !== [self stringValue])
     {
-        [self _setStringValue:newValue];
-
         if (!_isEditing)
         {
             _isEditing = YES;
@@ -744,13 +699,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
     }
 
-#endif
-
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 }
 
 - (void)keyDown:(CPEvent)anEvent
 {
+    if ([anEvent _couldBeKeyEquivalent] && [self performKeyEquivalent:anEvent])
+        return;
+
     // CPTextField uses an HTML input element to take the input so we need to
     // propagate the dom event so the element is updated. This has to be done
     // before interpretKeyEvents: though so individual commands have a chance
@@ -779,60 +735,26 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)insertNewline:(id)sender
 {
-    var newValue = [self _inputElement].value;
-
-    if (newValue !== _stringValue)
+    if (_isEditing)
     {
-        [self _setStringValue:newValue];
+        _isEditing = NO;
+        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
     }
 
-    if ([self _valueIsValid:_stringValue])
-    {
-        // If _isEditing == YES then the target action can also be called via
-        // resignFirstResponder, and it is possible that the target action
-        // itself will change this textfield's responder status, so start by
-        // setting the _isEditing flag to NO to prevent the target action being
-        // called twice (once below and once from resignFirstResponder).
-        if (_isEditing)
-        {
-            _isEditing = NO;
-            [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
-        }
-
-        // If there is no target action, or the sendAction call returns
-        // success.
-        if (![self action] || [self sendAction:[self action] to:[self target]])
-        {
-            [self selectAll:nil];
-        }
-    }
+    [self sendAction:[self action] to:[self target]];
+    [self selectText:nil];
 
     [[[self window] platformWindow] _propagateCurrentDOMEvent:NO];
 }
 
 - (void)insertNewlineIgnoringFieldEditor:(id)sender
 {
-    [self _insertCharacterIgnoringFieldEditor:CPNewlineCharacter];
-}
+    var oldValue = [self stringValue];
 
-- (void)insertTabIgnoringFieldEditor:(id)sender
-{
-    [self _insertCharacterIgnoringFieldEditor:CPTabCharacter];
-}
+    [self _inputElement].value += CPNewlineCharacter;
+    [self _setStringValue:[self _inputElement].value];
 
-- (void)_insertCharacterIgnoringFieldEditor:(CPString)aCharacter
-{
-#if PLATFORM(DOM)
-
-    var oldValue = _stringValue,
-        range = [self selectedRange],
-        element = [self _inputElement];
-
-    element.value = [element.value stringByReplacingCharactersInRange:[self selectedRange] withString:aCharacter];
-    [self _setStringValue:element.value];
-
-    // NOTE: _stringValue is now the current input element value
-    if (oldValue !== _stringValue)
+    if (oldValue !== [self stringValue])
     {
         if (!_isEditing)
         {
@@ -842,8 +764,25 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
         [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
     }
+}
 
-#endif
+- (void)insertTabIgnoringFieldEditor:(id)sender
+{
+    var oldValue = [self stringValue];
+
+    [self _inputElement].value += CPTabCharacter;
+    [self _setStringValue:[self _inputElement].value];
+
+    if (oldValue !== [self stringValue])
+    {
+        if (!_isEditing)
+        {
+            _isEditing = YES;
+            [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
+        }
+
+        [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
+    }
 }
 
 - (void)textDidBlur:(CPNotification)note
@@ -874,8 +813,15 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [super textDidChange:note];
 }
 
+- (void)sendAction:(SEL)anAction to:(id)anObject
+{
+    [self _reverseSetBinding];
+
+    [CPApp sendAction:anAction to:anObject from:self];
+}
+
 /*!
-    Returns the string in the text field.
+    Returns the string the text field.
 */
 - (id)objectValue
 {
@@ -884,84 +830,24 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 /*
     @ignore
-    Sets the internal string value without updating the value in the input element.
-    This should only be invoked when the underlying text element's value has changed.
+    Sets the internal string value without updating the value in the input element
 */
-- (BOOL)_setStringValue:(CPString)aValue
+- (void)_setStringValue:(id)aValue
 {
-    return [self _setStringValue:aValue isNewValue:YES errorDescription:nil];
-}
-
-/*
-    @ignore
-    Sets the internal string value without updating the value in the input element.
-    If there is a formatter and formatting fails, returns NO. Otherwise returns YES.
-*/
-- (BOOL)_setStringValue:(CPString)aValue isNewValue:(BOOL)isNewValue errorDescription:(CPStringRef)anError
-{
-    _stringValue = aValue;
-
-    var objectValue = aValue,
-        formatter = [self formatter],
-        result = YES;
-
-    if (formatter)
-    {
-        var object = nil;
-
-        if ([formatter getObjectValue:AT_REF(object) forString:aValue errorDescription:anError])
-            objectValue = object;
-        else
-        {
-            objectValue = undefined;  // Mark the value as invalid
-            result = NO;
-        }
-
-        isNewValue |= objectValue !== [super objectValue];
-    }
-
-    if (isNewValue)
-    {
-        [self willChangeValueForKey:@"objectValue"];
-        [super setObjectValue:objectValue];
-        [self _updatePlaceholderState];
-        [self didChangeValueForKey:@"objectValue"];
-    }
-
-    return result;
+    [self willChangeValueForKey:@"objectValue"];
+    [super setObjectValue:String(aValue)];
+    [self _updatePlaceholderState];
+    [self didChangeValueForKey:@"objectValue"];
 }
 
 - (void)setObjectValue:(id)aValue
 {
     [super setObjectValue:aValue];
 
-    var formatter = [self formatter];
-
-    if (formatter)
-    {
-        // If there is a formatter, make sure the object value can be formatted successfully
-        var formattedString = [self hasThemeState:CPThemeStateEditing] ? [formatter editingStringForObjectValue:aValue] : [formatter stringForObjectValue:aValue];
-
-        if (formattedString === nil)
-        {
-            var value = nil;
-
-            // Formatting failed, get an "empty" object by formatting an empty string.
-            // If that fails, the value is undefined.
-            if ([formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
-                value = undefined;
-
-            [super setObjectValue:value];
-        }
-    }
-
-    _stringValue = [self stringValue];
-
 #if PLATFORM(DOM)
 
     if (CPTextFieldInputOwner === self || [[self window] firstResponder] === self)
-        [self _inputElement].value = _stringValue;
-
+        [self _inputElement].value = aValue;
 #endif
 
     [self _updatePlaceholderState];
@@ -969,7 +855,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)_updatePlaceholderState
 {
-    if ((!_stringValue || _stringValue.length === 0) && ![self hasThemeState:CPThemeStateEditing])
+    var string = [self stringValue];
+
+    if ((!string || string.length === 0) && ![self hasThemeState:CPThemeStateEditing])
         [self setThemeState:CPTextFieldStatePlaceholder];
     else
         [self unsetThemeState:CPTextFieldStatePlaceholder];
@@ -1022,6 +910,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     However, since you don't know how tall it needs to be if you change the font, sizeToFit will still be
     useful for making the textfield an appropriate height.
 */
+
 - (void)sizeToFit
 {
     [self setFrameSize:[self _minimumFrameSize]];
@@ -1034,7 +923,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         minSize = [self currentValueForThemeAttribute:@"min-size"],
         maxSize = [self currentValueForThemeAttribute:@"max-size"],
         lineBreakMode = [self lineBreakMode],
-        text = (_stringValue || @" "),
+        text = ([self stringValue] || @" "),
         textSize = _CGSizeMakeCopy(frameSize),
         font = [self currentValueForThemeAttribute:@"font"];
 
@@ -1105,7 +994,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             return;
 
         var pasteboard = [CPPasteboard generalPasteboard],
-            stringForPasting = [_stringValue substringWithRange:selectedRange];
+            stringValue = [self stringValue],
+            stringForPasting = [stringValue substringWithRange:selectedRange];
 
         [pasteboard declareTypes:[CPStringPboardType] owner:nil];
         [pasteboard setString:stringForPasting forType:CPStringPboardType];
@@ -1135,8 +1025,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self deleteBackward:sender];
 
         var selectedRange = [self selectedRange],
+            stringValue = [self stringValue],
             pasteString = [pasteboard stringForType:CPStringPboardType],
-            newValue = [_stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];
+            newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];
 
         [self setStringValue:newValue];
         [self setSelectedRange:CPMakeRange(selectedRange.location + pasteString.length, 0)];
@@ -1150,8 +1041,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     if ([[self window] firstResponder] !== self)
         return CPMakeRange(0, 0);
 
-#if PLATFORM(DOM)
-
     // we wrap this in try catch because firefox will throw an exception in certain instances
     try
     {
@@ -1178,8 +1067,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         // fall through to the return
     }
 
-#endif
-
     return CPMakeRange(0, 0);
 }
 
@@ -1188,8 +1075,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     if (![[self window] firstResponder] === self)
         return;
 
-#if PLATFORM(DOM)
-
     var inputElement = [self _inputElement];
 
     try
@@ -1218,8 +1103,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     catch (e)
     {
     }
-
-#endif
 }
 
 - (void)selectAll:(id)sender
@@ -1237,7 +1120,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     selectedRange.location += 1;
     selectedRange.length -= 1;
 
-    var newValue = [_stringValue stringByReplacingCharactersInRange:selectedRange withString:""];
+    var stringValue = [self stringValue],
+        newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:""];
 
     [self setStringValue:newValue];
     [self setSelectedRange:CPMakeRange(selectedRange.location, 0)];
@@ -1390,7 +1274,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             string = [self placeholderString];
         else
         {
-            string = _stringValue;
+            string = [self stringValue];
 
             if ([self isSecure])
                 string = secureStringForString(string);
@@ -1433,7 +1317,7 @@ var secureStringForString = function(aString)
         return "";
 
     return Array(aString.length + 1).join(CPSecureTextFieldCharacter);
-};
+}
 
 
 var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
@@ -1503,16 +1387,6 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
 {
 }
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:@"Multiple Values" forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:@"No Selection" forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:@"Not Applicable" forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:@"" forMarker:CPNullMarker isDefault:YES];
-}
-
 - (void)setValueFor:(CPString)theBinding
 {
     var destination = [_info objectForKey:CPObservedObjectKey],
@@ -1523,13 +1397,28 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
 
     if (isPlaceholder)
     {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+        switch (newValue)
         {
-           [CPException raise:CPGenericException
-                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
-        }
+            case CPMultipleValuesMarker:
+                newValue = [options objectForKey:CPMultipleValuesPlaceholderBindingOption] || @"Multiple Values";
+                break;
 
-        newValue = [self _placeholderForMarker:newValue];
+            case CPNoSelectionMarker:
+                newValue = [options objectForKey:CPNoSelectionPlaceholderBindingOption] || @"No Selection";
+                break;
+
+            case CPNotApplicableMarker:
+                if ([options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+                    [CPException raise:CPGenericException
+                                reason:@"can't transform non applicable key on: "+_source+" value: "+newValue];
+
+                newValue = [options objectForKey:CPNotApplicablePlaceholderBindingOption] || @"Not Applicable";
+                break;
+
+            case CPNullMarker:
+                newValue = [options objectForKey:CPNullPlaceholderBindingOption] || @"";
+                break;
+        }
 
         [_source setPlaceholderString:newValue];
         [_source setObjectValue:nil];

AppKit/CPTheme.j

@@ -579,7 +579,6 @@ CPThemeStateCircular        = CPThemeState("circular");
         _cache = {};
 
         _name = [aCoder decodeObjectForKey:@"name"];
-        _defaultValue = [aCoder decodeObjectForKey:@"defaultValue"];
         _values = [CPDictionary dictionary];
 
         if ([aCoder containsValueForKey:@"value"])
@@ -612,7 +611,6 @@ CPThemeStateCircular        = CPThemeState("circular");
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [aCoder encodeObject:_name forKey:@"name"];
-    [aCoder encodeObject:_defaultValue forKey:@"defaultValue"];
 
     var keys = [_values allKeys],
         count = keys.length;
@@ -668,7 +666,7 @@ var numberOfOnes = function(aNumber)
     cachedNumberOfOnes[slot] = count;
 
     return count;
-};
+}
 
 numberOfOnes.displayName = "numberOfOnes";
 

AppKit/CPTokenField.j

@@ -97,66 +97,61 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 {
     if (self = [super initWithFrame:frame])
     {
+        _selectedRange = CPMakeRange(0, 0);
+
+        _tokenScrollView = [[CPScrollView alloc] initWithFrame:CGRectMakeZero()];
+        [_tokenScrollView setHasHorizontalScroller:NO];
+        [_tokenScrollView setHasVerticalScroller:NO];
+        [_tokenScrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+        var contentView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+        [contentView setAutoresizingMask:CPViewWidthSizable];
+        [_tokenScrollView setDocumentView:contentView];
+
+        [self addSubview:_tokenScrollView];
+
+        _tokenIndex = 0;
+
+        _cachedCompletions = [];
         _completionDelay = [CPTokenField defaultCompletionDelay];
+
         _tokenizingCharacterSet = [[self class] defaultTokenizingCharacterSet];
+
+        _autocompleteContainer = [[CPView alloc] initWithFrame:CPRectMake(0.0, 0.0, frame.size.width, 92.0)];
+        [_autocompleteContainer setBackgroundColor:[_CPMenuWindow backgroundColorForBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle]];
+
+        _autocompleteScrollView = [[CPScrollView alloc] initWithFrame:CPRectMake(1.0, 1.0, frame.size.width - 2.0, 90.0)];
+        [_autocompleteScrollView setAutohidesScrollers:YES];
+        [_autocompleteScrollView setHasHorizontalScroller:NO];
+        [_autocompleteContainer addSubview:_autocompleteScrollView];
+
+        _autocompleteView = [[CPTableView alloc] initWithFrame:CPRectMakeZero()];
+
+        var tableColumn = [[CPTableColumn alloc] initWithIdentifier:CPTokenFieldTableColumnIdentifier];
+        [tableColumn setResizingMask:CPTableColumnAutoresizingMask];
+        [_autocompleteView addTableColumn:tableColumn];
+
+        [_autocompleteView setDataSource:self];
+        [_autocompleteView setDelegate:self];
+        [_autocompleteView setAllowsMultipleSelection:NO];
+        [_autocompleteView setHeaderView:nil];
+        [_autocompleteView setCornerView:nil];
+        [_autocompleteView setRowHeight:30.0];
+        [_autocompleteView setGridStyleMask:CPTableViewSolidHorizontalGridLineMask];
+        [_autocompleteView setBackgroundColor:[CPColor clearColor]];
+        [_autocompleteView setGridColor:[CPColor colorWithRed:242.0 / 255.0 green:243.0 / 255.0 blue:245.0 / 255.0 alpha:1.0]];
+
+        [_autocompleteScrollView setDocumentView:_autocompleteView];
+
         [self setBezeled:YES];
 
-        [self _init];
-
         [self setObjectValue:[]];
-
         [self setNeedsLayout];
     }
 
     return self;
 }
 
-- (void)_init
-{
-    _selectedRange = CPMakeRange(0, 0);
-
-    var frame = [self frame];
-
-    _tokenScrollView = [[CPScrollView alloc] initWithFrame:CGRectMakeZero()];
-    [_tokenScrollView setHasHorizontalScroller:NO];
-    [_tokenScrollView setHasVerticalScroller:NO];
-    [_tokenScrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    var contentView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
-    [contentView setAutoresizingMask:CPViewWidthSizable];
-    [_tokenScrollView setDocumentView:contentView];
-
-    [self addSubview:_tokenScrollView];
-
-    _cachedCompletions = [];
-
-    _autocompleteContainer = [[CPView alloc] initWithFrame:CPRectMake(0.0, 0.0, frame.size.width, 92.0)];
-    [_autocompleteContainer setBackgroundColor:[_CPMenuWindow backgroundColorForBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle]];
-
-    _autocompleteScrollView = [[CPScrollView alloc] initWithFrame:CPRectMake(1.0, 1.0, frame.size.width - 2.0, 90.0)];
-    [_autocompleteScrollView setAutohidesScrollers:YES];
-    [_autocompleteScrollView setHasHorizontalScroller:NO];
-    [_autocompleteContainer addSubview:_autocompleteScrollView];
-
-    _autocompleteView = [[CPTableView alloc] initWithFrame:CPRectMakeZero()];
-
-    var tableColumn = [[CPTableColumn alloc] initWithIdentifier:CPTokenFieldTableColumnIdentifier];
-    [tableColumn setResizingMask:CPTableColumnAutoresizingMask];
-    [_autocompleteView addTableColumn:tableColumn];
-
-    [_autocompleteView setDataSource:self];
-    [_autocompleteView setDelegate:self];
-    [_autocompleteView setAllowsMultipleSelection:NO];
-    [_autocompleteView setHeaderView:nil];
-    [_autocompleteView setCornerView:nil];
-    [_autocompleteView setRowHeight:30.0];
-    [_autocompleteView setGridStyleMask:CPTableViewSolidHorizontalGridLineMask];
-    [_autocompleteView setBackgroundColor:[CPColor clearColor]];
-    [_autocompleteView setGridColor:[CPColor colorWithRed:242.0 / 255.0 green:243.0 / 255.0 blue:245.0 / 255.0 alpha:1.0]];
-
-    [_autocompleteScrollView setDocumentView:_autocompleteView];
-}
-
 // ===============
 // = CONVENIENCE =
 // ===============
@@ -164,7 +159,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 {
     var indexOfSelectedItem = 0;
 
-    _cachedCompletions = [self tokenField:self completionsForSubstring:[self _inputElement].value indexOfToken:0 indexOfSelectedItem:indexOfSelectedItem];
+    _cachedCompletions = [self tokenField:self completionsForSubstring:[self _inputElement].value indexOfToken:_tokenIndex indexOfSelectedItem:indexOfSelectedItem];
 
     [_autocompleteView selectRowIndexes:[CPIndexSet indexSetWithIndex:indexOfSelectedItem] byExtendingSelection:NO];
     [_autocompleteView reloadData];
@@ -172,20 +167,19 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 
 - (void)_autocompleteWithDOMEvent:(JSObject)DOMEvent
 {
-    if (![self _inputElement].value && (!_cachedCompletions || ![self hasThemeState:CPThemeStateAutoCompleting]))
+    if (!_cachedCompletions || ![self hasThemeState:CPThemeStateAutoCompleting])
         return;
 
     [self _hideCompletions];
 
-    var token = _cachedCompletions ? _cachedCompletions[[_autocompleteView selectedRow]] : nil,
+    var token = _cachedCompletions[[_autocompleteView selectedRow]],
         shouldRemoveLastObject = token !== @"" && [self _inputElement].value !== @"";
 
     if (!token)
         token = [self _inputElement].value;
 
     // Make sure the user typed an actual token to prevent the previous token from being emptied
-    // If the input area is empty, we want to fall back to the normal behavior, resigning first
-    // responder or selecting the next or previous key view.
+    // If the input area is empty, we want to fallback to the normal behavior, resigning first responder or select the next or previous key view
     if (!token || token === @"")
     {
         if (DOMEvent && DOMEvent.keyCode === CPTabKeyCode)
@@ -200,6 +194,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
         return;
     }
 
+
     var objectValue = [self objectValue];
 
     // Remove the uncompleted token and add the token string.
@@ -207,25 +202,10 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
     if (shouldRemoveLastObject)
         [objectValue removeObjectAtIndex:_selectedRange.location];
 
-    // Give the delegate a chance to confirm, replace or add to the list of tokens being added.
-    var delegateApprovedObjects = [self tokenField:self shouldAddObjects:[CPArray arrayWithObject:token] atIndex:_selectedRange.location],
-        delegateApprovedObjectsCount = [delegateApprovedObjects count];
-    if (delegateApprovedObjects)
-    {
-        for (var i = 0; i < delegateApprovedObjectsCount; i++)
-        {
-            [objectValue insertObject:[delegateApprovedObjects objectAtIndex:i] atIndex:_selectedRange.location + i];
-        }
-    }
-
-    // Put the cursor after the last inserted token.
+    [objectValue insertObject:token atIndex:_selectedRange.location];
     var location = _selectedRange.location;
-
     [self setObjectValue:objectValue];
-
-    if (delegateApprovedObjectsCount)
-        location += delegateApprovedObjectsCount;
-    _selectedRange = CPMakeRange(location, 0);
+    _selectedRange = CPMakeRange(location + 1, 0);
 
     [self _inputElement].value = @"";
     [self setNeedsLayout];
@@ -270,13 +250,8 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
     var indexOfToken = [[self _tokens] indexOfObject:token],
         objectValue = [self objectValue];
 
-    // If the selection was to the right of the deleted token, move it to the left. If the deleted token was
-    // selected, deselect it.
-    if (indexOfToken < _selectedRange.location)
-        _selectedRange.location--;
-    else
-        [self _deselectToken:token];
-
+    // If the token was selected, deselect it for selection preservation.
+    [self _deselectToken:token];
     // Preserve selection.
     var selection = CPCopyRange(_selectedRange);
     [objectValue removeObjectAtIndex:indexOfToken];
@@ -316,14 +291,6 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
     [self _controlTextDidChange];
 }
 
-- (void)_updatePlaceholderState
-{
-    if (([[self _tokens] count] === 0) && ![self hasThemeState:CPThemeStateEditing])
-        [self setThemeState:CPTextFieldStatePlaceholder];
-    else
-        [self unsetThemeState:CPTextFieldStatePlaceholder];
-}
-
 // =============
 // = RESPONDER =
 // =============
@@ -608,16 +575,14 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 {
 }
 
+
 // ========
 // = VIEW =
 // ========
 - (void)viewDidMoveToWindow
 {
     [[[self window] contentView] addSubview:_autocompleteContainer];
-
-#if PLATFORM(DOM)
     _autocompleteContainer._DOMElement.style.zIndex = 1000; // Anything else doesn't seem to work
-#endif
 }
 
 - (void)removeFromSuperview
@@ -660,7 +625,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             CPTokenFieldInputDidBlur = YES;
 
             return true;
-        };
+        }
 
         CPTokenFieldKeyDownFunction = function(aDOMEvent)
         {
@@ -814,7 +779,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             }
 
             return true;
-        };
+        }
 
         CPTokenFieldKeyPressFunction = function(aDOMEvent)
         {
@@ -844,7 +809,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             // Force immediate layout in case word wrapping is now necessary.
             [owner setNeedsLayout];
             [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-        };
+        }
 
         CPTokenFieldKeyUpFunction = function()
         {
@@ -857,14 +822,14 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             [self setNeedsLayout];
 
             [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-        };
+        }
 
         CPTokenFieldHandleBlur = function(anEvent)
         {
             CPTokenFieldInputOwner = nil;
 
             [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-        };
+        }
 
         if (document.attachEvent)
         {
@@ -1026,7 +991,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
         offset.x += width + spaceBetweenTokens.width;
 
         return r;
-    };
+    }
 
     var placeEditor = function(useRemainingWidth)
     {
@@ -1053,7 +1018,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
         // When editing, always scroll to the cursor.
         if (_selectedRange.length == 0)
             [[_tokenScrollView documentView] scrollRectToVisible:inputFrame];
-    };
+    }
 
     for (var i = 0, count = [tokens count]; i < count; i++)
     {
@@ -1158,7 +1123,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 {
     if ([[self delegate] respondsToSelector:@selector(tokenField:completionsForSubstring:indexOfToken:indexOfSelectedItem:)])
     {
-        return [[self delegate] tokenField:tokenField completionsForSubstring:substring indexOfToken:tokenIndex indexOfSelectedItem:selectedIndex];
+        return [[self delegate] tokenField:tokenField completionsForSubstring:substring indexOfToken:_tokenIndex indexOfSelectedItem:selectedIndex];
     }
 
     return [];
@@ -1184,19 +1149,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 // // return an array of represented objects you want to add.
 // // If you want to reject the add, return an empty array.
 // // returning nil will cause an error.
-- (CPArray)tokenField:(CPTokenField)tokenField shouldAddObjects:(CPArray)tokens atIndex:(int)index
-{
-    var  delegate = [self delegate];
-    if ([delegate respondsToSelector:@selector(tokenField:shouldAddObjects:atIndex:)])
-    {
-        var approvedObjects = [delegate tokenField:tokenField shouldAddObjects:tokens atIndex:index];
-        if (approvedObjects !== nil)
-            return approvedObjects;
-    }
-
-    return tokens;
-}
-
+// - (NSArray *)tokenField:(NSTokenField *)tokenField shouldAddObjects:(NSArray *)tokens atIndex:(NSUInteger)index;
 //
 // // If you return nil or don't implement these delegate methods, we will assume
 // // editing string = display string = represented object
@@ -1339,37 +1292,3 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 }
 
 @end
-
-
-var CPTokenFieldTokenizingCharacterSetKey   = "CPTokenFieldTokenizingCharacterSetKey",
-    CPTokenFieldCompletionDelayKey          = "CPTokenFieldCompletionDelay";
-
-@implementation CPTokenField (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _tokenizingCharacterSet = [aCoder decodeObjectForKey:CPTokenFieldTokenizingCharacterSetKey] || [[self class] defaultTokenizingCharacterSet];
-        _completionDelay = [aCoder decodeDoubleForKey:CPTokenFieldCompletionDelayKey] || [[self class] defaultCompletionDelay];
-
-        [self _init];
-
-        [self setNeedsLayout];
-        [self setNeedsDisplay:YES];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeInt:_tokenizingCharacterSet forKey:CPTokenFieldTokenizingCharacterSetKey];
-    [aCoder encodeDouble:_completionDelay forKey:CPTokenFieldCompletionDelayKey];
-}
-
-@end

AppKit/CPToolbar.j

@@ -50,17 +50,9 @@ CPToolbarDisplayModeIconOnly            = 2;
 */
 CPToolbarDisplayModeLabelOnly           = 3;
 
-
-CPToolbarSizeModeDefault                = 0;
-CPToolbarSizeModeRegular                = 1;
-CPToolbarSizeModeSmall                  = 2;
-
 var CPToolbarsByIdentifier              = nil,
     CPToolbarConfigurationsByIdentifier = nil;
 
-var TOOLBAR_REGULAR_HEIGHT              = 59.0,
-    TOOLBAR_SMALL_HEIGHT                = 46.0;
-
 /*!
     @ingroup appkit
     @class CPToolbar
@@ -95,7 +87,6 @@ var TOOLBAR_REGULAR_HEIGHT              = 59.0,
     BOOL                    _showsBaselineSeparator;
     BOOL                    _allowsUserCustomization;
     BOOL                    _isVisible;
-    int                     _sizeMode @accessors(property=sizeMode);
 
     id                      _delegate;
 
@@ -157,7 +148,6 @@ var TOOLBAR_REGULAR_HEIGHT              = 59.0,
 
         _identifier = anIdentifier;
         _isVisible = YES;
-        _sizeMode = CPToolbarSizeModeDefault;
 
         [CPToolbar _addToolbar:self forIdentifier:_identifier];
     }
@@ -212,16 +202,6 @@ var TOOLBAR_REGULAR_HEIGHT              = 59.0,
     [_window _noteToolbarChanged];
 }
 
-- (void)setSizeMode:(CPToolbarSizeMode)aSize
-{
-    if (aSize === _sizeMode)
-        return;
-    _sizeMode = aSize;
-
-    [[self _toolbarView] setFrame:[self _toolbarViewFrame]];
-    [_window _noteToolbarChanged];
-}
-
 - (CPWindow)_window
 {
     return _window;
@@ -252,17 +232,12 @@ var TOOLBAR_REGULAR_HEIGHT              = 59.0,
 
 }
 
-- (CGRect)_toolbarViewFrame
-{
-    return CPRectMake(0.0, 0.0, 1200.0, _sizeMode != CPToolbarSizeModeSmall ? TOOLBAR_REGULAR_HEIGHT : TOOLBAR_SMALL_HEIGHT);
-}
-
 /* @ignore */
 - (CPView)_toolbarView
 {
     if (!_toolbarView)
     {
-        _toolbarView = [[_CPToolbarView alloc] initWithFrame:[self _toolbarViewFrame]];
+        _toolbarView = [[_CPToolbarView alloc] initWithFrame:CPRectMake(0.0, 0.0, 1200.0, 59.0)];
 
         [_toolbarView setToolbar:self];
         [_toolbarView setAutoresizingMask:CPViewWidthSizable];
@@ -452,8 +427,7 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
     CPToolbarIdentifiedItemsKey         = @"CPToolbarIdentifiedItemsKey",
     CPToolbarDefaultItemsKey            = @"CPToolbarDefaultItemsKey",
     CPToolbarAllowedItemsKey            = @"CPToolbarAllowedItemsKey",
-    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey",
-    CPToolbarSizeModeKey                = @"CPToolbarSizeModeKey";
+    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey";
 
 @implementation CPToolbar (CPCoding)
 
@@ -472,7 +446,6 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
         _showsBaselineSeparator = [aCoder decodeBoolForKey:CPToolbarShowsBaselineSeparatorKey];
         _allowsUserCustomization = [aCoder decodeBoolForKey:CPToolbarAllowsUserCustomizationKey];
         _isVisible = [aCoder decodeBoolForKey:CPToolbarIsVisibleKey];
-        _sizeMode = [aCoder decodeIntForKey:CPToolbarSizeModeKey];
 
         _identifiedItems = [aCoder decodeObjectForKey:CPToolbarIdentifiedItemsKey];
         _defaultItems = [aCoder decodeObjectForKey:CPToolbarDefaultItemsKey];
@@ -519,7 +492,6 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
     [aCoder encodeBool:_showsBaselineSeparator forKey:CPToolbarShowsBaselineSeparatorKey];
     [aCoder encodeBool:_allowsUserCustomization forKey:CPToolbarAllowsUserCustomizationKey];
     [aCoder encodeBool:_isVisible forKey:CPToolbarIsVisibleKey];
-    [aCoder encodeInt:_sizeMode forKey:CPToolbarSizeModeKey]
 
     [aCoder encodeObject:_identifiedItems forKey:CPToolbarIdentifiedItemsKey];
     [aCoder encodeObject:_defaultItems forKey:CPToolbarDefaultItemsKey];
@@ -543,7 +515,7 @@ var TOOLBAR_TOP_MARGIN          = 5.0,
 var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
     return { index:anIndex, view:aView, label:aLabel, minWidth:aMinWidth };
-};
+}
 
 /* @ignore */
 @implementation _CPToolbarView : CPView
@@ -575,7 +547,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
     var bundle = [CPBundle bundleForClass:self];
 
-    _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size:CPSizeMake(10.0, 15.0)];
+    _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size: CPSizeMake(10.0, 15.0)];
 
     _CPToolbarViewExtraItemsAlternateImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsAlternateImage.png"] size:CGSizeMake(10.0, 15.0)];
 }
@@ -904,7 +876,7 @@ var _CPToolbarItemVisibilityPriorityCompare = function(lhs, rhs)
         return CPOrderedAscending;
 
     return CPOrderedDescending;
-};
+}
 
 var TOP_MARGIN      = 5.0,
     LABEL_MARGIN    = 2.0;
@@ -1043,7 +1015,7 @@ var TOP_MARGIN      = 5.0,
     _labelSize = [_labelField frame].size;
 
     _minSize = CGSizeMake(MAX(_labelSize.width, minSize.width), _labelSize.height + minSize.height + LABEL_MARGIN + TOP_MARGIN);
-    _maxSize = CGSizeMake(MAX(_labelSize.width, maxSize.width), 100000000.0);
+    _maxSize = CGSizeMake(MIN(_labelSize.width, maxSize.width), 100000000.0);
 
     [_toolbar tile];
 }

AppKit/CPUserDefaultsController.j

@@ -180,7 +180,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
     var keys = [_cachedValues allKeys],
         keysCount = [keys count];
 
-    while (keysCount--)
+    while(keysCount--)
     {
         var key = keys[keysCount];
         [self willChangeValueForKey:key];
@@ -194,7 +194,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
     var keys = [_cachedValues allKeys],
         keysCount = [keys count];
 
-    while (keysCount--)
+    while(keysCount--)
     {
         var key = keys[keysCount];
         [[_controller defaults] setObject:[_cachedValues objectForKey:key] forKey:key];
@@ -207,7 +207,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
         keys = [_cachedValues allKeys],
         keysCount = [keys count];
 
-    while (keysCount--)
+    while(keysCount--)
     {
         var key = keys[keysCount];
         [self willChangeValueForKey:key];
@@ -229,7 +229,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
         keys = [_cachedValues allKeys],
         keysCount = [keys count];
 
-    while (keysCount--)
+    while(keysCount--)
     {
         var key = keys[keysCount],
             value = [_cachedValues objectForKey:key],
@@ -250,7 +250,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
         keys = [_cachedValues allKeys],
         keysCount = [keys count];
 
-    while (keysCount--)
+    while(keysCount--)
     {
         var key = keys[keysCount],
             value = [_cachedValues objectForKey:key],

AppKit/CPView.j

@@ -141,7 +141,6 @@ var CPViewFlags                     = { },
     BOOL                _postsFrameChangedNotifications;
     BOOL                _postsBoundsChangedNotifications;
     BOOL                _inhibitFrameAndBoundsChangedNotifications;
-    BOOL                _inLiveResize;
 
 #if PLATFORM(DOM)
     DOMElement          _DOMElement;
@@ -292,9 +291,6 @@ var CPViewFlags                     = { },
         CPDOMDisplayServerSetStyleLeftTop(_DOMElement, NULL, _CGRectGetMinX(aFrame), _CGRectGetMinY(aFrame));
         CPDOMDisplayServerSetStyleSize(_DOMElement, width, height);
 
-        if (typeof(appkit_tag_dom_elements) !== "undefined" && !!appkit_tag_dom_elements)
-            _DOMElement.setAttribute("data-cappuccino-view", [self className]);
-
         _DOMImageParts = [];
         _DOMImageSizes = [];
 #endif
@@ -852,17 +848,11 @@ var CPViewFlags                     = { },
 
             if (_backgroundType === BackgroundVerticalThreePartImage)
             {
-                // Make sure to repeat the top and bottom pieces horizontally if they're not the exact width needed.
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], size.width, _DOMImageSizes[0].height);
                 CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width, size.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[2], size.width, _DOMImageSizes[2].height);
             }
             else if (_backgroundType === BackgroundHorizontalThreePartImage)
             {
-                // Make sure to repeat the left and right pieces vertically if they're not the exact height needed.
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], _DOMImageSizes[0].width, size.height);
                 CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, size.height);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[2], _DOMImageSizes[2].width, size.height);
             }
             else if (_backgroundType === BackgroundNinePartImage)
             {
@@ -1549,10 +1539,7 @@ var CPViewFlags                     = { },
         }
         else if (_backgroundType == BackgroundVerticalThreePartImage)
         {
-            // Make sure to repeat the top and bottom pieces horizontally if they're not the exact width needed.
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], frameSize.width, _DOMImageSizes[0].height);
             CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], frameSize.width, frameSize.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[2], frameSize.width, _DOMImageSizes[2].height);
 
             CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
             CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, 0.0, _DOMImageSizes[0].height);
@@ -1560,10 +1547,7 @@ var CPViewFlags                     = { },
         }
         else if (_backgroundType == BackgroundHorizontalThreePartImage)
         {
-            // Make sure to repeat the left and right pieces vertically if they're not the exact height needed.
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], _DOMImageSizes[0].width, frameSize.height);
             CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], frameSize.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, frameSize.height);
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[2], _DOMImageSizes[2].width, frameSize.height);
 
             CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
             CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, _DOMImageSizes[0].width, 0.0);
@@ -2144,43 +2128,6 @@ setBoundsOrigin:
 {
 }
 
-/*!
-    Return yes if the receiver is in a live-resize operation.
-*/
-- (BOOL)inLiveResize
-{
-    return _inLiveResize;
-}
-
-/*!
-    Not implemented.
-
-    A view will be sent this message before a window begins a resize operation. The
-    receiver might choose to simplify its drawing operations during a live resize
-    for speed.
-
-    Subclasses should call super.
-*/
-- (void)viewWillStartLiveResize
-{
-    _inLiveResize = YES;
-}
-
-/*!
-    Not implemented.
-
-    A view will be sent this message after a window finishes a resize operation. The
-    receiver which simplified its drawing operations in viewWillStartLiveResize might
-    stop doing so now. Note the view might no longer be in a window, so use
-    [self setNeedsDisplay:YES] if a final non-simplified redraw is required.
-
-    Subclasses should call super.
-*/
-- (void)viewDidEndLiveResize
-{
-    _inLiveResize = NO;
-}
-
 @end
 
 @implementation CPView (KeyView)
@@ -2596,50 +2543,6 @@ setBoundsOrigin:
     return (_themeAttributes && _themeAttributes[aName] !== undefined);
 }
 
-/*!
-    Registers theme values encoded in an array at runtime. The format of the data in the array
-    is the same as that used by ThemeDescriptors.j, with the exception that you need to use
-    CPColorWithImages() in place of PatternColor(). For more information see the comments
-    at the top of ThemeDescriptors.j.
-
-    @param themeValues array of theme values
-*/
-- (void)registerThemeValues:(CPArray)themeValues
-{
-    for (var i = 0; i < themeValues.length; ++i)
-    {
-        var attributeValueState = themeValues[i],
-            attribute = attributeValueState[0],
-            value = attributeValueState[1],
-            state = attributeValueState[2];
-
-        if (state)
-            [self setValue:value forThemeAttribute:attribute inState:state];
-        else
-            [self setValue:value forThemeAttribute:attribute];
-    }
-}
-
-/*!
-    Registers theme values encoded in an array at runtime. The format of the data in the array
-    is the same as that used by ThemeDescriptors.j, with the exception that you need to use
-    CPColorWithImages() in place of PatternColor(). The values in \c inheritedValues are
-    registered first, then those in \c themeValues override/augment the inherited values.
-    For more information see the comments at the top of ThemeDescriptors.j.
-
-    @param themeValues array of base theme values
-    @param inheritedValues array of overridden/additional theme values
-*/
-- (void)registerThemeValues:(CPArray)themeValues inherit:(CPArray)inheritedValues
-{
-    // Register inherited values first, then override those with the subtheme values.
-    if (inheritedValues)
-        [self registerThemeValues:inheritedValues];
-
-    if (themeValues)
-        [self registerThemeValues:themeValues];
-}
-
 - (CPView)createEphemeralSubviewNamed:(CPString)aViewName
 {
     return nil;
@@ -2896,7 +2799,7 @@ var _CPViewFullScreenModeStateMake = function(aView)
     var superview = aView._superview;
 
     return { autoresizingMask:aView._autoresizingMask, frame:CGRectMakeCopy(aView._frame), index:(superview ? [superview._subviews indexOfObjectIdenticalTo:aView] : 0), superview:superview };
-};
+}
 
 var _CPViewGetTransform = function(/*CPView*/ fromView, /*CPView */ toView)
 {
@@ -2993,4 +2896,4 @@ var _CPViewGetTransform = function(/*CPView*/ fromView, /*CPView */ toView)
     }*/
 
     return transform;
-};
+}

AppKit/CPViewAnimation.j

@@ -111,8 +111,7 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOutEffect";
             view = [self _targetView:dictionary],
             startFrame = [self _startFrame:dictionary],
             endFrame = [self _endFrame:dictionary],
-            differenceFrame = _CGRectMakeZero(),
-            value = [super currentValue];
+            differenceFrame = _CGRectMakeZero();
 
         differenceFrame.origin.x = endFrame.origin.x - startFrame.origin.x;
         differenceFrame.origin.y = endFrame.origin.y - startFrame.origin.y;
@@ -120,19 +119,19 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOutEffect";
         differenceFrame.size.height = endFrame.size.height - startFrame.size.height;
 
         var intermediateFrame = _CGRectMakeZero();
-        intermediateFrame.origin.x = startFrame.origin.x + differenceFrame.origin.x * value;
-        intermediateFrame.origin.y = startFrame.origin.y + differenceFrame.origin.y * value;
-        intermediateFrame.size.width = startFrame.size.width + differenceFrame.size.width * value;
-        intermediateFrame.size.height = startFrame.size.height + differenceFrame.size.height * value;
+        intermediateFrame.origin.x = startFrame.origin.x + differenceFrame.origin.x * progress;
+        intermediateFrame.origin.y = startFrame.origin.y + differenceFrame.origin.y * progress;
+        intermediateFrame.size.width = startFrame.size.width + differenceFrame.size.width * progress;
+        intermediateFrame.size.height = startFrame.size.height + differenceFrame.size.height * progress;
 
         [view setFrame:intermediateFrame];
 
         // Update the view's alpha value
         var effect = [self _effect:dictionary];
         if (effect === CPViewAnimationFadeInEffect)
-            [view setAlphaValue:1.0 * value];
+            [view setAlphaValue:1.0 * progress];
         else if (effect === CPViewAnimationFadeOutEffect)
-            [view setAlphaValue:1.0 + ( 0.0 - 1.0 ) * value];
+            [view setAlphaValue:1.0 + ( 0.0 - 1.0 ) * progress];
 
         if (progress === 1.0)
             [self _targetView:view setHidden:_CGRectIsNull(endFrame) || [view alphaValue] === 0.0];

AppKit/CPViewController.j

@@ -66,7 +66,6 @@ var CPViewControllerCachedCibs;
 {
     CPView          _view @accessors(property=view);
     BOOL            _isLoading;
-    BOOL            _isLazy;
 
     id              _representedObject @accessors(property=representedObject);
     CPString        _title @accessors(property=title);
@@ -125,7 +124,6 @@ var CPViewControllerCachedCibs;
         _cibExternalNameTable = anExternalNameTable || [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];
 
         _isLoading = NO;
-        _isLazy = NO;
     }
 
     return self;
@@ -138,12 +136,12 @@ var CPViewControllerCachedCibs;
 
     If you create your views manually, you must override this method and use
     it to create your view and assign it to the view property. The default
-    implementation for programmatic views is to create a plain, zero width & height
-    view. You can invoke super to utilize this view.
+    implementation for programmatic views is to create a plain view. You can
+    invoke super to utilize this view.
 
-    If you use Interface Builder to create your views, and you initialize the
-    controller using the initWithCibName:bundle: methods, then you MUST NOT override
-    this method. The consequences risk shattering the space-time continuum.
+    If you use Interface Builder to create your views, you initialize the view
+    using the initWithCibName:bundle: method then you must not override this
+    method. The consequences risk shattering the space-time continuum.
 
     Note: The cib loading system is currently synchronous.
 */
@@ -152,22 +150,17 @@ var CPViewControllerCachedCibs;
     if (_view)
         return;
 
-    if (_cibName)
+    // check if a cib is already cached for the current _cibName
+    var cib = [CPViewControllerCachedCibs objectForKey:_cibName];
+
+    if (!cib)
     {
-        // check if a cib is already cached for the current _cibName
-        var cib = [CPViewControllerCachedCibs objectForKey:_cibName];
-
-        if (!cib)
-        {
-            // if the cib isn't cached yet : fetch it and cache it
-            cib = [[CPCib alloc] initWithCibNamed:_cibName bundle:_cibBundle];
-            [CPViewControllerCachedCibs setObject:cib forKey:_cibName];
-        }
-
-        [cib instantiateCibWithExternalNameTable:_cibExternalNameTable];
+        // if the cib isn't cached yet : fetch it and cache it
+        cib = [[CPCib alloc] initWithContentsOfURL:[_cibBundle pathForResource:_cibName + @".cib"]];
+        [CPViewControllerCachedCibs setObject:cib forKey:_cibName];
     }
-    else
-        _view = [CPView new];
+
+    [cib instantiateCibWithExternalNameTable:_cibExternalNameTable];
 }
 
 /*!
@@ -206,11 +199,6 @@ var CPViewControllerCachedCibs;
         _isLoading = NO;
         [self viewDidLoad];
     }
-    else if (_isLazy)
-    {
-        _isLazy = NO;
-        [self viewDidLoad];
-    }
 
     return _view;
 }
@@ -220,9 +208,9 @@ var CPViewControllerCachedCibs;
     This method is called after the view controller has loaded its associated views into memory.
 
     This method is called regardless of whether the views were stored in a nib
-    file or created programmatically in the loadView method, but NOT when setView
-    is invoked. This method is most commonly used to perform additional initialization
-    steps on views that are loaded from cib files.
+    file or created programmatically in the loadView method. This method is
+    most commonly used to perform additional initialization steps on views
+    that are loaded from cib files.
 */
 - (void)viewDidLoad
 {
@@ -240,7 +228,13 @@ var CPViewControllerCachedCibs;
 */
 - (void)setView:(CPView)aView
 {
+    var viewWasLoaded = !_view;
+
     _view = aView;
+
+    // Make sure the viewDidLoad method is called if the view is set directly
+    if (!_isLoading && viewWasLoaded)
+        [self viewDidLoad];
 }
 
 @end
@@ -272,7 +266,6 @@ var CPViewControllerViewKey     = @"CPViewControllerViewKey",
         _cibBundle = bundlePath ? [CPBundle bundleWithPath:bundlePath] : [CPBundle mainBundle];
 
         _cibExternalNameTable = [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];
-        _isLazy = YES;
     }
 
     return self;

AppKit/CPWebView.j

@@ -199,7 +199,7 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
             _ignoreLoadEnd = NO;
 
         [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-    };
+    }
 
     if (_iframe.addEventListener)
         _iframe.addEventListener("load", _loadCallback, false);
@@ -830,7 +830,7 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
 - (@action)reload:(id)sender
 {
     // If we're displaying pure HTML, redisplay it.
-    if (!_url && (_html !== nil))
+    if(!_url && (_html !== nil))
         [self loadHTMLString:_html];
     else
         [self _loadMainFrameURL];

AppKit/CPWindow/CPWindow.j

@@ -271,7 +271,6 @@ var CPWindowActionMessageKeys = [
     BOOL                                _isAnimating;
     BOOL                                _hasShadow;
     BOOL                                _isMovableByWindowBackground;
-    BOOL                                _isMovable;
     unsigned                            _shadowStyle;
     BOOL                                _showsResizeIndicator;
 
@@ -405,7 +404,6 @@ CPTexturedBackgroundWindowMask
         _registeredDraggedTypesArray = [];
         _isSheet = NO;
         _acceptsMouseMovedEvents = YES;
-        _isMovable = YES;
 
         // Set up our window number.
         _windowNumber = [CPApp._windows count];
@@ -428,7 +426,6 @@ CPTexturedBackgroundWindowMask
 
         // Create a generic content view.
         [self setContentView:[[CPView alloc] initWithFrame:CGRectMakeZero()]];
-        [self setInitialFirstResponder:[self contentView]];
 
         _firstResponder = self;
 
@@ -455,7 +452,6 @@ CPTexturedBackgroundWindowMask
         if (aStyleMask & CPBorderlessBridgeWindowMask)
             [self setFullPlatformWindow:YES];
 
-        _autorecalculatesKeyViewLoop = NO;
         _defaultButtonEnabled = YES;
         _keyViewLoopIsDirty = YES;
 
@@ -484,7 +480,6 @@ CPTexturedBackgroundWindowMask
         [self close];
 
     _platformWindow = aPlatformWindow;
-    [_platformWindow _setTitle:_title window:self];
 
     if (wasVisible)
         [self orderFront:self];
@@ -516,10 +511,6 @@ CPTexturedBackgroundWindowMask
 - (void)awakeFromCib
 {
     _keyViewLoopIsDirty = ![self _hasKeyViewLoop];
-    // If no key view loop has been specified by hand, and we are not intending to auto recalculate,
-    // set up a default key view loop.
-    if (_keyViewLoopIsDirty && ![self autorecalculatesKeyViewLoop])
-        [self recalculateKeyViewLoop];
 }
 
 - (void)_setWindowView:(CPView)aWindowView
@@ -958,12 +949,6 @@ CPTexturedBackgroundWindowMask
 
     var bounds = CGRectMake(0.0, 0.0, CGRectGetWidth(_frame), CGRectGetHeight(_frame));
 
-    // During init the initial first responder is set to the contentView
-    // if it hasn't changed in the mean time we need to update that reference
-    // to the new contentView
-    if ([self initialFirstResponder] === _contentView)
-        [self setInitialFirstResponder:aView];
-
     _contentView = aView;
     [_contentView setFrame:[self contentRectForFrameRect:bounds]];
 
@@ -1288,17 +1273,17 @@ CPTexturedBackgroundWindowMask
 
 - (BOOL)acceptsFirstResponder
 {
-    return NO;
+    return YES;
 }
 
-- (CPView)initialFirstResponder
+- (id)initialFirstResponder
 {
     return _initialFirstResponder;
 }
 
-- (void)setInitialFirstResponder:(CPView)aView
+- (void)setInitialFirstResponder:(id)aResponder
 {
-    _initialFirstResponder = aView;
+    _initialFirstResponder = aResponder;
 }
 
 /*!
@@ -1374,7 +1359,6 @@ CPTexturedBackgroundWindowMask
     _title = aTitle;
 
     [_windowView setTitle:aTitle];
-    [_platformWindow _setTitle:_title window:self];
 
     [self _synchronizeMenuBarTitleWithWindowTitle];
 }
@@ -1445,23 +1429,6 @@ CPTexturedBackgroundWindowMask
     return _isMovableByWindowBackground;
 }
 
-/*!
-    Sets whether the window can be moved.
-    @param shouldBeMovable \c YES makes the window movable.
-*/
-- (void)setMovable:(BOOL)shouldBeMovable
-{
-    _isMovable = shouldBeMovable;
-}
-
-/*!
-    Returns \c YES if the window can be moved.
-*/
-- (void)isMovable
-{
-    return _isMovable;
-}
-
 /*!
     Sets the window location to be the center of the screen
 */
@@ -2505,7 +2472,9 @@ CPTexturedBackgroundWindowMask
 
     _autorecalculatesKeyViewLoop = shouldRecalculate;
 
-    if (_autorecalculatesKeyViewLoop)
+    if (_keyViewLoopIsDirty)
+        [self recalculateKeyViewLoop];
+    else if (_autorecalculatesKeyViewLoop)
         [self _dirtyKeyViewLoop];
 }
 
@@ -2516,70 +2485,30 @@ CPTexturedBackgroundWindowMask
 
 - (void)selectNextKeyView:(id)sender
 {
-    if (_keyViewLoopIsDirty && [self autorecalculatesKeyViewLoop])
-        [self recalculateKeyViewLoop];
-
-    var nextValidKeyView = nil;
-
     if ([_firstResponder isKindOfClass:[CPView class]])
-        nextValidKeyView = [_firstResponder nextValidKeyView];
-
-    if (!nextValidKeyView)
-    {
-        var initialFirstResponder = [self initialFirstResponder];
-
-        if ([initialFirstResponder acceptsFirstResponder])
-            nextValidKeyView = initialFirstResponder;
-        else
-            nextValidKeyView = [initialFirstResponder nextValidKeyView];
-    }
-
-    [self makeFirstResponder:nextValidKeyView];
+        [self selectKeyViewFollowingView:_firstResponder];
 }
 
 - (void)selectPreviousKeyView:(id)sender
 {
-    if (_keyViewLoopIsDirty && [self autorecalculatesKeyViewLoop])
-        [self recalculateKeyViewLoop];
-
-    var previousValidKeyView = nil;
-
     if ([_firstResponder isKindOfClass:[CPView class]])
-        previousValidKeyView = [_firstResponder previousValidKeyView];
-
-    if (!previousValidKeyView)
-    {
-        var initialFirstResponder = [self initialFirstResponder];
-
-        if ([initialFirstResponder acceptsFirstResponder])
-            previousValidKeyView = initialFirstResponder;
-        else
-            previousValidKeyView = [initialFirstResponder previousValidKeyView];
-    }
-
-    [self makeFirstResponder:previousValidKeyView];
+        [self selectKeyViewPrecedingView:_firstResponder];
 }
 
 - (void)selectKeyViewFollowingView:(CPView)aView
 {
-    if (_keyViewLoopIsDirty && [self autorecalculatesKeyViewLoop])
+    if (_keyViewLoopIsDirty)
         [self recalculateKeyViewLoop];
 
-    var nextValidKeyView = [aView nextValidKeyView];
-
-    if ([nextValidKeyView isKindOfClass:[CPView class]])
-        [self makeFirstResponder:nextValidKeyView];
+    [self makeFirstResponder:[aView nextValidKeyView]];
 }
 
 - (void)selectKeyViewPrecedingView:(CPView)aView
 {
-    if (_keyViewLoopIsDirty && [self autorecalculatesKeyViewLoop])
+    if (_keyViewLoopIsDirty)
         [self recalculateKeyViewLoop];
 
-    var previousValidKeyView = [aView previousValidKeyView];
-
-    if ([previousValidKeyView isKindOfClass:[CPView class]])
-        [self makeFirstResponder:previousValidKeyView];
+    [self makeFirstResponder:[aView previousValidKeyView]];
 }
 
 /*!
@@ -2667,16 +2596,14 @@ CPTexturedBackgroundWindowMask
 
 var allViews = function(aWindow)
 {
-    var views = [CPArray arrayWithObject:[aWindow contentView]];
+    var views = [[aWindow contentView] subviews],
+        index = 0;
 
-    [views addObjectsFromArray:[[aWindow contentView] subviews]];
-
-    var index = 0;
     for (; index < views.length; ++index)
         views = views.concat([views[index] subviews]);
 
     return views;
-};
+}
 
 var keyViewComparator = function(lhs, rhs, context)
 {
@@ -2707,7 +2634,7 @@ var keyViewComparator = function(lhs, rhs, context)
         return CPOrderedSame;
 
     return CPOrderedDescending;
-};
+}
 
 @implementation CPWindow (MenuBar)
 
@@ -2931,7 +2858,7 @@ var keyViewComparator = function(lhs, rhs, context)
 var interpolate = function(fromValue, toValue, progress)
 {
     return fromValue + (toValue - fromValue) * progress;
-};
+}
 
 /* @ignore */
 @implementation _CPWindowFrameAnimation : CPAnimation
@@ -3001,6 +2928,5 @@ CPCustomWindowShadowStyle   = 3;
 @import "_CPHUDWindowView.j"
 @import "_CPBorderlessWindowView.j"
 @import "_CPBorderlessBridgeWindowView.j"
-@import "_CPAttachedWindowView.j"
 @import "CPDragServer.j"
 @import "CPView.j"

AppKit/CPWindow/_CPAttachedWindowView.j

@@ -1,388 +0,0 @@
-/*
- * _CPAttachedWindowView.j
- * AppKit
- *
- * Created by Antoine Mercadal
- * Copyright 2011 <primalmotion@archipelproject.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "_CPWindowView.j"
-
-#define ALIGN_STROKE(point)  (FLOOR(point) === (point) ? (point) + halfStrokeWidth : (point))
-#define ALIGN_COORD(point)   (FLOOR(point))
-
-var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10);
-
-/*!
-    @ignore
-
-    A custom CPWindowView that manages a border and cursor
-*/
-@implementation _CPAttachedWindowView : _CPWindowView
-{
-    BOOL            _mouseDownPressed           @accessors(getter=isMouseDownPressed, setter=setMouseDownPressed:);
-    float           _arrowOffsetX               @accessors(property=arrowOffsetX);
-    float           _arrowOffsetY               @accessors(property=arrowOffsetY);
-    int             _appearance                 @accessors(property=appearance);
-    unsigned        _preferredEdge              @accessors(property=preferredEdge);
-
-    CGSize          _cursorSize;
-}
-
-/*!
-    Compute the contentView frame from a given window frame
-
-    @param aFrameRect the window frame
-*/
-- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
-{
-    var contentRect = CGRectMakeCopy(aFrameRect);
-
-    // @todo change border art and remove this pixel perfect adaptation
-    // return CGRectInset(contentRect, 20, 20);
-
-    contentRect.origin.x += 18;
-    contentRect.origin.y += 17;
-    contentRect.size.width -= 35;
-    contentRect.size.height -= 37;
-
-    return contentRect;
-}
-
-/*!
-    Compute the window frame from a given contentView frame
-
-    @param aContentRect the contentView frame
-*/
-+ (CGRect)frameRectForContentRect:(CGRect)aContentRect
-{
-    var frameRect = CGRectMakeCopy(aContentRect);
-
-    // @todo change border art and remove this pixel perfect adaptation
-    //return CGRectOffset(frameRect, 20, 20);
-
-    frameRect.origin.x -= 18;
-    frameRect.origin.y -= 17;
-    frameRect.size.width += 35;
-    frameRect.size.height += 37;
-    return frameRect;
-}
-
-/*!
-    Initialize the _CPWindowView
-*/
-- (id)initWithFrame:(CGRect)aFrame styleMask:(unsigned)aStyleMask
-{
-    if (self = [super initWithFrame:aFrame styleMask:aStyleMask])
-    {
-        _arrowOffsetX = 0.0;
-        _arrowOffsetY = 0.0;
-
-        // @TODO: make this themable
-        _appearance = CPPopoverAppearanceMinimal;
-        _cursorSize = CGSizeMakeCopy(_CPAttachedWindowViewDefaultCursorSize);
-    }
-
-    return self;
-}
-
-/*!
-    Hide the cursor
-*/
-- (void)hideCursor
-{
-    _cursorSize = CGSizeMakeZero();
-    [self setNeedsDisplay:YES];
-}
-
-/*!
-    Show the cursor
-*/
-- (void)showCursor
-{
-    _cursorSize = CGSizeMakeCopy(_CPAttachedWindowViewDefaultCursorSize);
-    [self setNeedsDisplay:YES];
-    _mouseDownPressed = NO;
-}
-
-/*!
-    Draw the view
-*/
-- (void)drawRect:(CGRect)aRect
-{
-    [super drawRect:aRect];
-
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        radius = 5,
-        arrowWidth = _cursorSize.width,
-        arrowHeight = _cursorSize.height,
-        strokeWidth = 1,
-        halfStrokeWidth = strokeWidth / 2.0,
-        strokeColor,
-        shadowColor = [[CPColor blackColor] colorWithAlphaComponent:.2],
-        shadowSize = CGSizeMake(0, 6),
-        shadowBlur = 15,
-        gradient,
-        frame = [self bounds];
-
-    if (_appearance == CPPopoverAppearanceMinimal)
-    {
-        gradient = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [(254.0 / 255), (254.0 / 255), (254.0 / 255), 0.93,
-                                                                                        (231.0 / 255), (231.0 / 255), (231.0 / 255), 0.93], [0,1], 2);
-        strokeColor = [CPColor colorWithHexString:@"B8B8B8"];
-    }
-    else
-    {
-        gradient = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [(38.0 / 255), (38.0 / 255), (38.0 / 255), 0.93,
-                                                                                        (18.0 / 255), (18.0 / 255), (18.0 / 255), 0.93], [0,1], 2);
-        strokeColor = [CPColor colorWithHexString:@"222222"];
-    }
-
-    // fix rect to take care of stroke and shadow
-    frame.origin.x += halfStrokeWidth + shadowBlur;
-    frame.origin.y += halfStrokeWidth + (shadowBlur + shadowSize.height / 2);
-    frame.size.width -= strokeWidth + (shadowBlur * 2);
-    frame.size.height -= strokeWidth + (shadowBlur * 2 + shadowSize.height);
-
-    CGContextSetStrokeColor(context, strokeColor);
-    CGContextSetLineWidth(context, strokeWidth);
-    CGContextBeginPath(context);
-    CGContextSetShadowWithColor(context, shadowSize, shadowBlur, shadowColor);
-    CGContextDrawLinearGradient(context, gradient, CGPointMake(CGRectGetMidX(frame), 0.0), CGPointMake(CGRectGetMidX(frame), frame.size.height), 0);
-
-    var xMin = _CGRectGetMinX(frame),
-        xMax = _CGRectGetMaxX(frame),
-        yMin = _CGRectGetMinY(frame),
-        yMax = _CGRectGetMaxY(frame),
-        arrowMinX = ALIGN_COORD(xMin + radius + strokeWidth),
-        arrowMaxX = ALIGN_COORD(xMax - radius - strokeWidth),
-        arrowMinY = ALIGN_COORD(yMin + radius + strokeWidth),
-        arrowMaxY = ALIGN_COORD(yMax - radius + strokeWidth),
-        arrowAnchor = CGPointMakeZero(),
-        arrowStart = CGPointMakeZero(),
-        pt = CGPointMakeZero();
-
-    // draw!
-    switch (_preferredEdge)
-    {
-        case CPMinXEdge:
-        case CPMaxXEdge:
-            // origin nw
-            pt.x = ALIGN_COORD(xMin + radius);
-            pt.y = yMin;
-            CGContextMoveToPoint(context, pt.x, pt.y);
-
-            // ne
-            pt.x = ALIGN_COORD(xMax - radius);
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, xMax, yMin, xMax, ALIGN_COORD(yMin + radius));
-
-            if (_preferredEdge === CPMinXEdge)
-            {
-                // arrow CPMinXEdge
-                arrowAnchor.x = ALIGN_STROKE(xMax);
-                arrowAnchor.y = ALIGN_COORD((frame.size.height / 2) + yMin + _arrowOffsetY);
-
-                // to top edge
-                pt.y = ALIGN_COORD(arrowAnchor.y - (arrowWidth / 2));
-
-                // adjust starting point to not go beyond the corner
-                if (pt.y <= arrowMinY)
-                    pt.y = arrowMinY;
-                else if ((pt.y + arrowWidth) > arrowMaxY)
-                    pt.y = arrowMaxY - arrowWidth;
-
-                pt.x = arrowAnchor.x;
-                arrowStart = CGPointMakeCopy(pt);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // top edge -> point
-                pt.x = ALIGN_STROKE(arrowAnchor.x + arrowHeight);
-                pt.y = arrowAnchor.y;
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // point -> bottom edge
-                pt.x = arrowAnchor.x;
-                pt.y = ALIGN_COORD(arrowStart.y + arrowWidth);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-            }
-
-            // se
-            pt.x = xMax;
-            pt.y = ALIGN_COORD(yMax - radius);
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMax, ALIGN_COORD(xMax - radius), yMax);
-
-            // sw
-            pt.x = ALIGN_COORD(xMin + radius);
-            pt.y = yMax;
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, xMin, pt.y, xMin, ALIGN_COORD(yMax - radius));
-
-            if (_preferredEdge === CPMaxXEdge)
-            {
-                // arrow CPMaxXEdge
-                arrowAnchor.x = ALIGN_STROKE(xMin);
-                arrowAnchor.y = ALIGN_COORD((frame.size.height / 2) + yMin + _arrowOffsetY);
-
-                // to bottom edge
-                pt.y = ALIGN_COORD(arrowAnchor.y + (arrowWidth / 2));
-
-                // adjust starting point to not go beyond the corner
-                if ((pt.y - arrowWidth) < arrowMinY)
-                    pt.y = arrowMinY + arrowWidth;
-                else if (pt.y > arrowMaxY)
-                    pt.y = arrowMaxY;
-
-                pt.x = arrowAnchor.x;
-                arrowStart = CGPointMakeCopy(pt);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // bottom edge -> point
-                pt.x = ALIGN_STROKE(arrowAnchor.x - arrowHeight);
-                pt.y = arrowAnchor.y;
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // point -> top edge
-                pt.x = arrowAnchor.x;
-                pt.y = ALIGN_COORD(arrowStart.y - arrowWidth);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-            }
-
-            // nw
-            pt.x = xMin;
-            pt.y = ALIGN_COORD(yMin + radius);
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMin, ALIGN_COORD(xMin + radius), yMin);
-            break;
-
-        case CPMaxYEdge:
-        case CPMinYEdge:
-            // origin sw
-            pt.x = xMin;
-            pt.y = ALIGN_COORD(yMax - radius);
-            CGContextMoveToPoint(context, pt.x, pt.y);
-
-            // nw
-            pt.y = ALIGN_COORD(yMin + radius);
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMin, ALIGN_COORD(xMin + radius), yMin);
-
-            if (_preferredEdge === CPMaxYEdge)
-            {
-                // arrow CPMaxYEdge
-                arrowAnchor.x = ALIGN_COORD((frame.size.width / 2) + xMin + _arrowOffsetX);
-                arrowAnchor.y = ALIGN_STROKE(yMin + _arrowOffsetY);
-
-                // to left edge
-                pt.x = ALIGN_COORD(arrowAnchor.x - (arrowWidth / 2));
-
-                // adjust starting point to not go beyond the corner
-                if (pt.x < arrowMinX)
-                    pt.x = arrowMinX;
-                else if ((pt.x + arrowWidth) > arrowMaxX)
-                    pt.x = arrowMaxX - arrowWidth;
-
-                pt.y = arrowAnchor.y;
-                arrowStart = CGPointMakeCopy(pt);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // left edge -> point
-                pt.x = arrowAnchor.x;
-                pt.y = ALIGN_STROKE(arrowAnchor.y - arrowHeight);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // point -> right edge
-                pt.x = ALIGN_COORD(arrowStart.x + arrowWidth);
-                pt.y = arrowAnchor.y;
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-            }
-
-            // ne
-            pt.x = ALIGN_COORD(xMax - radius);
-            pt.y = yMin;
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, xMax, pt.y, xMax, ALIGN_COORD(yMin + radius));
-
-            // se
-            pt.x = xMax;
-            pt.y = ALIGN_COORD(yMax - radius);
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMax, ALIGN_COORD(xMax - radius), yMax);
-
-            if (_preferredEdge === CPMinYEdge)
-            {
-                // arrow CPMinYEdge
-                arrowAnchor.x = ALIGN_COORD((frame.size.width / 2) + xMin + _arrowOffsetX);
-                arrowAnchor.y = ALIGN_STROKE(yMax + _arrowOffsetY);
-
-                // to right edge
-                pt.x = ALIGN_COORD(arrowAnchor.x + (arrowWidth / 2));
-
-                // adjust starting point to not go beyond the corner
-                if ((pt.x - arrowWidth) < arrowMinX)
-                    pt.x = arrowMinX + arrowWidth;
-                else if (pt.x > arrowMaxX)
-                    pt.x = arrowMaxX;
-
-                pt.y = arrowAnchor.y;
-                arrowStart = CGPointMakeCopy(pt);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // right edge -> point
-                pt.x = arrowAnchor.x;
-                pt.y = ALIGN_STROKE(arrowAnchor.y + arrowHeight);
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-
-                // point -> left edge
-                pt.x = ALIGN_COORD(arrowStart.x - arrowWidth);
-                pt.y = arrowAnchor.y;
-                CGContextAddLineToPoint(context, pt.x, pt.y);
-            }
-
-            // sw
-            pt.x = ALIGN_COORD(xMin + radius);
-            pt.y = yMax;
-            CGContextAddLineToPoint(context, pt.x, pt.y);
-            CGContextAddCurveToPoint(context, pt.x, pt.y, xMin, pt.y, xMin, ALIGN_COORD(yMax - radius));
-            break;
-
-        default:
-            // no computed edge means standard rounded rect
-            CGContextAddPath(context, CGPathWithRoundedRectangleInRect(frame, radius, radius, YES, YES, YES, YES));
-    }
-
-    CGContextClosePath(context);
-
-    //Draw it
-    CGContextStrokePath(context);
-    CGContextFillPath(context);
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    _mouseDownPressed = YES;
-    [super mouseDown:anEvent];
-}
-
-- (void)mouseUp:(CPEvent)anEvent
-{
-    _mouseDownPressed = NO;
-    [super mouseUp:anEvent];
-}
-
-@end

AppKit/CPWindow/_CPBorderlessBridgeWindowView.j

@@ -33,14 +33,7 @@ var _CPToolbarViewBackgroundColor = nil;
 + (CPColor)toolbarBackgroundColor
 {
     if (!_CPToolbarViewBackgroundColor)
-    {
-        var bundle = [CPBundle bundleForClass:[_CPBorderlessBridgeWindowView class]];
-        _CPToolbarViewBackgroundColor = CPColorWithImages([
-                ["_CPToolbarView/toolbar-background-top.png", 1, 1, bundle],
-                ["_CPToolbarView/toolbar-background-center.png", 1, 57.0, bundle],
-                ["_CPToolbarView/toolbar-background-bottom.png", 1, 1, bundle],
-            ], CPColorPatternIsVertical);
-    }
+        _CPToolbarViewBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPBorderlessBridgeWindowView class]] pathForResource:@"_CPToolbarView/_CPToolbarViewBackground.png"] size:CGSizeMake(1.0, 59.0)]];
 
     return _CPToolbarViewBackgroundColor;
 }

AppKit/CPWindow/_CPHUDWindowView.j

@@ -90,7 +90,7 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
 
     if ([[[self window] toolbar] isVisible])
     {
-        var toolbarHeight = CGRectGetHeight([[self toolbarView] frame]);
+        toolbarHeight = CGRectGetHeight([[self toolbarView] frame]);
 
         contentRect.origin.y += toolbarHeight;
         contentRect.size.height -= toolbarHeight;

AppKit/CPWindow/_CPStandardWindowView.j

@@ -181,7 +181,7 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0,
 
     if ([theToolbar isVisible])
     {
-        var toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
+        toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
 
         contentRect.origin.y += toolbarHeight;
         contentRect.size.height -= toolbarHeight;

AppKit/CPWindow/_CPToolTipWindowView.j

@@ -27,31 +27,15 @@
 {
     BOOL            _mouseDownPressed   @accessors(getter=isMouseDownPressed, setter=setMouseDownPressed:);
     unsigned        _gravity            @accessors(property=gravity);
+
+    CPColor         _backgroundColor;
+    CPColor         _strokeColor;
 }
 
 
 #pragma mark -
 #pragma mark Class methods
 
-+ (CPString)defaultThemeClass
-{
-    return @"tooltip";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[[CPColor colorWithHexString:@"E3E3E3"],
-                                                [CPColor colorWithHexString:@"FFFFCA"],
-                                                2.0,
-                                                1.0,
-                                                [CPColor blackColor]]
-                                       forKeys:[@"stroke-color",
-                                                @"background-color",
-                                                @"border-radius",
-                                                @"stroke-width",
-                                                @"color"]];
-}
-
 /*! compute the contentView frame from a given window frame
     @param aFrameRect the window frame
 */
@@ -83,6 +67,21 @@
 }
 
 
+#pragma mark -
+#pragma mark Initialization
+
+- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
+{
+    if (self = [super initWithFrame:aFrame styleMask:aStyleMask])
+    {
+        _strokeColor = [CPColor colorWithHexString:@"E3E3E3"];
+        _backgroundColor = [CPColor colorWithHexString:@"FFFFCA"];
+    }
+
+    return self;
+}
+
+
 #pragma mark -
 #pragma mark drawing
 
@@ -91,13 +90,11 @@
     [super drawRect:aRect];
 
     var context = [[CPGraphicsContext currentContext] graphicsPort],
-        radius = [self currentValueForThemeAttribute:@"border-radius"],
-        strokeWidth = [self currentValueForThemeAttribute:@"stroke-width"],
-        strokeColor = [self currentValueForThemeAttribute:@"stroke-color"],
-        bgColor = [self currentValueForThemeAttribute:@"background-color"];
+        radius = 2,
+        strokeWidth = 1;
 
-    CGContextSetStrokeColor(context, strokeColor);
-    CGContextSetFillColor(context, bgColor);
+    CGContextSetStrokeColor(context, _strokeColor);
+    CGContextSetFillColor(context, _backgroundColor);
     CGContextSetLineWidth(context, strokeWidth);
     CGContextBeginPath(context);
 

AppKit/CPWindow/_CPWindowView.j

@@ -111,7 +111,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
             return [self trackResizeWithEvent:anEvent];
     }
 
-    if ([theWindow isMovable] && [theWindow isMovableByWindowBackground])
+    if ([theWindow isMovableByWindowBackground])
         [self trackMoveWithEvent:anEvent];
 
     else
@@ -174,9 +174,6 @@ var _CPWindowViewResizeIndicatorImage = nil;
 
 - (void)trackMoveWithEvent:(CPEvent)anEvent
 {
-    if (![[self window] isMovable])
-        return;
-
     var type = [anEvent type];
 
     if (type === CPLeftMouseUp)

AppKit/CPWorkspace.j

@@ -1,56 +0,0 @@
-/*
- * CPWorkspace.j
- * AppKit
- *
- * Created by Alexander Ljungberg.
- * Copyright 2012, SlevenBits Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-@import <Foundation/CPString.j>
-
-var SharedWorkspace = nil;
-
-
-@implementation CPWorkspace : CPObject
-{
-
-}
-
-+ (CPWorkspace)sharedWorkspace
-{
-    if (!SharedWorkspace)
-        SharedWorkspace = [CPWorkspace new];
-
-    return SharedWorkspace;
-}
-
-- (BOOL)openFile:(CPString)fullPath
-{
-    var url = [CPURL URLWithString:fullPath];
-    return [self openURL:url];
-}
-
-- (BOOL)openURL:(CPURL)url
-{
-    if (!url || ![url absoluteURL])
-        return NO;
-    window.open([url absoluteURL]);
-    return YES;
-}
-
-@end

AppKit/Cib/CPCib.j

@@ -34,9 +34,9 @@
 @import "_CPCibWindowTemplate.j"
 
 
-CPCibOwner              = @"CPCibOwner";
-CPCibTopLevelObjects    = @"CPCibTopLevelObjects";
-CPCibReplacementClasses = @"CPCibReplacementClasses";
+CPCibOwner              = @"CPCibOwner",
+CPCibTopLevelObjects    = @"CPCibTopLevelObjects",
+CPCibReplacementClasses = @"CPCibReplacementClasses",
 CPCibExternalObjects    = @"CPCibExternalObjects";
 
 var CPCibObjectDataKey  = @"CPCibObjectDataKey";

AppKit/Cib/_CPCibWindowTemplate.j

@@ -125,13 +125,14 @@ var _CPCibWindowTemplateMinSizeKey                          = @"_CPCibWindowTemp
 
 - (id)_cibInstantiate
 {
-    var windowClass = CPClassFromString([self windowClass]),
-        theWindow = [[windowClass alloc] initWithContentRect:_windowRect styleMask:_windowStyleMask];
+    var windowClass = CPClassFromString([self windowClass]);
 
 /*    if (!windowClass)
         [NSException raise:NSInvalidArgumentException format:@"Unable to locate NSWindow class %@, using NSWindow",_windowClass];
         class=[NSWindow class];*/
 
+    var theWindow = [[windowClass alloc] initWithContentRect:_windowRect styleMask:_windowStyleMask];
+
     if (_minSize)
         [theWindow setMinSize:_minSize];
     if (_maxSize)

AppKit/CoreAnimation/CABackingStore.j

@@ -29,7 +29,7 @@
 function CABackingStoreGetContext(aBackingStore)
 {
     return aBackingStore.context;
-};
+}
 
 if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
 {
@@ -42,7 +42,7 @@ CABackingStoreCreate = function()
 
     // FIXME: Consolidate drawImage to support this.
     return { context:DOMElement.getContext("2d"), buffer:DOMElement, _image:DOMElement };
-};
+}
 
 CABackingStoreSetSize = function(aBackingStore, aSize)
 {
@@ -52,8 +52,7 @@ CABackingStoreSetSize = function(aBackingStore, aSize)
     buffer.height = aSize.height;
     buffer.style.width = PIXEL(aSize.width);
     buffer.style.height = PIXEL(aSize.height);
-};
-
+}
 }
 else
 {
@@ -65,10 +64,10 @@ CABackingStoreCreate = function()
     context.buffer = "";
 
     return { context:context };
-};
+}
 
 CABackingStoreSetSize = function(aBackingStore, aSize)
 {
-};
-
 }
+
+}

AppKit/CoreGraphics/CGColor.j

@@ -108,7 +108,7 @@ function CGColorCreateCopy(aColor)
 */
 function CGColorCreateGenericGray(gray, alpha)
 {
-    return CGColorCreate(CGColorSpaceCreateDeviceRGB(), [gray, gray, gray, alpha]);
+    return CGColorCreate(CGColorSpaceCreateDeviceRGB(), [gray,gray,gray, alpha]);
 }
 
 /*!
@@ -137,7 +137,7 @@ function CGColorCreateGenericRGB(red, green, blue, alpha)
 */
 function CGColorCreateGenericCMYK(cyan, magenta, yellow, black, alpha)
 {
-    return CGColorCreate(CGColorSpaceCreateDeviceCMYK(),
+    return CGColorCreate(CGColorSpaceCreateDeviceCMYK(), 
                          [cyan, magenta, yellow, black, alpha]);
 }
 
@@ -150,8 +150,7 @@ function CGColorCreateGenericCMYK(cyan, magenta, yellow, black, alpha)
 */
 function CGColorCreateCopyWithAlpha(aColor, anAlpha)
 {
-    if (!aColor)
-        return aColor; // Avoid error null pointer in next line
+    if ( !aColor ) return aColor; // Avoid error null pointer in next line
 
     var components = aColor.components.slice();
 

AppKit/CoreGraphics/CGContextCanvas.j

@@ -358,7 +358,7 @@ if (CPFeatureIsCompatible(CPJavaScriptCanvasTransformFeature))
 CGContextConcatCTM = function(aContext, anAffineTransform)
 {
     aContext.transform(anAffineTransform.a, anAffineTransform.b, anAffineTransform.c, anAffineTransform.d, anAffineTransform.tx, anAffineTransform.ty);
-};
+}
 
 }
 else
@@ -428,7 +428,7 @@ CGContextConcatCTM = function(aContext, anAffineTransform)
         CGContextScaleCTM(aContext, sx, sy);
     if (a2 != 0.0)
         CGContextRotateCTM(aContext, a2);
-};
+}
 
 }
 

AppKit/CoreGraphics/CGGradient.j

@@ -29,16 +29,16 @@ kCGGradientDrawsAfterEndLocation    = 1 << 1;
 
 function CGGradientCreateWithColorComponents(aColorSpace, components, locations, count)
 {
-    if (locations === undefined || locations === NULL)
+    if ( locations === undefined || locations === NULL ) 
     {
         var num_of_colors = components.length / 4,
             locations = [];
-        for (var idx = 0; idx < num_of_colors; idx++)
+        for ( var idx = 0; idx < num_of_colors; idx++ ) 
             locations.push( idx / (num_of_colors - 1) );
     }
 
-    if (count === undefined || count === NULL)
-        count = locations.length;
+    if ( count === undefined || count === NULL)
+        var count = locations.length;
 
     var colors = [];
 

AppKit/CoreText/CGContextText.j

@@ -0,0 +1,99 @@
+/*
+ * CGContextText.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+kCGTextFill = 0;
+kCGTextStroke = 1;
+kCGTextFillStroke = 2;
+kCGTextInvisible = 3;
+
+function CGContextGetTextMatrix(/* CGContext */ aContext)
+{
+    return aContext._textMatrix;
+}
+
+function CGContextSetTextMatrix(/* CGContext */ aContext, /* CGAffineTransform */ aTransform)
+{
+    aContext._textMatrix = aTransform;
+}
+
+function CGContextGetTextPosition(/* CGContext */ aContext)
+{
+    return aContext._textPosition || _CGPointMakeZero();
+}
+
+function CGContextSetTextPosition(/* CGContext */ aContext, /* float */ x, /* float */ y)
+{
+    aContext._textPosition = CGPointMake(x, y);
+}
+
+function CGContextGetFont(/* CGContext */ aContext)
+{
+    return aContext._CPFont;
+}
+
+function CGContextSelectFont(/* CGContext */ aContext, /* CPFont */ aFont)
+{
+    aContext.font = [aFont cssString];
+    aContext._CPFont = aFont;
+}
+
+function CGContextSetTextDrawingMode(/* CGContext */ aContext, /* CGTextDrawingMode */ aMode)
+{
+    aContext._textDrawingMode = aMode;
+}
+
+function CGContextShowText(/* CGContext */ aContext, /* CPString */ aString)
+{
+    CGContextShowTextAtPoint(aContext, aContext._textPosition.x, aContext._textPosition.y, aString);
+}
+
+function CGContextShowTextAtPoint(/* CGContext */ aContext, /* float */ x, /* float */ y, /* CPString */ aString)
+{
+    aContext.textBaseline = @"middle";
+    aContext.textAlign = @"left";
+    
+    var mode = aContext._textDrawingMode;
+    if (!mode && mode !== 0)
+        mode = kCGTextFill;
+    
+    var width = aContext.measureText(aString).width;
+    
+    if (mode === kCGTextFill || mode === kCGTextFillStroke)
+        aContext.fillText(aString, x, y);
+    if (mode === kCGTextStroke || mode === kCGTextFillStroke)
+        aContext.strokeText(aString, x, y);
+    
+    aContext._textPosition = CGPointMake(x + width, y);
+}
+
+// FIXME: these are hacks that override the default behavior.
+
+function CGContextSetFillColor(/* CGContext */ aContext, /* CPColor */ aColor)
+{
+    aContext.fillStyle = [aColor cssString];
+    aContext._CPColor = aColor;
+}
+
+function CGContextGetFillColor(/* CGContext */ aContext)
+{
+    return aContext._CPColor;
+}

AppKit/CoreText/CTFrame.j

@@ -0,0 +1,192 @@
+/*
+ * CTFrame.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CTLine.j"
+
+
+kCTFrameProgressionTopToBottom = 0;
+kCTFrameProgressionRightToLeft = 1;
+
+kCTFrameProgressionAttributeName = @"kCTFrameProgressionAttributeName";
+
+function _CTFrameCreate(aPath, attributes, lines, attributedString)
+{
+    return {
+        path: aPath,
+        attributes: attributes,
+        lines: lines,
+        string: attributedString
+    };
+}
+
+_CTFrameCreate.displayName = @"_CTFrameCreate";
+
+/*!
+    Returns the range of the frame based on the original string
+    FIX ME: This implementation is wrong
+*/
+function CTFrameGetStringRange(/* CTFrame */ aFrame)
+{
+    return CPMakeRange();
+}
+
+CTFrameGetStringRange.displayName = @"CTFrameGetStringRange";
+
+/*!
+    Returns a range object with the visisble characters
+    FIX ME: THis implementation is wrong
+*/
+function CTFrameGetVisibleStringRange(/* CTFrame */ aFrame)
+{
+    return CPMakeRange();
+}
+
+CTFrameGetVisibleStringRange.displayName = @"CTFrameGetVisibleStringRange";
+
+/*!
+    Returns the path for the frame.
+*/
+function CTFrameGetPath(/* CTFrame */ aFrame)
+{
+    return aFrame.path;
+}
+
+CTFrameGetPath.displayName = @"CTFrameGetPath";
+
+/*!
+    Returns a dictionary of attributes for the frame.
+*/
+function CTFrameGetFrameAttributes(/* CTFrame */ aFrame)
+{
+    return aFrame.frameAttributes;
+}
+
+CTFrameGetFrameAttributes.displayName = @"CTFrameGetFrameAttributes";
+
+/*!
+    Returns the array containing CTLines that make up the frame
+*/
+function CTFrameGetLines(/* CTFrame */ aFrame)
+{
+    return aFrame.lines;
+}
+
+CTFrameGetLines.displayName = @"CTFrameGetLines";
+
+/*!
+    Returns an array of CGPoints for the origin of each CTLine in the frame
+*/
+function CTFrameGetLineOrigins(/* CTFrame */ aFrame, /* CPRange */ aRange)
+{
+    var results = [],
+        lines = aRange ? CTFrameGetLinesForRange(aFrame, aRange) : aFrame.lines;
+    
+    for (var i = -1, count = lines.length; ++i < count;)
+        results.push(lines[i].origin);
+    
+    return results;
+}
+
+CTFrameGetLineOrigins.displayName = @"CTFrameGetLineOrigins";
+
+/*!
+    Returns an array of CTLines for a given range.
+    Divergent from Cocoa and expensive.
+*/
+function CTFrameGetLinesForRange(/* CTFrame */ aFrame, /* CPRange */ lhs)
+{
+    var lines = aFrame.lines, results = [];
+    for (var i = -1, count = lines.length; ++i < count;)
+    {
+        var line = lines[i],
+            rhs = CTLineGetStringRange(line);
+        
+        if ((CPMaxRange(lhs) < rhs.location || CPMaxRange(rhs) < lhs.location) && result.length)
+            break;
+        
+        if (lhs.location >= rhs.location && rhs.location <= CPMaxRange(lhs) && CPMaxRange(rhs) > lhs.location)
+            results.push(line);
+    }
+    
+    return results;
+}
+
+CTFrameGetLinesForRange.displayName = @"CTFrameGetLinesForRange";
+
+/*!
+    Returns a CPRange
+    This is divergent from Cocoa. It's a convenience method used in CPTextView.
+*/
+function CTFrameGetRangeForPoint(/* CTFrame */ aFrame, /* CGPoint */ aPoint)
+{
+    var lines = aFrame.lines, y = aPoint.y;
+    for (var i = -1, count = lines.length; ++i < count;)
+    {
+        var line = lines[i],
+            bounds = CTLineGetImageBounds(line),
+            lineY = line._startPosition.y;
+        
+        if (y >= lineY && y < bounds.size.height + lineY)
+        {
+            // FIXME: we seem to be doing stuff like this with some frequency;
+            // Maybe it should be normalized at an earlier point.
+            var index = CTLineGetStringIndexForPosition(line, aPoint),
+                range = CTLineGetStringRange(line);
+            
+            range.location += index;
+            range.length = 0;
+            return range;
+        }
+    }
+}
+
+CTFrameGetRangeForPoint.displayName = @"CTFrameGetRangeForPoint";
+
+/*!
+    Draws the frame to the graphics context.
+*/
+function CTFrameDraw(/* CTFrame */ aFrame, /* CGContext */ aContext)
+{
+    var origin = aFrame.path.start,
+        lines = aFrame.lines;
+    
+    CGContextSetTextPosition(aContext, origin.x, origin.y);
+    
+    for (var i = -1, count = lines.length; ++i < count;)
+    {
+        var line = lines[i],
+            alignment = [line.string attribute:@"alignment" atIndex:0 effectiveRange:CPMakeRange(0, 0)],
+            position = CGContextGetTextPosition(aContext);
+        
+        if (alignment === CPRightTextAlignment)
+            line.origin = CGPointMake((aFrame.path.elements[1].x - origin.x * 2) - CTLineGetTypographicBounds(line).width, position.y);
+        else if (alignment === CPCenterTextAlignment)
+            line.origin = CGPointMake(((aFrame.path.elements[1].x - origin.x) / 2) - CTLineGetTypographicBounds(line).width / 2, position.y);
+        else
+            line.origin = CGPointMake(origin.x, position.y);
+        
+        CGContextSetTextPosition(aContext, line.origin.x, line.origin.y);
+        CTLineDraw(line, aContext);
+    }
+}
+
+CTFrameDraw.displayName = @"CTFrameDraw";

AppKit/CoreText/CTFramesetter.j

@@ -0,0 +1,122 @@
+/*
+ * CTFramesetter.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CTFrame.j"
+@import "CTTypesetter.j"
+
+
+/*!
+    Creates a typesetter with a given CPAttributedString
+*/
+function CTFramesetterCreateWithAttributedString(/* CPAttributedString */ aString)
+{
+    return {
+        string: aString,
+        typesetter: CTTypesetterCreateWithAttributedString(aString)
+    };
+}
+
+CTFramesetterCreateWithAttributedString.displayName = @"CTFramesetterCreateWithAttributedString";
+
+/*!
+    Creates a CTFrame with a given typesetter, range, path, and attributes
+*/
+function CTFramesetterCreateFrame(/* CTFramesetter */ aFramesetter, /* CPRange */ aRange, /* CGPath */ aPath, /* CPDictionary */ frameAttributes)
+{
+    if (aFramesetter._cachedFrame && [aFramesetter._cachedAttributes isEqual:frameAttributes])
+        return aFramesetter._cachedFrame;
+    
+    var attributedString = aRange ? [aFramesetter.string attributedSubstringFromRange:aRange] : aFramesetter.string,
+        nonattributedString = [attributedString string],
+        splitLines = nonattributedString.split(/\n|\r/g),
+        lines = [];
+    
+    var index = 0;
+    for (var i = -1, count = splitLines.length; ++i < count;)
+    {
+        var length = splitLines[i].length;
+        if (i !== count - 1)
+            ++length;
+        
+        var range = CPMakeRange(index, length),
+            line = CTLineCreateWithAttributedString([attributedString attributedSubstringFromRange:range]);
+        
+        line.range = range; // FIXME: a couple hacks to make managing lines in CPTextView easier
+        line.prevLine = lastLine;
+        
+        if (lastLine)
+            lastLine.nextLine = line;
+        
+        lines.push(line);
+        index += length;
+        
+        var lastLine = line;
+    }
+    
+    return aFramesetter._cachedFrame = _CTFrameCreate(aPath, frameAttributes, lines);
+}
+
+CTFramesetterCreateFrame.displayName = @"CTFramesetterCreateFrame";
+
+/*!
+    Returns a CTTypesetter
+*/
+function CTFramesetterGetTypesetter(/* CTFramesetter */ aFramesetter)
+{
+    return aFramesetter.typesetter;
+}
+
+CTFramesetterGetTypesetter.displayName = @"CTFramesetterGetTypesetter";
+
+/*!
+    Returns a CGSize object with the suggested size for a given frame.
+*/
+function CTFramesetterSuggestFrameSizeWithConstraints(/* CTFramesetter */ aFramesetter, /* CPRange */ aRange, /* CPDictionary */ frameAttributes, /* CGSize */ constraints, /* {CPRange} */ fitRange)
+{
+    var frame = CTFramesetterCreateFrame(aFramesetter, aRange, null, frameAttributes),
+        lines = CTFrameGetLines(frame),
+        width = 0.0,
+        height = 0.0;
+    
+    for (var i = -1, count = lines.length; ++i < count;)
+    {
+        var bounds = CTLineGetTypographicBounds(lines[i]);
+        // var bounds = CTLineGetImageBounds(lines[i], [[CPGraphicsContext currentContext] graphicsPort]).size;
+        width = MAX(width, bounds.width);
+        height += bounds.lineHeight;
+        // height += bounds.height;
+    }
+    
+    return CGSizeMake(width, height);
+}
+
+CTFramesetterSuggestFrameSizeWithConstraints.displayName = @"CTFramesetterSuggestFrameSizeWithConstraints";
+
+/*!
+    Returns the CPAttributedString for a given framesetter
+*/
+function CTFramesetterGetAttributedString(/* CTFramesetter */ aFramesetter)
+{
+    return aFramesetter.string;
+}
+
+CTFramesetterGetAttributedString.displayName = @"CTFramesetterGetAttributedString";

AppKit/CoreText/CTLine.j

@@ -0,0 +1,258 @@
+/*
+ * CTLine.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CTRun.j"
+
+
+kCTLineTruncationStart = 0;
+kCTLineTruncationEnd = 1;
+kCTLineTruncationMiddle = 2;
+
+/*!
+    Creates a new line with a supplied CPAttributedString
+*/
+function CTLineCreateWithAttributedString(/* CPAttributedString */ aString)
+{
+    var line = {
+        string: aString,
+        runs: []
+    };
+    
+    _CTLineCreateRuns(line);
+    
+    return line;
+}
+
+CTLineCreateWithAttributedString.displayName = @"CTLineCreateWithAttributedString";
+
+/*!
+    Creates a new line truncated to a given width.
+    @param aLine - The input line
+    @param width - The constraining width
+    @param truncationToken - The characters to represent the truncation. This is usually an elipsis. If not token is given the string will just clip
+
+    FIX ME: Not implemented correctly
+*/
+function CTLineCreateTruncatedLine(/* CTLine */ aLine, /* float */ width, /* CTLineTruncationType */ truncationType, /* CTLine */ truncationToken)
+{
+    return aLine;
+}
+
+CTLineCreateTruncatedLine.displayName = @"CTLineCreateTruncatedLine";
+
+/*!
+    Returns a CTLine with justified text.
+    FIX ME: This is not implemented correctly
+*/
+function CTLineCreateJustifiedLine(/* CTline */ aLine, /* float */ justificationFactor, /* float */ width)
+{
+    return aLine;
+}
+
+CTLineCreateJustifiedLine.displayName = @"CTLineCreateJustifiedLine";
+
+/*!
+    Returns the number of glyphs in a given line.
+*/
+function CTLineGetGlyphCount(/* CTLine */ aLine)
+{
+    return [aLine.string length];
+}
+
+CTLineGetGlyphCount.displayName = @"CTLineGetGlyphCount";
+
+/*!
+    Returns the array of CTRuns that make up the line.
+*/
+function CTLineGetGlyphRuns(/* CTLine */ aLine)
+{
+    return aLine.runs;
+}
+
+CTLineGetGlyphRuns.displayName = @"CTLineGetGlyphRuns";
+
+/*!
+    Returns the range for which the CTLine makes up the original string
+*/
+function CTLineGetStringRange(/* CTLine */ aLine)
+{
+    return CPCopyRange(aLine.range) || CPMakeRange(0, [aLine.string length])
+}
+
+CTLineGetStringRange.displayName = @"CTLineGetStringRange";
+
+/*!
+    No op
+*/
+function CTLineGetPenOffsetForFlush(/* CTLine */ aLine, /* float */ flushFactor, /* float */ flushWidth)
+{
+    
+}
+
+CTLineGetPenOffsetForFlush.displayName = @"CTLineGetPenOffsetForFlush";
+/*!
+    Draws the CTLine to the graphics context.
+*/
+function CTLineDraw(/* CTLine */ aLine, /* CGContext */ aContext)
+{
+    var startPosition = aLine._startPosition = CGContextGetTextPosition(aContext),
+        height = CTLineGetImageBounds(aLine, aContext).size.height;
+    
+    // FIXME: This is WRONG. This NEEDS to be in CGContext.
+    CGContextSetTextPosition(aContext, startPosition.x, startPosition.y + height * 0.5);
+    
+    var runs = aLine.runs;
+    for (var i = -1, count = runs.length; ++i < count;)
+        CTRunDraw(runs[i], aContext);
+    
+    CGContextSetTextPosition(aContext, startPosition.x, startPosition.y + height);
+}
+
+CTLineDraw.displayName = @"CTLineDraw";
+
+/*!
+    Calcaulates the image bounds for a line.
+*/
+function CTLineGetImageBounds(/* CTLine */ aLine, /* CGContext */ aContext)
+{
+    if (aLine._imageBounds)
+        return aLine._imageBounds;
+    
+    var runs = aLine.runs,
+        width = 0.0,
+        height = 0.0;
+    
+    for (var i = -1, count = runs.length; ++i < count;)
+    {
+        var runSize = CTRunGetImageBounds(runs[i], aContext).size;
+        width += runSize.width;
+        height = MAX(height, runSize.height);
+    }
+    
+    return aLine._imageBounds = CGRectMake(0.0, 0.0, width, height);
+}
+
+CTLineGetImageBounds.displayName = @"CTLineGetImageBounds";
+
+/*!
+    Returns a JSObject: {width: float, ascent: float, descent: float, lineHeight: float}
+    This method is more expensive than CTLineGetImageBounds.
+*/
+function CTLineGetTypographicBounds(/* CTLine */ aLine)
+{
+    if (aLine._typographicBounds)
+        return aLine._typographicBounds;
+    
+    var runs = aLine.runs,
+        width = 0.0,
+        ascent = 0.0,
+        descent = 0.0,
+        lineHeight = 0.0;
+    
+    for (var i = -1, count = runs.length; ++i < count;)
+    {
+        var runObject = CTRunGetTypographicBounds(runs[i]);
+        width += runObject.width;
+        ascent = MAX(ascent, runObject.ascent);
+        descent = MAX(descent, runObject.descent);
+        lineHeight = MAX(lineHeight, runObject.lineHeight);
+    }
+    
+    return aLine._typographicBounds = {
+        width: width,
+        ascent: ascent,
+        descent: descent,
+        lineHeight: lineHeight
+    };
+}
+
+CTLineGetTypographicBounds.displayName = @"CTLineGetTypographicBounds";
+
+/*!
+    Returns the index of the line based on the original string
+*/
+function CTLineGetStringIndexForPosition(/* CTLine */ aLine, /* CGPoint */ aPoint)
+{
+    var runs = aLine.runs, x = aPoint.x, index = 0;
+    for (var i = -1, count = runs.length; ++i < count;)
+    {
+        var run = runs[i],
+            origins = run.glyphOrigins;
+        
+        for (var j = -1, jcount = origins.length; ++j < jcount;)
+        {
+            var origin = origins[j], next;
+            if (j < jcount - 1)
+                next = origins[j + 1];
+            else if (i < count - 1)
+                next = runs[i + 1].glyphOrigins[0];
+            else
+                return index++;
+            
+            if (x <= (next.x - origin.x) / 2 + origin.x)
+                return index;
+            
+            index++;
+        }
+    }
+}
+
+CTLineGetStringIndexForPosition.displayName = @"CTLineGetStringIndexForPosition";
+
+/*!
+    Returns the offset corresponding to a string index,
+    this works well for for movement between adjacent lines or for drawing a custom caret.  
+*/
+function CTLineGetOffsetForStringIndex(/* CTLine */ aLine, /* int */ anIndex, /* float */ secondaryOffset)
+{
+    var runs = aLine.runs;
+    for (var i = -1, count = runs.length; ++i < count;)
+    {
+        var run = runs[i], runRange = run.range;
+        if (CPLocationInRange(anIndex, runRange))
+            return run.glyphOrigins[anIndex - runRange.location];
+    }
+}
+
+CTLineGetOffsetForStringIndex.displayName = @"CTLineGetOffsetForStringIndex";
+
+function _CTLineCreateRuns(aLine)
+{
+    var string = aLine.string,
+        runs = aLine.runs,
+        rangeEntries = string._rangeEntries;
+    
+    for (var i = -1, count = rangeEntries.length; ++i < count;)
+    {
+        var rangeEntry = rangeEntries[i],
+            range = rangeEntry.range,
+            rangeString = [[string string] substringWithRange:range],
+            attributes = rangeEntry.attributes;
+        
+        var run = _CTRunCreate(rangeString, attributes);
+        run.range = range;
+        
+        runs.push(run);
+    }
+}
+
+_CTLineCreateRuns.displayName = @"_CTLineCreateRuns";

AppKit/CoreText/CTRun.j

@@ -0,0 +1,290 @@
+/*
+ * CTRun.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+kCTRunStatusNoStatus = 0;
+kCTRunStatusRightToLeft = 1 << 0;
+kCTRunStatusNonMonotonic = 1 << 1;
+kCTRunStatusNonIdentityMatrix = 1 << 2;
+
+/*!
+    A CTRun represents a span of characters with common attribtues.
+*/
+
+function _CTRunCreate(glyphs, attributes)
+{
+    return {
+        glyphs: glyphs,
+        attributes: attributes,
+        status: kCTRunStatusNoStatus
+    };
+}
+
+_CTRunCreate.displayName = @"_CTRunCreate";
+
+/*!
+    Returns the number of glyphs in the run.
+*/
+function CTRunGetGlyphCount(/* CTRun */ aRun)
+{
+    return aRun.glyphs.length;
+}
+
+CTRunGetGlyphCount.displayName = @"CTRunGetGlyphCount";
+
+/*!
+    Returns a CPDictionary of attributes for the CTRun
+*/
+function CTRunGetAttributes(/* CTRun */ aRun)
+{
+    return aRun.attributes;
+}
+
+CTRunGetAttributes.displayName = @"CTRunGetAttributes";
+
+/*!
+    Returns a CTRunStatus
+    CTRuns have status that can be used to speed up certain operations.
+
+    Possible values:
+
+    @code
+    kCTRunStatusNoStatus
+    kCTRunStatusRightToLeft
+    kCTRunStatusNonMonotonic
+    kCTRunStatusNonIdentityMatrix
+    @endcode
+*/
+function CTRunGetStatus(/* CTRun */ aRun)
+{
+    return aRun.status || kCTRunStatusNoStatus;
+}
+
+CTRunGetStatus.displayName = @"CTRunGetStatus";
+
+/*!
+    Returns an array of CGGlyphs
+    FIX ME: Not implemented correctly
+*/
+function CTRunGetGlyphs(/* CTRun */ aRun, /* CPRange */ aRange)
+{
+    if (!aRun.glyphs)
+        aRun.glyphs = [];
+    
+    return aRun.glyphs;
+}
+
+CTRunGetGlyphs.displayName = @"CTRunGetGlyphs";
+
+/*!
+    Returns an array of CGPoints
+    FIX ME: Not implemented correctly
+*/
+function CTRunGetPositions(/* CTRun */ aRun, /* CPRange */ aRange)
+{
+    if (!aRun.positions)
+        aRun.positions = [];
+    
+    return aRun.positions;
+}
+
+CTRunGetPositions.displayName = @"CTRunGetPositions";
+
+/*!
+    Returns an array of CGSizes
+    FIX ME: Not implemented correctly
+*/
+function CTRunGetAdvances(/* CTRun */ aRun, /* CPRange */ aRange)
+{
+    if (!aRun.advances)
+        aRun.advances = [];
+    
+    return aRun.advances;
+}
+
+CTRunGetAdvances.displayName = @"CTRunGetAdvances";
+
+/*!
+    Returns an array of indexes.
+    FIX ME: Not implemented correctly
+*/
+function CTRunGetStringIndices(/* CTRun */ aRun, /* CPRange */ aRange)
+{
+    if (!aRun.stringIndices)
+        aRun.stringIndices = [];
+    
+    return aRun.stringIndices;
+}
+
+CTRunGetStringIndices.displayName = @"CTRunGetStringIndices";
+
+/*!
+    Returns a CPRange containing the location of the run in the parent string
+*/
+function CTRunGetStringRange(/* CTRun */ aRun)
+{
+    return aRun.range;
+}
+
+CTRunGetStringRange.displayName = @"CTRunGetStringRange";
+
+/*!
+    Returns a JSObject: {width: float, ascender: float, descender: float, lineHeight: float}
+    More expensive
+*/
+function CTRunGetTypographicBounds(/* CTRun */ aRun, /* CPRange */ aRange)
+{
+    if (aRun._typographicBounds)
+        return aRun._typographicBounds;
+    
+    var attributes = aRun.attributes,
+        font = [attributes valueForKey:@"font"],
+        string = _CTRunStringForRange(aRun, aRange);
+    
+    return aRun._typographicBounds = {
+        width: [string sizeWithFont:font].width, // FIXME: account for tabs
+        ascender: [font ascender],
+        descender: [font descender],
+        lineHeight: [font defaultLineHeightForFont]
+    };
+}
+
+CTRunGetTypographicBounds.displayName = @"CTRunGetTypographicBounds";
+
+/*!
+    Returns a CGRect
+    Cheap
+*/
+function CTRunGetImageBounds(/* CTRun */ aRun, /* CGContext */ aContext, /* CPRange */ aRange)
+{
+    if (aRun._imageBounds)
+        return aRun._imageBounds;
+    
+    _CTRunPrepareDraw(aRun, aContext);
+    
+    var string = _CTRunStringForRange(aRun, aRange),
+        width = aContext.measureText(string).width,
+        height = [CGContextGetFont(aContext) defaultLineHeightForFont];
+    
+    _CTRunUnprepareDraw(aRun, aContext);
+    
+    return aRun._imageBounds = CGRectMake(0.0, 0.0, width, height);
+}
+
+CTRunGetImageBounds.displayName = @"CTRunGetImageBounds";
+
+// CGAffineTransform
+function CTRunGetTextMatrix(/* CTRun */ aRun)
+{
+    
+}
+
+CTRunGetTextMatrix.displayName = @"CTRunGetTextMatrix";
+
+/*!
+    Draws the run to the context
+*/
+function CTRunDraw(/* CTRun */ aRun, /* CGContext */ aContext, /* CPRange */ aRange)
+{
+    _CTRunPrepareDraw(aRun, aContext);
+    
+    var string = aRange ? [aRun.glyphs substringWithRange:aRange] : aRun.glyphs;
+    _CTRunDrawShadow(aRun, aContext, string);
+    
+    var origins = aRun.glyphOrigins = [];
+    for (var i = -1, count = string.length; ++i < count;)
+    {
+        var glyph = string[i];
+        origins[i] = CGContextGetTextPosition(aContext);
+        
+        CGContextShowText(aContext, glyph);
+    }
+    
+    _CTRunUnprepareDraw(aRun, aContext);
+}
+
+CTRunDraw.displayName = @"CTRunDraw";
+
+function _CTRunDrawShadow(aRun, aContext, aString)
+{
+    var attributes = aRun.attributes,
+        textShadowColor = [attributes valueForKey:@"text-shadow-color"],
+        textShadowOffset = [attributes valueForKey:@"text-shadow-offset"];
+    
+    if (textShadowColor && textShadowOffset)
+    {
+        var color = CGContextGetFillColor(aContext),
+            position = CGContextGetTextPosition(aContext);
+        
+        CGContextSetFillColor(aContext, textShadowColor);
+        CGContextShowTextAtPoint(aContext, position.x + textShadowOffset.width, position.y + textShadowOffset.height, aString);
+        
+        CGContextSetFillColor(aContext, color);
+        CGContextSetTextPosition(aContext, position.x, position.y);
+    }
+}
+
+_CTRunDrawShadow.displayName = @"_CTRunDrawShadow";
+
+function _CTRunPrepareDraw(aRun, aContext)
+{
+    var attributes = aRun.attributes,
+        font = [attributes valueForKey:@"font"],
+        color = [attributes valueForKey:@"color"];
+    
+    if (font)
+    {
+        CGContextSelectFont(aContext, font);
+        aRun._cachedFont = CGContextGetFont(aContext);
+    }
+    
+    if (color)
+    {
+        CGContextSetFillColor(aContext, color);
+        aRun._cachedColor = CGContextGetFillColor(aContext);
+    }
+}
+
+_CTRunPrepareDraw.displayName = @"_CTRunPrepareDraw";
+
+function _CTRunUnprepareDraw(aRun, aContext)
+{
+    if (aRun._cachedFont)
+    {
+        CGContextSelectFont(aContext, aRun._cachedFont);
+        aRun._cachedFont = nil;
+    }
+    
+    if (aRun._cachedColor)
+    {
+        CGContextSetFillColor(aContext, aRun._cachedColor);
+        aRun._cachedColor = nil;
+    }
+}
+
+_CTRunUnprepareDraw.displayName = @"_CTRunUnprepareDraw";
+
+function _CTRunStringForRange(aRun, aRange)
+{
+    return (!aRange || aRange.length === 0) ? aRun.glyphs : [aRun.glyphs substringWithRange:aRange];
+}
+
+_CTRunStringForRange.displayName = @"_CTRunStringForRange";

AppKit/CoreText/CTTypesetter.j

@@ -0,0 +1,60 @@
+/*
+ * CTTypesetter.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CTLine.j"
+
+
+kCTTypesetterOptionDisableBidiProcessing = @"kCTTypesetterOptionDisableBidiProcessing";
+kCTTypesetterOptionForcedEmbeddingLevel = @"kCTTypesetterOptionForcedEmbeddingLevel";
+
+// Returns a CTTypesetter
+function CTTypesetterCreateWithAttributedString(/* CPAttributedString */ aString)
+{
+    return CTTypesetterCreateWithAttributedStringAndOptions(aString, nil);
+}
+
+// Returns a CTTypesetter
+function CTTypesetterCreateWithAttributedStringAndOptions(/* CPAttributedString */ aString, /* CPDictionary */ aDictionary)
+{
+    return {
+        string: aString,
+        options: aDictionary
+    }
+}
+
+// Returns a CTLine
+function CTTypesetterCreateLine(/* CTTypesetter */ aTypesetter, /* CPRange */ aRange)
+{
+    
+}
+
+// Returns an index
+function CTTypesetterSuggestLineBreak(/* CTTypesetter */ aTypesetter, /* int */ startIndex, /* float */ width)
+{
+    
+}
+
+// Returns an index
+function CTTypesetterSuggestClusterBreak(/* CTTypesetter */ aTypesetter, /* int */ startIndex, /* float */ width)
+{
+    
+}

AppKit/CoreText/CoreText.j

@@ -1,10 +1,9 @@
 /*
- * __filename__
- * __project.name__
+ * CoreText.j
+ * CoreText
  *
- * Created by __user.name__ on __project.date__.
- *
- * Copyright __project.year__, __organization.name__. All rights reserved.
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,12 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/*
-    USAGE
+@import "CTFramesetter.j"
+@import "CTFrame.j"
+@import "CTTypesetter.j"
+@import "CTLine.j"
+@import "CTRun.j"
 
-    Put an @import of every source file in your framework here. Users of the framework
-    can then simply import this file instead of having to know what the individual
-    source filenames are.
-*/
-
-@import "__project.nameasidentifier__Class.j"
+@import "CGContextText.j"

AppKit/Platform/CPPlatformString.j

@@ -42,16 +42,7 @@
 #include "DOM/CPPlatformString.j"
 #else
 @implementation CPPlatformString : CPBasePlatformString
-
-+ (CGSize)sizeOfString:(CPString)aString withFont:(CPFont)aFont forWidth:(float)aWidth
 {
-    return _CGSizeMakeZero();
 }
-
-+ (CPDictionary)metricsOfFont:(CPFont)aFont
-{
-    return [CPDictionary dictionaryWithObjectsAndKeys:0, @"ascender", 0, @"descender", 0, @"lineHeight"];
-}
-
 @end
 #endif

AppKit/Platform/CPPlatformWindow.j

@@ -32,7 +32,6 @@ var PrimaryPlatformWindow   = NULL;
     CPInteger       _level;
     BOOL            _hasShadow;
     unsigned        _shadowStyle;
-    CPString        _title;
 
 #if PLATFORM(DOM)
     DOMWindow       _DOMWindow;
@@ -259,22 +258,6 @@ var PrimaryPlatformWindow   = NULL;
     return [CPPlatform isBrowser];
 }
 
-- (void)_setTitle:(CPString)aTitle window:(CPWindow)aWindow
-{
-    _title = aTitle;
-
-#if PLATFORM(DOM)
-    if (_DOMWindow && _DOMWindow.document
-        && (aWindow === [CPApp mainWindow] || [aWindow platformWindow] !== [CPPlatformWindow primaryPlatformWindow]))
-        _DOMWindow.document.title = _title;
-#endif
-}
-
-- (CPString)title
-{
-    return _title;
-}
-
 @end
 
 #if PLATFORM(BROWSER)

AppKit/Platform/DOM/CPPlatform.j

@@ -49,7 +49,7 @@ var screenNeedsInitialization   = NO,
         window.onunload = function()
         {
             [CPApp terminate:nil];
-        };
+        }
 }
 
 + (BOOL)isBrowser

AppKit/Platform/DOM/CPPlatformWindow+DOM.j

@@ -534,15 +534,13 @@ var ModifierKeyCodes = [
     if (_DOMWindow)
         return _DOMWindow.focus();
 
-    _DOMWindow = window.open("about:blank", "_blank", "menubar=no,location=no,resizable=yes,scrollbars=no,status=no,left=" + _CGRectGetMinX(_contentRect) + ",top=" + _CGRectGetMinY(_contentRect) + ",width=" + _CGRectGetWidth(_contentRect) + ",height=" + _CGRectGetHeight(_contentRect));
+    _DOMWindow = window.open("", "_blank", "menubar=no,location=no,resizable=yes,scrollbars=no,status=no,left=" + _CGRectGetMinX(_contentRect) + ",top=" + _CGRectGetMinY(_contentRect) + ",width=" + _CGRectGetWidth(_contentRect) + ",height=" + _CGRectGetHeight(_contentRect));
 
     [PlatformWindows addObject:self];
 
     // FIXME: cpSetFrame?
     _DOMWindow.document.write("<!DOCTYPE html><html lang='en'><head></head><body style='background-color:transparent;'></body></html>");
     _DOMWindow.document.close();
-    if (self != [CPPlatformWindow primaryPlatformWindow])
-        _DOMWindow.document.title = _title;
 
     if (![CPPlatform isBrowser])
     {
@@ -708,8 +706,7 @@ var ModifierKeyCodes = [
                             var characters;
 
                             // Handle key codes for which String.fromCharCode won't work.
-                            // Refs #1036: In Internet Explorer, both 'which' and 'charCode' are undefined for special keys.
-                            if (aDOMEvent.which === 0 || aDOMEvent.charCode === 0 || (aDOMEvent.which === undefined && aDOMEvent.charCode === undefined))
+                            if (aDOMEvent.which === 0 || aDOMEvent.charCode === 0)
                                 characters = KeyCodesToUnicodeMap[_keyCode];
 
                             if (!characters)
@@ -1568,7 +1565,7 @@ var _CPEventFromNativeMouseEvent = function(aNativeEvent, anEventType, aPoint, m
     aNativeEvent._eventNumber = anEventNumber;
     aNativeEvent._clickCount = aClickCount;
     aNativeEvent._pressure = aPressure;
-    if ((anEventType == CPLeftMouseDragged) || (anEventType == CPRightMouseDragged) || (anEventType == CPMouseMoved))
+    if((anEventType == CPLeftMouseDragged) || (anEventType == CPRightMouseDragged) || (anEventType == CPMouseMoved))
     {
         aNativeEvent._deltaX = aPoint.x - aMouseDragStart.x;
         aNativeEvent._deltaY = aPoint.y - aMouseDragStart.y;
@@ -1581,7 +1578,7 @@ var _CPEventFromNativeMouseEvent = function(aNativeEvent, anEventType, aPoint, m
 
 
     return aNativeEvent;
-};
+}
 
 var CLICK_SPACE_DELTA   = 5.0,
     CLICK_TIME_DELTA    = (typeof document != "undefined" && document.addEventListener) ? 350.0 : 1000.0;
@@ -1596,7 +1593,7 @@ var CPDOMEventGetClickCount = function(aComparisonEvent, aTimestamp, aLocation)
     return (aTimestamp - [aComparisonEvent timestamp] < CLICK_TIME_DELTA &&
         ABS(comparisonLocation.x - aLocation.x) < CLICK_SPACE_DELTA &&
         ABS(comparisonLocation.y - aLocation.y) < CLICK_SPACE_DELTA) ? [aComparisonEvent clickCount] + 1 : 1;
-};
+}
 
 var CPDOMEventStop = function(aDOMEvent, aPlatformWindow)
 {
@@ -1616,7 +1613,7 @@ var CPDOMEventStop = function(aDOMEvent, aPlatformWindow)
         aPlatformWindow._DOMFocusElement.focus();
         aPlatformWindow._DOMFocusElement.blur();
     }
-};
+}
 
 function CPWindowObjectList()
 {

AppKit/Platform/DOM/CPPlatformWindow+DOMKeys.j

@@ -229,4 +229,4 @@ CPKeyCodes.isCharacterKey = function(keyCode)
         default:
             return false;
     }
-};
+}