Merge branch 'master' into localStorage

Reviewed by me.

AppKit/CPApplication.j

@@ -132,8 +132,6 @@ CPRunContinuesResponse  = -1002;
 {
     self = [super init];
     
-    CPApp = self;
-
     if (self)
     {
         _eventListeners = [];
@@ -141,6 +139,63 @@ CPRunContinuesResponse  = -1002;
         _windows = [];
         
         [_windows addObject:nil];
+    
+        // FIXME: This should be read from the cib.
+        _mainMenu = [[CPMenu alloc] initWithTitle:@"MainMenu"];
+        
+        // FIXME: We should implement autoenabling.
+        [_mainMenu setAutoenablesItems:NO];
+
+        var bundle = [CPBundle bundleForClass:[CPApplication class]],
+            newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
+
+        [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]];
+        [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+
+        [_mainMenu addItem:newMenuItem];
+        
+        var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];
+        
+        [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]];
+        [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+        
+        [_mainMenu addItem:openMenuItem];
+        
+        var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
+            saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];
+        
+        [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]];
+        [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];        
+        
+        [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
+        [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];
+        
+        [saveMenuItem setSubmenu:saveMenu];
+        
+        [_mainMenu addItem:saveMenuItem];
+        
+        var editMenuItem = [[CPMenuItem alloc] initWithTitle:@"Edit" action:nil keyEquivalent:nil],
+            editMenu = [[CPMenu alloc] initWithTitle:@"Edit"],
+            
+            undoMenuItem = [[CPMenuItem alloc] initWithTitle:@"Undo" action:@selector(undo:) keyEquivalent:CPUndoKeyEquivalent],
+            redoMenuItem = [[CPMenuItem alloc] initWithTitle:@"Redo" action:@selector(redo:) keyEquivalent:CPRedoKeyEquivalent];
+
+        [undoMenuItem setKeyEquivalentModifierMask:CPUndoKeyEquivalentModifierMask];        
+        [redoMenuItem setKeyEquivalentModifierMask:CPRedoKeyEquivalentModifierMask];
+        
+        [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:@"Paste" action:@selector(paste:) keyEquivalent:@"v"]];
+    
+        [editMenuItem setSubmenu:editMenu];
+        [editMenuItem setHidden:YES];
+        
+        [_mainMenu addItem:editMenuItem];
+        
+        [_mainMenu addItem:[CPMenuItem separatorItem]];
     }
     
     return self;
@@ -1133,73 +1188,10 @@ var _CPAppBootstrapperActions = nil;
 
         return YES;
     }
-    else
-        [self loadCiblessBrowserMainMenu];
 
     return NO;
 }
 
-+ (void)loadCiblessBrowserMainMenu
-{
-    var mainMenu = [[CPMenu alloc] initWithTitle:@"MainMenu"];
-
-    // FIXME: We should implement autoenabling.
-    [mainMenu setAutoenablesItems:NO];
-
-    var bundle = [CPBundle bundleForClass:[CPApplication class]],
-        newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
-
-    [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]];
-    [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
-
-    [mainMenu addItem:newMenuItem];
-
-    var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];
-
-    [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]];
-    [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
-
-    [mainMenu addItem:openMenuItem];
-
-    var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
-        saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];
-
-    [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]];
-    [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
-
-    [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
-    [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];
-
-    [saveMenuItem setSubmenu:saveMenu];
-
-    [mainMenu addItem:saveMenuItem];
-
-    var editMenuItem = [[CPMenuItem alloc] initWithTitle:@"Edit" action:nil keyEquivalent:nil],
-        editMenu = [[CPMenu alloc] initWithTitle:@"Edit"],
-
-        undoMenuItem = [[CPMenuItem alloc] initWithTitle:@"Undo" action:@selector(undo:) keyEquivalent:CPUndoKeyEquivalent],
-        redoMenuItem = [[CPMenuItem alloc] initWithTitle:@"Redo" action:@selector(redo:) keyEquivalent:CPRedoKeyEquivalent];
-
-    [undoMenuItem setKeyEquivalentModifierMask:CPUndoKeyEquivalentModifierMask];
-    [redoMenuItem setKeyEquivalentModifierMask:CPRedoKeyEquivalentModifierMask];
-
-    [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:@"Paste" action:@selector(paste:) keyEquivalent:@"v"]];
-
-    [editMenuItem setSubmenu:editMenu];
-    [editMenuItem setHidden:YES];
-
-    [mainMenu addItem:editMenuItem];
-
-    [mainMenu addItem:[CPMenuItem separatorItem]];
-
-    [CPApp setMainMenu:mainMenu];
-}
-
 + (void)cibDidFinishLoading:(CPCib)aCib
 {
     [self performActions];

AppKit/CPBrowser.j

@@ -64,14 +64,14 @@
 
 + (CPImage)branchImage
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]] 
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[self class]] 
                                                     pathForResource:"browser-leaf.png"]
                                               size:CGSizeMake(9,9)];
 }
 
 + (CPImage)highlightedBranchImage
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]] 
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[self class]] 
                                                     pathForResource:"browser-leaf-highlighted.png"]
                                               size:CGSizeMake(9,9)];
 }
@@ -213,6 +213,8 @@
     [table setAllowsEmptySelection:_allowsEmptySelection];
     [table registerForDraggedTypes:[self registeredDraggedTypes]];
 
+    [self setNextResponder:table];
+
     [self _addTableColumnsToTableView:table forColumnIndex:index];
 
     var delegate = [[_CPBrowserTableDelegate alloc] init];
@@ -312,39 +314,6 @@
     [_contentView setFrameSize:CGSizeMake(xOrigin, height)];
 }
 
-- (unsigned)rowAtPoint:(CGPoint)aPoint
-{
-    var column = [self columnAtPoint:aPoint];
-    if (column === -1)
-        return -1;
-
-    var tableView = _tableViews[column];
-    return [tableView rowAtPoint:[tableView convertPoint:aPoint fromView:self]];
-}
-
-- (unsigned)columnAtPoint:(CGPoint)aPoint
-{
-    var adjustedPoint = [_contentView convertPoint:aPoint fromView:self];
-
-    for (var i = 0, count = _tableViews.length; i < count; i++)
-    {
-        var frame = [[_tableViews[i] enclosingScrollView] frame];
-        if (CGRectContainsPoint(frame, adjustedPoint))
-            return i;
-    }
-
-    return -1;
-}
-
-- (CGRect)rectOfRow:(unsigned)aRow inColumn:(unsigned)aColumn
-{
-    var tableView = _tableViews[aColumn],
-        rect = [tableView rectOfRow:aRow];
-
-    rect.origin = [self convertPoint:rect.origin fromView:tableView];
-    return rect;
-}
-
 // ITEMS
 
 - (id)itemAtRow:(int)row inColumn:(int)column
@@ -388,10 +357,6 @@
 
 // CLICK EVENTS
 
-- (void)trackMouse:(CPEvent)anEvent
-{
-}
-
 - (void)_column:(unsigned)columnIndex clickedRow:(unsigned)rowIndex
 {
     [self setLastColumn:columnIndex];
@@ -417,15 +382,6 @@
     [self sendAction:_doubleAction to:_target];
 }
 
-- (void)keyDown:(CPEvent)anEvent
-{
-    var column = [self selectedColumn];
-    if (column === -1)
-        return;
-
-    [_tableViews[column] keyDown:anEvent];
-}
-
 // SIZING
 
 - (float)columnContentWidthForColumnWidth:(float)aWidth
@@ -570,9 +526,6 @@
 
 - (CPIndexSet)selectedRowIndexesInColumn:(unsigned)column
 {
-    if (column < 0 || column > [self lastColumn] +1)
-        return [CPIndexSet indexSet];
-
     return [[self tableViewInColumn:column] selectedRowIndexes];
 }
 
@@ -598,6 +551,8 @@
 
     [[self tableViewInColumn:column] selectRowIndexes:indexSet byExtendingSelection:NO];
 
+    [self setNextResponder:[self tableViewInColumn:[self lastColumn]]];
+
     [self scrollColumnToVisible:column];
 
     if ([_delegate respondsToSelector:@selector(browserSelectionDidChange:)])
@@ -649,8 +604,6 @@
 
 @end
 
-var _CPBrowserResizeControlBackgroundImage = nil;
-
 @implementation _CPBrowserResizeControl : CPView
 {
     CGPoint     _mouseDownX;
@@ -659,26 +612,6 @@ var _CPBrowserResizeControlBackgroundImage = nil;
     unsigned    _width;
 }
 
-+ (CPImage)backgroundImage
-{
-    if (!_CPBrowserResizeControlBackgroundImage)
-    {
-        var path = [[CPBundle bundleForClass:[self class]] pathForResource:"browser-resize-control.png"];
-        _CPBrowserResizeControlBackgroundImage = [[CPImage alloc] initWithContentsOfFile:path
-                                                                                    size:CGSizeMake(15, 14)];
-    }
-
-    return _CPBrowserResizeControlBackgroundImage;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-        [self setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
-
-    return self;
-}
-
 - (void)mouseDown:(CPEvent)anEvent
 {
     _mouseDownX = [anEvent locationInWindow].x;
@@ -693,23 +626,34 @@ var _CPBrowserResizeControlBackgroundImage = nil;
     [_browser setWidth:_width + deltaX ofColumn:_index];
 }
 
-- (void)mouseUp:(CPEvent)anEvent
-{
-}
-
 @end
 
+var _CPBrowserResizeControlBackgroundImage = nil;
+
 @implementation _CPBrowserScrollView : CPScrollView
 {
     _CPBrowserResizeControl  _resizeControl;
     CPBrowser                _browser @accessors;
 }
 
++ (CPImage)backgroundImage
+{
+    if (!_CPBrowserResizeControlBackgroundImage)
+    {
+        var path = [[CPBundle bundleForClass:[self class]] pathForResource:"browser-resize-control.png"];
+        _CPBrowserResizeControlBackgroundImage = [[CPImage alloc] initWithContentsOfFile:path
+                                                                                    size:CGSizeMake(15, 14)];
+    }
+
+    return _CPBrowserResizeControlBackgroundImage;
+}
+
 - (void)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
         _resizeControl = [[_CPBrowserResizeControl alloc] initWithFrame:CGRectMakeZero()];
+        [_resizeControl setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
         [self addSubview:_resizeControl];
     }
 

AppKit/CPButton.j

@@ -530,7 +530,6 @@ CPButtonStateMixed  = CPThemeState("mixed");
         [contentView setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
         [contentView setImagePosition:[self currentValueForThemeAttribute:@"image-position"]];
         [contentView setImageScaling:[self currentValueForThemeAttribute:@"image-scaling"]];
-        [contentView setDimsImage:[self hasThemeState:CPThemeStateDisabled] && _imageDimsWhenDisabled];
     }
 }
 

AppKit/CPButtonBar.j

@@ -14,9 +14,8 @@
 + (id)plusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:self] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
 
-    [button setBordered:NO];
     [button setImage:image];
     [button setImagePosition:CPImageOnly];
 
@@ -26,30 +25,14 @@
 + (id)minusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:self] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
 
-    [button setBordered:NO];
     [button setImage:image];
     [button setImagePosition:CPImageOnly];
 
     return button;
 }
 
-+ (id)actionPopupButton
-{
-    var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"action_button.png"] size:CGSizeMake(22, 14)];
-
-    [button addItemWithTitle:nil];
-    [[button lastItem] setImage:image];
-    [button setImagePosition:CPImageOnly];
-    [button setValue:CGInsetMake(0, 0, 0, 0) forThemeAttribute:"content-inset"];
-
-    [button setPullsDown:YES];
-
-    return button;
-}
-
 + (CPString)themeClass
 {
     return @"button-bar";
@@ -57,8 +40,8 @@
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
+    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color", @"button-text-color"]];
+                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color"]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -99,7 +82,24 @@
     _buttons = [CPArray arrayWithArray:buttons];
 
     for (var i = 0, count = [_buttons count]; i < count; i++)
-        [_buttons[i] setBordered:YES];
+    {
+        var button = _buttons[i];
+
+        var normalColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateNormal],
+            highlightedColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted],
+            disabledColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled];
+
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered];    
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered];    
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered];    
+
+        // FIXME shouldn't need this
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
+
+        [button setBordered:YES];
+    }
     
     [self setNeedsLayout];
 }
@@ -176,11 +176,6 @@
 {
     [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
 
-    var normalColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateNormal],
-        highlightedColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted],
-        disabledColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled],
-        textColor = [self valueForThemeAttribute:@"button-text-color" inState:CPThemeStateNormal];
-
     var buttonsNotHidden = [CPArray arrayWithArray:_buttons],
         count = [buttonsNotHidden count];
 
@@ -189,23 +184,13 @@
             [buttonsNotHidden removeObject:buttonsNotHidden[count]];
 
     var currentButtonOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX([self bounds]) + 1 : -1,
-        bounds = [self bounds],
+        height = CGRectGetHeight([self bounds]) - 1;
-        height = CGRectGetHeight(bounds) - 1,
-        frameWidth = CGRectGetWidth(bounds),
-        resizeRect = _hasResizeControl ? [self rectForEphemeralSubviewNamed:"resize-control-view"] : CGRectMakeZero(),
-        resizeWidth = CGRectGetWidth(resizeRect),
-        availableWidth = frameWidth - resizeWidth - 1;
 
     for (var i = 0, count = [buttonsNotHidden count]; i < count; i++)
     {   
         var button = buttonsNotHidden[i],
             width = CGRectGetWidth([button frame]);
 
-        if (availableWidth > width)
-            availableWidth -=width;
-        else
-            break;
-
         if (_resizeControlIsLeftAligned)
         {
             [button setFrame:CGRectMake(currentButtonOffset - width, 1, width, height)];
@@ -217,16 +202,6 @@
             currentButtonOffset += width - 1;
         }
 
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered];    
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered];    
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered];    
-        [button setValue:textColor forThemeAttribute:@"text-color" inState:CPThemeStateBordered];    
-
-        // FIXME shouldn't need this
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-
         [self addSubview:button];
     }
 
@@ -241,12 +216,6 @@
     }
 }
 
-- (void)setFrameSize:(CGSize)aSize
-{
-    [super setFrameSize:aSize];
-    [self setNeedsLayout];
-}
-
 @end
 
 var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
@@ -277,3 +246,4 @@ var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
 }
 
 @end
+

AppKit/CPCheckBox.j

@@ -61,27 +61,4 @@
     return self;
 }
 
-- (void)takeStateFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
-{
-    var count = objects.length,
-        value = [objects[0] valueForKeyPath:aKeyPath] ? CPOnState : CPOffState;
-
-    [self setAllowsMixedState:NO];
-    [self setState:value];
-
-    while (count-- > 1)
-    {
-        if (value !== ([objects[count] valueForKeyPath:aKeyPath] ? CPOnState : CPOffState))
-        {
-            [self setAllowsMixedState:YES];
-            [self setState:CPMixedState];
-        }
-    }
-}
-
-- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
-{
-    [self takeStateFromKeyPath:aKeyPath ofObjects:objects];
-}
-
 @end

AppKit/CPClipView.j

@@ -190,39 +190,17 @@
 - (BOOL)autoscroll:(CPEvent)anEvent 
 {
     var bounds = [self bounds],
-        eventLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil],
+        eventLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-        superview = [self superview],
-        deltaX = 0,
-        deltaY = 0;
 
-    if (CGRectContainsPoint(bounds, eventLocation))
+    if (CPRectContainsPoint(bounds, eventLocation))
         return NO;
 
-    if (![superview isKindOfClass:[CPScrollView class]] || [superview hasVerticalScroller])
+    var newRect = CGRectMakeZero();
-    {
-        if (eventLocation.y < CGRectGetMinY(bounds))
-            deltaY = CGRectGetMinY(bounds) - eventLocation.y;
-        else if (eventLocation.y > CGRectGetMaxY(bounds))
-            deltaY = CGRectGetMaxY(bounds) - eventLocation.y;
-        if (deltaY < -bounds.size.height)
-            deltaY = -bounds.size.height;
-        if (deltaY > bounds.size.height)
-            deltaY = bounds.size.height;
-    }
 
-    if (![superview isKindOfClass:[CPScrollView class]] || [superview hasHorizontalScroller])
+    newRect.origin = eventLocation;
-    {
+    newRect.size = CPSizeMake(10, 10);
-        if (eventLocation.x < CGRectGetMinX(bounds))
-            deltaX = CGRectGetMinX(bounds) - eventLocation.x;
-        else if (eventLocation.x > CGRectGetMaxX(bounds))
-            deltaX = CGRectGetMaxX(bounds) - eventLocation.x;
-        if (deltaX < -bounds.size.width)
-            deltaX = -bounds.size.width;
-        if (deltaX > bounds.size.width)
-            deltaX = bounds.size.width;
-    }
 
-	return [self scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
+	return [_documentView scrollRectToVisible:newRect];
 }
 
 @end

AppKit/CPCollectionView.j

@@ -426,17 +426,8 @@
         x += itemSize.width + _horizontalMargin;
     }
     
-    var superview = [self superview],
-        proposedHeight =  y + itemSize.height + _verticalMargin;
-
-    if ([superview isKindOfClass:[CPClipView class]])
-    {
-        var superviewSize = [superview bounds].size;
-        proposedHeight = MAX(superviewSize.height, proposedHeight);
-    }
-
     _tileWidth = width;
-    [self setFrameSize:CGSizeMake(width, proposedHeight)];
+    [self setFrameSize:CGSizeMake(width, y + itemSize.height + _verticalMargin)];
     _tileWidth = -1.0;
 }
 
@@ -599,14 +590,6 @@
 
 - (void)mouseDragged:(CPEvent)anEvent
 {
-    var locationInWindow = [anEvent locationInWindow],
-        mouseDownLocationInWindow = [_mouseDownEvent locationInWindow];
-
-    // FIXME: This is because Safari's drag hysteresis is 3px x 3px
-    if ((ABS(locationInWindow.x - mouseDownLocationInWindow.x) < 3) &&
-        (ABS(locationInWindow.y - mouseDownLocationInWindow.y) < 3))
-        return;
-
     if (![_delegate respondsToSelector:@selector(collectionView:dragTypesForItemsAtIndexes:)])
         return;
 
@@ -718,7 +701,7 @@
         count = [indexArray count];
 
     for (; index < count; ++index)
-        frame = CGRectUnion(frame, [self frameForItemAtIndex:indexArray[index]]);
+        frame = CGRectUnion(frame, [self rectForItemAtIndex:indexArray[index]]);
 
     return frame;
 }

AppKit/CPColorWell.j

@@ -231,17 +231,11 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    if (![self isEnabled])
-        return;
-
     [self drawBezelWithHighlight:YES];
 }
 
 - (void)mouseDragged:(CPEvent)anEvent
 {
-    if (![self isEnabled])
-        return;
-
     [self drawBezelWithHighlight:CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil])];
 }
 
@@ -249,7 +243,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 {
     [self drawBezelWithHighlight:NO];
 
-    if (!CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil]) || ![self isEnabled])
+    if (!CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil]))
         return;
         
     [self activate:YES];

AppKit/CPDocument.j

@@ -210,10 +210,10 @@ var CPDocumentUntitledCount = 0;
     @throws CPUnsupportedMethodException if this method hasn't been overriden by the subclass
     @return the document data
 */
-- (CPData)dataOfType:(CPString)aType error:({CPError})anError
+- (CPData)dataOfType:(CPString)aType
 {
     [CPException raise:CPUnsupportedMethodException
-                reason:"dataOfType:error: must be overridden by the document subclass."];
+                reason:"dataOfType: must be overridden by the document subclass."];
 }
 
 /*!
@@ -473,8 +473,21 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)saveToURL:(CPURL)anAbsoluteURL ofType:(CPString)aTypeName forSaveOperation:(CPSaveOperationType)aSaveOperation delegate:(id)aDelegate didSaveSelector:(SEL)aDidSaveSelector contextInfo:(id)aContextInfo
 {
-    var data = [self dataOfType:[self fileType] error:nil],
+    if (anAbsoluteURL.isLocalStorageURL())
-        oldChangeCount = _changeCount;
+        [[CPDocumentController sharedDocumentController] _addLocalDocumentURL:anAbsoluteURL];
+
+    var data = nil;
+
+    if ([self respondsToSelector:@selector(dataOfType:error:)])
+    {
+        CPLog.warn("[" + CPStringFromClass([self class]) + " " + CPStringFromSelector(@selector(dataOfType:error:)) + "] is deprecated, please implement " + CPStringFromSelector(@selector(dataOfType:)) + " instead and simply throw exceptions when necessary.");
+
+        data = [self dataOfType:[self fileType] error:nil];
+    }
+    else
+        data = [self dataOfType:[self fileType]];
+
+    var oldChangeCount = _changeCount;
 
     _writeRequest = [CPURLRequest requestWithURL:anAbsoluteURL];
 

AppKit/CPDocumentController.j

@@ -38,6 +38,7 @@ var CPSharedDocumentController = nil;
 {
     CPArray _documents;
     CPArray _documentTypes;
+    CPArray _localDocumentURLs;
 }
 
 /*!
@@ -62,11 +63,27 @@ var CPSharedDocumentController = nil;
 
     if (self)
     {
-        _documents = [[CPArray alloc] init];
-        
         if (!CPSharedDocumentController)
             CPSharedDocumentController = self;
 
+        _localDocumentURLs = [CPSet set];
+
+        if (window.localStorage)
+        {
+            var localDocumentURLs = localStorage.getItem(CPDocumentControllerLocalDocumentURLsKey);
+
+            if (localDocumentURLs)
+            {
+                localDocumentURLs = JSON.parse(localDocumentURLs);
+
+                var count = [localDocumentURLs count];
+
+                while (count--)
+                    [_localDocumentURLs addObject:new CFURL(localDocumentURLs[count])];
+            }
+        }
+
+        _documents = [];
         _documentTypes = [[[CPBundle mainBundle] infoDictionary] objectForKey:@"CPBundleDocumentTypes"];
     }
     return self;
@@ -219,7 +236,7 @@ var CPSharedDocumentController = nil;
     Opens a new document in the application.
     @param aSender the requesting object
 */
