Manually bump up the version to 1.0.0.012 and see if this helps.

Changing version number

.gitignore

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

.rvmrc

@@ -0,0 +1,2 @@
+rvm_install_on_use_flag=1
+rvm jruby-head@buildr

AppKit/AppKit.j

@@ -37,13 +37,14 @@
 @import "CPCibControlConnector.j"
 @import "CPCibLoading.j"
 @import "CPCibOutletConnector.j"
+@import "CPCibRuntimeAttributesConnector.j"
 @import "CPClipView.j"
 @import "CPCollectionView.j"
 @import "CPCollectionViewItem.j"
 @import "CPColor.j"
 @import "CPColorPanel.j"
-@import "CPColorSpace.j"
 @import "CPColorWell.j"
+@import "CPComboBox.j"
 @import "CPCompatibility.j"
 @import "CPControl.j"
 @import "CPCookie.j"
@@ -56,7 +57,6 @@
 @import "CPFont.j"
 @import "CPFontManager.j"
 @import "CPGeometry.j"
-@import "CPGradient.j"
 @import "CPGraphics.j"
 @import "CPImage.j"
 @import "CPImageView.j"
@@ -101,6 +101,5 @@
 @import "CPViewAnimation.j"
 @import "CPViewController.j"
 @import "CPWebView.j"
-@import "CPWorkspace.j"
 @import "CPWindow.j"
 @import "CPWindowController.j"

AppKit/CPAlert.j

@@ -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/CPApplication.j

@@ -107,7 +107,7 @@ CPRunContinuesResponse  = -1002;
 
     CPPanel                 _aboutPanel;
 
-    CPThemeBlend            _themeBlend @accessors(property=themeBlend);
+    CPArray                 _themeBlends @accessors(property=themeBlends);
 }
 
 /*!
@@ -141,6 +141,8 @@ CPRunContinuesResponse  = -1002;
         _windows = [];
 
         [_windows addObject:nil];
+
+        _themeBlends = [];
     }
 
     return self;
@@ -1156,6 +1158,16 @@ CPRunContinuesResponse  = -1002;
                                                       userInfo:nil];
 }
 
+- (CPThemeBlend)themeBlend
+{
+    return (_themeBlends.length > 0 ? _themeBlends[0] : nil);
+}
+
+- (void)setThemeBlend:(CPThemeBlend)aThemeBlend
+{
+    _themeBlends[0] = aThemeBlend;
+}
+
 + (CPString)defaultThemeName
 {
     return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
@@ -1166,12 +1178,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 +1195,7 @@ _CPRunModalLoop = function(anEvent)
 
     if (theWindow == modalSession._window || [theWindow worksWhenModal])
         [theWindow sendEvent:anEvent];
-};
+}
 
 /*!
     Starts the GUI and Cappuccino frameworks. This function should be
@@ -1218,15 +1230,14 @@ function CPApplicationMain(args, namedArgs)
     [_CPAppBootstrapper performActions];
 }
 
-var _CPAppBootstrapperActions = nil;
+var _CPAppBootstrapperActions = nil,
+    _CPAppThemeURLsToLoad = [];
 
 @implementation _CPAppBootstrapper : CPObject
-{
-}
 
 + (CPArray)actions
 {
-    return [@selector(bootstrapPlatform), @selector(loadDefaultTheme), @selector(loadMainCibFile)];
+    return [@selector(bootstrapPlatform), @selector(loadThemes), @selector(loadMainCibFile)];
 }
 
 + (void)performActions
@@ -1250,17 +1261,30 @@ var _CPAppBootstrapperActions = nil;
     return [CPPlatform bootstrap];
 }
 
-+ (BOOL)loadDefaultTheme
++ (BOOL)loadThemes
 {
-    var defaultThemeName = [CPApplication defaultThemeName],
-        themeURL = nil;
+    _CPAppThemeURLsToLoad.push([CPApplication defaultThemeName]);
 
-    if (defaultThemeName === @"Aristo")
-        themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:defaultThemeName + @".blend"];
+    var auxiliaryThemes = ([[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPAuxiliaryThemes"] || []);
+
+    _CPAppThemeURLsToLoad = _CPAppThemeURLsToLoad.concat(auxiliaryThemes);
+
+    [self loadNextTheme];
+
+    return YES;
+}
+
++ (BOOL)loadNextTheme
+{
+    var themeName = _CPAppThemeURLsToLoad.shift();
+
+    if (themeName === @"Aristo")
+        themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:themeName + @".blend"];
     else
-        themeURL = [[CPBundle mainBundle] pathForResource:defaultThemeName + @".blend"];
+        themeURL = [[CPBundle mainBundle] pathForResource:themeName + @".blend"];
 
     var blend = [[CPThemeBlend alloc] initWithContentsOfURL:themeURL];
+
     [blend loadWithDelegate:self];
 
     return YES;
@@ -1268,10 +1292,17 @@ var _CPAppBootstrapperActions = nil;
 
 + (void)blendDidFinishLoading:(CPThemeBlend)aThemeBlend
 {
-    [[CPApplication sharedApplication] setThemeBlend:aThemeBlend];
-    [CPTheme setDefaultTheme:[CPTheme themeNamed:[CPApplication defaultThemeName]]];
+    var themeBlends = [CPApp themeBlends];
 
-    [self performActions];
+    [themeBlends addObject:aThemeBlend];
+
+    if ([themeBlends count] === 1)
+        [CPTheme setDefaultTheme:[CPTheme themeNamed:[CPApplication defaultThemeName]]];
+
+    if (_CPAppThemeURLsToLoad.length === 0)
+        [self performActions];
+    else
+        [self loadNextTheme];
 }
 
 + (BOOL)loadMainCibFile
@@ -1340,8 +1371,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

@@ -27,6 +27,7 @@
 @import "CPObjectController.j"
 @import "CPKeyValueBinding.j"
 
+
 /*!
 
 @class CPArrayController
@@ -284,8 +285,7 @@
 
     if (value === nil)
         value = [];
-
-    if (![value isKindOfClass:[CPArray class]])
+    else if (![value isKindOfClass:[CPArray class]])
         value = [value];
 
     var oldSelectedObjects = nil,
@@ -339,14 +339,6 @@
     [self setContent:anArray];
 }
 
-/*!
-    @ignore
-*/
-- (void)_setContentSet:(id)aSet
-{
-    [self setContent:[aSet allObjects]];
-}
-
 /*!
     Returns the content array of the controller.
     @return id the content array of the receiver
@@ -356,6 +348,14 @@
     return [self content];
 }
 
+/*!
+    @ignore
+*/
+- (void)_setContentSet:(id)aSet
+{
+    [self setContent:[aSet allObjects]];
+}
+
 /*!
     Returns the content of the receiver as a CPSet.
 
@@ -564,9 +564,13 @@
 - (BOOL)setSelectionIndexes:(CPIndexSet)indexes
 {
     [self _selectionWillChange]
-    var r = [self __setSelectionIndexes:indexes avoidEmpty:NO];
-    [self _selectionDidChange];
-    return r;
+
+    // When explicitly setting the selection, ignore avoidsEmptySelection
+    var changed = [self __setSelectionIndexes:indexes obeyAvoidsEmptySelection:NO];
+
+    [self _selectionDidChangeNotify:NO];
+
+    return changed;
 }
 
 /*
@@ -575,7 +579,7 @@
 */
 - (BOOL)__setSelectionIndex:(int)theIndex
 {
-    return [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:theIndex]];
+    return [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:theIndex] obeyAvoidsEmptySelection:YES];
 }
 
 /*
@@ -584,43 +588,37 @@
 */
 - (BOOL)__setSelectionIndexes:(CPIndexSet)indexes
 {
-    [self __setSelectionIndexes:indexes avoidEmpty:_avoidsEmptySelection];
+    [self __setSelectionIndexes:indexes  obeyAvoidsEmptySelection:YES];
 }
 
-- (BOOL)__setSelectionIndexes:(CPIndexSet)indexes avoidEmpty:(BOOL)avoidEmpty
+/*
+    Like setSelectionIndexes but don't fire any change notifications.
+    @ignore
+*/
+- (BOOL)__setSelectionIndexes:(CPIndexSet)indexes obeyAvoidsEmptySelection:(BOOL)obeyAvoidsEmptySelection
 {
-    var newIndexes = indexes;
+    if (!indexes)
+        indexes = [CPIndexSet indexSet];
 
-    if (!newIndexes)
-        newIndexes = [CPIndexSet indexSet];
-
-    if (![newIndexes count])
+    if (![indexes count])
     {
-        if (avoidEmpty && [[self arrangedObjects] count])
-            newIndexes = [CPIndexSet indexSetWithIndex:0];
+        if (obeyAvoidsEmptySelection && _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 +650,10 @@
     [self willChangeValueForKey:@"selectionIndexes"];
     [self _selectionWillChange];
 
-    var r = [self __setSelectedObjects:objects avoidEmpty:NO];
+    [self __setSelectedObjects:objects obeyAvoidsEmptySelection:NO];
 
     [self didChangeValueForKey:@"selectionIndexes"];
-    [self _selectionDidChange];
-    return r;
+    [self _selectionDidChangeNotify:NO];
 }
 
 /*
@@ -665,10 +662,14 @@
 */
 - (BOOL)__setSelectedObjects:(CPArray)objects
 {
-    [self __setSelectedObjects:objects avoidEmpty:_avoidsEmptySelection];
+    [self __setSelectedObjects:objects obeyAvoidsEmptySelection:YES];
 }
 
-- (BOOL)__setSelectedObjects:(CPArray)objects avoidEmpty:(BOOL)avoidEmpty
+/*
+    Like setSelectedObjects but don't fire any change notifications.
+    @ignore
+*/
+- (BOOL)__setSelectedObjects:(CPArray)objects obeyAvoidsEmptySelection:(BOOL)obeyAvoidsEmptySelection
 {
     var set = [CPIndexSet indexSet],
         count = [objects count],
@@ -682,7 +683,7 @@
             [set addIndex:index];
     }
 
-    [self __setSelectionIndexes:set avoidEmpty:avoidEmpty];
+    [self __setSelectionIndexes:set obeyAvoidsEmptySelection:obeyAvoidsEmptySelection];
     return YES;
 }
 
@@ -751,21 +752,13 @@
     }
 
     [self willChangeValueForKey:@"content"];