-- (CFAction)newDocument:(id)aSender
+- (@action)newDocument:(id)aSender
 {
     [self openUntitledDocumentOfType:[[_documentTypes objectAtIndex:0] objectForKey:@"CPBundleTypeName"] display:YES];
 }
@@ -455,3 +472,41 @@ var CPSharedDocumentController = nil;
 }
 
 @end
+
+var CPDocumentControllerLocalDocumentURLsKey = @"Cappuccino.CPDocumentController.documentURLs";
+
+@implementation CPDocumentController (LocalStorage)
+
+- (void)_addLocalDocumentURL:(CPURL)aURL
+{
+    if (!window.localStorage)
+        return;
+
+    [_localDocumentURLs addObject:aURL];
+
+    var stringURLs = [],
+        URL = nil,
+        URLEnumerator = [_localDocumentURLs objectEnumerator];
+
+    while (URL = [URLEnumerator nextObject])
+        stringURLs.push(URL + "");
+
+    localStorage.setItem(CPDocumentControllerLocalDocumentURLsKey, JSON.stringify(stringURLs));
+}
+
+- (void)_removeLocalDocumentURL:(CPURL)aURL
+{
+    if (!window.localStorage)
+        return;
+
+    [_localDocumentURLs removeObject:aURL];
+
+    localStorage.setItem(CPDocumentControllerLocalDocumentURLsKey, JSON.stringify([self allObjects]));
+}
+
+- (CPSet)localDocumentURLs
+{
+    return [_localDocumentURLs copy];
+}
+
+@end

AppKit/CPDragServer.j

@@ -40,10 +40,29 @@ CPDragOperationEvery    = -1;
 
 #define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])
 
-var CPDragServerPreviousEvent = nil,
+var    CPDragServerPreviousEvent      = nil,
-    CPDragServerPeriodicUpdateInterval = 0.05;
+CPDragServerAutoscrollInterval = nil;
+/*
+var CPDragServerAutoscroll = function()
+{
+    [CPDragServerSource autoscroll:CPDragServerPreviousEvent];
+}
 
-var CPSharedDragServer = nil;
+    if (CPDragServerAutoscrollInterval === nil)
+    {
+        if ([CPDragServerSource respondsToSelector:@selector(autoscroll:)])
+            CPDragServerAutoscrollInterval = setInterval(CPDragServerAutoscroll, 100);
+    }
+
+    CPDragServerPreviousEvent = anEvent;
+
+        if (CPDragServerAutoscrollInterval !== nil)
+            clearInterval(CPDragServerAutoscrollInterval);
+
+        CPDragServerAutoscrollInterval = nil;
+*/
+
+var CPSharedDragServer     = nil;
 
 var CPDragServerSource             = nil;
 var CPDragServerDraggingInfo       = nil;
@@ -131,13 +150,10 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
     CGPoint         _draggingLocation;
     id              _draggingDestination;
-    BOOL            _draggingDestinationWantsPeriodicUpdates;
 
     CGPoint         _startDragLocation;
     BOOL            _shouldSlideBack;
     unsigned        _dragOperation;
-
-    CPTimer         _draggingUpdateTimer;
 }
 
 /*
@@ -218,9 +234,6 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
 - (CPDragOperation)draggingUpdatedInPlatformWindow:(CPPlatformWindow)aPlatformWindow location:(CGPoint)aLocation
 {
-    [_draggingUpdateTimer invalidate];
-    _draggingUpdateTimer = nil;
-
     var dragOperation = CPDragOperationCopy;
     // We have to convert base to bridge since the drag event comes from the source window, not the drag window.
     var draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];
@@ -230,89 +243,25 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
     if(draggingDestination !== _draggingDestination)
     {
-        if ([_draggingDestination respondsToSelector:@selector(draggingExited:)])
+        if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingExited:)])
             [_draggingDestination draggingExited:CPDragServerDraggingInfo];
 
         _draggingDestination = draggingDestination;
 
-        if ([_draggingDestination respondsToSelector:@selector(wantsPeriodicDraggingUpdates)])
+        if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingEntered:)])
-            _draggingDestinationWantsPeriodicUpdates = [_draggingDestination wantsPeriodicDraggingUpdates];
-        else
-            _draggingDestinationWantsPeriodicUpdates = YES;
-
-        if ([_draggingDestination respondsToSelector:@selector(draggingEntered:)])
             dragOperation = [_draggingDestination draggingEntered:CPDragServerDraggingInfo];
     }
-    else if ([_draggingDestination respondsToSelector:@selector(draggingUpdated:)])
+    else if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingUpdated:)])
         dragOperation = [_draggingDestination draggingUpdated:CPDragServerDraggingInfo];
 
     if (!_draggingDestination)
         dragOperation = CPDragOperationNone;
-    else
-    {
-        if (_draggingDestinationWantsPeriodicUpdates)
-            _draggingUpdateTimer = [CPTimer scheduledTimerWithTimeInterval:CPDragServerPeriodicUpdateInterval
-                                                                    target:self
-                                                                  selector:@selector(_sendPeriodicDraggingUpdate:)
-                                                                  userInfo:[CPDictionary dictionaryWithJSObject:{platformWindow:aPlatformWindow, location:aLocation}]
-                                                                   repeats:NO];
-
-        var scrollView = [_draggingDestination isKindOfClass:[CPView class]] ? [_draggingDestination enclosingScrollView] : nil;
-        if (scrollView)
-        {
-            var contentView = [scrollView contentView],
-                bounds = [contentView bounds],
-                insetBounds = CGRectInset(bounds, 10, 10)
-                eventLocation = [contentView convertPoint:_draggingLocation fromView:nil],
-                deltaX = 0,
-                deltaY = 0;
-
-            if (!CGRectContainsPoint(insetBounds, eventLocation))
-            {
-                if ([scrollView hasVerticalScroller])
-                {
-                    if (eventLocation.y < CGRectGetMinY(insetBounds))
-                        deltaY = CGRectGetMinY(insetBounds) - eventLocation.y;
-                    else if (eventLocation.y > CGRectGetMaxY(insetBounds))
-                        deltaY = CGRectGetMaxY(insetBounds) - eventLocation.y;
-                    if (deltaY < -insetBounds.size.height)
-                        deltaY = -insetBounds.size.height;
-                    if (deltaY > insetBounds.size.height)
-                        deltaY = insetBounds.size.height;
-                }
-
-                if ([scrollView hasHorizontalScroller])
-                {
-                    if (eventLocation.x < CGRectGetMinX(insetBounds))
-                        deltaX = CGRectGetMinX(insetBounds) - eventLocation.x;
-                    else if (eventLocation.x > CGRectGetMaxX(insetBounds))
-                        deltaX = CGRectGetMaxX(insetBounds) - eventLocation.x;
-                    if (deltaX < -insetBounds.size.width)
-                        deltaX = -insetBounds.size.width;
-                    if (deltaX > insetBounds.size.width)
-                        deltaX = insetBounds.size.width;
-                }
-
-                [contentView scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
-            }
-        }
-    }
 
     return dragOperation;
 }
 
-- (void)_sendPeriodicDraggingUpdate:(CPTimer)aTimer
-{
-    var userInfo = [aTimer userInfo];
-    _dragOperation = [self draggingUpdatedInPlatformWindow:[userInfo objectForKey:@"platformWindow"] 
-                                                  location:[userInfo objectForKey:@"location"]];
-}
-
 - (void)draggingEndedInPlatformWindow:(CPPlatformWindow)aPlatformWindow globalLocation:(CGPoint)aLocation operation:(CPDragOperation)anOperation
 {
-    [_draggingUpdateTimer invalidate];
-    _draggingUpdateTimer = nil;
-
     [_draggedView removeFromSuperview];
 
     if (![CPPlatform supportsDragAndDrop])
@@ -455,25 +404,13 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
         // Stop tracking events.
         return;
     }
-    else if (type === CPKeyDown)
+
-    {
+    [self draggingSourceUpdatedWithGlobalLocation:platformWindowLocation];
-        var keyCode = [anEvent keyCode];
+    _dragOperation = [self draggingUpdatedInPlatformWindow:platformWindow location:platformWindowLocation];
-        if (keyCode === CPEscapeKeyCode)
-        {
-            _dragOperation = CPDragOperationNone;
-            [self draggingEndedInPlatformWindow:platformWindow globalLocation:CGPointMakeZero() operation:_dragOperation];
-            return;
-        }
-    }
-    else
-    {
-        [self draggingSourceUpdatedWithGlobalLocation:platformWindowLocation];
-        _dragOperation = [self draggingUpdatedInPlatformWindow:platformWindow location:platformWindowLocation];
-    }
 
     // If we're not a mouse up, then we're going to want to grab the next event.
     [CPApp setTarget:self selector:@selector(trackDragging:)
-        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPKeyDownMask
+        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask
         untilDate:nil inMode:0 dequeue:NO];
 }
 

AppKit/CPImageView.j

@@ -365,7 +365,7 @@ var LEFT_SHADOW_INSET       = 3.0,
     return _isEditable;
 }
 
-- (BOOL)performDragOperation:(CPDraggingInfo)aSender
+- (void)performDragOperation:(CPDraggingInfo)aSender
 {
     var images = [CPKeyedUnarchiver unarchiveObjectWithData:[[aSender draggingPasteboard] dataForType:CPImagesPboardType]];
 
@@ -374,8 +374,6 @@ var LEFT_SHADOW_INSET       = 3.0,
         [self setImage:images[0]];
         [self sendAction:[self action] to:[self target]];
     }
-    
-    return YES;
 }
 
 @end

AppKit/CPMenu/CPMenu.j

@@ -747,9 +747,6 @@ var _CPMenuBarVisible               = NO,
     }
 
     // Show it.
-    if ([CPPlatform isBrowser])
-        [menuWindow setPlatformWindow:[[aView window] platformWindow]];
-
     [menuWindow orderFront:self];
 
     // Track it.
@@ -819,9 +816,6 @@ var _CPMenuBarVisible               = NO,
         [menuWindow setFrameOrigin:CGRectIntersection(unconstrainedFrame, constraintRect).origin];
     }
 
-    if ([CPPlatform isBrowser])
-        [menuWindow setPlatformWindow:[[aView window] platformWindow]];
-
     [menuWindow orderFront:self];
 
     [[_CPMenuManager sharedMenuManager]

AppKit/CPOutlineView.j

@@ -85,8 +85,6 @@ CPOutlineViewDropOnItemIndex = -1;
     
     BOOL            _shouldRetargetChildIndex;
     CPInteger       _retargedChildIndex;
-    CPTimer         _dragHoverTimer;
-    id              _dropItem;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -110,7 +108,6 @@ CPOutlineViewDropOnItemIndex = -1;
         
         _retargedChildIndex = nil;
         _shouldRetargetChildIndex = NO;
-        _startHoverTime = nil;
 
         [self setIndentationPerLevel:16.0];
         [self setIndentationMarkerFollowsDataView:YES];
@@ -385,14 +382,43 @@ CPOutlineViewDropOnItemIndex = -1;
     return frame;
 }
 
-- (void)_performSelection:(BOOL)select forRow:(CPInteger)rowIndex context:(id)context
+- (void)selectRowIndexes:(CPIndexSet)rows byExtendingSelection:(BOOL)shouldExtendSelection
 {
-    [super _performSelection:select forRow:rowIndex context:context];
+    // First un highlight the old disclosure controls   
+    var previousSelectedRows = [];
+    [[self selectedRowIndexes] getIndexes:previousSelectedRows maxCount:-1 inIndexRange:nil];
     
-    var control = _disclosureControlsForRows[rowIndex],
+    var index = [previousSelectedRows count];
-        selector = select ? @"setThemeState:" : @"unsetThemeState:";
+    while (index--)
+    {
+        var rowIndex = previousSelectedRows[index],
+            item = [self itemAtRow:rowIndex];
         
-    [control performSelector:CPSelectorFromString(selector) withObject:CPThemeStateSelected];
+        if (![self isExpandable:item])
+            continue;
+        
+        var control = _disclosureControlsForRows[rowIndex];
+        [control setHighlighted:NO];
+    }
+    
+    [super selectRowIndexes:rows byExtendingSelection:shouldExtendSelection];
+    
+    // Now highlight the new disclosure controls
+    var selectedRows = [];
+        [rows getIndexes:selectedRows maxCount:-1 inIndexRange:nil];
+    
+        var index = [selectedRows count];
+    while (index--)
+    {
+        var rowIndex = selectedRows[index],
+            item = [self itemAtRow:rowIndex];
+        
+        if (![self isExpandable:item])
+            continue;
+        
+        var control = _disclosureControlsForRows[rowIndex];
+        [control setHighlighted:YES];
+    }
 }
 
 - (void)setDelegate:(id)aDelegate
@@ -508,29 +534,6 @@ CPOutlineViewDropOnItemIndex = -1;
 
 - (void)setDropItem:(id)theItem dropChildIndex:(int)theIndex
 {
-    if (_dropItem !== theItem && theIndex < 0 && [self isExpandable:theItem] && ![self isItemExpanded:theItem])
-    {
-        if (_dragHoverTimer)
-            [_dragHoverTimer invalidate];
-
-        var autoExpandCallBack = function(){
-            if (_dropItem)
-            {
-                [_dropOperationFeedbackView blink];
-                [CPTimer scheduledTimerWithTimeInterval:.3 callback:objj_msgSend(self, "expandItem:", _dropItem) repeats:NO]; //[self expandItem:_dropItem];
-            }
-        }
-
-        _dragHoverTimer = [CPTimer scheduledTimerWithTimeInterval:.8 callback:autoExpandCallBack repeats:NO];
-    }
-
-    if (theIndex >= 0)
-    {
-        [_dragHoverTimer invalidate];
-        _dragHoverTimer = nil;
-    }
-
-    _dropItem = theItem;
     _retargetedItem = theItem;
     _shouldRetargetItem = YES;
     
@@ -538,14 +541,6 @@ CPOutlineViewDropOnItemIndex = -1;
     _shouldRetargetChildIndex = YES;
 }
 
-- (void)_draggingEnded
-{
-    [super _draggingEnded];
-    _dropItem = nil;
-    [_dragHoverTimer invalidate];
-    _dragHoverTimer = nil;
-}
-
 - (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CPPoint)theOffset
 {
     if (_shouldRetargetItem)
@@ -624,8 +619,6 @@ CPOutlineViewDropOnItemIndex = -1;
         _disclosureControlsForRows[row] = control;
 
         [control setState:[self isItemExpanded:item] ? CPOnState : CPOffState];
-        var selector = [self isRowSelected:row] ? @"setThemeState:" : @"unsetThemeState:";
-        [control performSelector:CPSelectorFromString(selector) withObject:CPThemeStateSelected];
         [control setFrame:frame];
 
         [self addSubview:control];
@@ -1087,10 +1080,8 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     CGContextAddLineToPoint(context, 0.0, 0.0);
 
     CGContextClosePath(context);
-    var isHighlighted = [self hasThemeState:CPThemeStateHighlighted];
-    var color = [self hasThemeState:CPThemeStateSelected] ? (isHighlighted ? [CPColor lightGrayColor] : [CPColor whiteColor]) : (isHighlighted ? [CPColor blackColor] : [CPColor grayColor]);
 
-    CGContextSetFillColor(context, color);
+    CGContextSetFillColor(context, [self isHighlighted] ? [CPColor whiteColor] : [CPColor grayColor]);
     CGContextFillPath(context);
 }
 

AppKit/CPPopUpButton.j

@@ -703,23 +703,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     [self sendAction:[self action] to:[self target]];
 }
 
-- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
-{
-    var count = objects.length,
-        value = [objects[0] valueForKeyPath:aKeyPath];
-
-    [self selectItemWithTag:value];
-    [self setEnabled:YES];
-
-    while (count-- > 1)
-    {
-        if (value !== [objects[count] valueForKeyPath:aKeyPath])
-        {
-            [[self selectedItem] setState:CPOffState];
-        }
-    }
-}
-
 @end
 
 var CPPopUpButtonMenuKey            = @"CPPopUpButtonMenuKey",

AppKit/CPScrollView.j

@@ -445,7 +445,9 @@
 
 - (CPView)_headerView
 {
-    return [_headerClipView documentView];
+    var headerClipViewSubviews = [_headerClipView subviews];
+
+    return [headerClipViewSubviews count] ? headerClipViewSubviews[0] : nil;
 }
 
 - (CGRect)_cornerViewFrame
@@ -668,32 +670,15 @@
 */
 - (void)scrollWheel:(CPEvent)anEvent
 {
-    [self _respondToScrollWheelEventWithDeltaX:[anEvent deltaX] * _horizontalLineScroll 
+   var documentFrame = [[self documentView] frame],
-                                        deltaY:[anEvent deltaY] * _verticalLineScroll];
+       contentBounds = [_contentView bounds];
-}
-
-- (void)_respondToScrollWheelEventWithDeltaX:(float)deltaX deltaY:(float)deltaY
-{
-    var documentFrame = [[self documentView] frame],
-        contentBounds = [_contentView bounds],
-        contentFrame = [_contentView frame],
-        enclosingScrollView = [self enclosingScrollView],
-        extraX = 0,
-        extraY = 0;
 
     // We want integral bounds!
-    contentBounds.origin.x = ROUND(contentBounds.origin.x + deltaX);
+    contentBounds.origin.x = ROUND(contentBounds.origin.x + [anEvent deltaX] * _horizontalLineScroll);
-    contentBounds.origin.y = ROUND(contentBounds.origin.y + deltaY);
+    contentBounds.origin.y = ROUND(contentBounds.origin.y + [anEvent deltaY] * _verticalLineScroll);
 
-    var constrainedOrigin = [_contentView constrainScrollPoint:CGPointCreateCopy(contentBounds.origin)];
+    [_contentView scrollToPoint:contentBounds.origin];
-    extraX = ((contentBounds.origin.x - constrainedOrigin.x) / _horizontalLineScroll) * [enclosingScrollView horizontalLineScroll];
+    [_headerClipView scrollToPoint:CGPointMake(contentBounds.origin.x, 0.0)];
-    extraY = ((contentBounds.origin.y - constrainedOrigin.y) / _verticalLineScroll) * [enclosingScrollView verticalLineScroll];
-
-    [_contentView scrollToPoint:constrainedOrigin];
-    [_headerClipView scrollToPoint:CGPointMake(constrainedOrigin.x, 0.0)];
-
-    if (extraX || extraY)
-        [enclosingScrollView _respondToScrollWheelEventWithDeltaX:extraX deltaY:extraY];
 }
 
 - (void)keyDown:(CPEvent)anEvent
@@ -775,12 +760,6 @@ var CPScrollViewContentViewKey       = "CPScrollViewContentView",
         _contentView            = [aCoder decodeObjectForKey:CPScrollViewContentViewKey];
         _headerClipView         = [aCoder decodeObjectForKey:CPScrollViewHeaderClipViewKey];
         
-        if (!_headerClipView)
-        {
-            _headerClipView = [[CPClipView alloc] init];
-            [self addSubview:_headerClipView];
-        }
-
         _verticalScroller       = [aCoder decodeObjectForKey:CPScrollViewVScrollerKey];
         _horizontalScroller     = [aCoder decodeObjectForKey:CPScrollViewHScrollerKey];
 

AppKit/CPSlider.j

@@ -396,18 +396,6 @@ CPCircularSlider    = 1;
         _sendActionOn &= ~CPLeftMouseDraggedMask;
 }
 
-- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
-{
-    var count = objects.length,
-        value = [objects[0] valueForKeyPath:aKeyPath];
-
-    [self setObjectValue:value];
-
-    while (count-- > 1)
-        if (value !== ([objects[count] valueForKeyPath:aKeyPath]))
-            return [self setFloatValue:1.0];
-}
-
 @end
 
 var CPSliderMinValueKey             = "CPSliderMinValueKey",

AppKit/CPSplitView.j

@@ -217,9 +217,10 @@ var CPSplitViewHorizontalImage = nil,
         _DOMDividerElements[_drawingDivider].style.backgroundRepeat = "repeat";
 
         CPDOMDisplayServerAppendChild(_DOMElement, _DOMDividerElements[_drawingDivider]);
+
+        [self _setupDOMDivider];
     }
 
-    [self _setupDOMDivider];
     CPDOMDisplayServerSetStyleLeftTop(_DOMDividerElements[_drawingDivider], NULL, _CGRectGetMinX(aRect), _CGRectGetMinY(aRect));
     CPDOMDisplayServerSetStyleSize(_DOMDividerElements[_drawingDivider], _CGRectGetWidth(aRect), _CGRectGetHeight(aRect));
 #endif

AppKit/CPTableColumn.j

@@ -348,14 +348,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
 - (void)setHidden:(BOOL)shouldBeHidden
 {
-    shouldBeHidden = !!shouldBeHidden
-    if (_isHidden === shouldBeHidden)
-        return;
-    
     _isHidden = shouldBeHidden;
-    
-    [[self headerView] setHidden:shouldBeHidden];
-    [[self tableView] _tableColumnVisibilityDidChange:self];
 }
 
 - (BOOL)isHidden

AppKit/CPTableHeaderView.j

@@ -26,7 +26,7 @@
  
 @implementation _CPTableColumnHeaderView : CPView
 {
-    _CPImageAndTextView     _textField;
+    _CPImageAndTextView _textField;
 }
 
 - (void)initWithFrame:(CGRect)frame
@@ -147,32 +147,25 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
 @implementation CPTableHeaderView : CPView
 {
-    CPPoint                 _mouseDownLocation;
+    int _resizedColumn @accessors(readonly, property=resizedColumn);
-    CPPoint                 _previousTrackingLocation;
+    int _draggedColumn @accessors(readonly, property=draggedColumn);
-    int                     _activeColumn;
+    int _pressedColumn @accessors(readonly, property=pressedColumn);
-    int                     _pressedColumn;
     
-    BOOL                    _isResizing;
+    float _draggedDistance @accessors(readonly, property=draggedDistance);
-    BOOL                    _isDragging;
+    float _lastLocation;
-    BOOL                    _isTrackingColumn;
+    float _columnOldWidth;
     
-    float                   _columnOldWidth;
+    CPTableView _tableView @accessors(property=tableView);
-
-    CPTableView             _tableView @accessors(property=tableView);
 }
 
 - (void)_init
 {
-    _mouseDownLocation = CPPointMakeZero();
+    _resizedColumn = -1;
-    _previousTrackingLocation = CPPointMakeZero();
+    _draggedColumn = -1;
-    _activeColumn = -1;
     _pressedColumn = -1;
-
+    _draggedDistance = 0.0;
-    _isResizing = NO;
+    _lastLocation = nil;
-    _isDragging = NO;
+    _columnOldWidth = nil;
-    _isTrackingColumn = NO;
-
-    _columnOldWidth = 0.0;
 
     [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
 }
@@ -189,18 +182,26 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
 - (int)columnAtPoint:(CGPoint)aPoint
 {
-    return [_tableView columnAtPoint:CGPointMake(aPoint.x, aPoint.y)];
+    return [_tableView columnAtPoint:CGPointMake(aPoint.x, 0)];
 }
 
 - (CGRect)headerRectOfColumn:(int)aColumnIndex
 {
-    var headerRect = [self bounds],
+    var tableColumns = [_tableView tableColumns];
-        columnRect = [_tableView rectOfColumn:aColumnIndex];
 
-    headerRect.origin.x = CPRectGetMinX(columnRect);
+    if (aColumnIndex < 0 || aColumnIndex > [tableColumns count])
-    headerRect.size.width = CPRectGetWidth(columnRect);
+        [CPException raise:"invalid" reason:"tried to get headerRectOfColumn: on invalid column"];
 
-    return headerRect;
+    // UPDATE COLUMN RANGES ?
+        
+    var tableRange = _tableView._tableColumnRanges[aColumnIndex],
+        bounds = [self bounds];
+
+    var rMinX = ROUND(tableRange.location);
+    bounds.origin.x = rMinX;
+    bounds.size.width = FLOOR(tableRange.length + tableRange.location - rMinX);
+    
+    return bounds;
 }
 
 - (CGRect)_cursorRectForColumn:(int)column
@@ -235,280 +236,104 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
 - (void)mouseDown:(CPEvent)theEvent
 {
-    [self trackMouse:theEvent];
+    var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil],
+        clickedColumn = [self columnAtPoint:mouseLocation];    
+    
+    // should we send column -1 ?
+    [_tableView _sendDelegateDidMouseDownInHeader:clickedColumn];
+    
+    var resizeLocation = CGPointMake(mouseLocation.x - 5, mouseLocation.y),
+        resizedColumn = [self columnAtPoint:resizeLocation];
+    
+    if (resizedColumn == -1)
+        return;
+
+    // 2 different tracking methods: one for resizing/stop-resizing, another one for selection/reordering
+    if ([_tableView allowsColumnResizing]
+        && CGRectContainsPoint([self _cursorRectForColumn:resizedColumn], mouseLocation))
+    {
+        _resizedColumn = resizedColumn;
+        [_tableView._tableColumns[_resizedColumn] setDisableResizingPosting:YES];
+        [_tableView setDisableAutomaticResizing:YES];
+        [self trackResizeWithEvent:theEvent];
+    }
+    else
+    {
+        [self _setPressedColumn:clickedColumn];
+        [self trackMouseWithEvent:theEvent];
+    }    
 }
 
-- (void)trackMouse:(CPEvent)theEvent
+- (void)trackMouseWithEvent:(CPEvent)theEvent
 {
-    var type = [theEvent type],
+    var type = [theEvent type];
-        currentLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil];
     
-    // Take the right columns resize tracking area into account
+    if (type == CPLeftMouseUp)
-    currentLocation.x -= 5.0;
-
-    var columnIndex = [self columnAtPoint:currentLocation],
-        shouldResize = [self shouldResizeTableColumn:columnIndex at:CPPointMake(currentLocation.x + 5.0, currentLocation.y)];
-
-    if (type === CPLeftMouseUp)
     {
-        if (shouldResize)
+        var location = [self convertPoint:[theEvent locationInWindow] fromView:nil],
-            [self stopResizingTableColumn:_activeColumn at:currentLocation];
+            clickedColumn = [self columnAtPoint:location];
-        else if ([self _shouldStopTrackingTableColumn:columnIndex at:currentLocation])
-        {
-            [_tableView _didClickTableColumn:columnIndex modifierFlags:[theEvent modifierFlags]];
-            [self stopTrackingTableColumn:columnIndex at:currentLocation];
 
-            _isTrackingColumn = NO;
+        [self _setPressedColumn:-1];
-        }
         
-        [self _updateResizeCursor:[CPApp currentEvent]];
+        if (clickedColumn != -1)
+            [_tableView _didClickTableColumn:clickedColumn modifierFlags:[theEvent modifierFlags]];
         
-        _activeColumn = CPNotFound;
         return;
     }
 
-    if (type === CPLeftMouseDown)
+    [CPApp setTarget:self selector:@selector(trackMouseWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPLeftMouseDownMask untilDate:nil inMode:nil dequeue:YES];
+}
+
+- (void)trackResizeWithEvent:(CPEvent)anEvent
+{
+    var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
+        tableColumn = [[_tableView tableColumns] objectAtIndex:_resizedColumn],
+        type = [anEvent type];
+
+    if (_lastLocation == nil)
+        _lastLocation = location;
+
+    if (_columnOldWidth == nil)
+        _columnOldWidth = [tableColumn width];
+
+    if (type === CPLeftMouseUp)
     {   
-        if (columnIndex === -1)
+        [self _updateResizeCursor:anEvent];
-            return;
                 
-        _mouseDownLocation = currentLocation;
+        [tableColumn _postDidResizeNotificationWithOldWidth:_columnOldWidth];
-        _activeColumn = columnIndex;
+        [tableColumn setDisableResizingPosting:NO];        
+        [_tableView setDisableAutomaticResizing:NO];
 
-        [_tableView _sendDelegateDidMouseDownInHeader:columnIndex];
+        _resizedColumn = -1;
+        _lastLocation = nil;
+        _columnOldWidth = nil;
 
-        if (shouldResize)
+        return;
-            [self startResizingTableColumn:columnIndex at:currentLocation];
-        else
-        {
-            [self startTrackingTableColumn:columnIndex at:currentLocation];
-            _isTrackingColumn = YES;
-        }
     }            
     else if (type === CPLeftMouseDragged)
     {
-        if (shouldResize)
+        var newWidth = [tableColumn width] + location.x - _lastLocation.x;
-            [self continueResizingTableColumn:_activeColumn at:currentLocation];
+        
+        if (newWidth < [tableColumn minWidth])
+            [[CPCursor resizeRightCursor] set];
+        else if (newWidth > [tableColumn maxWidth])
+            [[CPCursor resizeLeftCursor] set];
         else
         {
-            if (_activeColumn === columnIndex && CPRectContainsPoint([self headerRectOfColumn:columnIndex], currentLocation))
+            _tableView._lastColumnShouldSnap = NO;
-            {
+            [tableColumn setWidth:newWidth];
-                if (_isTrackingColumn && _pressedColumn !== -1)
+            // FIXME: there has to be a better way to do this...
-                {
+            // We should refactor the auto resizing crap.
-                    if (![self continueTrackingTableColumn:columnIndex at:currentLocation])
+            // We need to figure out the exact cocoa behavior here though. 
-                        return; // Stop tracking the column, because it's being dragged
+            _lastLocation = location;
-                } else
-                    [self startTrackingTableColumn:columnIndex at:currentLocation];
 
-            } else if (_isTrackingColumn && _pressedColumn !== -1)
+            [[CPCursor resizeLeftRightCursor] set];
-                [self stopTrackingTableColumn:_activeColumn at:currentLocation];
+            [self setNeedsLayout];
+            [self setNeedsDisplay:YES];
         }
     }
 
-    _previousTrackingLocation = currentLocation;
+    [CPApp setTarget:self selector:@selector(trackResizeWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
-    [CPApp setTarget:self selector:@selector(trackMouse:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
-}
-
-- (void)startTrackingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
-{
-    [self _setPressedColumn:aColumnIndex];
-}
-
-- (BOOL)continueTrackingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
-{
-    if ([self _shouldDragTableColumn:aColumnIndex at:aPoint])
-    {
-        var columnRect = [self headerRectOfColumn:aColumnIndex],
-            offset = CPPointMakeZero(),
-            view = [_tableView _dragViewForColumn:aColumnIndex event:[CPApp currentEvent] offset:offset],
-            viewLocation = CPPointMakeZero();
-
-        viewLocation.x = ( CPRectGetMinX(columnRect) + offset.x ) + ( aPoint.x - _mouseDownLocation.x );
-        viewLocation.y = CPRectGetMinY(columnRect) + offset.y;
-
-        [self dragView:view at:viewLocation offset:CPSizeMakeZero() event:[CPApp currentEvent] 
-            pasteboard:[CPPasteboard pasteboardWithName:CPDragPboard] source:self slideBack:YES];
-
-        return NO;
-    }
-
-    return YES;
-}
-
-- (BOOL)_shouldStopTrackingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
-{
-    return _isTrackingColumn && _activeColumn === aColumnIndex && 
-        CPRectContainsPoint([self headerRectOfColumn:aColumnIndex], aPoint);
-}
-
-- (void)stopTrackingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
-{
-    [self _setPressedColumn:CPNotFound];
-    [self _updateResizeCursor:[CPApp currentEvent]];
-}
-
-- (BOOL)_shouldDragTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
-{
-    return [_tableView allowsColumnReordering] && ABS(aPoint.x - _mouseDownLocation.x) >= 10.0;
-}
-
-- (CPRect)_headerRectOfLastVisibleColumn
-{
-    var tableColumns = [_tableView tableColumns],
-        columnIndex = [tableColumns count];
-
-    while (columnIndex--)
-    {
-        var tableColumn = [tableColumns objectAtIndex:columnIndex];
-
-        if (![tableColumn isHidden])
-            return [self headerRectOfColumn:columnIndex];
-    }
-
-    return nil;
-}
-
-- (void)_constrainDragView:(CPView)theDragView at:(CPPoint)aPoint
-{
-    var tableColumns = [_tableView tableColumns],
-        lastColumnRect = [self _headerRectOfLastVisibleColumn];
-        activeColumnRect = [self headerRectOfColumn:_activeColumn];
-        dragWindow = [theDragView window],
-        frame = [dragWindow frame];
-
-    // Convert the frame origin from the global coordinate system to the windows' coordinate system
-    frame.origin = [[self window] convertGlobalToBase:frame.origin];
-    // the from the window to the view
-    frame.origin = [self convertPoint:frame.origin fromView:nil];
-
-    // This effectively clamps the value between the minimum and maximum
-    frame.origin.x = MAX(0.0, MIN(CGRectGetMinX(frame), CGRectGetMaxX(lastColumnRect) - CGRectGetWidth(activeColumnRect)));
-
-    // Make sure the column cannot move vertically
-    frame.origin.y = CPRectGetMinY(lastColumnRect);
-
-    // Convert the calculated origin back to the window coordinate system
-    frame.origin = [self convertPoint:frame.origin toView:nil];
-    // Then back to the global coordinate system
-    frame.origin = [[self window] convertBaseToGlobal:frame.origin];
-
-    [dragWindow setFrame:frame];
-}
-
-- (void)_moveColumn:(int)aFromIndex toColumn:(int)aToIndex
-{
-    [_tableView moveColumn:aFromIndex toColumn:aToIndex];
-    _activeColumn = aToIndex;
-    _pressedColumn = _activeColumn;
-
-    [_tableView _setDraggedColumn:_activeColumn];
-}
-
-- (void)draggedView:(CPView)aView beganAt:(CPPoint)aPoint
-{
-    _isDragging = YES;
-
-    [[[[_tableView tableColumns] objectAtIndex:_activeColumn] headerView] setHidden:YES];
-    [_tableView _setDraggedColumn:_activeColumn];
-
-    [self setNeedsDisplay:YES];
-}
-
-- (void)draggedView:(CPView)aView movedTo:(CPPoint)aPoint
-{
-    [self _constrainDragView:aView at:aPoint];
-
-    var dragWindow = [aView window],
-        dragWindowFrame = [dragWindow frame];
-
-    var hoverPoint = CGPointCreateCopy(aPoint);
-
-    if (aPoint.x < _previousTrackingLocation.x)
-        hoverPoint = CGPointMake(CGRectGetMinX(dragWindowFrame), CGRectGetMinY(dragWindowFrame));
-    else if (aPoint.x > _previousTrackingLocation.x)
-        hoverPoint = CGPointMake(CGRectGetMaxX(dragWindowFrame), CGRectGetMinY(dragWindowFrame));
-
-    // Convert the hover point from the global coordinate system to windows' coordinate system
-    hoverPoint = [[self window] convertGlobalToBase:hoverPoint];
-    // then to the view
-    hoverPoint = [self convertPoint:hoverPoint fromView:nil];
-
-    var hoveredColumn = [self columnAtPoint:hoverPoint];
-
-    if (hoveredColumn !== -1)
-    {
-        var columnRect = [self headerRectOfColumn:hoveredColumn],
-            columnCenterPoint = [self convertPoint:CGPointMake(CGRectGetMidX(columnRect), CGRectGetMidY(columnRect)) fromView:self];
-        if (hoveredColumn < _activeColumn && hoverPoint.x < columnCenterPoint.x)
-            [self _moveColumn:_activeColumn toColumn:hoveredColumn];
-        else if (hoveredColumn > _activeColumn && hoverPoint.x > columnCenterPoint.x)
-            [self _moveColumn:_activeColumn toColumn:hoveredColumn];
-    }
-
-    _previousTrackingLocation = aPoint;
-}
-
-- (void)draggedView:(CPImage)aView endedAt:(CGPoint)aLocation operation:(CPDragOperation)anOperation
-{
-    _isDragging = NO;
-    _isTrackingColumn = NO; // We need to do this explicitly because the mouse up section of trackMouse is never reached
-
-    [_tableView _setDraggedColumn:-1];
-    [[[[_tableView tableColumns] objectAtIndex:_activeColumn] headerView] setHidden:NO];
-    [self stopTrackingTableColumn:_activeColumn at:aLocation];
-
-    [self setNeedsDisplay:YES];
-}
-
-- (BOOL)shouldResizeTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
-{
-    if (_isResizing)
-        return YES;
-
-    if (_isTrackingColumn)
-        return NO;
-
-    return [_tableView allowsColumnResizing] && CPRectContainsPoint([self _cursorRectForColumn:aColumnIndex], aPoint);
-}
-
-- (void)startResizingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
-{
-    _isResizing = YES;
-
-    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex];
-
-    [tableColumn setDisableResizingPosting:YES];
-    [_tableView setDisableAutomaticResizing:YES];
-}
-
-- (void)continueResizingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
-{
-    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex],
-        newWidth = [tableColumn width] + aPoint.x - _previousTrackingLocation.x;
-
-    if (newWidth < [tableColumn minWidth])
-        [[CPCursor resizeRightCursor] set];
-    else if (newWidth > [tableColumn maxWidth])
-        [[CPCursor resizeLeftCursor] set];
-    else
-    {
-        _tableView._lastColumnShouldSnap = NO;
-        [tableColumn setWidth:newWidth];
-
-        [[CPCursor resizeLeftRightCursor] set];
-        [self setNeedsLayout];
-        [self setNeedsDisplay:YES];
-    }
-}
-
-- (void)stopResizingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
-{
-    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex];
-    [tableColumn _postDidResizeNotificationWithOldWidth:_columnOldWidth];
-    [tableColumn setDisableResizingPosting:NO];
-    [_tableView setDisableAutomaticResizing:NO];
-
-    _isResizing = NO;
 }
 
 - (void)_updateResizeCursor:(CPEvent)theEvent
@@ -540,6 +365,12 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         [[CPCursor arrowCursor] set];
 }
 
+- (void)viewDidMoveToWindow
+{
+    //if ([_tableView allowsColumnResizing])
+    //    [[self window] setAcceptsMouseMovedEvents:YES];
+}
+
 - (void)mouseEntered:(CPEvent)theEvent
 {   
     [self _updateResizeCursor:theEvent];
@@ -619,11 +450,26 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     CGContextClosePath(context);
     CGContextStrokePath(context);
         
-    if (_isDragging)
+/*
+    var maxY = CGRectGetMaxY([self bounds]);
+    // draw normal gradient for remaining space
+    if (supportsCanvasGradient)
     {
-        CGContextSetFillColor(context, [CPColor grayColor]);
+        aRect.origin.x = columnMaxX - 0.5;
-        CGContextFillRect(context, [self headerRectOfColumn:_activeColumn])
+        aRect.size.width -= columnMaxX;
+        CGContextBeginPath(context);
+        CGContextAddRect(context, CGRectMake(columnMaxX + 1, 0, CGRectGetMaxX([self bounds]) - columnMaxX, CGRectGetHeight([self bounds])));
+        CGContextClosePath(context);    
+        CGContextDrawLinearGradient(context, [_CPTableColumnHeaderView headerGradient], CGPointMake(0,0), CGPointMake(0, maxY - 1),0);
     }   
+   
+    // Draw bottom line
+    CGContextBeginPath(context);    
+    CGContextMoveToPoint(context, 0, maxY - 0.5);
+    CGContextAddLineToPoint(context, CGRectGetMaxX([self bounds]), maxY - 0.5);
+    CGContextClosePath(context);
+    CGContextStrokePath(context);
+*/   
 }
 
 @end
@@ -650,3 +496,4 @@ var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey";
 }
 
 @end
+

AppKit/CPTableView.j

@@ -86,7 +86,7 @@ CPTableViewSolidVerticalGridLineMask   = 1 << 0;
 CPTableViewSolidHorizontalGridLineMask = 1 << 1;
 
 CPTableViewNoColumnAutoresizing = 0;
-CPTableViewUniformColumnAutoresizingStyle = 1; // FIX ME: This is FUBAR
+CPTableViewUniformColumnAutoresizingStyle = 1;
 CPTableViewSequentialColumnAutoresizingStyle = 2;
 CPTableViewReverseSequentialColumnAutoresizingStyle = 3;
 CPTableViewLastColumnOnlyAutoresizingStyle = 4;
@@ -212,9 +212,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     CPGradient  _sourceListActiveGradient;
     CPColor     _sourceListActiveTopLineColor;
     CPColor     _sourceListActiveBottomLineColor;    