-
-    /*
-    If the content array is bound then our addObject: message below will cause the observed
-    array to change. The binding will call setContent:_contentObject on this array
-    controller to let it know about the change. We want to ignore that message since we
-    A) already have the right _contentObject and B) properly update _arrangedObjects
-    by hand below.
-    */
-    _disableSetContent = YES;
+    [self _willModifyContent];
     [_contentObject addObject:object];
 
     // Allow handlesContentAsCompoundValue reverse sets to trigger.
     [[CPBinder getBinding:@"contentArray" forObject:self] _contentArrayDidChange];
 
-    _disableSetContent = NO;
+    [self _didModifyContent];
 
     if (willClearPredicate)
     {
@@ -786,14 +779,15 @@
             [_selectionIndexes shiftIndexesStartingAtIndex:pos by:1];
     }
     /*
-    else if (_filterPredicate !== nil)
-    ...
-    // Implies _filterPredicate && ![_filterPredicate evaluateWithObject:object], so the new object does
-    // not appear in arrangedObjects and we do not have to update at all.
+        else if (_filterPredicate !== nil)
+        ...
+        Implies _filterPredicate && ![_filterPredicate evaluateWithObject:object], so the new object does
+        not appear in arrangedObjects and we do not have to update at all.
     */
 
     // This will also send notificaitons for arrangedObjects.
     [self didChangeValueForKey:@"content"];
+
     if (willClearPredicate)
         [self didChangeValueForKey:@"filterPredicate"];
 }
@@ -819,10 +813,7 @@
 
     [self willChangeValueForKey:@"content"];
 
-    /*
-    See _disableSetContent explanation in addObject:.
-    */
-    _disableSetContent = YES;
+    [self _willModifyContent];
 
     // The atArrangedObjectIndex: part of this method's name only refers to where the
     // object goes in arrangedObjects, not in the content array. So use addObject:,
@@ -831,7 +822,7 @@
     // Allow handlesContentAsCompoundValue reverse sets to trigger.
     [[CPBinder getBinding:@"contentArray" forObject:self] _contentArrayDidChange];
 
-    _disableSetContent = NO;
+    [self _didModifyContent];
 
     if (willClearPredicate)
         [self __setFilterPredicate:nil];
@@ -849,6 +840,7 @@
         [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:0]];
 
     [self didChangeValueForKey:@"content"];
+
     if (willClearPredicate)
         [self didChangeValueForKey:@"filterPredicate"];
 }
@@ -861,15 +853,13 @@
 - (void)removeObject:(id)object
 {
     [self willChangeValueForKey:@"content"];
-
-    // See _disableSetContent explanation in addObject:.
-    _disableSetContent = YES;
+    [self _willModifyContent];
 
     [_contentObject removeObject:object];
     // Allow handlesContentAsCompoundValue reverse sets to trigger.
     [[CPBinder getBinding:@"contentArray" forObject:self] _contentArrayDidChange];
 
-    _disableSetContent = NO;
+    [self _didModifyContent];
 
     if (_filterPredicate === nil || [_filterPredicate evaluateWithObject:object])
     {
@@ -920,6 +910,15 @@
     [self removeObjectsAtArrangedObjectIndexes:_selectionIndexes];
 }
 
+/*!
+    Removes the object at the specified index in the controller's arranged objects from the content array.
+    @param int index - index of the object to remove.
+*/
+- (void)removeObjectAtArrangedObjectIndex:(int)index
+{
+    [self removeObjectsAtArrangedObjectIndexes:[CPIndexSet indexSetWithIndex:index]];
+}
+
 /*!
     Removes the objects at the specified indexes in the controller's arranged objects from the content array.
     @param CPIndexSet indexes - indexes of the objects to remove.
@@ -928,20 +927,21 @@
 {
     [self willChangeValueForKey:@"content"];
 
-    /*
-    See _disableSetContent explanation in addObject:.
-    */
     _disableSetContent = YES;
 
     var arrangedObjects = [self arrangedObjects],
         index = [anIndexSet lastIndex],
         position = CPNotFound,
-        newSelectionIndexes = [_selectionIndexes copy];
+        newSelectionIndexes = [_selectionIndexes copy],
+        proxy = [_CPKVOProxy proxyForObject:self];
 
     while (index !== CPNotFound)
     {
         var object = [arrangedObjects objectAtIndex:index];
 
+        // Make sure arrangedObjects does not notify because of content change
+        [proxy suppressNotificationsForKeyPath:@"arrangedObjects"];
+
         // First try the simple case which should work if there are no sort descriptors.
         if ([_contentObject objectAtIndex:index] === object)
             [_contentObject removeObjectAtIndex:index];
@@ -955,6 +955,9 @@
             contentIndex = [_contentObject indexOfObjectIdenticalTo:object];
             [_contentObject removeObjectAtIndex:contentIndex];
         }
+
+        // Now arrangedObjects can notify
+        [proxy unsuppressNotificationsForKeyPath:@"arrangedObjects"];
         [arrangedObjects removeObjectAtIndex:index];
 
         // Deselect this row if it was selected, and either way shift all selection indexes
@@ -964,6 +967,7 @@
 
         index = [anIndexSet indexLessThanIndex:index];
     }
+
     // Allow handlesContentAsCompoundValue reverse sets to trigger.
     [[CPBinder getBinding:@"contentArray" forObject:self] _contentArrayDidChange];
     _disableSetContent = NO;
@@ -1010,15 +1014,13 @@
 - (void)_removeObjects:(CPArray)objects
 {
     [self willChangeValueForKey:@"content"];
-
-    // See _disableSetContent explanation in addObject:.
-    _disableSetContent = YES;
+    [self _willModifyContent];
 
     [_contentObject removeObjectsInArray:objects];
     // Allow handlesContentAsCompoundValue reverse sets to trigger.
     [[CPBinder getBinding:@"contentArray" forObject:self] _contentArrayDidChange];
 
-    _disableSetContent = NO;
+    [self _didModifyContent];
 
     var arrangedObjects = [self arrangedObjects],
         position = [arrangedObjects indexOfObject:[objects objectAtIndex:0]];
@@ -1055,13 +1057,39 @@
     return [self isEditable];
 }
 
+// Internal
+- (void)_willModifyContent
+{
+    /*
+        If the content array is bound then our addObject: message below will cause the observed
+        array to change. The binding will call setContent:_contentObject on this array
+        controller to let it know about the change. We want to ignore that message since we
+        A) already have the right _contentObject and B) properly update _arrangedObjects
+        by hand below.
+    */
+    _disableSetContent = YES;
+
+    /*
+        When mutating arrangedObjects, we mutate the content first. But mutating the content
+        will trigger a notification that the arrangedObjects have changed, which we want to
+        suppress, since the arrangedObjects mutation will do the correct notification.
+    */
+    [[_CPKVOProxy proxyForObject:self] suppressNotificationsForKeyPath:@"arrangedObjects"];
+}
+
+- (void)_didModifyContent
+{
+    _disableSetContent = NO;
+    [[_CPKVOProxy proxyForObject:self] unsuppressNotificationsForKeyPath:@"arrangedObjects"];
+}
+
 @end
 
 @implementation CPArrayController (CPBinder)
 
 + (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (theBinding == @"contentArray")
+    if (theBinding === @"content" || theBinding === @"contentArray")
         return [_CPArrayControllerContentBinder class];
 
     return [super _binderClassForBinding:theBinding];
@@ -1076,45 +1104,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] || keyPath.indexOf("@") !== -1;
 
-    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/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,7 @@ CPBelowBottom = 6;
     var box = [[self alloc] initWithFrame:CGRectMakeZero()],
         enclosingView = [aView superview];
 
-    [box setAutoresizingMask:[aView autoresizingMask]];
+	[box setAutoresizingMask:[aView autoresizingMask]];
     [box setFrameFromContentFrame:[aView frame]];
 
     [enclosingView replaceSubview:aView with:box];
@@ -98,9 +84,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 +278,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 +297,7 @@ CPBelowBottom = 6;
     if (_borderType === CPNoBorder)
         return;
 