-    
-    int         _draggedColumnIndex;
-    
 /*
     CPGradient  _sourceListInactiveGradient;
     CPColor     _sourceListInactiveTopLineColor;
@@ -235,6 +232,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         _allowsEmptySelection = YES;
         _allowsColumnSelection = NO;
         _disableAutomaticResizing = NO;
+        _tableViewFlags = 0;
 
         //Setting Display Attributes
         _selectionHighlightStyle = CPTableViewSelectionHighlightStyleRegular;
@@ -247,13 +245,28 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         _dirtyTableColumnRangeIndex = CPNotFound;
         _numberOfHiddenColumns = 0;
 
+        _objectValues = { };
+        _dataViewsForTableColumns = { };
+        _dataViews=  [];
+        _numberOfRows = 0;
+        _exposedRows = [CPIndexSet indexSet];
+        _exposedColumns = [CPIndexSet indexSet];
+        _cachedDataViews = { };
         _intercellSpacing = _CGSizeMake(0.0, 0.0);
         _rowHeight = 23.0;
 
         [self setGridColor:[CPColor colorWithHexString:@"dce0e2"]];
         [self setGridStyleMask:CPTableViewGridNone];
 
+        _headerView = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, [self bounds].size.width, _rowHeight)];
+
+        [_headerView setTableView:self];
+
+        _cornerView = [[_CPCornerView alloc] initWithFrame:CGRectMake(0, 0, [CPScroller scrollerWidth], CGRectGetHeight([_headerView frame]))];
+
         _lastSelectedRow = -1;
+        _selectedColumnIndexes = [CPIndexSet indexSet];
+        _selectedRowIndexes = [CPIndexSet indexSet];
         _currentHighlightedTableColumn = nil;
 
         _sortDescriptors = [CPArray array];
@@ -266,6 +279,10 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         _dragOperationDefaultMask = nil;
         _destinationDragStyle = CPTableViewDraggingDestinationFeedbackStyleRegular;
 
+        _tableDrawView = [[_CPTableDrawView alloc] initWithTableView:self];
+        [_tableDrawView setBackgroundColor:[CPColor clearColor]];
+        [self addSubview:_tableDrawView];
+
         [self setBackgroundColor:[CPColor whiteColor]];
         [self _init];
     }
@@ -276,45 +293,11 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 // FIX ME: we have a lot of redundent init stuff in initWithFrame: and initWithCoder: we should move it all into here.
 - (void)_init
 {
-        _tableViewFlags = 0;
-
-        _selectedColumnIndexes = [CPIndexSet indexSet];
-        _selectedRowIndexes = [CPIndexSet indexSet];
-
         _dropOperationFeedbackView = [[_CPDropOperationDrawingView alloc] initWithFrame:_CGRectMakeZero()];
         [_dropOperationFeedbackView setTableView:self];
 
         _lastColumnShouldSnap = NO;
 
-        if (!_alternatingRowBackgroundColors)
-            _alternatingRowBackgroundColors = [[CPColor whiteColor], [CPColor colorWithHexString:@"e4e7ff"]];
-
-        _tableColumnRanges = [];
-        _dirtyTableColumnRangeIndex = 0;
-        _numberOfHiddenColumns = 0;
-
-        _objectValues = { };
-        _dataViewsForTableColumns = { };
-        _dataViews=  [];
-        _numberOfRows = 0;
-        _exposedRows = [CPIndexSet indexSet];
-        _exposedColumns = [CPIndexSet indexSet];
-        _cachedDataViews = { };
-
-        _tableDrawView = [[_CPTableDrawView alloc] initWithTableView:self];
-        [_tableDrawView setBackgroundColor:[CPColor clearColor]];
-        [self addSubview:_tableDrawView];
-
-        if (!_headerView)
-            _headerView = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, [self bounds].size.width, _rowHeight)];
-
-        [_headerView setTableView:self];
-
-        if (!_cornerView)
-            _cornerView = [[_CPCornerView alloc] initWithFrame:CGRectMake(0, 0, [CPScroller scrollerWidth], CGRectGetHeight([_headerView frame]))];
-        
-        _draggedColumnIndex = -1;
-        
         // Gradients for the source list
         _sourceListActiveGradient = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [89.0/255.0, 153.0/255.0, 209.0/255.0,1.0, 33.0/255.0, 94.0/255.0, 208.0/255.0,1.0], [0,1], 2);
         _sourceListActiveTopLineColor = [CPColor colorWithCalibratedRed:(61.0/255.0) green:(123.0/255.0) blue:(218.0/255.0) alpha:1.0];
@@ -677,15 +660,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     [self setNeedsLayout];
 }
 
-- (void)_setDraggedColumn:(int)aColumnIndex
-{
-    if (_draggedColumnIndex === aColumnIndex)
-        return;
-        
-    _draggedColumnIndex = aColumnIndex;
-    
-    [self reloadDataForRowIndexes:_exposedRows columnIndexes:[CPIndexSet indexSetWithIndex:aColumnIndex]];
-}
 
 /*!
     Moves the column and heading at a given index to a new given index.
@@ -705,37 +679,15 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     else
         _dirtyTableColumnRangeIndex = MIN(fromIndex, toIndex, _dirtyTableColumnRangeIndex);
 
+    if (toIndex > fromIndex)
+        --toIndex;
+
     var tableColumn = _tableColumns[fromIndex];
 
     [_tableColumns removeObjectAtIndex:fromIndex];
     [_tableColumns insertObject:tableColumn atIndex:toIndex];
 
-    [[self headerView] setNeedsLayout];
+    [self setNeedsLayout];
-    [[self headerView] setNeedsDisplay:YES];
-
-    var rowIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self numberOfRows])],
-        columnIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(fromIndex, toIndex)];
-        
-    [self reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
-}
-
-/*!
-    @ignore
-*/
-- (void)_tableColumnVisibilityDidChange:(CPTableColumn)aColumn
-{
-    var columnIndex = [[self tableColumns] indexOfObjectIdenticalTo:aColumn];
-    
-    if (_dirtyTableColumnRangeIndex < 0)
-        _dirtyTableColumnRangeIndex = columnIndex;
-    else
-        _dirtyTableColumnRangeIndex = MIN(columnIndex, _dirtyTableColumnRangeIndex);
-    
-    [[self headerView] setNeedsLayout];
-    [[self headerView] setNeedsDisplay:YES];
-    
-    var rowIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self numberOfRows])];
-    [self reloadDataForRowIndexes:rowIndexes columnIndexes:[CPIndexSet indexSetWithIndex:columnIndex]];
 }
 
 - (CPArray)tableColumns
@@ -853,22 +805,22 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
         var count = deselectRows.length;
         while (count--)
-            [self _performSelection:NO forRow:deselectRows[count] context:dataViewsInTableColumn];
+        {
+            var rowIndex = deselectRows[count];
+            var view = dataViewsInTableColumn[rowIndex];
+            [view unsetThemeState:CPThemeStateSelected];
+        }
 
         count = selectRows.length;
         while (count--)
-            [self _performSelection:YES forRow:selectRows[count] context:dataViewsInTableColumn];
+        {
+            var rowIndex = selectRows[count];
+            var view = dataViewsInTableColumn[rowIndex];
+            [view setThemeState:CPThemeStateSelected];
+        }
     }
 }
 
-- (void)_performSelection:(BOOL)select forRow:(CPInteger)rowIndex context:(id)context
-{
-    var view = context[rowIndex],
-        selector = select ? @"setThemeState:" : @"unsetThemeState:";
-
-    [view performSelector:CPSelectorFromString(selector) withObject:CPThemeStateSelected];
-}
-
 - (void)_updateHighlightWithOldColumns:(CPIndexSet)oldColumns newColumns:(CPIndexSet)newColumns
 {
     var firstExposedColumn = [_exposedColumns firstIndex],
@@ -1092,8 +1044,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     if (_dirtyTableColumnRangeIndex < 0)
         return;
 
-    _numberOfHiddenColumns = 0;
-
     var index = _dirtyTableColumnRangeIndex,
         count = NUMBER_OF_COLUMNS(),
         x = index === 0 ? 0.0 : CPMaxRange(_tableColumnRanges[index - 1]);
@@ -1103,10 +1053,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         var tableColumn = _tableColumns[index];
 
         if ([tableColumn isHidden])
-        {
-            _numberOfHiddenColumns += 1;
             _tableColumnRanges[index] = CPMakeRange(x, 0.0);
-        }
 
         else
         {
@@ -1128,9 +1075,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 {
     aColumnIndex = +aColumnIndex;
 
-    var column = [[self tableColumns] objectAtIndex:aColumnIndex];
+    if (aColumnIndex < 0 || aColumnIndex >= NUMBER_OF_COLUMNS())
-
-    if ([column isHidden] || aColumnIndex < 0 || aColumnIndex >= NUMBER_OF_COLUMNS())
         return _CGRectMakeZero();
 
     UPDATE_COLUMN_RANGES_IF_NECESSARY();
@@ -1283,6 +1228,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     return _CGRectMake(tableColumnRange.location, _CGRectGetMinY(rectOfRow), tableColumnRange.length, _CGRectGetHeight(rectOfRow));
 }
 
+//FIX ME: We should refactor this!
 - (void)resizeWithOldSuperviewSize:(CGSize)aSize
 {
     [super resizeWithOldSuperviewSize:aSize];
@@ -1293,53 +1239,57 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     var mask = _columnAutoResizingStyle;
 
     if(mask === CPTableViewUniformColumnAutoresizingStyle)
+    {
        [self _resizeAllColumnUniformlyWithOldSize:aSize];
-    else if(mask === CPTableViewLastColumnOnlyAutoresizingStyle)
+    }
+
+    if(mask === CPTableViewLastColumnOnlyAutoresizingStyle)
+    {
         [self sizeLastColumnToFit];
-    else if(mask === CPTableViewFirstColumnOnlyAutoresizingStyle)
+    }
-        [self _autoResizeFirstColumn];
-}
 
-- (void)_autoResizeFirstColumn
+    if(mask === CPTableViewFirstColumnOnlyAutoresizingStyle)
-{
+    {
-    var superview = [self superview];
+        var superview = [self superview];
 
-     if (!superview)
+        if (!superview)
-         return;
+            return;
 
-     var superviewSize = [superview bounds].size;
+        var superviewSize = [superview bounds].size;
 
-     UPDATE_COLUMN_RANGES_IF_NECESSARY();
+        UPDATE_COLUMN_RANGES_IF_NECESSARY();
 
-     var count = NUMBER_OF_COLUMNS(),
+        var count = NUMBER_OF_COLUMNS();
-         visColumns = [[CPArray alloc] init],
-         totalWidth = 0,
-         i = 0;
 
-     for(; i < count; i++)
+        var visColumns = [[CPArray alloc] init];
-     {
+        var totalWidth = 0;
-         if(![_tableColumns[i] isHidden])
-         {
-             [visColumns addObject:i];
-             totalWidth += [_tableColumns[i] width];
-         }
-     }
 
-     count = [visColumns count];
+        for(var i=0; i < count; i++)
+        {
+            if(![_tableColumns[i] isHidden])
+            {
+                [visColumns addObject:i];
+                totalWidth += [_tableColumns[i] width];
+            }
+        }
 
-     //if there are rows
+        count = [visColumns count];
-     if (count > 0)
-     {
-         var columnToResize = _tableColumns[visColumns[0]];
-         var newWidth = superviewSize.width - totalWidth;// - [columnToResize width];
-         newWidth += [columnToResize width];
-         newWidth = (newWidth < [columnToResize minWidth]) ? [columnToResize minWidth] : newWidth;
-         newWidth = (newWidth > [columnToResize maxWidth]) ? [columnToResize maxWidth] : newWidth;
 
-         [columnToResize setWidth:FLOOR(newWidth)];
+        //if there are rows
-     }
+        if (count > 0)
+        {
+            var columnToResize = _tableColumns[visColumns[0]];
+            var newWidth = superviewSize.width - totalWidth;// - [columnToResize width];
+            newWidth += [columnToResize width];
+            newWidth = (newWidth < [columnToResize minWidth]) ? [columnToResize minWidth] : newWidth;
+            newWidth = (newWidth > [columnToResize maxWidth]) ? [columnToResize maxWidth] : newWidth;
+
+            [columnToResize setWidth:FLOOR(newWidth)];
+        }
+
+        [self setNeedsLayout];
+    }
 
-     [self setNeedsLayout];
 }
 
 - (void)_resizeAllColumnUniformlyWithOldSize:(CGSize)oldSize
@@ -1818,7 +1768,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     return [[CPImage alloc] initWithContentsOfFile:@"Frameworks/AppKit/Resources/GenericFile.png" size:CGSizeMake(32,32)];
 }
 
-- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)theDraggedRows tableColumns:(CPArray)theTableColumns event:(CPEvent)theDragEvent offset:(CPPointPointer)dragViewOffset
+- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)theDraggedRows tableColumns:(CPArray)theTableColumns event:(CPEvent)theDragEvent offset:(CPPoint)dragViewOffset
 {
     var bounds = [self bounds],
         view = [[CPView alloc] initWithFrame:bounds];
@@ -1854,55 +1804,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     return view;
 }
 
-/*!
-    @ignore
-    // Fetches all the data views (from the datasource) for the column and it's visible rows
-    // Copy the dataviews add them to a transparent drag view and use that drag view 
-    // to make it appear we are dragging images of those rows (as you would do in regular Cocoa)
-*/
-- (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CPPointPointer)theDragViewOffset
-{
-    var dragView = [[CPView alloc] initWithFrame:CPRectMakeZero()];
-        tableColumn = [[self tableColumns] objectAtIndex:theColumnIndex],
-        bounds = CPRectMake(0.0, 0.0, [tableColumn width], CPRectGetHeight([self _exposedRect]) + 23.0),
-        columnRect = [self rectOfColumn:theColumnIndex],
-        headerView = [tableColumn headerView];
-    
-    row = [_exposedRows firstIndex];
-    while (row !== CPNotFound)
-    {
-        var dataView = [self _newDataViewForRow:row tableColumn:tableColumn],
-            dataViewFrame = [self frameOfDataViewAtColumn:theColumnIndex row:row];
-            
-        // Only one column is ever dragged so we just place the view at 
-        dataViewFrame.origin.x = 0.0;
-            
-        // Offset by table header height - scroll position
-        dataViewFrame.origin.y = ( CPRectGetMinY(dataViewFrame) - CPRectGetMinY([self _exposedRect]) ) + 23.0;
-        [dataView setFrame:dataViewFrame];
-        
-        [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
-        [dragView addSubview:dataView];
-        
-        row = [_exposedRows indexGreaterThanIndex:row];
-    }
-    
-    // Add the column header view
-    var headerFrame = [headerView frame];
-    headerFrame.origin = CPPointMakeZero();
-    
-    columnHeaderView = [[_CPTableColumnHeaderView alloc] initWithFrame:headerFrame];
-    [columnHeaderView setStringValue:[headerView stringValue]];
-    [columnHeaderView setThemeState:[headerView themeState]];
-    [dragView addSubview:columnHeaderView];
-    
-    [dragView setBackgroundColor:[CPColor whiteColor]];
-    [dragView setAlphaValue:0.7];
-    [dragView setFrame:bounds];
-    
-    return dragView;
-}
-
 - (void)setDraggingSourceOperationMask:(CPDragOperation)mask forLocal:(BOOL)isLocal
 {
     //ignoral local for the time being since only one capp app can run at a time...
@@ -2143,12 +2044,8 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     for (; columnIndex < columnsCount; ++columnIndex)
     {
         var column = columnArray[columnIndex],
-            tableColumn = _tableColumns[column];
+            tableColumn = _tableColumns[column],
-            
+            tableColumnUID = [tableColumn UID];
-        if ([tableColumn isHidden] || columnIndex === _draggedColumnIndex)
-            continue;
-            
-        var tableColumnUID = [tableColumn UID];
 
         if (!_dataViewsForTableColumns[tableColumnUID])
             _dataViewsForTableColumns[tableColumnUID] = [];
@@ -2261,9 +2158,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
 - (void)_enqueueReusableDataView:(CPView)aDataView
 {
-    if (!aDataView)
-        return;
-    
     // FIXME: yuck!
     var identifier = aDataView.identifier;
 
@@ -2301,15 +2195,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     [self drawBackgroundInClipRect:exposedRect];
     [self drawGridInClipRect:exposedRect];
     [self highlightSelectionInClipRect:exposedRect];
-    
-    if (_draggedColumnIndex === -1)
-        return;
-        
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        columnRect = [self rectOfColumn:_draggedColumnIndex];
-
-    CGContextSetFillColor(context, [CPColor grayColor]);
-    CGContextFillRect(context, columnRect);
 }
 
 - (void)drawBackgroundInClipRect:(CGRect)aRect
@@ -2317,6 +2202,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     if (!_usesAlternatingRowBackgroundColors)
         return;
 
+
     var rowColors = [self alternatingRowBackgroundColors],
         colorCount = [rowColors count];
 
@@ -2454,9 +2340,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
 - (void)highlightSelectionInClipRect:(CGRect)aRect
 {
-    if (_selectionHighlightStyle === CPTableViewDraggingDestinationFeedbackStyleNone)
-        return;
-
     var context = [[CPGraphicsContext currentContext] graphicsPort],
         indexes = [],
         rectSelector = @selector(rectOfRow:);
@@ -2486,8 +2369,9 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     if (!count)
         return;
   
-    var drawGradient = (_selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList && [_selectedRowIndexes count] >= 1),
+    var drawGradient = (_selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList && [_selectedRowIndexes count] >= 1);
-        deltaHeight = 0.5 * (_gridStyleMask & CPTableViewSolidHorizontalGridLineMask);
+    
+    var deltaHeight = 0.5 * (_gridStyleMask & CPTableViewSolidHorizontalGridLineMask);
 
     CGContextBeginPath(context);
     while (count--)
@@ -2550,9 +2434,10 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
             
             for(var c = firstExposedColumn; c < exposedColumnCount; c++)
             {
+                //console.log(columnIndexes);
                 var colRect = [self rectOfColumn:exposedColumnIndexes[c]],
                     colX = CGRectGetMaxX(colRect) + 0.5;
-
+                //console.log(colX);
                 CGContextMoveToPoint(context, colX, minY);
                 CGContextAddLineToPoint(context, colX, maxY);
             }
@@ -2676,10 +2561,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 {
     // Prevent CPControl from eating the mouse events when we are in a drag session
     if (![_draggedRowIndexes count])
-    {
-        [self autoscroll:anEvent];
         [super trackMouse:anEvent];
-    }
     else
         [CPApp sendEvent:anEvent];
 }
@@ -2993,6 +2875,13 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     [_dropOperationFeedbackView setCurrentRow:row];
     [self addSubview:_dropOperationFeedbackView];
     
+    // FIXME : Maybe we should do this in a timer outside this method. 
+    // Problem: we don't know when the scroll ends or when the next -draggingUpdated is called. 
+    if (row > 0 && location.y - CGRectGetMinY(exposedClipRect) < _rowHeight)
+        [self scrollRowToVisible:row - 1];
+    else if (row < numberOfRows && CGRectGetMaxY(exposedClipRect) - location.y < _rowHeight)
+        [self scrollRowToVisible:row + 1];
+        
     return dragOperation;
 }
 
@@ -3160,7 +3049,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
 - (void)keyDown:(CPEvent)anEvent
 {
-    [self interpretKeyEvents:[anEvent]];
+    [self interpretKeyEvents:[CPArray arrayWithObject:anEvent]];
 }
 
 - (void)moveDown:(id)sender
@@ -3298,18 +3187,34 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
         _allowsEmptySelection = [aCoder decodeBoolForKey:CPTableViewEmptySelectionKey];
         _allowsColumnSelection = [aCoder decodeBoolForKey:CPTableViewColumnSelectionKey];
 
+        _tableViewFlags = 0;
+
         //Setting Display Attributes
         _selectionHighlightStyle = CPTableViewSelectionHighlightStyleRegular;
 
-        _tableColumns = [aCoder decodeObjectForKey:CPTableViewTableColumnsKey] || [];
+        _usesAlternatingRowBackgroundColors = [aCoder decodeBoolForKey:CPTableViewUsesAlternatingBackgroundKey];
+        [self setAlternatingRowBackgroundColors:[[CPColor whiteColor], [CPColor colorWithHexString:@"e4e7ff"]]];
+
+        _tableColumns = [aCoder decodeObjectForKey:CPTableViewTableColumnsKey];
         [_tableColumns makeObjectsPerformSelector:@selector(setTableView:) withObject:self];
 
-        if ([aCoder containsValueForKey:CPTableViewRowHeightKey])
+        _tableColumnRanges = [];
-            _rowHeight = [aCoder decodeFloatForKey:CPTableViewRowHeightKey];
+        _dirtyTableColumnRangeIndex = 0;
-        else
+        _numberOfHiddenColumns = 0;
-            _rowHeight = 23.0;
 
-        _intercellSpacing = [aCoder decodeSizeForKey:CPTableViewIntercellSpacingKey] || _CGSizeMake(0.0, 0.0);
+        _objectValues = { };
+        _dataViewsForTableColumns = { };
+        _dataViews=  [];
+        _numberOfRows = 0;
+        _exposedRows = [CPIndexSet indexSet];
+        _exposedColumns = [CPIndexSet indexSet];
+        _cachedDataViews = { };
+        _rowHeight = [aCoder decodeFloatForKey:CPTableViewRowHeightKey];
+        
+        if ([aCoder containsValueForKey:CPTableViewIntercellSpacingKey])
+            _intercellSpacing = [aCoder decodeSizeForKey:CPTableViewIntercellSpacingKey];
+        else
+            _intercellSpacing = _CGSizeMake(0.0, 0.0);
         
         _gridColor = [aCoder decodeObjectForKey:CPTableViewGridColorKey] || [CPColor grayColor];
         _gridStyleMask = [aCoder decodeIntForKey:CPTableViewGridStyleMaskKey] || CPTableViewGridNone;
@@ -3320,9 +3225,15 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
         _headerView = [aCoder decodeObjectForKey:CPTableViewHeaderViewKey];
         _cornerView = [aCoder decodeObjectForKey:CPTableViewCornerViewKey];
 
+        _selectedColumnIndexes = [CPIndexSet indexSet];
+        _selectedRowIndexes = [CPIndexSet indexSet];
+
         _dataSource = [aCoder decodeObjectForKey:CPTableViewDataSourceKey];
         _delegate = [aCoder decodeObjectForKey:CPTableViewDelegateKey];
 
+        _tableDrawView = [[_CPTableDrawView alloc] initWithTableView:self];
+        [_tableDrawView setBackgroundColor:[CPColor clearColor]];
+        [self addSubview:_tableDrawView];
         [self _init];
 
         [self viewWillMoveToSuperview:[self superview]];
@@ -3403,12 +3314,11 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
     unsigned    dropOperation @accessors;
     CPTableView tableView @accessors;
     int         currentRow @accessors;
-    BOOL        isBlinking @accessors;
 }
 
 - (void)drawRect:(CGRect)aRect
 {
-    if(tableView._destinationDragStyle === CPTableViewDraggingDestinationFeedbackStyleNone || isBlinking)
+    if(tableView._destinationDragStyle === CPTableViewDraggingDestinationFeedbackStyleNone)
         return;
     
     var context = [[CPGraphicsContext currentContext] graphicsPort];
@@ -3474,28 +3384,7 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
         CGContextStrokePath(context);
         //CGContextStrokeLineSegments(context, [aRect.origin.x + 8,  aRect.origin.y + 8, 300 , aRect.origin.y + 8]);
     }
-}
         
-- (void)blink
-{
-    if (dropOperation !== CPTableViewDropOn)
-        return;
 
-    isBlinking = YES;
-
-    var showCallback = function() {
-        objj_msgSend(self, "setHidden:", NO)
-        isBlinking = NO;
-    }
-
-    var hideCallback = function() {
-        objj_msgSend(self, "setHidden:", YES)
-        isBlinking = YES;
-    }
-
-    objj_msgSend(self, "setHidden:", YES);
-    [CPTimer scheduledTimerWithTimeInterval:0.1 callback:showCallback repeats:NO];
-    [CPTimer scheduledTimerWithTimeInterval:0.19 callback:hideCallback repeats:NO];
-    [CPTimer scheduledTimerWithTimeInterval:0.27 callback:showCallback repeats:NO];
 }
 @end

AppKit/CPTextField.j

@@ -997,7 +997,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return bounds;
 }
 