-    var bounds = CGRectMakeCopy([self bounds]);
+    var bounds = [self bounds];
 
     switch (_boxType)
     {
@@ -411,16 +312,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 +386,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 +407,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 +429,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

@@ -60,7 +60,7 @@ var cachedBlackColor,
 /*!
     Orientation to use with \c CPColorPattern for vertical patterns.
 */
-CPColorPatternIsVertical = YES;
+CPColorPatternIsVertical = YES,
 
 /*!
     Orientation to use with \c CPColorPattern for horizontal patterns.
@@ -133,7 +133,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 +147,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 +228,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 +253,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 +480,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 +494,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
 {

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

@@ -526,7 +526,7 @@ var CPControlBlackColor = [CPColor blackColor];
     // Cocoa raises an invalid parameter assertion and returns if you pass nil.
     if (aString === nil || aString === undefined)
     {
-        CPLog.warn("nil sent to CPControl -setStringValue");
+        CPLog.warn("nil or undefined sent to CPControl -setStringValue");
         return;
     }
 
@@ -536,10 +536,10 @@ var CPControlBlackColor = [CPColor blackColor];
     {
         value = nil;
 
-        if ([_formatter getObjectValue:AT_REF(value) forString:aString errorDescription:nil] === NO)
+        if (![_formatter getObjectValue:AT_REF(value) forString:aString errorDescription:nil])
         {
             // 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)
+            if (!aString || ![_formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil])
                 value = undefined;  // Means the value is invalid
         }
     }

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,12 +571,10 @@ 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.)
+    // Cocoa does not consider space, backspace, or escape a key equivalent
+    // if 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);
@@ -585,13 +583,18 @@ var _CPEventPeriodicEventPeriod         = 0,
             c === CPEnterCharacter ||
             c === CPNewlineCharacter ||
             c === CPCarriageReturnCharacter ||
-            c === CPEscapeFunctionKey)
+            c === CPEscapeFunctionKey ||
+            (!firstResponderIsText &&
+                (c === CPSpaceFunctionKey ||
+                 c === CPDeleteCharacter ||
+                 c === CPBackspaceCharacter)))
         {
             return YES;
         }
     }
 
-    return !firstResponderIsText;
+    // FIXME: More cases?
+    return NO;
 }
 
 /*!

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

@@ -281,7 +281,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.onerror = function ()
         {
@@ -293,7 +293,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.onabort = function ()
         {
@@ -305,7 +305,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.src = _filename;
 

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]];
@@ -214,7 +210,7 @@ var CPBindingOperationAnd = 0,
     return aValue;
 }
 
-- (id)reverseTransformValue:(id)aValue withOptions:(CPDictionary)options
+- (id)reverseTransformValue:(id)aValue withOptions: (CPDictionary)options
 {
     var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
         valueTransformer;
@@ -274,42 +270,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)
@@ -353,7 +313,7 @@ var CPBindingOperationAnd = 0,
         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 +425,7 @@ var resolveMultipleValues = function resolveMultipleValues(/*CPString*/key, /*CP
     }
 
     return !operation;
-};
+}
 
 var invokeAction = function invokeAction(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
 {
@@ -502,7 +462,7 @@ var invokeAction = function invokeAction(/*CPString*/targetKey, /*CPString*/argu
     }
 
     [invocation invoke];
-};
+}
 
 // Keys in options dictionary
 
@@ -527,6 +487,8 @@ CPSelectedIndexBinding  = @"selectedIndex";
 CPTextColorBinding      = @"textColor";
 CPToolTipBinding        = @"toolTip";
 CPValueBinding          = @"value";
+CPContentBinding        = @"content";
+CPContentValuesBinding  = @"contentValues";
 
 //Binding options constants
 CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelection";
@@ -557,8 +519,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/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;
 }
 
 /*!

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,

AppKit/CPObjectController.j

@@ -131,8 +131,8 @@
 
     _contentObject = aContent;
 
-    [self _selectionDidChange];
     [self didChangeValueForKey:@"contentObject"];
+    [self _selectionDidChange];
 }
 
 /*!
@@ -323,12 +323,22 @@
     @ignore
 */
 - (void)_selectionDidChange
+{
+    [self _selectionDidChangeNotify:YES];
+}
+
+/*!
+    @ignore
+*/
+- (void)_selectionDidChangeNotify:(BOOL)notify
 {
     if (_selection === undefined || _selection === nil)
         _selection = [[CPControllerSelectionProxy alloc] initWithController:self];
 
     [_selection controllerDidChange];
-    [self didChangeValueForKey:@"selection"];
+
+    if (notify)
+        [self didChangeValueForKey:@"selection"];
 }
 
 /*!
@@ -663,25 +673,24 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (id)_controllerMarkerForValues:(CPArray)theValues
 {
-    var count = [theValues count],
-        value;
+    var count = [theValues count];
 
     if (!count)
-        value = CPNoSelectionMarker;
+        return CPNoSelectionMarker;
     else if (count === 1)
         value = [theValues objectAtIndex:0];
     else
     {
         if ([_controller alwaysUsesMultipleValuesMarker])
-            value = CPMultipleValuesMarker;
+            return CPMultipleValuesMarker;
         else
         {
             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; i++)
             {
                 if (![value isEqual:[theValues objectAtIndex:i]])
-                    value = CPMultipleValuesMarker;
+                    return CPMultipleValuesMarker;
             }
         }
     }
@@ -694,8 +703,21 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (id)valueForKeyPath:(CPString)theKeyPath
 {
-    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath],
+    // If valueForKeyPath fails because of an undefined key, return CPNotApplicableMarker
+    var value;
+
+    try
+    {
+        var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath];
         value = [self _controllerMarkerForValues:values];
+    }
+    catch (ex)
+    {
+        if ([ex name] === CPUndefinedKeyException)
+            value = CPNotApplicableMarker;
+        else
+            throw ex;
+    }
 
     [_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,6 +1458,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
                     userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
+
 - (void)keyDown:(CPEvent)anEvent
 {
     var character = [anEvent charactersIgnoringModifiers],
@@ -1484,7 +1467,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     // 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)
+    if (character !== CPRightArrowFunctionKey && character !== CPLeftArrowFunctionKey) 
         return [super keyDown:anEvent];
 
     var rows = [self selectedRowIndexes],
@@ -1498,6 +1481,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 
     for (; i < c; i++)
         items.push([self itemAtRow:indexes[i]]);
+   
 
     if (character === CPRightArrowFunctionKey)
     {
@@ -1506,32 +1490,12 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     }
     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]];
+            [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 +1534,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 +1559,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 +1589,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 +1640,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
         }
     }//end of with
     return descendants;
-};
+}
 
 @implementation _CPOutlineViewTableViewDataSource : CPObject
 {
@@ -1830,9 +1792,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 +1804,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 +1885,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 +1907,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 +1984,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 +1992,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

@@ -35,10 +35,11 @@ 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_willClose_   = 1 << 3,
     CPPopoverDelegate_popover_didClose_     = 1 << 4;
 
 
@@ -49,14 +50,11 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
     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
+        – popoverShouldClose:(CPPopover)aPopOver
+        – popoverWillShow:(CPPopover)aPopOver
+        – popoverDidShow:(CPPopover)aPopOver
+        – popoverWillClose:(CPPopover)aPopOver
+        – popoverDidClose:(CPPopover)aPopOver
 */
 @implementation CPPopover : CPResponder
 {
@@ -64,17 +62,18 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
     @outlet id                  _delegate               @accessors(getter=delegate);
 
     BOOL                        _animates               @accessors(property=animates);
+    BOOL                        _shown                  @accessors(getter=shown);
     int                         _appearance             @accessors(property=appearance);
     int                         _behavior               @accessors(getter=behavior);
 
+    BOOL                        _needsCompute;
     _CPAttachedWindow           _attachedWindow;
-    BOOL                        _needsNewAttachedWindow;
     int                         _implementedDelegateMethods;
 }
 
 
 #pragma mark -
-#pragma mark Initialization
+#pragma mark INitialization
 
 /*!
     Initialize the CPPopover witn default values
@@ -85,10 +84,11 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 {
     if (self = [super init])
     {
-        _animates               = YES;
-        _appearance             = CPPopoverAppearanceMinimal;
-        _behavior               = CPPopoverBehaviorApplicationDefined;
-        _needsNewAttachedWindow = YES;
+        _animates       = YES;
+        _appearance     = CPPopoverAppearanceMinimal;
+        _behavior       = CPPopoverBehaviorApplicationDefined;
+        _needsCompute   = YES;
+        _shown          = NO;
     }
 
     return self;
@@ -101,11 +101,11 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 /*!
     Returns the current rect of the popover
 
-    @return CGRect representing the frame of the popover
+    @return CPRect represeting the frame of the popover
 */
-- (CGRect)positioningRect
+- (CPRect)positionningRect
 {
-    if (![_attachedWindow isVisible])
+    if (!_attachedWindow || ![_attachedWindow isVisible])
         return nil;
     return [_attachedWindow frame];
 }
@@ -113,9 +113,9 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 /*! Sets the frame of the popover
     @param aRect the desired frame
 */
-- (void)setPositioningRect:(CGRect)aRect
+- (void)setPositionningRect:(CPRect)aRect
 {
-    if (![_attachedWindow isVisible])
+    if (!_attachedWindow || ![_attachedWindow isVisible])
         return;
     [_attachedWindow setFrame:aRect];
 }
@@ -123,11 +123,11 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 /*!
     Returns the size of the popover's view
 
-    @return CGSize representing the size of the popover's view
+    @return CPSize represeting the size of the popover's view
 */
-- (CGSize)contentSize
+- (CPRect)contentSize
 {
-    if (![_attachedWindow isVisible])
+    if (!_attachedWindow || ![_attachedWindow isVisible])
         return nil;
     return [[_contentViewController view] frameSize];
 }
@@ -145,20 +145,21 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 /*!
     Indicates if CPPopover is visible
 
-    @returns \c YES if visible
+    @returns YES if visible
 */
 - (BOOL)shown
 {
+    if (!_attachedWindow)
+        return NO;
     return [_attachedWindow isVisible];
 }
 
 /*!
-Set the behaviour of the CPPopover. It can be:
+    Set the behaviour of the CPPopover. It can be
+        - CPPopoverBehaviorTransient: the popover will be close if another control outside the popover become the responder
+        - CPPopoverBehaviorApplicationDefined: (DEFAULT) the application is responsible for closing the popover
 
-- \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
+    @param aBehaviour the desired behaviour
 */
 - (void)setBehaviour:(int)aBehaviour
 {
@@ -166,9 +167,10 @@ Set the behaviour of the CPPopover. It can be:
         return;
 
     _behavior = aBehaviour;
-    _needsNewAttachedWindow = YES;
+    _needsCompute = YES;
 }
 
+
 - (void)setDelegate:(id)aDelegate
 {
     if (_delegate === aDelegate)
@@ -194,33 +196,31 @@ Set the behaviour of the CPPopover. It can be:
 }
 
 #pragma mark -
-#pragma mark Positioning
+#pragma mark Positionning
 
 /*!
     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.
+    @param preferredEdge: CPRectEdge representing the prefered positionning.
 */
-- (void)showRelativeToRect:(CGRect)positioningRect ofView:(CPView)positioningView preferredEdge:(CPRectEdge)preferredEdge
+- (void)showRelativeToRect:(CPRect)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])
+    if (!_contentViewController)
+         [CPException raise:CPInternalInconsistencyException reason:@"contentViewController must not be nil"];
+
+    if (_needsCompute)
     {
         var styleMask = (_behavior == CPPopoverBehaviorTransient) ? CPClosableOnBlurWindowMask : nil;
-        _attachedWindow = [[_CPAttachedWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:styleMask];
-        _needsNewAttachedWindow = NO;
+        _attachedWindow = [[_CPAttachedWindow alloc] initWithContentRect:CPRectMakeZero() styleMask:styleMask];
     }
 
     [_attachedWindow setAppearance:_appearance];
     [_attachedWindow setAnimates:_animates];
-    [_attachedWindow setDelegate:self];
     [_attachedWindow setMovableByWindowBackground:NO];
     [_attachedWindow setFrame:[_attachedWindow frameRectForContentRect:[[_contentViewController view] frame]]];
     [_attachedWindow setContentView:[_contentViewController view]];
@@ -230,7 +230,7 @@ Set the behaviour of the CPPopover. It can be:
     else if (positioningView)
         [_attachedWindow positionRelativeToView:positioningView preferredEdge:preferredEdge];
     else
-        [CPException raise:CPInvalidArgumentException reason:@"a value must be passed for positioningRect or positioningView"];
+        [CPException raise:CPInvalidArgumentException reason:@"you must set positioningRect or positioningRect"];
 
     if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
         [_delegate popoverDidShow:self];
@@ -250,8 +250,8 @@ Set the behaviour of the CPPopover. It can be:
 
     [_attachedWindow close];
 
-    // popoverDidClose will be sent from attachedWindowDidClose, since
-    // the attached window will close asynchronously when animating.
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_)
+        [_delegate popoverDidClose:self];
 }
 
 
@@ -268,36 +268,8 @@ Set the behaviour of the CPPopover. It can be:
     [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)
 
@@ -307,12 +279,12 @@ var CPPopoverNeedsNewAttachedWindowKey = @"CPPopoverNeedsNewAttachedWindowKey",
 
     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]];
+        _needsCompute = [aCoder decodeIntForKey:@"_needsCompute"];
+        _appearance = [aCoder decodeIntForKey:@"_appearance"];
+        _animates = [aCoder decodeBoolForKey:@"_animates"];
+        _contentViewController = [aCoder decodeObjectForKey:@"_contentViewController"];
+        [self setDelegate:[aCoder decodeObjectForKey:@"_delegate"]];
+        [self setBehaviour:[aCoder decodeIntForKey:@"_behavior"]];
     }
     return self;
 }
@@ -321,12 +293,12 @@ var CPPopoverNeedsNewAttachedWindowKey = @"CPPopoverNeedsNewAttachedWindowKey",
 {
     [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];
+    [aCoder encodeInt:_behavior forKey:@"_behavior"];
+    [aCoder encodeInt:_appearance forKey:@"_appearance"];
+    [aCoder encodeBool:_needsCompute forKey:@"_needsCompute"];
+    [aCoder encodeObject:_contentViewController forKey:@"_contentViewController"];
+    [aCoder encodeObject:_delegate forKey:@"_delegate"];
+    [aCoder encodeObject:_animates forKey:@"_animates"];
 }
 
-@end
+@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)
     {
@@ -602,7 +457,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]];
 }
@@ -710,20 +565,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 +583,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 +606,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 +631,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/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/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];
 
@@ -332,18 +332,18 @@ CPTableColumnUserResizingMask   = 1 << 1;
     individual cell that is shown. As a result, changes made after calling this method won't be reflected.
 
     Example:
-        @code
-        [tableColumn setDataView:someView]; // snapshot taken
-        [[tableColumn dataView] setSomething:x]; //won't work
-        @endcode
+    @code
+    [tableColumn setDataView:someView]; // snapshot taken
+    [[tableColumn dataView] setSomething:x]; //won't work
+    @endcode
 
     This doesn't work because the snapshot is taken before the new property is applied. Instead, do:
-        @code
-        [someView setSomething:x];
-        [tableColumn setDataView:someView];
-        @endcode
+    @code
+    [someView setSomething:x];
+    [tableColumn setDataView:someView];
+    @endcode
 
-    @note you should implement CPKeyedArchiving otherwise you might see unexpected results.
+    @note You should implement CPKeyedArchiving otherwise you might see unexpected results.
     This is done by adding the following methods to your class:
     @endnote
 
@@ -380,7 +380,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     }
     @endcode
 
-    @section Themeing
+    @section Theming
 
     When you set a dataview and it is added to the tableview the theme state will be set to \c CPThemeStateTableDataView
     When the dataview becomes selected the theme state will be set to \c CPThemeStateSelectedDataView.
@@ -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
@@ -323,6 +323,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 {
     _tableViewFlags = 0;
     _lastSelectedRow = -1;
+    _clickedRow = -1;
 
     _selectedColumnIndexes = [CPIndexSet indexSet];
     _selectedRowIndexes = [CPIndexSet indexSet];
@@ -509,11 +510,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 +679,6 @@ NOT YET IMPLEMENTED
 */
 - (void)setRowHeight:(unsigned)aRowHeight
 {
-    // Accept row heights such as "0".
     aRowHeight = +aRowHeight;
 
     if (_rowHeight === aRowHeight)
@@ -769,6 +764,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 +954,6 @@ NOT YET IMPLEMENTED
 */
 - (void)_moveColumn:(unsigned)fromIndex toColumn:(unsigned)toIndex
 {
-    // Convert parameters such as "0" to 0.
     fromIndex = +fromIndex;
     toIndex = +toIndex;
 
@@ -1513,8 +1511,6 @@ NOT YET IMPLEMENTED
 
     if ([scrollView isKindOfClass:[CPScrollView class]] && [scrollView documentView] === self)
         [scrollView _updateCornerAndHeaderView];
-
-    [self setNeedsLayout];
 }
 
 // Complexity:
@@ -1566,7 +1562,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 +1791,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 +1985,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),
@@ -3050,6 +3045,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     return _sortDescriptors;
 }
 
+
 /*!
     @ignore
 */
@@ -3430,6 +3426,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         [aTableColumn setDataView:dataView];
     }
 
+
     return [aTableColumn _newDataViewForRow:aRow];
 }
 
@@ -3501,20 +3498,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
 */
@@ -3701,7 +3686,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 +3706,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 +3813,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 +3824,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 +3973,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];
 
@@ -4653,19 +4638,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 +4662,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 +4939,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
@@ -28,7 +29,7 @@
 @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";
@@ -168,8 +169,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(2.0, 2.0, 2.0, 2.0), [CPNull null]]
-                                       forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(2.0, 2.0, 2.0, 2.0), _CGInsetMake(3.0, 3.0, 3.0, 3.0), [CPNull null]]
+                                       forKeys:[@"bezel-inset", @"content-inset", @"border-inset", @"bezel-color"]];
 }
 
 /* @ignore */
@@ -202,14 +203,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;
@@ -506,31 +507,32 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     }
 
     var contentRect = [self contentRectForBounds:[self bounds]],
-        verticalAlign = [self currentValueForThemeAttribute:"vertical-alignment"];
+        verticalAlign = [self currentValueForThemeAttribute:"vertical-alignment"],
+        lineHeight = [font defaultLineHeightForFont];
 
     switch (verticalAlign)
     {
         case CPTopVerticalTextAlignment:
-            var topPoint = (_CGRectGetMinY(contentRect) + 1) + "px"; // for the same reason we have a -1 for the left, we also have a + 1 here
+            var topPoint = _CGRectGetMinY(contentRect) + "px"; // for the same reason we have a -1 for the left, we also have a + 1 here
             break;
 
         case CPCenterVerticalTextAlignment:
-            var topPoint = (_CGRectGetMidY(contentRect) - (font._lineHeight / 2) + 1) + "px";
+            var topPoint = (_CGRectGetMidY(contentRect) - (lineHeight / 2)) + "px";
             break;
 
         case CPBottomVerticalTextAlignment:
-            var topPoint = (_CGRectGetMaxY(contentRect) - font._lineHeight) + "px";
+            var topPoint = (_CGRectGetMaxY(contentRect) - lineHeight) + "px";
             break;
 
         default:
-            var topPoint = (_CGRectGetMinY(contentRect) + 1) + "px";
+            var topPoint = _CGRectGetMinY(contentRect) + "px";
             break;
     }
 
     element.style.top = topPoint;
     element.style.left = (_CGRectGetMinX(contentRect) - 1) + "px"; // why -1?
     element.style.width = _CGRectGetWidth(contentRect) + "px";
-    element.style.height = font._lineHeight + "px"; // private ivar for the line height of the DOM text at this particular size
+    element.style.height = lineHeight + "px";
 
     _DOMElement.appendChild(element);
 