-- (CGRect)bezelRectForBounds:(CGRect)bounds
+- (CGRect)bezelRectForBounds:(CFRect)bounds
 {
     var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
 
@@ -1087,22 +1087,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     }
 }
 
-- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
-{
-    var count = objects.length,
-        value = [objects[0] valueForKeyPath:aKeyPath];
-
-    [self setStringValue:value];
-    [self setPlaceholderString:@""];
-
-    while (count-- > 1)
-        if (value !== [objects[count] valueForKeyPath:aKeyPath])
-        {
-            [self setPlaceholderString:@"Multiple Values"];
-            [self setStringValue:@""];
-        }
-}
-
 @end
 
 var secureStringForString = function(aString)

AppKit/CPToolbarItem.j

@@ -449,9 +449,6 @@ CPToolbarItemVisibilityPriorityUser
 
 - (void)validate
 {
-    var action = [self action],
-        target = [self target];
-
     // View items do not do any target-action analysis.
     if (_view)
     {
@@ -461,9 +458,13 @@ CPToolbarItemVisibilityPriorityUser
         return;
     }
 
+    var action = [self action];
+
     if (!action)
         return [self setEnabled:NO];
 
+    var target = [self target];
+
     if (target && ![target respondsToSelector:action])
         return [self setEnabled:NO];
 

AppKit/CPView.j

@@ -94,8 +94,7 @@ var DOMElementPrototype         = nil,
     BackgroundTrivialColor              = 0,
     BackgroundVerticalThreePartImage    = 1,
     BackgroundHorizontalThreePartImage  = 2,
-    BackgroundNinePartImage             = 3,
+    BackgroundNinePartImage             = 3;
-    BackgroundTransparentColor          = 4;
 #endif
 
 var CPViewFlags                     = { },
@@ -140,7 +139,6 @@ var CPViewFlags                     = { },
     
     BOOL                _isHidden;
     BOOL                _hitTests;
-    BOOL                _clipsToBounds;
     
     BOOL                _postsFrameChangedNotifications;
     BOOL                _postsBoundsChangedNotifications;
@@ -279,7 +277,6 @@ var CPViewFlags                     = { },
 
         _autoresizingMask = CPViewNotSizable;
         _autoresizesSubviews = YES;
-        _clipsToBounds = YES;
     
         _opacity = 1.0;
         _isHidden = NO;
@@ -838,33 +835,28 @@ var CPViewFlags                     = { },
 
     if (_backgroundType !== BackgroundTrivialColor)
     {
-        if (_backgroundType === BackgroundTransparentColor)
+        var images = [[_backgroundColor patternImage] imageSlices];
+
+        if (_backgroundType === BackgroundVerticalThreePartImage)
         {
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], size.width, size.height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width, size.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
         }
-        else
+
+        else if (_backgroundType === BackgroundHorizontalThreePartImage)
         {
-            var images = [[_backgroundColor patternImage] imageSlices];
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, size.height);
+        }
 
-            if (_backgroundType === BackgroundVerticalThreePartImage)
+        else if (_backgroundType === BackgroundNinePartImage)
-            {
+        {
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width, size.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
+            var width = size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width,
-            }
+                height = size.height - _DOMImageSizes[0].height - _DOMImageSizes[6].height;
-            else if (_backgroundType === BackgroundHorizontalThreePartImage)
-            {
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, size.height);
-            }
-            else if (_backgroundType === BackgroundNinePartImage)
-            {
-                var width = size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width,
-                    height = size.height - _DOMImageSizes[0].height - _DOMImageSizes[6].height;
 
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], width, _DOMImageSizes[0].height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], width, _DOMImageSizes[0].height);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[3], _DOMImageSizes[3].width, height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[3], _DOMImageSizes[3].width, height);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[4], width, height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[4], width, height);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[5], _DOMImageSizes[5].width, height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[5], _DOMImageSizes[5].width, height);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[7], width, _DOMImageSizes[7].height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[7], width, _DOMImageSizes[7].height);
-            }
         }
     }
 #endif
@@ -1196,23 +1188,6 @@ var CPViewFlags                     = { },
     return _isHidden;
 }
 
-- (void)setClipsToBounds:(BOOL)shouldClip
-{
-    if (_clipsToBounds === shouldClip)
-        return;
-
-    _clipsToBounds = shouldClip;
-
-#if PLATFORM(DOM)
-    _DOMElement.style.overflow = _clipsToBounds ? "hidden" :  "visible";
-#endif
-}
-
-- (BOOL)clipsToBounds
-{
-    return _clipsToBounds;
-}
-
 /*!
     Sets the opacity of the receiver. The value must be in the range of 0.0 to 1.0, where 0.0 is 
     completely transparent and 1.0 is completely opaque.
@@ -1386,7 +1361,7 @@ var CPViewFlags                     = { },
     }
     else
     {
-        _backgroundType = colorNeedsDOMElement ? BackgroundTransparentColor : BackgroundTrivialColor;
+        _backgroundType = BackgroundTrivialColor;
         amount = (colorNeedsDOMElement ? 1 : 0) - _DOMImageParts.length;
     }
 
@@ -1409,7 +1384,7 @@ var CPViewFlags                     = { },
             _DOMElement.removeChild(_DOMImageParts.pop());
     }
 
-    if (_backgroundType === BackgroundTrivialColor || _backgroundType === BackgroundTransparentColor)
+    if (_backgroundType === BackgroundTrivialColor)
     {
         var colorCSS = colorExists ? [_backgroundColor cssString] : "";
 

AppKit/CPViewController.j

@@ -50,7 +50,7 @@ var CPViewControllerCachedCibs;
     CPView          _view;
 
     id              _representedObject @accessors(property=representedObject);
-    CPString        _title @accessors(property=title);
+    CPString        _title;
 
     CPString        _cibName @accessors(property=cibName, readonly);
     CPBundle        _cibBundle @accessors(property=cibBundle, readonly);
@@ -78,7 +78,9 @@ var CPViewControllerCachedCibs;
 
 - (id)initWithCibName:(CPString)aCibNameOrNil bundle:(CPBundle)aCibBundleOrNil owner:(id)anOwner
 {
-    return [self initWithCibName:aCibNameOrNil bundle:aCibBundleOrNil externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]];
+    return [self initWithCibName:aCibNameOrNil
+                          bundle:aCibBundleOrNil
+               externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]];
 }
 
 /*!
@@ -97,13 +99,34 @@ var CPViewControllerCachedCibs;
     {
         // Don't load the cib until someone actually requests the view. The user may just be intending to use setView:.
         _cibName = aCibNameOrNil;
-        _cibBundle = aCibBundleOrNil || [CPBundle mainBundle];
+        _cibBundle = aCibBundleOrNil;
+
+        if (!_cibBundle)
+        {
+            var owner = [anExternalNameTable objectForKey:CPCibOwner];
+
+            _cibBundle = owner ? [CPBundle bundleForClass:[owner class]] : [CPBundle mainBundle];
+        }
+
         _cibExternalNameTable = anExternalNameTable || [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];
     }
 
     return self;
 }
 
+- (void)setTitle:(CPString)aTitle
+{
+    _title = aTitle;
+
+    if (self._navigationItem)
+        [_navigationItem setTitle:aTitle];
+}
+
+- (CPString)title
+{
+    return _title;
+}
+
 /*!
     Programmatically creates the view that the controller manages.
     You should never call this method directly. The view controller calls this method when the view property is requested but is nil.
@@ -124,9 +147,9 @@ var CPViewControllerCachedCibs;
     // check if a cib is already cached for the current _cibName
     var cib = [CPViewControllerCachedCibs objectForKey:_cibName];
 
+    // If the cib isn't cached yet : fetch it and cache it
     if (!cib)
     {
-        // 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];
     }
@@ -192,6 +215,34 @@ var CPViewControllerCachedCibs;
     _view = aView;
 }
 
+- (CPNavigationItem)navigationItem
+{
+    var navigationItem = self._navigationItem;
+
+    if (!navigationItem)
+        navigationItem = [[CPNavigationItem alloc] initWithTitle:[self title]];
+
+    self._navigationItem = navigationItem;
+
+    return navigationItem;
+}
+
+- (void)viewWillAppear:(BOOL)isAnimated
+{
+}
+
+- (void)viewDidAppear:(BOOL)isAnimated
+{
+}
+
+- (void)viewWillDisappear:(BOOL)isAnimated
+{
+}
+
+- (void)viewDidDisappear:(BOOL)isAnimated
+{
+}
+
 @end
 
 

AppKit/CPWebView.j

@@ -74,8 +74,6 @@ CPWebViewScrollNative                           = 2;
     
     int         _scrollMode;
     CGSize      _scrollSize;
-
-    int         _loadHTMLStringTimer;
 }
 
 - (id)initWithFrame:(CPRect)frameRect frameName:(CPString)frameName groupName:(CPString)groupName
@@ -112,7 +110,6 @@ CPWebViewScrollNative                           = 2;
     _iframe.style.width = "100%";
     _iframe.style.height = "100%";
     _iframe.style.borderWidth = "0px";
-    _iframe.frameBorder = "0";
     
     [self setDrawsBackground:YES];
     
@@ -174,32 +171,7 @@ CPWebViewScrollNative                           = 2;
     [self _resizeWebFrame];
 }
 
-- (void)_attachScrollEventIfNecessary
+- (BOOL)_resizeWebFrame
-{
-    if (_scrollMode !== CPWebViewScrollAppKit)
-        return;
-
-    var win = null;
-    try { win = [self DOMWindow]; } catch (e) {}
-
-    if (win && win.addEventListener)
-    {
-        var scrollEventHandler = function(anEvent)
-        {
-            var frameBounds = [self bounds],
-                frameCenter = CGPointMake(CGRectGetMidX(frameBounds), CGRectGetMidY(frameBounds)),
-                windowOrigin = [self convertPoint:frameCenter toView:nil],
-                globalOrigin = [[self window] convertBaseToBridge:windowOrigin];
-
-            anEvent._overrideLocation = globalOrigin;
-            [[[self window] platformWindow] scrollEvent:anEvent];
-        };
-
-        win.addEventListener("DOMMouseScroll", scrollEventHandler, false);
-    }
-}
-
-- (void)_resizeWebFrame
 {
     if (_scrollMode === CPWebViewScrollAppKit)
     {
@@ -209,14 +181,13 @@ CPWebViewScrollNative                           = 2;
         }
         else
         {
-            var visibleRect = [_frameView visibleRect];
+            [_frameView setFrameSize:[_scrollView contentSize]];
-            [_frameView setFrameSize:CGSizeMake(CGRectGetMaxX(visibleRect), CGRectGetMaxY(visibleRect))];
             
             // try to get the document size so we can correctly set the frame
             var win = null;
             try { win = [self DOMWindow]; } catch (e) {}
 
-            if (win && win.document && win.document.body)
+            if (win && win.document)
             {
                 var width = win.document.body.scrollWidth,
                     height = win.document.body.scrollHeight;
@@ -232,8 +203,6 @@ CPWebViewScrollNative                           = 2;
             
                 [_frameView setFrameSize:CGSizeMake(800, 1600)];
             }
-
-            [_frameView scrollRectToVisible:visibleRect];
         }
     }
 }
@@ -248,10 +217,7 @@ CPWebViewScrollNative                           = 2;
 
 - (void)_setScrollMode:(int)aScrollMode
 {
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+    _scrollMode = aScrollMode;
-        _scrollMode = CPWebViewScrollNative;
-    else
-        _scrollMode = aScrollMode;
         
     _ignoreLoadStart = YES;
     _ignoreLoadEnd  = YES;
@@ -290,8 +256,6 @@ CPWebViewScrollNative                           = 2;
 
     [self _setScrollMode:CPWebViewScrollAppKit];
 
-    [_frameView setFrameSize:[_scrollView contentSize]];
-
     [self _startedLoading];
     
     _ignoreLoadStart = YES;
@@ -329,15 +293,8 @@ CPWebViewScrollNative                           = 2;
         // clear the iframe
         _iframe.src = "";
 
-        if (_loadHTMLStringTimer !== nil)
-        {
-            window.clearTimeout(_loadHTMLStringTimer);
-            _loadHTMLStringTimer = nil;
-        }
-
         // need to give the browser a chance to reset iframe, otherwise we'll be document.write()-ing the previous document 
-        _loadHTMLStringTimer = window.setTimeout(function()
+        window.setTimeout(function() {
-        {
             var win = [self DOMWindow];
             
             win.document.write(_html);
@@ -358,7 +315,6 @@ CPWebViewScrollNative                           = 2;
 - (void)_finishedLoading
 {
     [self _resizeWebFrame];
-    [self _attachScrollEventIfNecessary];
     
     [[CPNotificationCenter defaultCenter] postNotificationName:CPWebViewProgressFinishedNotification object:self];
 

AppKit/CPWindow/CPWindow.j

@@ -372,15 +372,6 @@ CPTexturedBackgroundWindowMask
             [self setPlatformWindow:[CPPlatformWindow primaryPlatformWindow]];
         else
         {
-            // give zero sized borderless bridge windows a default size if we're not in the browser so they show up in NativeHost.
-            if ((aStyleMask & CPBorderlessBridgeWindowMask) && aContentRect.size.width === 0 && aContentRect.size.height === 0)
-            {
-                var visibleFrame = [[[CPScreen alloc] init] visibleFrame];
-                _frame.size.height = MIN(768.0, visibleFrame.size.height);
-                _frame.size.width = MIN(1024.0, visibleFrame.size.width);
-                _frame.origin.x = (visibleFrame.size.width - _frame.size.width) / 2;
-                _frame.origin.y = (visibleFrame.size.height - _frame.size.height) / 2;
-            }
             [self setPlatformWindow:[[CPPlatformWindow alloc] initWithContentRect:_frame]];
             [self platformWindow]._only = self;
         }
@@ -892,23 +883,6 @@ CPTexturedBackgroundWindowMask
     return _contentView;
 }
 
-/*!
-    Applies an alpha value to the window.
-    @param aValue the alpha value to apply
-*/
-- (void)setAlphaValue:(float)aValue
-{
-    [_windowView setAlphaValue:aValue];
-}
-
-/*!
-    Returns the alpha value of the window.
-*/
-- (float)alphaValue
-{
-    return [_windowView alphaValue];
-}
-
 /*!
     Sets the window's background color.
     @param aColor the new color for the background
@@ -1933,8 +1907,7 @@ CPTexturedBackgroundWindowMask
             [keyWindow makeKeyWindow];
         else
         {
-            var mainMenu = [CPApp mainMenu],
+            var menuWindow = [CPApp mainMenu]._menuWindow;
-                menuWindow = mainMenu ? mainMenu._menuWindow : nil;
             for (var i = 0; i < windowCount; i++)
             {
                 var currentWindow = allWindows[i];
@@ -1962,8 +1935,7 @@ CPTexturedBackgroundWindowMask
             [mainWindow makeMainWindow];
         else
         {
-            var mainMenu = [CPApp mainMenu],
+            var menuWindow = [CPApp mainMenu]._menuWindow;
-                menuWindow = mainMenu ? mainMenu._menuWindow : nil;
             for (var i = 0; i < windowCount; i++)
             {
                 var currentWindow = allWindows[i];

AppKit/Cib/CPCibLoading.j

@@ -37,12 +37,12 @@ var CPCibOwner = @"CPCibOwner";
 
 @implementation CPBundle (CPCibLoading)
 
-+ (CPCib)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable
++ (void)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable
 {
-    return [[[CPCib alloc] initWithContentsOfURL:anAbsolutePath] instantiateCibWithExternalNameTable:aNameTable];
+    [[[CPCib alloc] initWithContentsOfURL:anAbsolutePath] instantiateCibWithExternalNameTable:aNameTable];
 }
 
-+ (CPCib)loadCibNamed:(CPString)aName owner:(id)anOwner
++ (void)loadCibNamed:(CPString)aName owner:(id)anOwner
 {
     if (![aName hasSuffix:@".cib"])
         aName = [aName stringByAppendingString:@".cib"];
@@ -51,24 +51,24 @@ var CPCibOwner = @"CPCibOwner";
     var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle],
         path = [bundle pathForResource:aName];
 
-    return [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]];
+    [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]];
 }
 
-- (CPCib)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable
+- (void)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable
 {
-    return [[[CPCib alloc] initWithContentsOfURL:aFileName] instantiateCibWithExternalNameTable:aNameTable];
+    [[[CPCib alloc] initWithContentsOfURL:aFileName] instantiateCibWithExternalNameTable:aNameTable];
 }
 
-+ (CPCib)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable loadDelegate:aDelegate
++ (void)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable loadDelegate:aDelegate
 {
-    return ([[CPCib alloc]
+    [[CPCib alloc]
     initWithContentsOfURL:anAbsolutePath
              loadDelegate:[[_CPCibLoadDelegate alloc]
                 initWithLoadDelegate:aDelegate
-                   externalNameTable:aNameTable]]);
+                   externalNameTable:aNameTable]];
 }
 
-+ (CPCib)loadCibNamed:(CPString)aName owner:(id)anOwner loadDelegate:(id)aDelegate
++ (void)loadCibNamed:(CPString)aName owner:(id)anOwner loadDelegate:(id)aDelegate
 {
     if (![aName hasSuffix:@".cib"])
         aName = [aName stringByAppendingString:@".cib"];
@@ -77,17 +77,17 @@ var CPCibOwner = @"CPCibOwner";
     var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle],
         path = [bundle pathForResource:aName];
     
-    return [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner] loadDelegate:aDelegate];
+    [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner] loadDelegate:aDelegate];
 }
 
-- (CPCib)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable loadDelegate:(id)aDelegate
+- (void)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable loadDelegate:(id)aDelegate
 {
-    return ([[CPCib alloc]
+    [[CPCib alloc]
         initWithCibNamed:aFileName
                   bundle:self
             loadDelegate:[[_CPCibLoadDelegate alloc]
                 initWithLoadDelegate:aDelegate
-                   externalNameTable:aNameTable]]);
+                   externalNameTable:aNameTable]];
 }
 
 @end

AppKit/Platform/CPPlatformWindow.j

@@ -41,7 +41,6 @@ var PrimaryPlatformWindow   = NULL;
 
     DOMElement      _DOMBodyElement;
     DOMElement      _DOMFocusElement;
-    DOMElement      _DOMEventGuard;
 
     CPArray         _windowLevels;
     CPDictionary    _windowLayers;
@@ -74,15 +73,6 @@ var PrimaryPlatformWindow   = NULL;
     return [CPSet set];
 }
 
-+ (BOOL)supportsMultipleInstances
-{
-#if PLATFORM(DOM)
-    return !CPBrowserIsEngine(CPInternetExplorerBrowserEngine);
-#else
-    return NO;
-#endif
-}
-
 + (CPPlatformWindow)primaryPlatformWindow
 {
     return PrimaryPlatformWindow;

AppKit/Platform/DOM/CPPlatformWindow+DOM.j

@@ -130,6 +130,8 @@ var CPDOMEventGetClickCount,
     StopDOMEventPropagation,
     StopContextMenuDOMEventPropagation;
 
+var _DOMEventGuard;
+
 //right now we hard code q, w, r and t as keys to propogate
 //these aren't normal keycodes, they are with modifier key codes
 //might be mac only, we should investigate futher later.
@@ -278,7 +280,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     _DOMBodyElement = theDocument.getElementById("cappuccino-body") || theDocument.body;
 
     // FIXME: Always do this?
-    if (supportsNativeDragAndDrop)
+    if ([CPPlatform supportsDragAndDrop])
         _DOMBodyElement.style["-khtml-user-select"] = "none";
 
     _DOMBodyElement.webkitTouchCallout = "none";
@@ -467,7 +469,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     [PlatformWindows addObject:self];
 
     // FIXME: cpSetFrame?
-    _DOMWindow.document.write("<!DOCTYPE html><html lang='en'><head></head><body style='background-color:transparent;'></body></html>");
+    _DOMWindow.document.write("<html><head></head><body style = 'background-color:transparent;'></body></html>");
     _DOMWindow.document.close();
 
     if (![CPPlatform isBrowser])
@@ -514,11 +516,6 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         DOMDragElement.style.left = -_CGRectGetWidth(draggedWindowFrame) + "px";
         DOMDragElement.style.top = -_CGRectGetHeight(draggedWindowFrame) + "px";
 
-        var parentNode = DOMDragElement.parentNode;
-
-        if (parentNode)
-            parentNode.removeChild(DOMDragElement);
-
         _DOMBodyElement.appendChild(DOMDragElement);
 
         var draggingOffset = [dragServer draggingOffset];
@@ -851,11 +848,10 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     if(!aDOMEvent)
         aDOMEvent = window.event;
 
-    var location = nil;
     if (CPFeatureIsCompatible(CPJavaScriptMouseWheelValues_8_15))
     {
-        var x = aDOMEvent._offsetX || 0.0,
+        var x = 0.0,
-            y = aDOMEvent._offsetY || 0.0,
+            y = 0.0,
             element = aDOMEvent.target;
         
         while (element.nodeType !== 1)
@@ -871,12 +867,10 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
             } while (element = element.offsetParent);
         }
     
-        location = _CGPointMake((x + ((aDOMEvent.clientX - 8) / 15)), (y + ((aDOMEvent.clientY - 8) / 15)));
+        var location = _CGPointMake((x + ((aDOMEvent.clientX - 8) / 15)), (y + ((aDOMEvent.clientY - 8) / 15)));
     }
-    else if (aDOMEvent._overrideLocation)
-        location = aDOMEvent._overrideLocation;
     else
-        location = _CGPointMake(aDOMEvent.clientX, aDOMEvent.clientY);
+        var location = _CGPointMake(aDOMEvent.clientX, aDOMEvent.clientY);
         
     var deltaX = 0.0,
         deltaY = 0.0,
@@ -1195,7 +1189,6 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
 
         [_windowLevels insertObject:aLevel atIndex:insertionIndex];
         layer._DOMElement.style.zIndex = aLevel;
-
         _DOMBodyElement.appendChild(layer._DOMElement);
     }
     

AppKit/Themes/Aristo/ThemeDescriptors.j

@@ -439,7 +439,7 @@
         isVertical:NO]);
 
     [button setValue:CPLeftTextAlignment forThemeAttribute:@"alignment" inState:CPThemeStateBordered];
-    [button setValue:[CPFont systemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
+    [button setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
     [button setValue:CGInsetMake(0.0, 0.0, 0.0, 20.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
     [button setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];    
     [button setValue:bezelColorSelected forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateSelected];
@@ -493,7 +493,7 @@
         isVertical:NO]);
     
     [button setValue:CPLeftTextAlignment forThemeAttribute:@"alignment" inState:CPThemeStateBordered];
-    [button setValue:[CPFont systemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
+    [button setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
     [button setValue:CGInsetMake(0.0, 0.0, 0.0, 20.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
     [button setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];    
     [button setValue:bezelColorSelected forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateSelected];
@@ -721,7 +721,7 @@
 
 + (CPButtonBar)themedButtonBar
 {
-    var buttonBar = [[CPButtonBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 147.0, 26.0)],
+    var buttonBar = [[CPButtonBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 140.0, 26.0)],
         color = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"buttonbar-bezel.png" size:CGSizeMake(1.0, 26.0)]];
 
     [buttonBar setHasResizeControl:YES];
@@ -761,13 +761,8 @@
     [buttonBar setValue:buttonBezelColor forThemeAttribute:@"button-bezel-color"];
     [buttonBar setValue:buttonBezelHighlightedColor forThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted];
     [buttonBar setValue:buttonBezelDisabledColor forThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled];
-    [buttonBar setValue:[CPColor blackColor] forThemeAttribute:@"button-text-color"];
 
-    var popup = [CPButtonBar actionPopupButton];
+    [buttonBar setButtons:[[CPButtonBar plusButton], [CPButtonBar minusButton], [self themedPullDownMenu]]];
-    [popup addItemWithTitle:"Item 1"];
-    [popup addItemWithTitle:"Item 2"];
-
-    [buttonBar setButtons:[[CPButtonBar plusButton], [CPButtonBar minusButton], popup]];
 
     return buttonBar;
 }

AppKit/_CPImageAndTextView.j

@@ -63,7 +63,6 @@ var HORIZONTAL_MARGIN   = 3.0,
     
     CPCellImagePosition     _imagePosition;
     CPImageScaling          _imageScaling;
-    BOOL                    _shouldDimImage;
     
     CPImage                 _image;
     CPString                _text;
@@ -212,17 +211,6 @@ var HORIZONTAL_MARGIN   = 3.0,
     return _imageScaling;
 }
 
-- (void)setDimsImage:(BOOL)shouldDim
-{
-    var shouldDimImage = !!shouldDimImage;
-
-    if (_shouldDimImage !== shouldDimImage)
-    {
-        _shouldDimImage = shouldDim;
-        [self setNeedsLayout];
-    }
-}
-
 - (void)setTextColor:(CPColor)aTextColor
 {
     if (_textColor === aTextColor)
@@ -584,11 +572,6 @@ var HORIZONTAL_MARGIN   = 3.0,
             imageHeight *= scale;
         }
 
-        if (CPFeatureIsCompatible(CPOpacityRequiresFilterFeature))
-            imageStyle.filter = @"alpha(opacity=" + _shouldDimImage ? 35 : 100 + ")";
-        else
-            imageStyle.opacity = _shouldDimImage ? 0.35 : 1.0;
-
         _DOMImageElement.width = imageWidth;
         _DOMImageElement.height = imageHeight;        
         imageStyle.width = MAX(imageWidth, 0) + "px";

CommonJS/bin/flatten

@@ -10,8 +10,6 @@ var FILE = require("file");
 var OS = require("os");
 var UTIL = require("util");
 
-var CACHEMANIFEST = require("objective-j/cache-manifest");
-
 var stream = require("term").stream;
 var parser = new (require("args").Parser)();
 
@@ -51,10 +49,6 @@ parser.option("-c", "--compressor", "compressor")
     .set()
     .help("Select a compressor to use (closure-compiler, yuicompressor, shrinksafe), or \"none\" (default: shrinksafe)");
 
-parser.option("--manifest", "manifest")
-    .set(true)
-    .help("Generate HTML5 cache manifest.");
-
 parser.option("-v", "--verbose", "verbose")
    .def(false)
    .set(true)
@@ -132,13 +126,6 @@ function main(args)
     });
 
     rewriteMainHTML(outputPath.join(options.index));
-
-    if (options.manifest) {
-        CACHEMANIFEST.generateManifest(outputPath, {
-            index : outputPath.join(options.index),
-            exclude : Object.keys(flattener.filesToCache).map(function(path) { return outputPath.join(path).toString(); })
-        });
-    }
 }
 
 // ObjectiveJFlattener inherits from ObjectiveJRuntimeAnalyzer

CommonJS/bin/press

@@ -10,8 +10,6 @@ require("narwhal").ensureEngine("rhino");
 var FILE = require("file");
 var OS = require("os");
 
-var CACHEMANIFEST = require("objective-j/cache-manifest");
-
 var stream = require("term").stream;
 var parser = new (require("args").Parser)();
 
@@ -33,20 +31,11 @@ parser.option("-f", "--force", "force")
    .set(true)
    .help("Force overwriting OUTPUT_PROJECT if it exists");
 
-parser.option("--index", "index")
-   .def("index.html")
-   .set()
-   .help("The root HTML file to modify (default: index.html) (NOTE: currently only used by '--manifest' option)");
-
 parser.option("-p", "--pngcrush", "png")
     .def(false)
     .set(true)
     .help("Run pngcrush on all PNGs (pngcrush must be installed!)");
 
-parser.option("--manifest", "manifest")
-    .set(true)
-    .help("Generate HTML5 cache manifest.");
-
 parser.option("-v", "--verbose", "verbose")
     .def(false)
     .set(true)
@@ -157,12 +146,6 @@ function press(rootPath, outputPath, options) {
     if (options.png) {
         pngcrushDirectory(outputPath);
     }
-
-    if (options.manifest) {
-        CACHEMANIFEST.generateManifest(outputPath, {
-            index : outputPath.join(options.index)
-        });
-    }
 }
 
 function pressEnvironment(rootPath, outputFiles, environment, options) {

CommonJS/lib/cappuccino/nativehost.js

@@ -1,70 +0,0 @@
-var FILE = require("file");
-var OS = require("os");
-
-var NATIVEHOST_SOURCE = FILE.path(module.path).dirname().dirname().dirname().join("support", "NativeHost.app");
-
-exports.buildNativeHost = function(rootPath, buildNative, options) {
-    options = options || {};
-    options.index = options.index || "index.html";
-
-    rootPath = FILE.path(rootPath);
-    buildNative = FILE.path(buildNative);
-
-    if (buildNative.exists())
-        buildNative.rmtree();
-
-    buildNative.dirname().mkdirs();
-    // FIXME: Narwhal doesn't preserve permissions
-    // FILE.copyTree(NATIVEHOST_SOURCE, buildNative);
-    OS.system(["cp", "-r", NATIVEHOST_SOURCE, buildNative]);
-    FILE.chmod(buildNative.join("Contents", "MacOS", "NativeHost"), 0755);
-
-    var rootBaseName = rootPath.basename();
-    var buildClientDirectory = buildNative.join("Contents", "Resources", rootBaseName);
-
-    FILE.mkdirs(FILE.dirname(buildClientDirectory));
-    // FILE.copyTree(rootPath, buildClientDirectory);
-    OS.system(["cp", "-r", rootPath, buildClientDirectory]);
-
-    var defaultBundleName = buildNative.basename().match(/^(.*)(\.app)?$/)[1];
-
-    function mergePlist(plist, path) {
-        var otherPlist = CFPropertyList.readPropertyListFromFile(String(path));
-
-        otherPlist.keys().forEach(function(key) {
-            var value = otherPlist.valueForKey(key);
-            plist.setValueForKey(key, value);
-
-            if (key === "CPBundleName")
-                plist.setValueForKey("CFBundleName", value);
-
-            if (key === "CFBundleIconFile") {
-                var iconPath = rootPath.join("Resources", value);
-                if (iconPath.isFile())
-                    iconPath.copy(buildNative.join("Contents", "Resources", value));
-                else
-                    print("Warning: CFBundleIconFile references " + value + " but does not exist in the resources directory.");
-            }
-
-            if (key === "CFBundleExecutable") {
-                buildNative.join("Contents", "MacOS", "NativeHost").rename(value);
-                // FIXME:
-                FILE.chmod(buildNative.join("Contents", "MacOS", value), 0755);
-            }
-        });
-    }
-
-    CFPropertyList.modifyPlist(buildNative.join("Contents", "Info.plist"), function(plist) {
-
-        plist.setValueForKey("CFBundleName", defaultBundleName);
-        plist.setValueForKey("NHInitialResource", FILE.join(rootBaseName, options.index));
-
-        // merge Cappuccino plist
-        var cappPlistPath = rootPath.join("Info.plist");
-        if (cappPlistPath.isFile())
-            mergePlist(plist, cappPlistPath);
-
-        if (options.extraPlistPath)
-            mergePlist(plist, options.extraPlistPath);
-    });
-}

CommonJS/lib/cappuccino/objj-flatten-additions.js

@@ -1,7 +1,6 @@
 
 var URLCache = { };
 
-var CFHTTPRequest_open = CFHTTPRequest.prototype.open;
 CFHTTPRequest.prototype.open = function(/*String*/ method, /*String*/ url, /*Boolean*/ async, /*String*/ user, /*String*/ password)
 {
     var cachedRequest = CFHTTPRequest._lookupCachedRequest(url);
@@ -14,7 +13,7 @@ CFHTTPRequest.prototype.open = function(/*String*/ method, /*String*/ url, /*Boo
             ObjectiveJ.determineAndDispatchHTTPRequestEvents(self);
         };
     }
-    return CFHTTPRequest_open.apply(this, arguments);
+    return this._nativeRequest.open(method, url, async, user, password);
 }
 
 CFHTTPRequest._cacheRequest = function(/*CFURL|String*/ aURL, /*Number*/ status, /*Object*/ headers, /*String*/ body)

Foundation/CPArray.j

@@ -145,10 +145,10 @@
 {
     var i = 2,
         array = [[self alloc] init],
-        count = arguments.length;
+        argument;
 
-    for (; i < count; ++i)
+    for(; i < arguments.length && (argument = arguments[i]) != nil; ++i)
-        array.push(arguments[i]);
+        array.push(argument);
 
     return array;
 }
@@ -209,13 +209,13 @@
         var index = 0,
             count = [anArray count];
             
-        for (; index < count; ++index)
+        for(; index < count; ++index)
         {
             if (anArray[index].isa)
                 self[index] = [anArray[index] copy];
             // Do a deep/shallow copy?
             else
-                self[index] = anArray[index];
+                self[index] = anArray;
         }
     }
     
@@ -229,10 +229,10 @@
 {
     // The arguments array contains self and _cmd, so the first object is at position 2.
     var i = 2,
-        count = arguments.length;
+        argument;
     
-    for (; i < count; ++i)
+    for(; i < arguments.length && (argument = arguments[i]) != nil; ++i)
-        push(arguments[i]);
+        push(argument);
 
     return self; 
 }
@@ -251,7 +251,7 @@
     {
         var index = 0;
     
-        for (; index < aCount; ++index)
+        for(; index < aCount; ++index)
             push(objects[index]);
     }
 
@@ -278,21 +278,24 @@
 
 /*!
     Returns the index of \c anObject in this array.
-    If the object is not in the array,
+    If the object is \c nil or not in the array,
     returns \c CPNotFound. It first attempts to find
-    a match using \c -isEqual:, then \c ===.
+    a match using \c -isEqual:, then \c ==.
     @param anObject the object to search for
 */
 - (int)indexOfObject:(id)anObject
 {
+    if (anObject === nil)
+        return CPNotFound;
+    
     var i = 0, 
         count = length;
 
     // Only use -isEqual: if our object is a CPObject.
-    if (anObject && anObject.isa)
+    if (anObject.isa)
     {
-        for (; i < count; ++i)
+        for(; i < count; ++i)
-            if ([self[i] isEqual:anObject])
+            if([self[i] isEqual:anObject])
                 return i;
     }
     // If indexOf exists, use it since it's probably 
@@ -301,8 +304,8 @@
         return indexOf(anObject);
     // Last resort, do a straight forward linear O(N) search.
     else
-        for (; i < count; ++i)
+        for(; i < count; ++i)
-            if (self[i] === anObject)
+            if(self[i] == anObject)
                 return i;
     
     return CPNotFound;
@@ -311,39 +314,45 @@
 /*!
     Returns the index of \c anObject in the array
     within \c aRange. It first attempts to find
-    a match using \c -isEqual:, then \c ===.
+    a match using \c -isEqual:, then \c ==.
     @param anObject the object to search for
     @param aRange the range to search within
     @return the index of the object, or \c CPNotFound if it was not found.
 */
 - (int)indexOfObject:(id)anObject inRange:(CPRange)aRange
 {
+    if (anObject === nil)
+        return CPNotFound;
+    
     var i = aRange.location, 
         count = MIN(CPMaxRange(aRange), length);
     
     // Only use isEqual: if our object is a CPObject.
-    if (anObject && anObject.isa)
+    if (anObject.isa)
     {
-        for (; i < count; ++i)
+        for(; i < count; ++i)
-            if ([self[i] isEqual:anObject])
+            if([self[i] isEqual:anObject])
                 return i;
     }
     // Last resort, do a straight forward linear O(N) search.
     else
-        for (; i < count; ++i)
+        for(; i < count; ++i)
-            if (self[i] === anObject)
+            if(self[i] == anObject)
                 return i;
     
     return CPNotFound;
 }
 
 /*!
-    Returns the index of \c anObject in the array. The test for equality is done using only \c ===.
+    Returns the index of \c anObject in the array. The test for equality is done using only \c ==.
     @param anObject the object to search for
     @return the index of the object in the array. \c CPNotFound if the object is not in the array.
 */
 - (int)indexOfObjectIdenticalTo:(id)anObject
 {
+    if (anObject === nil)
+        return CPNotFound;
+    
     // If indexOf exists, use it since it's probably 
     // faster than anything we can implement.
     if (self.indexOf)
@@ -355,8 +364,8 @@
         var index = 0, 
             count = length;
         
-        for (; index < count; ++index)
+        for(; index < count; ++index)
-            if (self[index] === anObject)
+            if(self[index] === anObject)
                 return index;
     }
     
@@ -373,6 +382,9 @@
 */
 - (int)indexOfObjectIdenticalTo:(id)anObject inRange:(CPRange)aRange
 {
+    if (anObject === nil)
+        return CPNotFound;
+    
     // If indexOf exists, use it since it's probably 
     // faster than anything we can implement.
     if (self.indexOf)
@@ -389,8 +401,8 @@
         var index = aRange.location, 
             count = MIN(CPMaxRange(aRange), length);
         
-        for (; index < count; ++index)
+        for(; index < count; ++index)
-            if (self[index] == anObject)
+            if(self[index] == anObject)
                 return index;
     }
     
@@ -407,7 +419,7 @@
 */
 - (unsigned)indexOfObject:(id)anObject sortedBySelector:(SEL)aSelector
 {
-    return [self indexOfObject:anObject sortedByFunction:function(lhs, rhs) { objj_msgSend(lhs, aSelector, rhs); }];
+    return [self indexOfObject:anObject sortedByFunction: function(lhs, rhs) { objj_msgSend(lhs, aSelector, rhs); }];
 }
 
 /*!
@@ -448,17 +460,13 @@
 
 - (unsigned)_indexOfObject:(id)anObject sortedByFunction:(Function)aFunction context:(id)aContext
 {
-    if (!aFunction)
+    if (!aFunction || anObject === undefined)
         return CPNotFound;
 
     if (length === 0)
         return -1;
 
-    var mid,
+    var mid, c, first = 0, last = length - 1;
-        c,
-        first = 0,
-        last = length - 1;
-
     while (first <= last)
     {
         mid = FLOOR((first + last) / 2);
@@ -477,7 +485,7 @@
         }
     }
 
-    return -first - 1;
+    return -first-1;
 }
 
 /*!
@@ -497,7 +505,7 @@
             result = CPOrderedSame;
 
         while (i < count)
-            if ((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
+            if((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
                 return result;
 
         return result;
@@ -511,8 +519,7 @@
 {
     var count = [self count];
     
-    if (!count)
+    if (!count) return nil;
-        return nil;
     
     return self[count - 1];
 }
@@ -539,7 +546,7 @@
     var index = CPNotFound,
         objects = [];
 
-    while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound)
+    while((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound)
         [objects addObject:[self objectAtIndex:index]];
 
     return objects;
@@ -579,7 +586,7 @@
     var index = 0, 
         count = length;
         
-    for (; index < count; ++index)
+    for(; index < count; ++index)
         objj_msgSend(self[index], aSelector);
 }
 
@@ -597,7 +604,7 @@
     var index = 0, 
         count = length;
         
-    for (; index < count; ++index)
+    for(; index < count; ++index) 
         objj_msgSend(self[index], aSelector, anObject);
 }
 
@@ -610,7 +617,7 @@
         count = length,
         argumentsArray = [nil, aSelector].concat(objects || []);
 
-    for (; index < count; ++index)
+    for(; index < count; ++index)
     {
         argumentsArray[0] = self[index];
         objj_msgSend.apply(this, argumentsArray);
@@ -632,8 +639,8 @@
     var i = 0,
         count = [self count];
 
-    for (; i < count; ++i)
+    for(; i < count; ++i)
-        if ([anArray containsObject:self[i]])
+        if([anArray containsObject:self[i]])
             return self[i];
 
     return nil;
@@ -653,7 +660,7 @@
     var index = 0,
         count = [self count];
     
-    for (; index < count; ++index)
+    for(; index < count; ++index)
     {
         var lhs = self[index],
             rhs = anArray[index];
@@ -671,7 +678,7 @@
     if (self === anObject)
         return YES;
     
-    if (![anObject isKindOfClass:[CPArray class]])
+    if(![anObject isKindOfClass:[CPArray class]])
         return NO;
 
     return [self isEqualToArray:anObject];
@@ -686,7 +693,12 @@
 */
 - (CPArray)arrayByAddingObject:(id)anObject
 {
+    if (anObject === nil || anObject === undefined)
+        [CPException raise:CPInvalidArgumentException
+                    reason:"arrayByAddingObject: object can't be nil"];
+
     var array = [self copy];
+    
     array.push(anObject);
     
     return array;
@@ -708,8 +720,8 @@
         count = [self count],
         array = [CPArray array];
     
-    for (; i<count; ++i)
+    for(; i<count; ++i)
-        if (aPredicate.evaluateWithObject(self[i]))
+        if(aPredicate.evaluateWithObject(self[i]))
             array.push(self[i]);
     
     return array;
@@ -808,7 +820,7 @@
         count = [self count],
         description = '(';
 
-    for (; index < count; ++index)
+    for(; index < count; ++index)
     {
         if (index === 0)
             description += '\n';
@@ -841,7 +853,7 @@
         count = [self count],
         array = [];
     
-    for (; index < count; ++index)
+    for(; index < count; ++index)
         if (self[index].isa && [self[index] isKindOfClass:[CPString class]] && [filterTypes containsObject:[self[index] pathExtension]])
             array.push(self[index]);
     
@@ -859,7 +871,7 @@
     var i = 0,
         count = [self count];
     
-    for (; i < count; ++i)
+    for(; i < count; ++i)
         [self[i] setValue:aValue forKey:aKey];
 }
 
@@ -874,7 +886,7 @@
         count = [self count],
         array = [];
     
-    for (; i < count; ++i)
+    for(; i < count; ++i)
         array.push([self[i] valueForKey:aKey]);
     
     return array;
@@ -954,12 +966,12 @@
     var indexesCount = [indexes count],
         objectsCount = [objects count];
     
-    if (indexesCount !== objectsCount)
+    if(indexesCount !== objectsCount)
         [CPException raise:CPRangeException reason:"the counts of the passed-in array (" + objectsCount + ") and index set (" + indexesCount + ") must be identical."];
     
     var lastIndex = [indexes lastIndex];
     
-    if (lastIndex >= [self count] + indexesCount)
+    if(lastIndex >= [self count] + indexesCount)
         [CPException raise:CPRangeException reason:"the last index (" + lastIndex + ") must be less than the sum of the original count (" + [self count] + ") and the insertion count (" + indexesCount + ")."];    
     
     var index = 0,
@@ -978,14 +990,14 @@
             result = CPOrderedSame;
 
         while (i < count)
-            if ((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
+            if((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
                 return result;
 
         return result;
     } context:nil];
 
     if (index < 0)
-        index = -index - 1;
+        index = -index-1;
 
     [self insertObject:anObject atIndex:index];
     return index;
@@ -1012,7 +1024,7 @@
     var i = 0, 
         index = [anIndexSet firstIndex];
    
-    while (index != CPNotFound)
+    while(index != CPNotFound)
     {
         [self replaceObjectAtIndex:index withObject:objects[i++]];
         index = [anIndexSet indexGreaterThanIndex:index];
@@ -1053,8 +1065,7 @@
 */
 - (void)setArray:(CPArray)anArray
 {
-    if (self == anArray)
+    if(self == anArray) return;
-        return;
     
     splice.apply(self, [0, length].concat(anArray));
 }
@@ -1197,8 +1208,8 @@
             count = [descriptors count],
             result = CPOrderedSame;
         
-        while (i < count)
+        while(i < count)
-            if ((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
+            if((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
                 return result;
         
         return result;

Foundation/CPJSONPConnection.j

@@ -56,7 +56,7 @@ CPJSONPCallbackReplacementString = @"${JSONP_CALLBACK}";
 
 + (CPJSONPConnection)connectionWithRequest:(CPURLRequest)aRequest callback:(CPString)callbackParameter delegate:(id)aDelegate
 {
-    return [[[self class] alloc] initWithRequest:aRequest callback:callbackParameter delegate:aDelegate startImmediately:YES];
+    return [[[self class] alloc] initWithRequest:aRequest callback:callbackParameter delegate:aDelegate startImmediately:YES];;
 }
 
 - (id)initWithRequest:(CPURLRequest)aRequest callback:(CPString)aString delegate:(id)aDelegate 
@@ -88,12 +88,7 @@ CPJSONPCallbackReplacementString = @"${JSONP_CALLBACK}";
     {
         CPJSONPConnectionCallbacks["callback"+[self UID]] = function(data)
         {
-            if ([_delegate respondsToSelector:@selector(connection:didReceiveData:)])
+            [_delegate connection:self didReceiveData:data];
-                [_delegate connection:self didReceiveData:data];
-
-            if ([_delegate respondsToSelector:@selector(connectionDidFinishLoading:)])
-                    [_delegate connectionDidFinishLoading:self];
-    
             [self removeScriptTag];
     
             [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
@@ -123,9 +118,7 @@ CPJSONPCallbackReplacementString = @"${JSONP_CALLBACK}";
     }
     catch (exception)
     {
-        if ([_delegate respondsToSelector:@selector(connection:didFailWithError:)])
+        [_delegate connection: self didFailWithError: exception];
-            [_delegate connection: self didFailWithError: exception];
-
         [self removeScriptTag];
     }
 }

Foundation/CPKeyValueObserving.j

@@ -480,12 +480,6 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
 
 - (void)willChangeValueForKey:(CPString)aKey
 {
-    var superClass = [self class],
-        methodSelector = @selector(willChangeValueForKey:),
-        methodImp = class_getMethodImplementation(superClass, methodSelector);
-
-    methodImp(self, methodSelector, aKey);
-
     if (!aKey)
         return;
 
@@ -496,12 +490,6 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
 
 - (void)didChangeValueForKey:(CPString)aKey
 {
-    var superClass = [self class],
-        methodSelector = @selector(didChangeValueForKey:),
-        methodImp = class_getMethodImplementation(superClass, methodSelector);
-
-    methodImp(self, methodSelector, aKey);
-
     if (!aKey)
         return;
 
@@ -510,12 +498,6 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
 
 - (void)willChange:(CPKeyValueChange)change valuesAtIndexes:(CPIndexSet)indexes forKey:(CPString)aKey
 {
-    var superClass = [self class],
-        methodSelector = @selector(willChange:valuesAtIndexes:forKey:),
-        methodImp = class_getMethodImplementation(superClass, methodSelector);
-
-    methodImp(self, methodSelector, change, indexes, aKey);
-
     if (!aKey)
         return;
 
@@ -526,12 +508,6 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
 
 - (void)didChange:(CPKeyValueChange)change valuesAtIndexes:(CPIndexSet)indexes forKey:(CPString)aKey
 {
-    var superClass = [self class],
-        methodSelector = @selector(didChange:valuesAtIndexes:forKey:),
-        methodImp = class_getMethodImplementation(superClass, methodSelector);
-
-    methodImp(self, methodSelector, change, indexes, aKey);
-
     if (!aKey)
         return;
 

Foundation/CPNull.j

@@ -57,23 +57,4 @@ var CPNullSharedNull = nil;
     return CPNullSharedNull;
 }
 
-/*!
-    Returns CPNull null.
-    @param aCoder the coder from which to do nothing
-    @return [CPNull null]
-*/
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    return [CPNull null];
-}
-
-/*!
-    Writes out nothing to the specified coder.
-    @param aCoder the coder to which nothing will
-    be written
-*/
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-}
-
 @end

Foundation/CPRunLoop.j

@@ -157,7 +157,6 @@ var CPRunLoopLastNativeRunLoop = 0;
     CPDate  _effectiveDate;
 
     CPArray _orderedPerforms;
-    int     _runLoopInsuranceTimer;
 }
 
 /*
@@ -268,17 +267,6 @@ var CPRunLoopLastNativeRunLoop = 0;
         aTimer._lastNativeRunLoopsForModes = {};
         
     aTimer._lastNativeRunLoopsForModes[aMode] = CPRunLoopLastNativeRunLoop;
-
-
-    // FIXME: Hack for not doing this in CommonJS
-    if ([CFBundle.environments() indexOfObject:("Browser")] !== CPNotFound)
-    {
-        if (!_runLoopInsuranceTimer)
-            _runLoopInsuranceTimer = window.setNativeTimeout(function()
-            {
-                [self limitDateForMode:CPDefaultRunLoopMode];
-            }, 0);
-    }
 }
 
 /*!
@@ -292,16 +280,6 @@ var CPRunLoopLastNativeRunLoop = 0;
         
     _runLoopLock = YES;
     
-    // FIXME: Hack for not doing this in CommonJS
-    if ([CFBundle.environments() indexOfObject:("Browser")] !== CPNotFound)
-    {
-        if (_runLoopInsuranceTimer)
-        {
-            window.clearNativeTimeout(_runLoopInsuranceTimer);
-            _runLoopInsuranceTimer = nil;
-        }
-    }
-
     var now = _effectiveDate ? [_effectiveDate laterDate:[CPDate date]] : [CPDate date],
         nextFireDate = nil,
         nextTimerFireDate = _nextTimerFireDatesForModes[aMode];

Foundation/CPSet.j

@@ -467,11 +467,6 @@
     }
 }
 
-- (CPString)description
-{
-    return @"{(" + [self allObjects].join(", ") + ")}";
-}
-
 @end
 
 @implementation CPSet (CPCopying)

Objective-J/CFHTTPRequest.js

@@ -92,23 +92,15 @@ if (!NativeRequest)
 
 GLOBAL(CFHTTPRequest) = function()
 {
-    this._isOpen = false;
-    this._requestHeaders = {};
-    this._mimeType = null;
-
     this._eventDispatcher = new EventDispatcher(this);
     this._nativeRequest = new NativeRequest();
 
     var self = this;
-    this._stateChangeHandler = function()
+
+    this._nativeRequest.onreadystatechange = function()
     {
         determineAndDispatchHTTPRequestEvents(self);
     }
-
-    this._nativeRequest.onreadystatechange = this._stateChangeHandler;
-
-    if (CFHTTPRequest.AuthenticationDelegate !== nil)
-        this._eventDispatcher.addEventListener("HTTP403", function(){CFHTTPRequest.AuthenticationDelegate(self)});
 }
 
 CFHTTPRequest.UninitializedState    = 0;
@@ -117,9 +109,6 @@ CFHTTPRequest.LoadedState           = 2;
 CFHTTPRequest.InteractiveState      = 3;
 CFHTTPRequest.CompleteState         = 4;
 
-//override to forward all CFHTTPRequest authorization failures to a single function
-CFHTTPRequest.AuthenticationDelegate = nil;
-
 CFHTTPRequest.prototype.status = function()
 {
     try
@@ -188,7 +177,8 @@ CFHTTPRequest.prototype.responseText = function()
 
 CFHTTPRequest.prototype.setRequestHeader = function(/*String*/ aHeader, /*Object*/ aValue)
 {
-    this._requestHeaders[aHeader] = aValue;
+    if (!this._URL)
+        return this._nativeRequest.setRequestHeader(aHeader, aValue);
 }
 
 CFHTTPRequest.prototype.getResponseHeader = function(/*String*/ aHeader)
@@ -203,39 +193,70 @@ CFHTTPRequest.prototype.getAllResponseHeaders = function()
 
 CFHTTPRequest.prototype.overrideMimeType = function(/*String*/ aMimeType)
 {
-    this._mimeType = aMimeType;
+    if ("overrideMimeType" in this._nativeRequest)
+        return this._nativeRequest.overrideMimeType(aMimeType);
 }
 
 CFHTTPRequest.prototype.open = function(/*String*/ aMethod, /*String*/ aURL, /*Boolean*/ isAsynchronous, /*String*/ aUser, /*String*/ aPassword)
 {
-    this._isOpen = true;
+    aURL = makeAbsoluteURL(aURL);
-    this._URL = aURL;
+
-    this._async = isAsynchronous;
+    if (aURL.isStorageURL())
-    this._method = aMethod;
+    {
-    this._user = aUser;
+        this._URL = aURL;
-    this._password = aPassword;
+        this._method = aMethod;
-    return this._nativeRequest.open(aMethod, aURL, isAsynchronous, aUser, aPassword);
+        this._isAsynchronous = isAsynchronous;
+
+        return;
+    }
+
+    else if (this._URL)
+    {
+        delete this._URL;
+        delete this._method;
+        delete this._isAsynchronous;
+    }
+
+    return this._nativeRequest.open(aMethod, aURL + "", isAsynchronous, aUser, aPassword);
+}
+
+function sendStorage(/*CFHTTPRequest*/ aRequest, /*String*/ aBody)
+{
+    var method = aRequest._method.toUpperCase(),
+        eventDispatcher = aRequest._eventDispatcher;
+
+    if (method === "GET")
+    {
+        var item = localStorage.getItem(aRequest._URL);
+
+        if (item === undefined)
+            eventDispatcher.dispatchEvent({ type:"failure", request:aRequest });
+
+        else
+            eventDispatcher.dispatchEvent({ type:"success", request:aRequest });
+    }
+
+    else if (method === "POST" || method === "PUT")
+    {
+        try
+        {
+            localStorage.setItem(aRequest._URL, aBody);
+            eventDispatcher.dispatchEvent({ type:"success", request:aRequest });
+        }
+        catch (anException)
+        {
+            eventDispatcher.dispatchEvent({ type:"failure", request:aRequest });
+        }
+    }
+
+    else
+        eventDispatcher.dispatchEvent({ type:"failure", request:aRequest });
 }
 
 CFHTTPRequest.prototype.send = function(/*Object*/ aBody)
 {
-    for (var i in this._requestHeaders)
+    if (this._URL)
-    {
+        return sendStorage(this, aBody);
-        if (this._requestHeaders.hasOwnProperty(i))
-            this._nativeRequest.setRequestHeader(i, this._requestHeaders[i]);
-    }
-
-    if (!this._isOpen)
-    {
-        delete this._nativeRequest.onreadystatechange;
-        this._nativeRequest.open(this._method, this._URL, this._async, this._user, this._password);
-        this._nativeRequest.onreadystatechange = this._stateChangeHandler;
-    }
-
-    if (this._mimeType && "overrideMimeType" in this._nativeRequest)
-        this._nativeRequest.overrideMimeType(this._mimeType);
-
-    this._isOpen = false;
 
     try
     {
@@ -250,7 +271,6 @@ CFHTTPRequest.prototype.send = function(/*Object*/ aBody)
 
 CFHTTPRequest.prototype.abort = function()
 {
-    this._isOpen = false;
     return this._nativeRequest.abort();
 }
 
@@ -271,20 +291,20 @@ function determineAndDispatchHTTPRequestEvents(/*CFHTTPRequest*/ aRequest)
     eventDispatcher.dispatchEvent({ type:"readystatechange", request:aRequest});
 
     var nativeRequest = aRequest._nativeRequest,
-        readyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
+        readyState = ["uninitialized", "loading", "loaded", "interactive", "complete"][aRequest.readyState()];
 
-    if (readyStates[aRequest.readyState()] === "complete")
+    eventDispatcher.dispatchEvent({ type:readyState, request:aRequest});
+
+    if (readyState === "complete")
     {
         var status = "HTTP" + aRequest.status();
+
         eventDispatcher.dispatchEvent({ type:status, request:aRequest });
 
         var result = aRequest.success() ? "success" : "failure";
-        eventDispatcher.dispatchEvent({ type:result, request:aRequest });
 
-        eventDispatcher.dispatchEvent({ type:readyStates[aRequest.readyState()], request:aRequest});
+        eventDispatcher.dispatchEvent({ type:result, request:aRequest });
     }
-    else
-        eventDispatcher.dispatchEvent({ type:readyStates[aRequest.readyState()], request:aRequest});
 }
 
 function FileRequest(/*CFURL*/ aURL, onsuccess, onfailure)

Objective-J/CFPropertyList.js

@@ -91,16 +91,6 @@ CFPropertyList.writePropertyListToFile = function(/*CFPropertyList*/ aPropertyLi
 {
     return FILE.write(aFilePath, CFPropertyList.stringFromPropertyList(aPropertyList, aFormat), { charset:"UTF-8" });
 }
-CFPropertyList.modifyPlist = function(/*String*/ aFilePath, /*Function*/ aCallback, /*String*/ aFormat)
-{
-    var string = FILE.read(aFilePath, { charset:"UTF-8" });
-    var format = CFPropertyList.sniffedFormatOfString(string);
-    var plist = CFPropertyList.propertyListFromString(string, format);
-
-    aCallback(plist);
-
-    CFPropertyList.writePropertyListToFile(plist, aFilePath, aFormat || format);
-}
 #endif
 
 function serializePropertyList(/*CFPropertyList*/ aPropertyList, /*Object*/ serializers)

Objective-J/CFURL.js

@@ -498,6 +498,27 @@ CFURL.prototype.authority = function()
 
 DISPLAY_NAME(CFURL.prototype.authority);
 
+CFURL.prototype.isStorageURL = function()
+{
+    return this.isLocalStorageURL() || this.isSessionStorageURL();
+}
+
+DISPLAY_NAME(CFURL.prototype.isStorageURL);
+
+CFURL.prototype.isLocalStorageURL = function()
+{
+    return this.scheme() === "storage.local";
+}
+
+DISPLAY_NAME(CFURL.prototype.isLocalStorageURL);
+
+CFURL.prototype.isSessionStorageURL = function()
+{
+    return this.scheme() === "storage.session";
+}
+
+DISPLAY_NAME(CFURL.prototype.isSessionStorageURL);
+
 CFURL.prototype.hasDirectoryPath = function()
 {
     var hasDirectoryPath = this._hasDirectoryPath;

Objective-J/CommonJS/lib/objective-j.js

@@ -182,11 +182,5 @@ exports.fullVersionString = function() {
     );
 }
 
-global.ObjectiveJ = {};
-
-for (key in exports)
-    if (Object.prototype.hasOwnProperty.call(exports, key))
-        global.ObjectiveJ[key] = exports[key];
-
 if (require.main == module.id)
     exports.run(system.args);

Objective-J/CommonJS/lib/objective-j/cache-manifest.js

@@ -2,14 +2,12 @@
 var FILE = require("file");
 var MD5 = require("md5");
 
-var FileList = require("jake").FileList;
+var FileList = require("jake").FileList,
 var BundleTask = require("objective-j/jake/bundletask").BundleTask;
 
-exports.generateManifest = function(productPath, options)
+exports.generateManifest = function(productPath, indexFilePath)
 {
-    options = options || {};
+    indexFilePath = indexFilePath || FILE.join(productPath, "index.html");
-
-    indexFilePath = options.index || FILE.join(productPath, "index.html");
 
     if (!FILE.isFile(indexFilePath)) {
         print("Warning: Skipping cache manifest generation, no index file at "+indexFilePath);
@@ -35,28 +33,21 @@ exports.generateManifest = function(productPath, options)
     list.exclude("**/LICENSE");
     list.exclude("**/MHTML*");
     list.exclude("**/CommonJS.environment/*");
-    list.exclude("**/*.cur"); // FIXME: sprite these?
 
     // FIXME: bleh. heuristic for whether index file includes debug frameworks
     if (index.indexOf('"Frameworks/Debug"') < 0)
         list.exclude("**/Frameworks/Debug/*");
 
-    if (options.exclude)
-        options.exclude.forEach(list.exclude.bind(list));
-
     list.forEach(function(path) {
         if (FILE.isFile(path)) {
-            var relative = FILE.relative(productPath, path);
-
             // FIXME: check the actual sprited images file
-            // check index for references to file (for spinner.gif, etc)
+            if (BundleTask.isSpritable(path))
-            if (BundleTask.isSpritable(path) && index.indexOf(relative) < 0)
                 return;
 
             // include hash of each file in comments to expire when any file changes
             var hash = MD5.hash(FILE.read(path, "b")).decodeToString("base16");
             manifestOut.print("# " + hash);
-            manifestOut.print(relative);
+            manifestOut.print(FILE.relative(productPath, path));
         }
     });
 

Objective-J/CommonJS/lib/objective-j/jake/applicationtask.js

@@ -130,7 +130,7 @@ ApplicationTask.prototype.defineCacheManifestTask = function()
     // TODO: can we conditionally generate based on outdated files?
     var manifestPath = FILE.join(productPath, "app.manifest");
     Jake.task(manifestPath, function() {
-        require("../cache-manifest").generateManifest(productPath, { index : indexFilePath });
+        require("../cache-manifest").generateManifest(productPath, indexFilePath);
     });
 
     this.enhance([manifestPath]);

Objective-J/CommonJS/lib/objective-j/jake/bundletask.js

@@ -453,9 +453,7 @@ BundleTask.prototype.resourcesPath = function()
 
 // Don't sprite images larger than 32KB, IE 8 doesn't like it.
 BundleTask.isSpritable = function(aResourcePath) {
-    return isImage(aResourcePath) && FILE.size(aResourcePath) < 32768 &&
+    return isImage(aResourcePath) && FILE.size(aResourcePath) < 32768;
-           ("data:" + mimeType(aResourcePath) + ";base64," +
-            base64.encode(FILE.read(aResourcePath, "b"))).length < 32768;
 }
 
 BundleTask.prototype.defineResourceTask = function(aResourcePath, aDestinationPath)

Objective-J/Executable.js

@@ -35,11 +35,7 @@ function Executable(/*String*/ aCode, /*Array*/ fileDependencies, /*CFURL|String
     this._function = aFunction || NULL;
     this._URL = makeAbsoluteURL(aURL || new CFURL("(Anonymous" + (AnonymousExecutableCount++) + ")"));
 
-    this._fileDependencies = fileDependencies || [];
+    this._fileDependencies = fileDependencies;
-
-#ifndef COMMONJS
-    this._fileDependencies.push.apply(this._fileDependencies, parseRequireFileDependencies(aCode));
-#endif
 
     if (fileDependencies.length)
     {
@@ -57,23 +53,6 @@ function Executable(/*String*/ aCode, /*Array*/ fileDependencies, /*CFURL|String
 
 exports.Executable = Executable;
 
-function parseRequireFileDependencies(aCode)
-{
-    var dependencies = [];
-    if (aCode)
-    {
-        var pattern = /(?:^|[^\w.])require\s*\(\s*["']([^"']+)["']\s*\)/g;
-        while (match = pattern.exec(aCode))
-        {
-            var id = match[1];
-            if (!(/\.[^\/]+$/).test(id))
-                id += ".js";
-            dependencies.push(new FileDependency(new CFURL(id), (/^[.\/]/).test(id)));
-        }
-    }
-    return dependencies;
-}
-
 Executable.prototype.path = function()
 {
     return this.URL().path();
@@ -94,8 +73,6 @@ Executable.prototype.functionParameters = function()
 
 #ifdef COMMONJS
     functionParameters = functionParameters.concat("require", "exports", "module", "system", "print", "window");
-#else
-    functionParameters = functionParameters.concat("require", "exports", "module");
 #endif
 
     return functionParameters;
@@ -109,65 +86,11 @@ Executable.prototype.functionArguments = function()
 
 #ifdef COMMONJS
     functionArguments = functionArguments.concat(Executable.commonJSArguments());
-#else
-    functionArguments = functionArguments.concat(this.getCommonJSRequire(), this.getCommonJSExports(), this.getCommonJSModule());
 #endif
 
     return functionArguments;
 }
 
-Executable.prototype.getCommonJSRequire = function()
-{
-    if (!this._commonJSRequire)
-    {
-        var executor = this.fileExecuter();
-        var importer = this.fileImporter();
-
-        var req = function(id)
-        {
-            if (!(/\.[^\/]+$/).test(id))
-                id += ".js";
-
-            return executor(id, (id.charAt(0) === "." || id.charAt(0) === "/"), NO);
-        }
-        req.async = function(id, callback) {
-            if (!(/\.[^\/]+$/).test(id))
-                id += ".js";
-
-            importer(id, (id.charAt(0) === "." || id.charAt(0) === "/"), function() {
-                callback(req(id));
-            });
-        };
-        req.paths = OBJJ_INCLUDE_PATHS;
-        this._commonJSRequire = req;
-    }
-    return this._commonJSRequire;
-}
-
-Executable.prototype.getCommonJSExports = function()
-{
-    if (!this._commonJSExports)
-        this._commonJSExports = {};
-    return this._commonJSExports;
-}
-
-Executable.prototype.setCommonJSExports = function(commonJSExports)
-{
-    if (this._commonJSExports)
-        throw "CommonJS exports for " + this.URL() + " already set.";
-    this._commonJSExports = commonJSExports;
-}
-
-Executable.prototype.getCommonJSModule = function()
-{
-    if (!this._commonJSModule)
-        this._commonJSModule = {
-            path : this.path(),
-            url : this.URL().toString()
-        };
-    return this._commonJSModule;
-}
-
 DISPLAY_NAME(Executable.prototype.functionArguments);
 
 #ifdef COMMONJS
@@ -427,36 +350,14 @@ Executable.fileExecuterForURL = function(/*CFURL|String*/ aURL)
     {
         cachedFileExecuter = function(/*CFURL*/ aURL, /*BOOL*/ isQuoted, /*BOOL*/ shouldForce)
         {
-            // CommonJS "exports" support:
-            // this is a little hacky. we use the internaly created "exports" if it executes synchronously,
-            // otherwise we have to create our own exports object that we can return immediately
-            // then set it on the executable right before it is eventually executed.
-            var commonJSExports = {},
-                hasSetExports = false,
-                hasReturnedExports = false;
-
             Executable.fileExecutableSearcherForURL(referenceURL)(aURL, isQuoted,
             function(/*FileExecutable*/ aFileExecutable)
             {
                 if (!aFileExecutable.hasLoadedFileDependencies())
                     throw "No executable loaded for file at URL " + aURL;
 
-                if (hasReturnedExports && !hasSetExports)
-                {
-                    aFileExecutable.setCommonJSExports(commonJSExports);
-                    hasSetExports = true;
-                }
-
                 aFileExecutable.execute(shouldForce);
-
-                if (!hasReturnedExports)
-                {
-                    commonJSExports = aFileExecutable.getCommonJSExports();
-                }
             });
-
-            hasReturnedExports = true;
-            return commonJSExports;
         }
 
         cachedFileExecuters[referenceURLString] = cachedFileExecuter;

Tests/Foundation/CPArrayTest.j

@@ -21,8 +21,8 @@
 
 - (void)testsInsertObjectsAtIndexes
 {
-    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four"],
+    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four", nil],
-        newAdditions = [CPArray arrayWithObjects:@"a", @"b"],
+        newAdditions = [CPArray arrayWithObjects:@"a", @"b", nil],
         indexes = [CPMutableIndexSet indexSetWithIndex:1];
 
     [indexes addIndex:3];
@@ -31,8 +31,8 @@
 
     [self assert:array equals:[@"one", @"a", @"two", @"b", @"three", @"four"]];
 
-    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four"],
+    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four", nil],
-        newAdditions = [CPArray arrayWithObjects:@"a", @"b"],
+        newAdditions = [CPArray arrayWithObjects:@"a", @"b", nil],
         indexes = [CPMutableIndexSet indexSetWithIndex:5];
     
     [indexes addIndex:4];
@@ -41,8 +41,8 @@
 
     [self assert:array equals:[@"one", @"two", @"three", @"four", @"a", @"b"]];
     
-    var array = [CPMutableArray arrayWithObjects: @"one", @"two", @"three", @"four"],
+    var array = [CPMutableArray arrayWithObjects: @"one", @"two", @"three", @"four", nil],
-        newAdditions = [CPArray arrayWithObjects: @"a", @"b", @"c"],
+        newAdditions = [CPArray arrayWithObjects: @"a", @"b", @"c", nil],
         indexes = [CPMutableIndexSet indexSetWithIndex:1];
 
     [indexes addIndex:2];
@@ -53,8 +53,8 @@
     [self assert:array equals:[@"one", @"a", @"b", @"two", @"c", @"three", @"four"]];
 
 
-    var array = [CPMutableArray arrayWithObjects: @"one", @"two", @"three", @"four"],
+    var array = [CPMutableArray arrayWithObjects: @"one", @"two", @"three", @"four", nil],
-        newAdditions = [CPArray arrayWithObjects: @"a", @"b", @"c"],
+        newAdditions = [CPArray arrayWithObjects: @"a", @"b", @"c", nil],
         indexes = [CPMutableIndexSet indexSetWithIndex:1];
 
     [indexes addIndex:2];
@@ -64,9 +64,10 @@
     
     [self assert:array equals:[@"one", @"a", @"b", @"two", @"three", @"four", @"c"]];
 
+    //
     
-    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four"],
+    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four", nil],
-        newAdditions = [CPArray arrayWithObjects:@"a", @"b"],
+        newAdditions = [CPArray arrayWithObjects:@"a", @"b", nil],
         indexes = [CPMutableIndexSet indexSetWithIndex:5];
     
     [indexes addIndex:6];
@@ -90,7 +91,7 @@
 			
 	[array removeObjectsAtIndexes: indexes];
 	
-	[self assert:array equals:[@"one", @"two", @"four", nil]];
+	[self assert:array equals:[@"one", @"two", @"four"]];
 }
 
 - (void)testIndexOfObjectSortedByFunction
@@ -211,15 +212,10 @@
 
 - (void)testInitWithArrayCopyItems
 {
-    var a = [[CopyableObject new], 2, 3, {empty:true}];
+    var a = [[CopyableObject new], 2, 3];
     var b = [[CPArray alloc] initWithArray:a copyItems:YES];
 
     [self assert:a notEqual:b];
-
-    [self assert:a[0] notEqual:b[0]];
-    [self assert:a[1] equals:b[1]];
-    [self assert:a[2] equals:b[2]];
-    [self assertTrue:a[3] === b[3]];
 }
 
 - (void)testIsEqualToArray

Tests/Foundation/CPNullTest.j

@@ -1,12 +0,0 @@
-@import <Foundation/CPNull.j>
-@import <Foundation/CPKeyedArchiver.j>
-@import <Foundation/CPKeyedUnarchiver.j>
-
-@implementation CPNullTest : OJTestCase
-
-- (void)testArchiving
-{
-    [self assert:[CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:[CPNull null]]] equals:[CPNull null]];
-}
-
-@end

Tests/Foundation/CPSetTest.j

@@ -56,17 +56,4 @@
     [self assertFalse:[set containsObject:nil]];
 }
 
-- (void)testDescription
-{
-    [self assert:@"{()}" equals:[set description]];
-    [set addObject:"horizon"];
-    [set addObject:"surfer"];
-    [set addObject:"7"];
-    var desc = [set description];
-    // Ordering may not be guaranteed.
-    [self assertTrue:desc.match(new RegExp("{\(.*horizon.*\)}"))];
-    [self assertTrue:desc.match(new RegExp("{\(.*surfer.*\)}"))];
-    [self assertTrue:desc.match(new RegExp("{\(.*7.*\)}"))];
-}
-
 @end

Tests/Manual/CPBrowserTest/AppController.j

@@ -29,16 +29,6 @@
 - (CPArray)children
 {
     return [[Node withValue:1],
-            [Node withValue:2],
-            [Node withValue:3],
-            [Node withValue:2],
-            [Node withValue:3],
-            [Node withValue:2],
-            [Node withValue:3],
-            [Node withValue:2],
-            [Node withValue:3],
-            [Node withValue:2],
-            [Node withValue:3],
             [Node withValue:2],
             [Node withValue:3],
             [Node withValue:4]];

Tests/Manual/CPBrowserTest/CPBrowser.j

@@ -0,0 +1 @@
+../../../AppKit/CPBrowser.j

Tests/Manual/CommonJSModules/Info.plist

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CPApplicationDelegateClass</key>
-	<string>AppController</string>
-	<key>CPBundleName</key>
-	<string>TestApp</string>
-	<key>CPPrincipalClass</key>
-	<string>CPApplication</string>
-</dict>
-</plist>

Tests/Manual/CommonJSModules/index-debug.html

@@ -1,101 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index-debug.html
- TestApp
-
- Created by You on May 11, 2010.
- Copyright 2010, Your Company All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
-        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
-
-        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-
-        <meta name="apple-mobile-web-app-capable" content="yes" />
-        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-
-        <link rel="apple-touch-icon" href="Resources/icon.png" />
-        <link rel="apple-touch-startup-image" href="Resources/default.png" />
-
-        <title>TestApp</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
-        </script>
-        
-        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
-        <script type="text/javascript">
-            objj_msgSend_reset();
-
-            // DEBUG OPTIONS:
-
-            // Uncomment to enable printing of backtraces on exceptions:
-            //objj_msgSend_decorate(objj_backtrace_decorator);
-
-            // Uncomment to enable runtime type checking:
-            //objj_msgSend_decorate(objj_typecheck_decorator);
-
-            // Uncomment (along with both above) to print backtraces on type check errors:
-            //objj_typecheck_prints_backtrace = true;
-
-            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
-            //CPLogUnregister(CPLogDefault);
-
-            // Uncomment to enable a specific logger:
-            CPLogRegister(CPLogConsole);
-            //CPLogRegister(CPLogPopup);
-        </script>
-        
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading TestApp...</p></div>");
-                </script>
-        
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/CommonJSModules/index.html

@@ -1,79 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index.html
- TestApp
-
- Created by You on May 11, 2010.
- Copyright 2010, Your Company All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
-        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
-
-        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-
-        <meta name="apple-mobile-web-app-capable" content="yes" />
-        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-
-        <link rel="apple-touch-icon" href="Resources/icon.png" />
-        <link rel="apple-touch-startup-image" href="Resources/default.png" />
-
-        <title>TestApp</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-        </script>
-        
-        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading TestApp...</p></div>");
-                </script>
-        
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>
-

Tests/Manual/CommonJSModules/lib/system.js

@@ -1,5 +0,0 @@
-exports.stdio = {
-    print : function() {
-        throw "shouldn't be using system.stdio.print"
-    }
-}

Tests/Manual/CommonJSModules/main.j

@@ -1,87 +0,0 @@
-/*
- * AppController.j
- * TestApp
- *
- * Created by You on May 11, 2010.
- * Copyright 2010, Your Company All rights reserved.
- */
-
-// @import <Foundation/Foundation.j>
-
-var url = window.location.toString();
-var dir = url.substring(0, url.lastIndexOf("/"));
-
-var testNames = [
-    "absolute",
-    "cyclic",
-    "determinism", // failing
-    "exactExports",
-    "hasOwnProperty", // failing
-    "method",
-    "missing", // failing
-    "monkeys",
-    "nested",
-    "relative",
-    "transitive"
-];
-
-// ObjectiveJ.asyncLoader = false;
-
-print = function() {
-    test.logs.push(Array.prototype.join.apply(arguments, [","]));
-    console.warn.apply(console, arguments);
-}
-
-var tests = [];
-var test = { pass : true, logs : [] };
-var pause = false;
-
-function main(args, namedArgs)
-{
-    var hash = window.location.hash.substring(1);
-    if (hash) {
-        tests = JSON.parse(decodeURIComponent(hash))
-    }
-
-    var index = tests.length;
-
-    test.name = testNames[index];
-
-    function next() {
-        window.clearNativeTimeout(timeout);
-
-        tests.push(test);
-        if (index < testNames.length - 1) {
-            window.location.hash = "#" + encodeURIComponent(JSON.stringify(tests));
-            window.location.reload();
-        } else {
-            alert(tests.map(function(test) {
-                return test.logs.map(function(log) {
-                    return test.name + ": " + log;
-                }).join("\n") + "\n" +
-                "== " + (test.pass ? "PASS" : "FAIL") + " ==\n";
-            }).join("\n"));
-        }
-    }
-
-    var timeout = window.setNativeTimeout(function() {
-        test.pass = false;
-        if (pause) alert(test.name + ": timed out")
-        next();
-    }, 1000);
-
-    try {
-        console.log("running: " + test.name);
-
-        var testDir = dir + "/tests/" + test.name;
-        require.paths.unshift(dir + "/lib", testDir);
-        require.async(testDir + "/program", function() {
-            if (pause) alert(test.name + ": completed");
-            next();
-        });
-
-    } catch (e) {
-        test.pass = false;
-        print(test.name+ ": exception=" + e);
-    }
-}

Tests/Manual/CommonJSModules/tests/absolute/b.js

@@ -1 +0,0 @@
-exports.foo = function() {};

Tests/Manual/CommonJSModules/tests/absolute/program.js

@@ -1,5 +0,0 @@
-var test = require('test');
-var a = require('submodule/a');
-var b = require('b');
-test.assert(a.foo().foo === b.foo, 'require works with absolute identifiers');
-test.print('DONE', 'info');

Tests/Manual/CommonJSModules/tests/absolute/submodule/a.js

@@ -1,3 +0,0 @@
-exports.foo = function () {
-    return require('b');
-};

Tests/Manual/CommonJSModules/tests/absolute/test.js

@@ -1,15 +0,0 @@
-
-exports.print = typeof print !== "undefined" ? print : function () {
-    var system = require("system");
-    var stdio = system.stdio;
-    stdio.print.apply(stdio, arguments);
-};
-
-exports.assert = function (guard, message) {
-    if (guard) {
-        exports.print('PASS ' + message, 'pass');
-    } else {
-        exports.print('FAIL ' + message, 'fail');
-    }
-};
-

Tests/Manual/CommonJSModules/tests/cyclic/a.js

@@ -1,4 +0,0 @@
-exports.a = function () {
-    return b;
-};
-var b = require('b');

Tests/Manual/CommonJSModules/tests/cyclic/b.js

@@ -1,4 +0,0 @@
-var a = require('a');
-exports.b = function () {
-    return a;
-};

Tests/Manual/CommonJSModules/tests/cyclic/program.js

@@ -1,10 +0,0 @@
-var test = require('test');
-var a = require('a');
-var b = require('b');
-
-test.assert(a.a, 'a exists');
-test.assert(b.b, 'b exists')
-test.assert(a.a().b === b.b, 'a gets b');
-test.assert(b.b().a === a.a, 'b gets a');
-
-test.print('DONE', 'info');

Tests/Manual/CommonJSModules/tests/cyclic/test.js

@@ -1,15 +0,0 @@
-
-exports.print = typeof print !== "undefined" ? print : function () {
-    var system = require("system");
-    var stdio = system.stdio;
-    stdio.print.apply(stdio, arguments);
-};
-
-exports.assert = function (guard, message) {
-    if (guard) {
-        exports.print('PASS ' + message, 'pass');
-    } else {
-        exports.print('FAIL ' + message, 'fail');
-    }
-};
-

Tests/Manual/CommonJSModules/tests/determinism/program.js

@@ -1,3 +0,0 @@
-var test = require('test');
-require('submodule/a');
-test.print('DONE', 'info');

Tests/Manual/CommonJSModules/tests/determinism/submodule/a.js

@@ -1,9 +0,0 @@
-var test = require('test');
-var pass = false;
-var test = require('test');
-try {
-    require('a');
-} catch (exception) {
-    pass = true;
-}
-test.assert(pass, 'require does not fall back to relative modules when absolutes are not available.')

Tests/Manual/CommonJSModules/tests/determinism/submodule/b.js

@@ -1,2 +0,0 @@
-
-

Tests/Manual/CommonJSModules/tests/determinism/test.js

@@ -1,15 +0,0 @@
-
-exports.print = typeof print !== "undefined" ? print : function () {
-    var system = require("system");
-    var stdio = system.stdio;
-    stdio.print.apply(stdio, arguments);
-};
-
-exports.assert = function (guard, message) {
-    if (guard) {
-        exports.print('PASS ' + message, 'pass');
-    } else {
-        exports.print('FAIL ' + message, 'fail');
-    }
-};
-

Tests/Manual/CommonJSModules/tests/exactExports/a.js

@@ -1,3 +0,0 @@
-exports.program = function () {
-    return require('program');
-};

Tests/Manual/CommonJSModules/tests/exactExports/program.js

@@ -1,4 +0,0 @@
-var test = require('test');
-var a = require('a');
-test.assert(a.program() === exports, 'exact exports');
-test.print('DONE', 'info');

Tests/Manual/CommonJSModules/tests/exactExports/test.js

@@ -1,15 +0,0 @@
-
-exports.print = typeof print !== "undefined" ? print : function () {
-    var system = require("system");
-    var stdio = system.stdio;
-    stdio.print.apply(stdio, arguments);
-};
-
-exports.assert = function (guard, message) {
-    if (guard) {
-        exports.print('PASS ' + message, 'pass');
-    } else {
-        exports.print('FAIL ' + message, 'fail');
-    }
-};
-

Tests/Manual/CommonJSModules/tests/hasOwnProperty/program.js

@@ -1,4 +0,0 @@
-var hasOwnProperty = require('hasOwnProperty');
-var toString = require('toString');
-var test = require('test');
-test.print('DONE', 'info');

Tests/Manual/CommonJSModules/tests/hasOwnProperty/test.js

@@ -1,15 +0,0 @@
-
-exports.print = typeof print !== "undefined" ? print : function () {
-    var system = require("system");
-    var stdio = system.stdio;
-    stdio.print.apply(stdio, arguments);
-};
-
-exports.assert = function (guard, message) {
-    if (guard) {
-        exports.print('PASS ' + message, 'pass');
-    } else {
-        exports.print('FAIL ' + message, 'fail');
-    }
-};
-

Tests/Manual/CommonJSModules/tests/method/a.js

@@ -1,12 +0,0 @@
-exports.foo = function () {
-    return this;
-};
-exports.set = function (x) {
-    this.x = x;
-};
-exports.get = function () {
-    return this.x;
-};
-exports.getClosed = function () {
-    return exports.x;
-};

Tests/Manual/CommonJSModules/tests/method/program.js

@@ -1,8 +0,0 @@
-var test = require('test');
-var a = require('a');
-var foo = a.foo;
-test.assert(a.foo() == a, 'calling a module member');
-test.assert(foo() == (function (){return this})(), 'members not implicitly bound');
-a.set(10);
-test.assert(a.get() == 10, 'get and set')
-test.print('DONE', 'info');

Tests/Manual/CommonJSModules/tests/method/test.js

@@ -1,15 +0,0 @@
-
-exports.print = typeof print !== "undefined" ? print : function () {
-    var system = require("system");
-    var stdio = system.stdio;
-    stdio.print.apply(stdio, arguments);
-};
-
-exports.assert = function (guard, message) {
-    if (guard) {
-        exports.print('PASS ' + message, 'pass');
-    } else {
-        exports.print('FAIL ' + message, 'fail');
-    }
-};
-

Tests/Manual/CommonJSModules/tests/missing/program.js

@@ -1,8 +0,0 @@
-var test = require('test');
-try {
-    require('bogus');
-    test.print('FAIL require throws error when module missing', 'fail');
-} catch (exception) {
-    test.print('PASS require throws error when module missing', 'pass');
-}
-test.print('DONE', 'info');

Tests/Manual/CommonJSModules/tests/missing/test.js

@@ -1,15 +0,0 @@
-
-exports.print = typeof print !== "undefined" ? print : function () {
-    var system = require("system");
-    var stdio = system.stdio;
-    stdio.print.apply(stdio, arguments);
-};
-
-exports.assert = function (guard, message) {
-    if (guard) {
-        exports.print('PASS ' + message, 'pass');
-    } else {
-        exports.print('FAIL ' + message, 'fail');
-    }
-};
-

Tests/Manual/CommonJSModules/tests/monkeys/a.js

@@ -1 +0,0 @@
-require('program').monkey = 10;

Tests/Manual/CommonJSModules/tests/monkeys/program.js

@@ -1,4 +0,0 @@
-var a = require('a');
-var test = require('test');
-test.assert(exports.monkey == 10, 'monkeys permitted');
-test.print('DONE', 'info');

Tests/Manual/CommonJSModules/tests/monkeys/test.js

@@ -1,15 +0,0 @@
-
-exports.print = typeof print !== "undefined" ? print : function () {
-    var system = require("system");
-    var stdio = system.stdio;
-    stdio.print.apply(stdio, arguments);
-};
-
-exports.assert = function (guard, message) {
-    if (guard) {
-        exports.print('PASS ' + message, 'pass');
-    } else {
-        exports.print('FAIL ' + message, 'fail');
-    }
-};
-

Tests/Manual/CommonJSModules/tests/nested/a/b/c/d.js

@@ -1,3 +0,0 @@
-exports.foo = function () {
-    return 1;
-};

Tests/Manual/CommonJSModules/tests/nested/program.js

@@ -1,3 +0,0 @@
-var test = require('test');
-test.assert(require('a/b/c/d').foo() == 1, 'nested module identifier');
-test.print('DONE', 'info');

Tests/Manual/CommonJSModules/tests/nested/test.js

@@ -1,15 +0,0 @@
-
-exports.print = typeof print !== "undefined" ? print : function () {
-    var system = require("system");
-    var stdio = system.stdio;
-    stdio.print.apply(stdio, arguments);
-};
-
-exports.assert = function (guard, message) {
-    if (guard) {
-        exports.print('PASS ' + message, 'pass');
-    } else {
-        exports.print('FAIL ' + message, 'fail');
-    }
-};
-

Tests/Manual/CommonJSModules/tests/relative/program.js

@@ -1,5 +0,0 @@
-var test = require('test');
-var a = require('submodule/a');
-var b = require('submodule/b');
-test.assert(a.foo == b.foo, 'a and b share foo through a relative require');
-test.print('DONE', 'info');

Tests/Manual/CommonJSModules/tests/relative/submodule/a.js

@@ -1 +0,0 @@
-exports.foo = require('./b').foo;

Tests/Manual/CommonJSModules/tests/relative/submodule/b.js

@@ -1,2 +0,0 @@
-exports.foo = function () {
-};

Tests/Manual/CommonJSModules/tests/relative/test.js

@@ -1,15 +0,0 @@
-
-exports.print = typeof print !== "undefined" ? print : function () {
-    var system = require("system");
-    var stdio = system.stdio;
-    stdio.print.apply(stdio, arguments);
-};
-
-exports.assert = function (guard, message) {
-    if (guard) {
-        exports.print('PASS ' + message, 'pass');
-    } else {
-        exports.print('FAIL ' + message, 'fail');
-    }
-};
-

Tests/Manual/CommonJSModules/tests/transitive/a.js

@@ -1 +0,0 @@
-exports.foo = require('b').foo;

Tests/Manual/CommonJSModules/tests/transitive/b.js

@@ -1 +0,0 @@
-exports.foo = require('c').foo;

Tests/Manual/CommonJSModules/tests/transitive/c.js

@@ -1,3 +0,0 @@
-exports.foo = function () {
-    return 1;
-};

Tests/Manual/CommonJSModules/tests/transitive/program.js

@@ -1,3 +0,0 @@
-var test = require('test');
-test.assert(require('a').foo() == 1, 'transitive');
-test.print('DONE', 'info');