@@ -573,17 +575,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 #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)
+    if ([self _valueIsValid:element.value] === NO)
     {
         [self setThemeState:CPThemeStateEditing];
         element.focus();
@@ -630,15 +626,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 #endif
 
-    // post CPControlTextDidEndEditingNotification
-    if (_isEditing)
-    {
-        _isEditing = NO;
-        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
+    _isEditing = NO;
+    [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
 
-        if ([self sendsActionOnEndEditing])
-            [self sendAction:[self action] to:[self target]];
-    }
+    if ([self sendsActionOnEndEditing])
+        [self sendAction:[self action] to:[self target]];
 
     [self textDidBlur:[CPNotification notificationWithName:CPTextFieldDidBlurNotification object:self userInfo:nil]];
 
@@ -779,13 +771,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)insertNewline:(id)sender
 {
-    var newValue = [self _inputElement].value;
-
-    if (newValue !== _stringValue)
-    {
-        [self _setStringValue:newValue];
-    }
-
     if ([self _valueIsValid:_stringValue])
     {
         // If _isEditing == YES then the target action can also be called via
@@ -1022,6 +1007,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]];
@@ -1035,7 +1021,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         maxSize = [self currentValueForThemeAttribute:@"max-size"],
         lineBreakMode = [self lineBreakMode],
         text = (_stringValue || @" "),
-        textSize = _CGSizeMakeCopy(frameSize),
+        textSize = CGSizeMakeCopy(frameSize),
         font = [self currentValueForThemeAttribute:@"font"];
 
     textSize.width -= contentInset.left + contentInset.right;
@@ -1305,10 +1291,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (CGRect)contentRectForBounds:(CGRect)bounds
 {
-    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
-
-    if (!contentInset)
-        return bounds;
+    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"],
+        contentInset = [self currentValueForThemeAttribute:@"content-inset"];
 
     bounds.origin.x += contentInset.left;
     bounds.origin.y += contentInset.top;
@@ -1333,6 +1317,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return bounds;
 }
 
+- (CGInset)borderInset
+{
+    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"],
+        borderInset = [self currentValueForThemeAttribute:@"border-inset"];
+
+    return CGInsetUnion(bezelInset, borderInset);
+}
+
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
     if (aName === "bezel-view")
@@ -1433,7 +1425,7 @@ var secureStringForString = function(aString)
         return "";
 
     return Array(aString.length + 1).join(CPSecureTextFieldCharacter);
-};
+}
 
 
 var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
@@ -1503,16 +1495,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 +1505,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

@@ -25,9 +25,10 @@
 @import <Foundation/CPKeyedUnarchiver.j>
 
 
-var CPThemesByName          = { },
-    CPThemeDefaultTheme     = nil,
-    CPThemeDefaultHudTheme  = nil;
+var CPThemesByName              = { },
+    CPThemeNamesByInheritance   = [],
+    CPThemeDefaultTheme         = nil,
+    CPThemeDefaultHudTheme      = nil;
 
 
 /*!
@@ -76,6 +77,52 @@ var CPThemesByName          = { },
     return CPThemesByName[aName];
 }
 
+/*!
+    Returns an array of names of all loaded themes, in the order they were loaded.
+*/
++ (CPArray)allThemeNames
+{
+    return [CPThemeNamesByInheritance copy];
+}
+
+/*!
+    Returns the closest matching theme for a given view or view class.
+    The matching proceeds as follows:
+
+    - The default theme class name for the class is retrieved.
+    - Starting with the last loaded theme and proceeding towards the default theme,
+      each theme is checked to see if it defines that theme class.
+    - If the theme defines the class name, that theme is returned.
+    - If no themes match, the default theme is returned.
+
+    @param aViewOrClass The view or view class to match with a theme
+    @return             The first matching theme
+*/
++ (CPTheme)themeForView:(id)aViewOrClass
+{
+    var themeClass = nil;
+
+    if (class_isMetaClass(aViewOrClass.isa))
+        themeClass = [aViewOrClass defaultThemeClass];
+    else
+        themeClass = [aViewOrClass themeClass];
+
+    if (themeClass)
+    {
+        var count = CPThemeNamesByInheritance.length;
+
+        while (count--)
+        {
+            var theme = CPThemesByName[CPThemeNamesByInheritance[count]];
+
+            if ([theme._attributes containsKey:themeClass])
+                return theme;
+        }
+    }
+
+    return CPThemeDefaultTheme;
+}
+
 - (id)initWithName:(CPString)aName
 {
     self = [super init];
@@ -86,6 +133,9 @@ var CPThemesByName          = { },
         _attributes = [CPDictionary dictionary];
 
         CPThemesByName[_name] = self;
+
+        if (![CPThemeNamesByInheritance containsObject:_name])
+            CPThemeNamesByInheritance.push(_name);
     }
 
     return self;
@@ -299,6 +349,9 @@ var CPThemeNameKey          = @"CPThemeNameKey",
         _attributes = [aCoder decodeObjectForKey:CPThemeAttributesKey];
 
         CPThemesByName[_name] = self;
+
+        if (![CPThemeNamesByInheritance containsObject:_name])
+            CPThemeNamesByInheritance.push(_name);
     }
 
     return self;
@@ -579,7 +632,6 @@ CPThemeStateCircular        = CPThemeState("circular");
         _cache = {};
 
         _name = [aCoder decodeObjectForKey:@"name"];
-        _defaultValue = [aCoder decodeObjectForKey:@"defaultValue"];
         _values = [CPDictionary dictionary];
 
         if ([aCoder containsValueForKey:@"value"])
@@ -612,7 +664,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 +719,7 @@ var numberOfOnes = function(aNumber)
     cachedNumberOfOnes[slot] = count;
 
     return count;
-};
+}
 
 numberOfOnes.displayName = "numberOfOnes";
 

AppKit/CPTokenField.j

@@ -93,10 +93,11 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
     return "tokenfield";
 }
 
-- (id)initWithFrame:(CPRect)frame
+- (id)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame])
     {
+        _selectedRange = CPMakeRange(0, 0);
         _completionDelay = [CPTokenField defaultCompletionDelay];
         _tokenizingCharacterSet = [[self class] defaultTokenizingCharacterSet];
         [self setBezeled:YES];
@@ -113,16 +114,14 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 
 - (void)_init
 {
-    _selectedRange = CPMakeRange(0, 0);
-
     var frame = [self frame];
 
-    _tokenScrollView = [[CPScrollView alloc] initWithFrame:CGRectMakeZero()];
+    _tokenScrollView = [[CPScrollView alloc] initWithFrame:_CGRectMakeZero()];
     [_tokenScrollView setHasHorizontalScroller:NO];
     [_tokenScrollView setHasVerticalScroller:NO];
     [_tokenScrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 
-    var contentView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    var contentView = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
     [contentView setAutoresizingMask:CPViewWidthSizable];
     [_tokenScrollView setDocumentView:contentView];
 
@@ -130,15 +129,15 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 
     _cachedCompletions = [];
 
-    _autocompleteContainer = [[CPView alloc] initWithFrame:CPRectMake(0.0, 0.0, frame.size.width, 92.0)];
+    _autocompleteContainer = [[CPView alloc] initWithFrame:_CGRectMake(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 = [[CPScrollView alloc] initWithFrame:_CGRectMake(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()];
+    _autocompleteView = [[CPTableView alloc] initWithFrame:_CGRectMakeZero()];
 
     var tableColumn = [[CPTableColumn alloc] initWithIdentifier:CPTokenFieldTableColumnIdentifier];
     [tableColumn setResizingMask:CPTableColumnAutoresizingMask];
@@ -164,28 +163,31 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 {
     var indexOfSelectedItem = 0;
 
+#if PLATFORM(DOM)
     _cachedCompletions = [self tokenField:self completionsForSubstring:[self _inputElement].value indexOfToken:0 indexOfSelectedItem:indexOfSelectedItem];
+#endif
 
     [_autocompleteView selectRowIndexes:[CPIndexSet indexSetWithIndex:indexOfSelectedItem] byExtendingSelection:NO];
     [_autocompleteView reloadData];
 }
 
+#if PLATFORM(DOM)
+
 - (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 +202,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
         return;
     }
 
+
     var objectValue = [self objectValue];
 
     // Remove the uncompleted token and add the token string.
@@ -207,25 +210,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];
@@ -238,6 +226,8 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
     [self _autocompleteWithDOMEvent:nil];
 }
 
+#endif
+
 - (void)_selectToken:(_CPTokenFieldToken)token byExtendingSelection:(BOOL)extend
 {
     var indexOfToken = [[self _tokens] indexOfObject:token];
@@ -270,13 +260,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 +301,6 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
     [self _controlTextDidChange];
 }
 
-- (void)_updatePlaceholderState
-{
-    if (([[self _tokens] count] === 0) && ![self hasThemeState:CPThemeStateEditing])
-        [self setThemeState:CPTextFieldStatePlaceholder];
-    else
-        [self unsetThemeState:CPTextFieldStatePlaceholder];
-}
-
 // =============
 // = RESPONDER =
 // =============
@@ -401,10 +378,10 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 
     [self unsetThemeState:CPThemeStateEditing];
 
-    [self _autocomplete];
-
 #if PLATFORM(DOM)
 
+    [self _autocomplete];
+
     var element = [self _inputElement];
 
     CPTokenFieldInputResigning = YES;
@@ -608,16 +585,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 +635,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             CPTokenFieldInputDidBlur = YES;
 
             return true;
-        };
+        }
 
         CPTokenFieldKeyDownFunction = function(aDOMEvent)
         {
@@ -689,7 +664,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
                 rowRect = [autocompleteView rectOfRow:index],
                 owner = CPTokenFieldInputOwner;
 
-            if (rowRect && !CPRectContainsRect([clipView bounds], rowRect))
+            if (rowRect && !CGRectContainsRect([clipView bounds], rowRect))
                 [clipView scrollToPoint:[autocompleteView rectOfRow:index].origin];
 
             if (aDOMEvent.keyCode === CPReturnKeyCode || aDOMEvent.keyCode === CPTabKeyCode)
@@ -779,7 +754,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             else if (aDOMEvent.keyCode === CPDeleteKeyCode)
             {
                 // Highlight the previous token if backspace was pressed in an empty input element or re-show the completions view
-                if (CPTokenFieldDOMInputElement.value == @"")
+                if (CPTokenFieldDOMInputElement.value.length === 0)
                 {
                     [self _hideCompletions];
 
@@ -814,7 +789,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             }
 
             return true;
-        };
+        }
 
         CPTokenFieldKeyPressFunction = function(aDOMEvent)
         {
@@ -844,7 +819,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             // Force immediate layout in case word wrapping is now necessary.
             [owner setNeedsLayout];
             [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-        };
+        }
 
         CPTokenFieldKeyUpFunction = function()
         {
@@ -857,14 +832,14 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             [self setNeedsLayout];
 
             [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-        };
+        }
 
         CPTokenFieldHandleBlur = function(anEvent)
         {
             CPTokenFieldInputOwner = nil;
 
             [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-        };
+        }
 
         if (document.attachEvent)
         {
@@ -899,6 +874,15 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 }
 #endif
 
+// In the context of a token field, it is empty when there are no tokens
+- (void)_updatePlaceholderState
+{
+    if (([[self _tokens] count] === 0) && ![self hasThemeState:CPThemeStateEditing])
+        [self setThemeState:CPTextFieldStatePlaceholder];
+    else
+        [self unsetThemeState:CPTextFieldStatePlaceholder];
+}
+
 // - (void)setTokenStyle: (NSTokenStyle) style;
 // - (NSTokenStyle)tokenStyle;
 //
@@ -981,9 +965,9 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
         // Manually sizeToFit because CPTableView's sizeToFit doesn't work properly
         [_autocompleteContainer setHidden:NO];
         var frameOrigin = [self convertPoint:[self bounds].origin toView:[_autocompleteContainer superview]];
-        [_autocompleteContainer setFrameOrigin:CPPointMake(frameOrigin.x, frameOrigin.y + frame.size.height)];
-        [_autocompleteContainer setFrameSize:CPSizeMake(CPRectGetWidth([self bounds]), 92.0)];
-        [_autocompleteScrollView setFrameSize:CPSizeMake([_autocompleteContainer frame].size.width - 2.0, 90.0)];
+        [_autocompleteContainer setFrameOrigin:_CGPointMake(frameOrigin.x, frameOrigin.y + frame.size.height)];
+        [_autocompleteContainer setFrameSize:_CGSizeMake(_CGRectGetWidth([self bounds]), 92.0)];
+        [_autocompleteScrollView setFrameSize:_CGSizeMake([_autocompleteContainer frame].size.width - 2.0, 90.0)];
     }
     else
         [_autocompleteContainer setHidden:YES];
@@ -993,11 +977,11 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
         return;
 
     // Move each token into the right position.
-    var contentRect = CGRectMakeCopy([contentView bounds]),
+    var contentRect = _CGRectMakeCopy([contentView bounds]),
         contentOrigin = contentRect.origin,
         contentSize = contentRect.size,
-        offset = CPPointMake(contentOrigin.x, contentOrigin.y),
-        spaceBetweenTokens = CPSizeMake(2.0, 2.0),
+        offset = _CGPointMake(contentOrigin.x, contentOrigin.y),
+        spaceBetweenTokens = _CGSizeMake(2.0, 2.0),
         isEditing = [[self window] firstResponder] == self,
         tokenToken = [_CPTokenFieldToken new];
 
@@ -1008,7 +992,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 
     var fitAndFrame = function(width, height)
     {
-        var r = CGRectMake(0, 0, width, height);
+        var r = _CGRectMake(0, 0, width, height);
 
         if (offset.x + width >= contentSize.width && offset.x > contentOrigin.x)
         {
@@ -1021,15 +1005,16 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
 
         // Make sure the frame fits.
         if (CGRectGetHeight([contentView bounds]) < offset.y + height)
-            [contentView setFrame:CGRectMake(0, 0, CGRectGetWidth([_tokenScrollView bounds]), offset.y + height)];
+            [contentView setFrame:_CGRectMake(0, 0, CGRectGetWidth([_tokenScrollView bounds]), offset.y + height)];
 
         offset.x += width + spaceBetweenTokens.width;
 
         return r;
-    };
+    }
 
     var placeEditor = function(useRemainingWidth)
     {
+#if PLATFORM(DOM)
         var element = [self _inputElement],
             textWidth = 1;
 
@@ -1039,6 +1024,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             // without clipping. Since different fonts might have different sizes of "X" this
             // solution is not ideal, but it works.
             textWidth = [(element.value || @"") + "X" sizeWithFont:[self font]].width;
+
             if (useRemainingWidth)
                 textWidth = MAX(contentSize.width - offset.x - 1, textWidth);
         }
@@ -1053,7 +1039,8 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
         // When editing, always scroll to the cursor.
         if (_selectedRange.length == 0)
             [[_tokenScrollView documentView] scrollRectToVisible:inputFrame];
-    };
+#endif
+    }
 
     for (var i = 0, count = [tokens count]; i < count; i++)
     {
@@ -1079,6 +1066,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
     if (isEditing && CPMaxRange(_selectedRange) >= [tokens count])
         placeEditor(true);
 
+#if PLATFORM(DOM)
     // Hide the editor if there are selected tokens, but still keep it active
     // so we can continue using our standard keyboard handling events.
     if (isEditing && _selectedRange.length)
@@ -1086,24 +1074,27 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
         [self _inputElement].style.left = "-10000px";
         [self _inputElement].focus();
     }
+#endif
 
     // Trim off any excess height downwards.
     if (CGRectGetHeight([contentView bounds]) > offset.y + tokenHeight)
-        [contentView setFrame:CGRectMake(0, 0, CGRectGetWidth([_tokenScrollView bounds]), offset.y + tokenHeight)];
+        [contentView setFrame:_CGRectMake(0, 0, CGRectGetWidth([_tokenScrollView bounds]), offset.y + tokenHeight)];
 
     if (_shouldScrollTo !== CPScrollDestinationNone)
     {
         // Only carry out the scroll if the cursor isn't visible.
         if (!(isEditing && _selectedRange.length == 0))
         {
-
             var scrollToToken = _shouldScrollTo;
+
             if (scrollToToken === CPScrollDestinationLeft)
                 scrollToToken = tokens[_selectedRange.location]
             else if (scrollToToken === CPScrollDestinationRight)
                 scrollToToken = tokens[MAX(0, CPMaxRange(_selectedRange) - 1)];
+
             [self _scrollTokenViewToVisible:scrollToToken];
         }
+
         _shouldScrollTo = CPScrollDestinationNone;
     }
 }
@@ -1184,19 +1175,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
@@ -1231,11 +1210,11 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
     return "tokenfield-token";
 }
 
-- (id)initWithFrame:(CPRect)frame
+- (id)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame])
     {
-        _deleteButton = [[_CPTokenFieldTokenCloseButton alloc] initWithFrame:CPRectMakeZero()];
+        _deleteButton = [[_CPTokenFieldTokenCloseButton alloc] initWithFrame:_CGRectMakeZero()];
         [self addSubview:_deleteButton];
 
         [self setEditable:NO];
@@ -1296,7 +1275,7 @@ var CPThemeStateAutoCompleting          = @"CPThemeStateAutoCompleting",
             buttonOffset = [_deleteButton currentValueForThemeAttribute:@"offset"],
             buttonSize = [_deleteButton currentValueForThemeAttribute:@"min-size"];
 
-        [_deleteButton setFrame:CPRectMake(CPRectGetMaxX(frame) - buttonOffset.x, CPRectGetMinY(frame) + buttonOffset.y, buttonSize.width, buttonSize.height)];
+        [_deleteButton setFrame:_CGRectMake(_CGRectGetMaxX(frame) - buttonOffset.x, _CGRectGetMinY(frame) + buttonOffset.y, buttonSize.width, buttonSize.height)];
     }
 }
 

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;

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,14 +291,11 @@ 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
 
-        _theme = [CPTheme defaultTheme];
+        _theme = [CPTheme themeForView:self];
         _themeState = CPThemeStateNormal;
 
         [self setupViewFlags];
@@ -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,14 +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)
@@ -2620,16 +2559,6 @@ setBoundsOrigin:
     }
 }
 
-/*!
-    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.
@@ -2792,7 +2721,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
 
         [self setupViewFlags];
 
-        _theme = [CPTheme defaultTheme];
+        _theme = [CPTheme themeForView:self];
         _themeClass = [aCoder decodeObjectForKey:CPViewThemeClassKey];
         _themeState = CPThemeState([aCoder decodeIntForKey:CPViewThemeStateKey]);
         _themeAttributes = {};
@@ -2896,7 +2825,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 +2922,4 @@ var _CPViewGetTransform = function(/*CPView*/ fromView, /*CPView */ toView)
     }*/
 
     return transform;
-};
+}

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,7 @@ CPTexturedBackgroundWindowMask
         [self close];
 
     _platformWindow = aPlatformWindow;
-    [_platformWindow _setTitle:_title window:self];
+    [_platformWindow setTitle:_title];
 
     if (wasVisible)
         [self orderFront:self];
@@ -516,10 +512,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 +950,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 +1274,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 +1360,7 @@ CPTexturedBackgroundWindowMask
     _title = aTitle;
 
     [_windowView setTitle:aTitle];
-    [_platformWindow _setTitle:_title window:self];
+    [_platformWindow setTitle:_title];
 
     [self _synchronizeMenuBarTitleWithWindowTitle];
 }
@@ -1445,23 +1431,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 +2474,9 @@ CPTexturedBackgroundWindowMask
 
     _autorecalculatesKeyViewLoop = shouldRecalculate;
 
-    if (_autorecalculatesKeyViewLoop)
+    if (_keyViewLoopIsDirty)
+        [self recalculateKeyViewLoop];
+    else if (_autorecalculatesKeyViewLoop)
         [self _dirtyKeyViewLoop];
 }
 
@@ -2516,70 +2487,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 +2598,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 +2636,7 @@ var keyViewComparator = function(lhs, rhs, context)
         return CPOrderedSame;
 
     return CPOrderedDescending;
-};
+}
 
 @implementation CPWindow (MenuBar)
 
@@ -2931,7 +2860,7 @@ var keyViewComparator = function(lhs, rhs, context)
 var interpolate = function(fromValue, toValue, progress)
 {
     return fromValue + (toValue - fromValue) * progress;
-};
+}
 
 /* @ignore */
 @implementation _CPWindowFrameAnimation : CPAnimation

AppKit/CPWindow/_CPAttachedWindowView.j

@@ -22,15 +22,11 @@
 
 @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
+    A custom CPWindowView that manage border and cursor
 */
 @implementation _CPAttachedWindowView : _CPWindowView
 {
@@ -40,7 +36,7 @@ var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10);
     int             _appearance                 @accessors(property=appearance);
     unsigned        _preferredEdge              @accessors(property=preferredEdge);
 
-    CGSize          _cursorSize;
+    CPSize          _cursorSize;
 }
 
 /*!
@@ -85,16 +81,18 @@ var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10);
 /*!
     Initialize the _CPWindowView
 */
-- (id)initWithFrame:(CGRect)aFrame styleMask:(unsigned)aStyleMask
+- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
 {
     if (self = [super initWithFrame:aFrame styleMask:aStyleMask])
     {
+        var bundle = [CPBundle bundleForClass:[self class]];
         _arrowOffsetX = 0.0;
         _arrowOffsetY = 0.0;
 
         // @TODO: make this themable
+        _useGlowingEffect = YES;
         _appearance = CPPopoverAppearanceMinimal;
-        _cursorSize = CGSizeMakeCopy(_CPAttachedWindowViewDefaultCursorSize);
+        _cursorSize = CPSizeMake(15, 10);
     }
 
     return self;
@@ -105,7 +103,7 @@ var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10);
 */
 - (void)hideCursor
 {
-    _cursorSize = CGSizeMakeZero();
+    _cursorSize = CPSizeMakeZero();
     [self setNeedsDisplay:YES];
 }
 
@@ -114,7 +112,7 @@ var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10);
 */
 - (void)showCursor
 {
-    _cursorSize = CGSizeMakeCopy(_CPAttachedWindowViewDefaultCursorSize);
+    _cursorSize = CPSizeMake(15, 10);
     [self setNeedsDisplay:YES];
     _mouseDownPressed = NO;
 }
@@ -131,13 +129,11 @@ var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10);
         arrowWidth = _cursorSize.width,
         arrowHeight = _cursorSize.height,
         strokeWidth = 1,
-        halfStrokeWidth = strokeWidth / 2.0,
         strokeColor,
         shadowColor = [[CPColor blackColor] colorWithAlphaComponent:.2],
-        shadowSize = CGSizeMake(0, 6),
+        shadowSize = CGSizeMake(0, 7),
         shadowBlur = 15,
-        gradient,
-        frame = [self bounds];
+        gradient;
 
     if (_appearance == CPPopoverAppearanceMinimal)
     {
@@ -153,217 +149,133 @@ var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10);
     }
 
     // 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);
+    aRect.origin.x += strokeWidth + shadowBlur;
+    aRect.origin.y += strokeWidth + (shadowBlur + shadowSize.height / 2);
+    aRect.size.width -= (strokeWidth * 2) + (shadowBlur * 2);
+    aRect.size.height -= (strokeWidth * 2) + (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);
+    CGContextDrawLinearGradient(context, gradient, CGPointMake(CPRectGetMidX(aRect), 0.0), CGPointMake(CPRectGetMidX(aRect), aRect.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();
+
+    var xMin = _CGRectGetMinX(aRect),
+        xMax = _CGRectGetMaxX(aRect),
+        yMin = _CGRectGetMinY(aRect),
+        yMax = _CGRectGetMaxY(aRect);
 
     // draw!
     switch (_preferredEdge)
     {
         case CPMinXEdge:
-        case CPMaxXEdge:
-            // origin nw
-            pt.x = ALIGN_COORD(xMin + radius);
-            pt.y = yMin;
-            CGContextMoveToPoint(context, pt.x, pt.y);
+            // origin ne
+            CGContextMoveToPoint(context, xMin + radius, yMin);
 
             // 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));
+            CGContextAddLineToPoint(context, xMax - radius, yMin);
+            CGContextAddCurveToPoint(context, xMax - radius, yMin, xMax, yMin, xMax, 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);
-            }
+            // arrow CPMinXEdge
+            CGContextAddLineToPoint(context, xMax, (aRect.size.height / 2) + aRect.origin.y + _arrowOffsetY - (arrowHeight - 2));
+            CGContextAddLineToPoint(context, aRect.size.width + arrowHeight + aRect.origin.x + _arrowOffsetX, (aRect.size.height / 2) + aRect.origin.y + _arrowOffsetY);
+            CGContextAddLineToPoint(context, aRect.size.width + aRect.origin.x + _arrowOffsetX, (aRect.size.height / 2 + (arrowWidth / 2)) + aRect.origin.y + _arrowOffsetY);
 
             // 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);
+            CGContextAddLineToPoint(context, xMax, yMax - radius);
+            CGContextAddCurveToPoint(context, xMax, yMax - radius, xMax, yMax, 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);
-            }
+            CGContextAddLineToPoint(context, xMin + radius, yMax);
+            CGContextAddCurveToPoint(context, xMin + radius, yMax, xMin, yMax, xMin, yMax - radius);
 
             // 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);
+            CGContextAddLineToPoint(context, xMin, yMin + radius);
+            CGContextAddCurveToPoint(context, xMin, yMin + radius, xMin, yMin, xMin + radius, yMin);
+            break;
+
+        case CPMaxXEdge:
+            // origin ne
+            CGContextMoveToPoint(context, xMin + radius, yMin);
+
+            // ne
+            CGContextAddLineToPoint(context, xMax - radius, yMin);
+            CGContextAddCurveToPoint(context, xMax - radius, yMin, xMax, yMin, xMax, yMin + radius);
+
+            // se
+            CGContextAddLineToPoint(context, xMax, yMax - radius);
+            CGContextAddCurveToPoint(context, xMax, yMax - radius, xMax, yMax, xMax - radius, yMax);
+
+            // sw
+            CGContextAddLineToPoint(context, xMin + radius, yMax);
+            CGContextAddCurveToPoint(context, xMin + radius, yMax, xMin, yMax, xMin, yMax - radius);
+
+            // arrow CPMaxXEdge
+            CGContextAddLineToPoint(context, xMin, (aRect.size.height / 2 + (arrowWidth / 2) + aRect.origin.y + _arrowOffsetY));
+            CGContextAddLineToPoint(context, aRect.origin.x - arrowHeight + _arrowOffsetX, (aRect.size.height / 2) + aRect.origin.y + _arrowOffsetY);
+            CGContextAddLineToPoint(context, aRect.origin.x + _arrowOffsetX, (aRect.size.height / 2 - (arrowWidth / 2) + aRect.origin.y + _arrowOffsetY));
+
+            // nw
+            CGContextAddLineToPoint(context, xMin, yMin + radius);
+            CGContextAddCurveToPoint(context, xMin, yMin + radius, xMin, yMin, 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);
+            // origin nw
+            CGContextMoveToPoint(context, xMin, yMin + yMin);
 
             // 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);
+            CGContextAddLineToPoint(context, xMin, yMin + radius);
+            CGContextAddCurveToPoint(context, xMin, yMin + radius, xMin, yMin, 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);
-            }
+            // arrow CPMaxYEdge
+            CGContextAddLineToPoint(context, (aRect.size.width / 2) + aRect.origin.x + _arrowOffsetX - (arrowWidth / 2), yMin);
+            CGContextAddLineToPoint(context, (aRect.size.width / 2) + aRect.origin.x + _arrowOffsetX, aRect.origin.y - arrowHeight + _arrowOffsetY);
+            CGContextAddLineToPoint(context, (aRect.size.width / 2) + (arrowWidth / 2) + aRect.origin.x + _arrowOffsetX, aRect.origin.y + _arrowOffsetY);
 
             // 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));
+            CGContextAddLineToPoint(context, xMax - radius, yMin);
+            CGContextAddCurveToPoint(context, xMax - radius, yMin, xMax, yMin, xMax, 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);
-            }
+            CGContextAddLineToPoint(context, xMax, yMax - radius);
+            CGContextAddCurveToPoint(context, xMax, yMax - radius, xMax, yMax, 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));
+            CGContextAddLineToPoint(context, xMin + radius, yMax);
+            CGContextAddCurveToPoint(context, xMin + radius, yMax, xMin, yMax, xMin, yMax - radius);
+            break;
+
+        case CPMinYEdge:
+            // origin nw
+            CGContextMoveToPoint(context, xMin, yMin + yMin);
+
+            // nw
+            CGContextAddLineToPoint(context, xMin, yMin + radius);
+            CGContextAddCurveToPoint(context, xMin, yMin + radius, xMin, yMin, xMin + radius, yMin);
+
+            // ne
+            CGContextAddLineToPoint(context, xMax - radius, yMin);
+            CGContextAddCurveToPoint(context, xMax - radius, yMin, xMax, yMin, xMax, yMin + radius);
+
+            // se
+            CGContextAddLineToPoint(context, xMax, yMax - radius);
+            CGContextAddCurveToPoint(context, xMax, yMax - radius, xMax, yMax, xMax - radius, yMax);
+
+            // arrow CPMinYEdge
+            CGContextAddLineToPoint(context,  (aRect.size.width / 2) + (arrowWidth / 2) + aRect.origin.x + _arrowOffsetX , yMax);
+            CGContextAddLineToPoint(context, (aRect.size.width / 2) + aRect.origin.x + _arrowOffsetX, aRect.size.height + aRect.origin.y + arrowHeight + _arrowOffsetY);
+            CGContextAddLineToPoint(context, (aRect.size.width / 2) - (arrowWidth / 2) + aRect.origin.x + _arrowOffsetX, aRect.size.height + aRect.origin.y + _arrowOffsetY);
+
+            // sw
+            CGContextAddLineToPoint(context, xMin + radius, yMax);
+            CGContextAddCurveToPoint(context, xMin + radius, yMax, xMin, yMax, xMin, yMax - radius);
             break;
 
         default:
             // no computed edge means standard rounded rect
-            CGContextAddPath(context, CGPathWithRoundedRectangleInRect(frame, radius, radius, YES, YES, YES, YES));
+            CGContextAddPath(context, CGPathWithRoundedRectangleInRect(aRect, radius, radius, YES, YES, YES, YES));
     }
 
     CGContextClosePath(context);

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/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/CPCibRuntimeAttributesConnector.j

@@ -0,0 +1,64 @@
+/*
+ * CPCibRuntimeAttributesConnector.j
+ * AppKit
+ *
+ * Created by Aparajita Fishman.
+ * 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 "CPCibConnector.j"
+
+var CPCibRuntimeAttributesConnectorObjectKey   = @"CPCibRuntimeAttributesConnectorObjectKey",
+    CPCibRuntimeAttributesConnectorKeyPathsKey = @"CPCibRuntimeAttributesConnectorKeyPathsKey",
+    CPCibRuntimeAttributesConnectorValuesKey   = @"CPCibRuntimeAttributesConnectorValuesKey";
+
+@implementation CPCibRuntimeAttributesConnector : CPCibConnector
+{
+    id _keyPaths;
+    id _values;
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _source = [aCoder decodeObjectForKey:CPCibRuntimeAttributesConnectorObjectKey];
+        _keyPaths = [aCoder decodeObjectForKey:CPCibRuntimeAttributesConnectorKeyPathsKey];
+        _values = [aCoder decodeObjectForKey:CPCibRuntimeAttributesConnectorValuesKey];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeObject:_source forKey:CPCibRuntimeAttributesConnectorObjectKey];
+    [aCoder encodeObject:_keyPaths forKey:CPCibRuntimeAttributesConnectorKeyPathsKey];
+    [aCoder encodeObject:_values forKey:CPCibRuntimeAttributesConnectorValuesKey];
+}
+
+- (void)establishConnection
+{
+    var count = [_keyPaths count];
+
+    while (count--)
+        [_source setValue:_values[count] forKeyPath:_keyPaths[count]];
+}
+
+@end

AppKit/Cib/_CPCibClassSwapper.j

@@ -61,14 +61,14 @@ var _CPCibClassSwapperClassNameKey          = @"_CPCibClassSwapperClassNameKey",
 
         if (!object)
         {
-            CPLog.error("Unable to find class " + theClassName + " in cib file.");
+            CPLog.error("Unable to find class " + theClassName + " referenced in cib file.");
 
             object = [self allocObjectWithCoder:aCoder className:[aCoder decodeObjectForKey:_CPCibClassSwapperOriginalClassNameKey]];
         }
     }
 
     if (!object)
-        [CPException raise:CPInvalidArgumentException reason:@"Unable to find class " + theClassName + " in cib file."];
+        [CPException raise:CPInvalidArgumentException reason:@"Unable to find class " + theClassName + " referenced in cib file."];
 
     return object;
 }

AppKit/Cib/_CPCibCustomResource.j

@@ -43,6 +43,11 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
     return [[self alloc] initWithClassName:@"CPImage" resourceName:aResourceName properties:[CPDictionary dictionaryWithObject:aSize forKey:@"size"]];
 }
 
++ (id)imageResourceWithName:(CPString)aResourceName size:(CGSize)aSize bundleClass:(CPString)aBundleClass
+{
+    return [[self alloc] initWithClassName:@"CPImage" resourceName:aResourceName properties:[CPDictionary dictionaryWithObjects:[aSize, aBundleClass] forKeys:[@"size", @"bundleClass"]]];
+}
+
 - (id)initWithClassName:(CPString)aClassName resourceName:(CPString)aResourceName properties:(CPDictionary)properties
 {
     self = [super init];
@@ -89,7 +94,18 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
             else if (_resourceName == "CPRemoveTemplate")
                 return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
 
-            return [[CPImage alloc] initWithContentsOfFile:[[aCoder bundle] pathForResource:_resourceName] size:_properties.valueForKey(@"size")];
+            var bundleClass = _properties.valueForKey(@"bundleClass"),
+                bundle = nil;
+
+            if (bundleClass)
+            {
+                bundleClass = CPClassFromString(bundleClass);
+
+                if (bundleClass)
+                    bundle = [CPBundle bundleForClass:bundleClass];
+            }
+
+            return [[CPImage alloc] initWithContentsOfFile:[(bundle || [aCoder bundle]) pathForResource:_resourceName] size:_properties.valueForKey(@"size")];
         }
 
     return self;

AppKit/Cib/_CPCibObjectData.j

@@ -29,6 +29,7 @@
 @import "CPCibControlConnector.j"
 @import "CPCibOutletConnector.j"
 @import "CPCibBindingConnector.j"
+@import "CPCibRuntimeAttributesConnector.j"
 
 
 @implementation _CPCibObjectData : CPObject
@@ -257,11 +258,29 @@ var _CPCibObjectDataNamesKeysKey                = @"_CPCibObjectDataNamesKeysKey
     _replacementObjects[[_fileOwner UID]] = anOwner;
 
     var index = 0,
-        count = _connections.length;
+        count = _connections.length,
+        runtimeAttributeConnectors = [],
+        connection = nil;
 
     for (; index < count; ++index)
     {
-        var connection = _connections[index];
+        connection = _connections[index];
+
+        if ([connection isKindOfClass:[CPCibRuntimeAttributesConnector class]])
+            // Defer runtime attribute connections until after all other connections are made
+            runtimeAttributeConnectors.push(connection);
+        else
+        {
+            [connection replaceObjects:_replacementObjects];
+            [connection establishConnection];
+        }
+    }
+
+    count = runtimeAttributeConnectors.length;
+
+    for (index = 0; index < count; ++index)
+    {
+        connection = runtimeAttributeConnectors[index];
 
         [connection replaceObjects:_replacementObjects];
         [connection establishConnection];

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/CGGeometry.j

@@ -267,6 +267,32 @@ function CGPointFromEvent(anEvent)
     return _CGPointMake(anEvent.clientX, anEvent.clientY);
 }
 
+/*!
+    Combines two insets by adding their individual elements and returns the result.
+
+    @group CGInset
+*/
+function CGInsetUnion(lhsInset, rhsInset)
+{
+    return _CGInsetMake(lhsInset.top + rhsInset.top,
+                        lhsInset.right + rhsInset.right,
+                        lhsInset.bottom + rhsInset.bottom,
+                        lhsInset.left + rhsInset.left);
+}
+
+/*!
+    Subtract one inset from another by subtracting their individual elements and returns the result.
+
+    @group CGInset
+*/
+function CGInsetDifference(lhsInset, rhsInset)
+{
+    return _CGInsetMake(lhsInset.top - rhsInset.top,
+                        lhsInset.right - rhsInset.right,
+                        lhsInset.bottom - rhsInset.bottom,
+                        lhsInset.left - rhsInset.left);
+}
+
 function CGInsetFromString(aString)
 {
     var numbers = aString.substr(1, aString.length - 2).split(',');

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/Platform/CPPlatformWindow.j

@@ -259,13 +259,12 @@ var PrimaryPlatformWindow   = NULL;
     return [CPPlatform isBrowser];
 }
 
-- (void)_setTitle:(CPString)aTitle window:(CPWindow)aWindow
+- (void)setTitle:(CPString)aTitle
 {
     _title = aTitle;
 
 #if PLATFORM(DOM)
-    if (_DOMWindow && _DOMWindow.document
-        && (aWindow === [CPApp mainWindow] || [aWindow platformWindow] !== [CPPlatformWindow primaryPlatformWindow]))
+    if (_DOMWindow && _DOMWindow.document)
         _DOMWindow.document.title = _title;
 #endif
 }

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

@@ -541,8 +541,7 @@ var ModifierKeyCodes = [
     // 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;
+    _DOMWindow.document.title = _title;
 
     if (![CPPlatform isBrowser])
     {
@@ -708,8 +707,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 +1566,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 +1579,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 +1594,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 +1614,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;
     }
-};
+}