Upped the version number to 0.8.1.

Reviewed by me.
One additional fix for IE not loading in certain occasions.
2026-09-09 12:17:13 +00:00 · 2010-04-09 22:21:37 -07:00 · 2010-04-08 23:54:20 -07:00 · 2010-04-07 19:50:35 -07:00 · 2010-04-01 23:49:23 -07:00 · 2010-04-01 23:39:14 -07:00
89 changed files with 1413 additions and 842 deletions
@@ -860,12 +860,11 @@ CPRunContinuesResponse  = -1002;
    
    if ([windowController respondsToSelector:anAction])
        return windowController;
-    
+
    var theDocument = [windowController document];
-    
-    if (theDocument != delegate && [theDocument respondsToSelector:anAction])
+    if (theDocument !== delegate && [theDocument respondsToSelector:anAction])
        return theDocument;
-    
+
    return nil;
 }

@@ -874,7 +873,7 @@ CPRunContinuesResponse  = -1002;
    Checks for a target in the following order:
    <ol>
        <li>a responder from the key window</li>
-        <li>a responder frmo the main window</li>
+        <li>a responder from the main window</li>
        <li>the CPApplication instance</li>
        <li>the application delegate</li>
        <li>the document controller</li>
@@ -913,8 +912,6 @@ CPRunContinuesResponse  = -1002;
 - (void)setCallback:(Function)aCallback forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
    _eventListeners.push(_CPEventListenerMake(aMask, aCallback));
-    
-    if (_eventListeners.length == 3) objj_debug_print_backtrace();
 }

 - (CPEvent)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
@@ -973,10 +970,9 @@ CPRunContinuesResponse  = -1002;
   [self endSheet:sheet returnCode:0];
 }

-
 - (CPArray)arguments
 {
-    if(_fullArgsString != window.location.hash)
+    if(_fullArgsString !== window.location.hash)
        [self _reloadArguments];
    
    return _args;
@@ -1009,12 +1005,18 @@ CPRunContinuesResponse  = -1002;
 - (void)_reloadArguments
 {
    _fullArgsString = window.location.hash;
-    var args = _fullArgsString.replace("#", "").split("/").slice(0);
    
-    for(var i=0, count = args.length; i<count; i++) 
-        args[i] = decodeURIComponent(args[i]);
-    
-    _args = args;
+    if (_fullArgsString.length)
+    {
+        var args = _fullArgsString.substring(1).split("/");
+
+        for (var i = 0, count = args.length; i < count; i++)
+            args[i] = decodeURIComponent(args[i]);
+
+        _args = args;
+    }
+    else
+        _args = [];
 }

 - (CPDictionary)namedArguments
@@ -1058,7 +1060,7 @@ CPRunContinuesResponse  = -1002;
    else if ([self mainWindow])
        [[self mainWindow] makeKeyAndOrderFront:self];
    else
-        [[[self mainMenu] window] makeKeyWindow]; //FIXME this may not actually work
+        [[self mainMenu]._menuWindow makeKeyWindow]; //FIXME this may not actually work

    _previousKeyWindow = nil;
    _previousMainWindow = nil;
@@ -1143,29 +1145,8 @@ function CPApplicationMain(args, namedArgs)

    [principalClass sharedApplication];

-    //FIXME?
-    if (!args)
-    {
-        var args = [CPApp arguments];
-
-        if([args containsObject:"debug"])
-            CPLogRegister(CPLogPopup);
-    }
-
-    if (!namedArgs)
-    {
-        var searchParams = window.location.search.substring(1).split("&");
-            namedArgs = [CPDictionary dictionary];
-
-        for(var i=0; i<searchParams.length; i++)
-        {
-            var index = searchParams[i].indexOf('=');
-            if(index == -1)
-                [namedArgs setObject: "" forKey:searchParams[i]];
-            else
-                [namedArgs setObject: searchParams[i].substring(index+1) forKey: searchParams[i].substring(0, index)];
-        }
-    }
+    if ([args containsObject:"debug"])
+        CPLogRegister(CPLogPopup);

    CPApp._args = args;
    CPApp._namedArgs = namedArgs;
@@ -1243,6 +1224,11 @@ var _CPAppBootstrapperActions = nil;
    [self performActions];
 }

+ (void)cibDidFailToLoad:(CPCib)aCib
+{
+    throw new Error("Could not load main cib file (Did you forget to nib2cib it?).");
+}
+
 + (void)reset
 {
 	_CPAppBootstrapperActions = nil;
@@ -162,6 +162,7 @@ CPGrooveBorder  = 3;

    [aView setFrame:CGRectInset([self bounds], _contentMargin.width + _borderWidth, _contentMargin.height + _borderWidth)];
    [self replaceSubview:_contentView with:aView];
+    [aView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
    
    _contentView = aView;    
 }
@@ -502,8 +502,6 @@ CPButtonStateMixed  = CPThemeState("mixed");
    }
    else
        return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
-
-    return [super createEphemeralSubviewNamed:aName];
 }

 - (void)layoutSubviews
@@ -511,9 +509,8 @@ CPButtonStateMixed  = CPThemeState("mixed");
    var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
                                           positioned:CPWindowBelow
                      relativeToEphemeralSubviewNamed:@"content-view"];
-      
-    if (bezelView)
-        [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+
+    [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];

    var contentView = [self layoutEphemeralSubviewNamed:@"content-view"
                                             positioned:CPWindowAbove
@@ -120,9 +120,13 @@
        
    [super setBoundsOrigin:aPoint];

-    var superview = [self superview];
-    
-    if([superview isKindOfClass:[CPScrollView class]])
+    var superview = [self superview],
+
+        // This is hack to avoid having to import CPScrollView.
+        // FIXME: Should CPScrollView be finding out about this on its own somehow?
+        scrollViewClass = objj_getClass("CPScrollView");
+
+    if([superview isKindOfClass:scrollViewClass])
        [superview reflectScrolledClipView:self];
 }

@@ -173,9 +177,13 @@
        return;

    // ... and we're in a scroll view of course.
-    var superview = [self superview];
-        
-    if ([superview isKindOfClass:[CPScrollView class]])
+    var superview = [self superview],
+
+        // This is hack to avoid having to import CPScrollView.
+        // FIXME: Should CPScrollView be finding out about this on its own somehow?
+        scrollViewClass = objj_getClass("CPScrollView");
+
+    if ([superview isKindOfClass:scrollViewClass])
        [superview reflectScrolledClipView:self];
 }

@@ -597,6 +597,10 @@
    if (![_selectionIndexes count])
        return;

+    if ([_delegate respondsToSelector:@selector(collectionView:canDragItemsAtIndexes:withEvent:)] &&
+        ![_delegate collectionView:self canDragItemsAtIndexes:_selectionIndexes withEvent:_mouseDownEvent])
+        return;
+
    // Set up the pasteboard
    var dragTypes = [_delegate collectionView:self dragTypesForItemsAtIndexes:_selectionIndexes];

@@ -676,41 +680,42 @@
    return _delegate;
 }

+- (CPCollectionViewItem)itemAtIndex:(unsigned)anIndex
+{
+    return [_items objectAtIndex:anIndex];
+}
+
+- (CGRect)frameForItemAtIndex:(unsigned)anIndex
+{
+    return [[[self itemAtIndex:anIndex] view] frame];
+}
+
+- (CGRect)frameForItemsAtIndexes:(CPIndexSet)anIndexSet
+{
+    var indexArray = [],
+        frame = CGRectNull;
+
+    [anIndexSet getIndexes:indexArray maxCount:-1 inIndexRange:nil];
+
+    var index = 0,
+        count = [indexArray count];
+
+    for (; index < count; ++index)
+        frame = CGRectUnion(frame, [self rectForItemAtIndex:indexArray[index]]);
+
+    return frame;
+}
+
@end

@implementation CPCollectionView (KeyboardInteraction)

- (CGRect)rectForItemAtIndex:(int)index
-{
-    // Don't re-compute anything just grab the current frame
-    // This allows subclasses to override tile without messing this up.
-    return [[_items[index] view] frame];
-}
-
- (CGRect)rectForItemsAtIndexes:(CPIndexSet)indexSet
-{
-    var indexArray = [],
-        rect = nil;
-
-    [indexSet getIndexes:indexArray maxCount:-1 inIndexRange:nil];
-
-    for (var i = 0, count = indexArray.length; i < count; ++i)
-    {
-        var index = indexArray[i];
-        if (rect == nil)
-            rect = [self rectForItemAtIndex:index];
-        else
-            rect = CGRectUnion(rect, [self rectForItemAtIndex:index]);
-    }
-
-    return rect;
-}
-
 - (void)_scrollToSelection
 {
-    var rect = [self rectForItemsAtIndexes:[self selectionIndexes]];
-    if (rect) 
-        [self scrollRectToVisible:rect];
+    var frame = [self frameForItemsAtIndexes:[self selectionIndexes]];
+
+    if (!CGRectIsNull(frame))
+        [self scrollRectToVisible:frame];
 }

 - (void)moveLeft:(id)sender
@@ -753,7 +758,7 @@
    [self _scrollToSelection];
 }

- (void)deleteBackwards:(id)sender
+- (void)deleteBackward:(id)sender
 {
    if ([[self delegate] respondsToSelector:@selector(collectionView:shouldDeleteItemsAtIndexes:)])
    {
@@ -775,6 +780,26 @@

@end

+@implementation CPCollectionView (Deprecated)
+
+- (CGRect)rectForItemAtIndex:(int)anIndex
+{
+    _CPReportLenientDeprecation([self class], _cmd, @selector(frameForItemAtIndex:));
+
+    // Don't re-compute anything just grab the current frame
+    // This allows subclasses to override tile without messing this up.
+    return [self frameForItemAtIndex:anIndex];
+}
+
+- (CGRect)rectForItemsAtIndexes:(CPIndexSet)anIndexSet
+{
+    _CPReportLenientDeprecation([self class], _cmd, @selector(frameForItemsAtIndexes:));
+
+    return [self frameForItemsAtIndexes:anIndexSet];
+}
+
+@end
+
 var CPCollectionViewMinItemSizeKey      = @"CPCollectionViewMinItemSizeKey",
    CPCollectionViewMaxItemSizeKey      = @"CPCollectionViewMaxItemSizeKey",
    CPCollectionViewVerticalMarginKey   = @"CPCollectionViewVerticalMarginKey",
@@ -51,7 +51,7 @@ var CPSharedFontManager     = nil,

 // Changing the Default Font Conversion Classes
 /*!
-    Sets the class that will be used to create the applcation's
+    Sets the class that will be used to create the application's
    font manager.
 */
 + (void)setFontManagerFactory:(Class)aClass
@@ -227,8 +227,8 @@ var SelectionColor                              = nil,
    
    CGContextClosePath(context);
    
-    CGContextSetShadowWithColor(context, CGSizeMake(0.0, 1.0), 1.1, _shadowColor);
-    CGContextSetFillColor(context, _color);
+    CGContextSetShadowWithColor(context, CGSizeMake(0.0, 1.0), 1.1, _shadowColor || [CPColor whiteColor]);
+    CGContextSetFillColor(context, _color || [CPColor blackColor]);
    CGContextFillPath(context);
 }

@@ -52,9 +52,10 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_


 var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_                                  = 1 << 1,
-    CPOutlineViewDelegate_outlineView_shouldSelectItem_                                             = 1 << 2;
+    CPOutlineViewDelegate_outlineView_shouldSelectItem_                                             = 1 << 2,
    CPOutlineViewDelegate_outlineView_heightOfRowByItem_                                            = 1 << 3,
-    CPOutlineViewDelegate_outlineView_willDisplayView_forTableColumn_item_                          = 1 << 4;
+    CPOutlineViewDelegate_outlineView_willDisplayView_forTableColumn_item_                          = 1 << 4,
+    CPOutlineViewDelegate_outlineView_isGroupItem_                                                  = 1 << 5;

 CPOutlineViewDropOnItemIndex = -1;

@@ -468,7 +469,10 @@ CPOutlineViewDropOnItemIndex = -1;

    if ([_outlineViewDelegate respondsToSelector:@selector(outlineView:willDisplayView:forTableColumn:item:)])
        _implementedOutlineViewDelegateMethods |= CPOutlineViewDelegate_outlineView_willDisplayView_forTableColumn_item_;
-        
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(outlineView:isGroupItem:)])
+         _implementedOutlineViewDelegateMethods |= CPOutlineViewDelegate_outlineView_isGroupItem_;
+
    if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewColumnDidMove:)])
        [defaultCenter
            addObserver:_outlineViewDelegate
@@ -1020,7 +1024,13 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    }
 }

+- (BOOL)tableView:(CPTableView)aTableView isGroupRow:(int)row
+{
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_isGroupItem_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView isGroupItem:[_outlineView itemAtRow:theRow]];

+    return NO;
+}

@end

@@ -235,7 +235,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 */
 - (void)checkSpaceForParts
 {
- var bounds = [self bounds];
+    var bounds = [self bounds];

    // Assume we won't be needing the arrows.
    if (_knobProportion === 1.0)
@@ -290,8 +290,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
            _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, 0,  width - trackInset.left - trackInset.right, height);
        }
-}
-
+    }
    else
    {
        var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"],
@@ -24,26 +24,10 @@

 #include "Platform/Platform.h"

-/*!
-    @global
-    @group Menu tags
-*/
-CPSearchFieldRecentsTitleMenuItemTag = 1000;
-/*!
-    @global
-    @group Menu tags
-*/
-CPSearchFieldRecentsMenuItemTag = 1001;
-/*!
-    @global
-    @group Menu tags
-*/
-CPSearchFieldClearRecentsMenuItemTag = 1002;
-/*!
-    @global
-    @group Menu tags
-*/
-CPSearchFieldNoRecentsMenuItemTag = 1003;
+CPSearchFieldRecentsTitleMenuItemTag    = 1000;
+CPSearchFieldRecentsMenuItemTag         = 1001;
+CPSearchFieldClearRecentsMenuItemTag    = 1002;
+CPSearchFieldNoRecentsMenuItemTag       = 1003;

 var CPSearchFieldSearchImage = nil,
    CPSearchFieldFindImage = nil,
@@ -85,58 +69,43 @@ var CPSearchFieldSearchImage = nil,
    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"]];
 }

- (id)initWithFrame:(CPRect)frame
+- (id)initWithFrame:(CGRect)frame
 {
-    self = [super initWithFrame:frame];
-    if (self != nil)
+    if (self = [super initWithFrame:frame])
    {
        _recentSearches = [CPArray array];
        _maximumRecents = 10;
        _sendsWholeSearchString = NO;
        _sendsSearchStringImmediately = NO;
        _recentsAutosaveName = nil;
-         
-        [self setBezeled:YES];
-        [self setBezelStyle:CPTextFieldRoundedBezel];
-        [self setBordered:YES];
-        [self setEditable:YES];
-        [self setDelegate:self];
-        
-        _cancelButton = [[CPButton alloc] initWithFrame:CPMakeRect(frame.size.width - 27,(frame.size.height-22)/2,22,22)];
-        [self resetCancelButton];
-        [_cancelButton setHidden:YES];
-        [_cancelButton setAutoresizingMask:CPViewMinXMargin];
-        [self addSubview:_cancelButton];
-        
-        _searchButton = [[CPButton alloc] initWithFrame:CPMakeRect(5,(frame.size.height-25)/2,25,25)];
-        [self resetSearchButton];
-        [self addSubview:_searchButton];

+        [self _initWithFrame:frame];
 #if PLATFORM(DOM)
-    _cancelButton._DOMElement.style.cursor = "default";
-    _searchButton._DOMElement.style.cursor = "default";
-#endif
-          
+        _cancelButton._DOMElement.style.cursor = "default";
+        _searchButton._DOMElement.style.cursor = "default";
+#endif          
    }
    
    return self;
 }

- (id)copy
+- (void)_initWithFrame:(CGRect)frame
 {
-    var copy = [super copy];
+    [self setBezeled:YES];
+    [self setBezelStyle:CPTextFieldRoundedBezel];
+    [self setBordered:YES];
+    [self setEditable:YES];
+    [self setDelegate:self];
    
-    [copy setCancelButton:[_cancelButton copy]];
-    [copy setSearchButton:[_searchButton copy]];
-    [copy setSendsWholeSearchString:[_sendsWholeSearchString copy]];
-    [copy setSendsSearchStringImmediately:[_sendsSearchStringImmediately copy]];
-    [copy setMaximumRecents:_maximumRecents];
-    if (_recentsAutosaveName)
-        [copy setrecentsAutosaveName:[_recentsAutosaveName copy]];
-    if (_searchMenuTemplate)
-        [copy setSearchMenutemplate:[_searchMenuTemplate copy]];
+    _cancelButton = [[CPButton alloc] initWithFrame:CPMakeRect(frame.size.width - 27,(frame.size.height-22)/2,22,22)];
+    [self resetCancelButton];
+    [_cancelButton setHidden:YES];
+    [_cancelButton setAutoresizingMask:CPViewMinXMargin];
+    [self addSubview:_cancelButton];
    
-    return copy;
+    _searchButton = [[CPButton alloc] initWithFrame:CPMakeRect(5,(frame.size.height-25)/2,25,25)];
+    [self resetSearchButton];
+    [self addSubview:_searchButton];
 }

 // Managing Buttons
@@ -714,6 +683,7 @@ var CPSearchButtonKey                   = @"CPSearchButtonKey",
    [coder encodeBool:_sendsWholeSearchString forKey:CPSendsWholeSearchStringKey];
    [coder encodeBool:_sendsSearchStringImmediately forKey:CPSendsSearchStringImmediatelyKey];
    [coder encodeInt:_maximumRecents forKey:CPMaximumRecentsKey];
+
    if (_recentsAutosaveName)
        [coder encodeObject:_recentsAutosaveName forKey:CPRecentsAutosaveNameKey];
    if (_searchMenuTemplate)
@@ -722,21 +692,23 @@ var CPSearchButtonKey                   = @"CPSearchButtonKey",

 - (id)initWithCoder:(CPCoder)coder
 {
-    self = [super initWithCoder:coder];
-    
-    _searchButton             = [coder decodeObjectForKey:CPSearchButtonKey];
-    _cancelButton             = [coder decodeObjectForKey:CPCancelButtonKey];
-    _recentsAutosaveName      = [coder decodeObjectForKey:CPRecentsAutosaveNameKey];
-    _sendsWholeSearchString   = [coder decodeBoolForKey:CPSendsWholeSearchStringKey];
-    _sendsSearchStringImmediately = [coder decodeBoolForKey:CPSendsSearchStringImmediatelyKey];
-    _maximumRecents           = [coder decodeIntForKey:CPMaximumRecentsKey];
-    var template              = [coder decodeObjectForKey:CPSearchMenuTemplateKey];
-    if (template)
-        [self setSearchMenuTemplate:template];
-        
-    [self setDelegate:self];
+    if (self = [super initWithCoder:coder])
+    {
+        _searchButton             = [coder decodeObjectForKey:CPSearchButtonKey];
+        _cancelButton             = [coder decodeObjectForKey:CPCancelButtonKey];
+        _recentsAutosaveName      = [coder decodeObjectForKey:CPRecentsAutosaveNameKey];
+        _sendsWholeSearchString   = [coder decodeBoolForKey:CPSendsWholeSearchStringKey];
+        _sendsSearchStringImmediately = [coder decodeBoolForKey:CPSendsSearchStringImmediatelyKey];
+        _maximumRecents           = [coder decodeIntForKey:CPMaximumRecentsKey];
+
+        var template              = [coder decodeObjectForKey:CPSearchMenuTemplateKey];
+        if (template)
+            [self setSearchMenuTemplate:template];
+            
+        [self setDelegate:self];
+    }

    return self;
 }

-@end
+@end
@@ -81,8 +81,8 @@ CPTableColumnUserResizingMask   = 1 << 1;
        var textDataView = [CPTextField new];
        [textDataView setLineBreakMode:CPLineBreakByTruncatingTail];
        [textDataView setValue:[CPColor colorWithHexString:@"333333"] forThemeAttribute:@"text-color"];
-        [textDataView setValue:[CPColor whiteColor] forThemeAttribute:@"text-color" inState:CPThemeStateHighlighted];
-        [textDataView setValue:[CPFont boldSystemFontOfSize:12] forThemeAttribute:@"font" inState:CPThemeStateHighlighted];
+        [textDataView setValue:[CPColor whiteColor] forThemeAttribute:@"text-color" inState:CPThemeStateSelected];
+        [textDataView setValue:[CPFont boldSystemFontOfSize:12] forThemeAttribute:@"font" inState:CPThemeStateSelected];
        [textDataView setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
        [self setDataView:textDataView];
    }
@@ -24,8 +24,6 @@
@import "CPTableView.j"
@import "CPView.j"
 
-var CPThemeStatePressed = CPThemeState("pressed");
-
@implementation _CPTableColumnHeaderView : CPView
 {
    _CPImageAndTextView _textField;
@@ -62,11 +60,11 @@ var CPThemeStatePressed = CPThemeState("pressed");
 {
    var themeState = [self themeState];

-    if(themeState & CPThemeStateHighlighted && themeState & CPThemeStatePressed)
+    if(themeState & CPThemeStateSelected && themeState & CPThemeStateHighlighted)
        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-highlighted-pressed.png", CGSizeMake(1.0, 22.0))]];
-    else if (themeState & CPThemeStateHighlighted)
+    else if (themeState & CPThemeStateSelected)
        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-highlighted.png", CGSizeMake(1.0, 22.0))]];
-    else if (themeState & CPThemeStatePressed)
+    else if (themeState & CPThemeStateHighlighted)
        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-pressed.png", CGSizeMake(1.0, 22.0))]];
    else 
        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
@@ -160,21 +158,24 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    CPTableView _tableView @accessors(property=tableView);
 }

- (void)initWithFrame:(CGRect)aFrame
+- (void)_init
+{
+    _resizedColumn = -1;
+    _draggedColumn = -1;
+    _pressedColumn = -1;
+    _draggedDistance = 0.0;
+    _lastLocation = nil;
+    _columnOldWidth = nil;
+
+    [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];

    if (self)
-    {
-        _resizedColumn = -1;
-        _draggedColumn = -1;
-        _pressedColumn = -1;
-        _draggedDistance = 0.0;
-        _lastLocation = nil;
-        _columnOldWidth = nil;
-        
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
-    }
+        [self _init];

    return self;
 }
@@ -221,13 +222,13 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    if (_pressedColumn != -1)
    {
        var headerView = [_tableView._tableColumns[_pressedColumn] headerView];
-        [headerView unsetThemeState:CPThemeStatePressed];
+        [headerView unsetThemeState:CPThemeStateHighlighted];
    }    
    
    if (column != -1)
    {
        var headerView = [_tableView._tableColumns[column] headerView];
-        [headerView setThemeState:CPThemeStatePressed];
+        [headerView setThemeState:CPThemeStateHighlighted];
    }
    
    _pressedColumn = column;
@@ -481,12 +482,7 @@ var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey";
 {
    if (self = [super initWithCoder:aCoder])
    {
-        _resizedColumn = -1;
-        _draggedColumn = -1;
-        _pressedColumn = -1;
-        _draggedDistance = 0.0;
-        _lastLocation = nil;
-        _columnOldWidth = nil;
+        [self _init];
        _tableView = [aCoder decodeObjectForKey:CPTableHeaderViewTableViewKey];
    }

@@ -67,29 +67,29 @@ var CPTableViewDelegate_selectionShouldChangeInTableView_
    CPTableViewDelegate_tableViewSelectionIsChanging_                                                   = 1 << 19;

 //CPTableViewDraggingDestinationFeedbackStyles
-CPTableViewDraggingDestinationFeedbackStyleNone = -1,
-CPTableViewDraggingDestinationFeedbackStyleRegular = 0,
+CPTableViewDraggingDestinationFeedbackStyleNone = -1;
+CPTableViewDraggingDestinationFeedbackStyleRegular = 0;
 CPTableViewDraggingDestinationFeedbackStyleSourceList = 1;

 //CPTableViewDropOperations
-CPTableViewDropOn = 0,
+CPTableViewDropOn = 0;
 CPTableViewDropAbove = 1;

 // TODO: add docs

-CPTableViewSelectionHighlightStyleNone = -1,
-CPTableViewSelectionHighlightStyleRegular = 0,
+CPTableViewSelectionHighlightStyleNone = -1;
+CPTableViewSelectionHighlightStyleRegular = 0;
 CPTableViewSelectionHighlightStyleSourceList = 1;

 CPTableViewGridNone                    = 0;
 CPTableViewSolidVerticalGridLineMask   = 1 << 0;
 CPTableViewSolidHorizontalGridLineMask = 1 << 1;

-CPTableViewNoColumnAutoresizing = 0,
-CPTableViewUniformColumnAutoresizingStyle = 1,
-CPTableViewSequentialColumnAutoresizingStyle = 2,
-CPTableViewReverseSequentialColumnAutoresizingStyle = 3,
-CPTableViewLastColumnOnlyAutoresizingStyle = 4,
+CPTableViewNoColumnAutoresizing = 0;
+CPTableViewUniformColumnAutoresizingStyle = 1;
+CPTableViewSequentialColumnAutoresizingStyle = 2;
+CPTableViewReverseSequentialColumnAutoresizingStyle = 3;
+CPTableViewLastColumnOnlyAutoresizingStyle = 4;
 CPTableViewFirstColumnOnlyAutoresizingStyle = 5;


@@ -261,14 +261,14 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        [_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];
-        
+
        _draggedRowIndexes = [CPIndexSet indexSet];
        _verticalMotionCanDrag = YES;
        _isSelectingSession = NO;
@@ -276,10 +276,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        _retargetedDropOperation = nil;
        _dragOperationDefaultMask = nil;
        _destinationDragStyle = CPTableViewDraggingDestinationFeedbackStyleRegular;
-        _dropOperationFeedbackView = [[_dropOperationDrawingView alloc] initWithFrame:_CGRectMakeZero()];
-        [self addSubview:_dropOperationFeedbackView];
-        [_dropOperationFeedbackView setHidden:YES];
-        [_dropOperationFeedbackView setTableView:self];

        _tableDrawView = [[_CPTableDrawView alloc] initWithTableView:self];
        [_tableDrawView setBackgroundColor:[CPColor clearColor]];
@@ -294,6 +290,9 @@ 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
 {
+        _dropOperationFeedbackView = [[_dropOperationDrawingView alloc] initWithFrame:_CGRectMakeZero()];
+        [_dropOperationFeedbackView setTableView:self];
+
        _lastColumnShouldSnap = NO;
        _backgroundColor = [CPColor whiteColor];

@@ -807,7 +806,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        {
            var rowIndex = deselectRows[count];
            var view = dataViewsInTableColumn[rowIndex];
-            [view unsetThemeState:CPThemeStateHighlighted];
+            [view unsetThemeState:CPThemeStateSelected];
        }

        count = selectRows.length;
@@ -815,7 +814,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        {
            var rowIndex = selectRows[count];
            var view = dataViewsInTableColumn[rowIndex];
-            [view setThemeState:CPThemeStateHighlighted];
+            [view setThemeState:CPThemeStateSelected];
        }
    }
 }
@@ -847,13 +846,13 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        {
            var rowIndex = selectRows[i],
                dataView = dataViewsInTableColumn[rowIndex];
-            [dataView unsetThemeState:CPThemeStateHighlighted];
+            [dataView unsetThemeState:CPThemeStateSelected];
        }
        
        if (_headerView)
        {
            var headerView = [_tableColumns[columnIndex] headerView];
-            [headerView unsetThemeState:CPThemeStateHighlighted];
+            [headerView unsetThemeState:CPThemeStateSelected];
        }
    }

@@ -868,16 +867,21 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        {
            var rowIndex = selectRows[i],
                dataView = dataViewsInTableColumn[rowIndex];
-            [dataView setThemeState:CPThemeStateHighlighted];
+            [dataView setThemeState:CPThemeStateSelected];
        }
        if (_headerView)
        {
            var headerView = [_tableColumns[columnIndex] headerView];
-            [headerView setThemeState:CPThemeStateHighlighted];
+            [headerView setThemeState:CPThemeStateSelected];
        }
    }
 }

+- (int)selectedColumn
+{
+    [_selectedColumnIndexes lastIndex];
+}
+
 - (CPIndexSet)selectedColumnIndexes
 {
    return _selectedColumnIndexes;
@@ -1738,10 +1742,10 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
    if (_headerView)
    {
        if (_currentHighlightedTableColumn != nil)
-            [[_currentHighlightedTableColumn headerView] unsetThemeState:CPThemeStateHighlighted];
+            [[_currentHighlightedTableColumn headerView] unsetThemeState:CPThemeStateSelected];
   
        if (aTableColumn != nil)
-            [[aTableColumn headerView] setThemeState:CPThemeStateHighlighted];
+            [[aTableColumn headerView] setThemeState:CPThemeStateSelected];
    }
    
    _currentHighlightedTableColumn = aTableColumn;
@@ -1757,25 +1761,18 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
    return YES;
 }

- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows 
-                          tableColumns:(CPArray)theTableColumns 
-                                 event:(CPEvent)dragEvent 
-                                offset:(CPPointPointer)dragImageOffset
+- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPointPointer)dragImageOffset
 {
    return [[CPImage alloc] initWithContentsOfFile:@"Frameworks/AppKit/Resources/GenericFile.png" size:CGSizeMake(32,32)];
 }

- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)theDraggedRows 
-                        tableColumns:(CPArray)theTableColumns 
-                               event:(CPEvent)theDragEvent 
-                              offset:(CPPoint)dragViewOffset
+- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)theDraggedRows tableColumns:(CPArray)theTableColumns event:(CPEvent)theDragEvent offset:(CPPoint)dragViewOffset
 {
    var bounds = [self bounds],
        view = [[CPView alloc] initWithFrame:bounds];
-        
-    [view setBackgroundColor:[CPColor clearColor]];
+
    [view setAlphaValue:0.7];
-    
+
    // We have to fetch all the data views for the selected rows and columns
    // After that we can copy these 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)
@@ -1785,35 +1782,34 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        exposedRowsLength = [_exposedRows lastIndex] - firstExposedRow + 1,
        columns = [],
        rows = [];
-        
+
    [_exposedColumns getIndexes:columns maxCount:-1 inIndexRange:CPMakeRange(firstExposedColumn, exposedColumnsLength)];
    [theDraggedRows getIndexes:rows maxCount:-1 inIndexRange:CPMakeRange(firstExposedRow, exposedRowsLength)];

    var columnIndex = [columns count];
-        
+
    while (columnIndex--) 
    {
        var column = columns[columnIndex],
            tableColumn = [_tableColumns objectAtIndex:column],
            rowIndex = [rows count];
-        
+
        while (rowIndex--)
        { 
            var row = rows[rowIndex];
            var dataView = [self _newDataViewForRow:row tableColumn:tableColumn];
-            
-            [dataView setBackgroundColor:[CPColor clearColor]];
+
            [dataView setFrame:[self frameOfDataViewAtColumn:column row:row]];
            [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
-            
+
            [view addSubview:dataView];
        }
    }
-    
+
    var dragPoint = [self convertPoint:[theDragEvent locationInWindow] fromView:nil];
    dragViewOffset.x = CGRectGetWidth(bounds)/2 - dragPoint.x;
    dragViewOffset.y = CGRectGetHeight(bounds)/2 - dragPoint.y;
-    
+
    return view;
 }

@@ -1835,7 +1831,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        var numberOfRows = [self numberOfRows] + 1;
        var reason = @"Attempt to set dropRow=" + row + 
                     " dropOperation=CPTableViewDropOn when [0 - " + numberOfRows + "] is valid range of rows."
-        
+
        [[CPException exceptionWithName:@"Error" reason:reason userInfo:nil] raise];
    }
        
@@ -1891,7 +1887,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        return;

    _sortDescriptors = newSortDescriptors;
-  
+
  	[self _sendDataSourceSortDescriptorsDidChange:oldSortDescriptors];
 }

@@ -1991,7 +1987,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;

    // Now clear all the leftovers
    // FIXME: this could be faster!
-    for (identifier in _cachedDataViews)
+    for (var identifier in _cachedDataViews)
    {
        var dataViews = _cachedDataViews[identifier],
            count = dataViews.length;
@@ -2078,9 +2074,9 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
            [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];

            if (isColumnSelected || [self isRowSelected:row])
-                [dataView setThemeState:CPThemeStateHighlighted];
+                [dataView setThemeState:CPThemeStateSelected];
            else
-                [dataView unsetThemeState:CPThemeStateHighlighted];
+                [dataView unsetThemeState:CPThemeStateSelected];

            if (_implementedDelegateMethods & CPTableViewDelegate_tableView_willDisplayView_forTableColumn_row_)
                [_delegate tableView:self willDisplayView:dataView forTableColumn:tableColumn row:row];
@@ -2149,12 +2145,12 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
    }
 }

- (void)_commitDataViewObjectValue:(CPTextView)sender
+- (void)_commitDataViewObjectValue:(id)sender
 {
-    [_dataSource tableView:self
-        setObjectValue:[sender objectValue]
-        forTableColumn:sender.tableViewEditedColumnObj
-        row:sender.tableViewEditedRowIndex];
+    [_dataSource tableView:self setObjectValue:[sender objectValue] forTableColumn:sender.tableViewEditedColumnObj row:sender.tableViewEditedRowIndex];
+
+    if ([sender respondsToSelector:@selector(setEditable:)])
+        [sender setEditable:NO];
 }

 - (CPView)_newDataViewForRow:(CPInteger)aRow tableColumn:(CPTableColumn)aTableColumn
@@ -2760,7 +2756,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 */
 - (void)draggingExited:(id)sender
 {
-    [_dropOperationFeedbackView setHidden:YES];
+    [_dropOperationFeedbackView removeFromSuperview];
 }

 /*
@@ -2776,7 +2772,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
    _retargetedDropOperation = nil;
    _retargetedDropRow = nil;
    _draggedRowIndexes = [CPIndexSet indexSet];
-    [_dropOperationFeedbackView setHidden:YES];
+    [_dropOperationFeedbackView removeFromSuperview];
 }
 /*
    @ignore
@@ -2909,7 +2905,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 {
    // FIX ME: is there anything else that needs to happen here?
    // actual validation is called in dragginUpdated:
-    [_dropOperationFeedbackView setHidden:YES];
+    [_dropOperationFeedbackView removeFromSuperview];

    return (_implementedDataSourceMethods & CPTableViewDataSource_tableView_validateDrop_proposedRow_proposedDropOperation_);
 }
@@ -3185,6 +3181,7 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
    CPTableViewGridColorKey                 = @"CPTableViewGridColorKey",
    CPTableViewGridStyleMaskKey             = @"CPTableViewGridStyleMaskKey",
    CPTableViewUsesAlternatingBackgroundKey = @"CPTableViewUsesAlternatingBackgroundKey",
+    CPTableViewAlternatingRowColorsKey      = @"CPTableViewAlternatingRowColorsKey",
    CPTableViewHeaderViewKey                = @"CPTableViewHeaderViewKey",
    CPTableViewCornerViewKey                = @"CPTableViewCornerViewKey";

@@ -3234,6 +3231,9 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
        
        _gridColor = [aCoder decodeObjectForKey:CPTableViewGridColorKey] || [CPColor grayColor];
        _gridStyleMask = [aCoder decodeIntForKey:CPTableViewGridStyleMaskKey] || CPTableViewGridNone;
+
+        _alternatingRowBackgroundColors = [aCoder decodeObjectForKey:CPTableViewAlternatingRowColorsKey];
+        _usesAlternatingRowBackgroundColors = [aCoder decodeObjectForKey:CPTableViewUsesAlternatingBackgroundKey]
        
        _headerView = [aCoder decodeObjectForKey:CPTableViewHeaderViewKey];
        _cornerView = [aCoder decodeObjectForKey:CPTableViewCornerViewKey];
@@ -3277,6 +3277,7 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
    [aCoder encodeInt:_gridStyleMask forKey:CPTableViewGridStyleMaskKey];
    
    [aCoder encodeBool:_usesAlternatingRowBackgroundColors forKey:CPTableViewUsesAlternatingBackgroundKey];
+    [aCoder encodeObject:_alternatingRowBackgroundColors forKey:CPTableViewAlternatingRowColorsKey]

    [aCoder encodeObject:_cornerView forKey:CPTableViewCornerViewKey];
    [aCoder encodeObject:_headerView forKey:CPTableViewHeaderViewKey];
@@ -813,7 +813,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    if (![CPPlatform isBrowser])
    {
        [self copy:sender];
-        [self deleteBackwards:sender];
+        [self deleteBackward:sender];
    }
 }

@@ -826,7 +826,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        if (![[pasteboard types] containsObject:CPStringPboardType])
            return;

-        [self deleteBackwards:sender];
+        [self deleteBackward:sender];

        var selectedRange = [self selectedRange],
            stringValue = [self stringValue],
@@ -912,7 +912,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    [self selectText:sender];
 }

- (void)deleteBackwards:(id)sender
+- (void)deleteBackward:(id)sender
 {
    var selectedRange = [self selectedRange],
        stringValue = [self stringValue],
@@ -668,7 +668,7 @@ var CPViewFlags                     = { },
    return _tag;
 }

- (void)viewWithTag:(CPInteger)aTag
+- (CPView)viewWithTag:(CPInteger)aTag
 {
    if ([self tag] == aTag)
        return self;
@@ -1497,7 +1497,8 @@ CPTexturedBackgroundWindowMask
    if (_firstResponder != self && [_firstResponder respondsToSelector:@selector(resignKeyWindow)])
        [_firstResponder resignKeyWindow];

-    CPApp._keyWindow = nil;
+    if (CPApp._keyWindow === self)
+        CPApp._keyWindow = nil;

    [[CPNotificationCenter defaultCenter]
        postNotificationName:CPWindowDidResignKeyNotification
@@ -1858,7 +1859,8 @@ CPTexturedBackgroundWindowMask
        postNotificationName:CPWindowDidResignMainNotification
                      object:self];

-    CPApp._mainWindow = nil;
+    if (CPApp._mainWindow === self)
+        CPApp._mainWindow = nil;
 }

 - (void)_updateMainAndKeyWindows
@@ -1866,9 +1868,6 @@ CPTexturedBackgroundWindowMask
    var allWindows = [CPApp orderedWindows],
        windowCount = [allWindows count];

-    if (!windowCount)
-        return;
-
    if ([self isKeyWindow])
    {
        var keyWindow = [CPApp keyWindow];
@@ -1893,11 +1892,10 @@ CPTexturedBackgroundWindowMask
            }

            if (![CPApp keyWindow])
-                [keyWindow makeKeyWindow];
+                [menuWindow makeKeyWindow];
        }
    }

-
    if ([self isMainWindow])
    {
        var mainWindow = [CPApp mainWindow];
@@ -71,11 +71,12 @@ var _CPToolbarViewBackgroundColor = nil;
        [self addSubview:_toolbarBackgroundView positioned:CPWindowBelow relativeTo:nil];
    }
            
-    var frame = CGRectMakeZero();
-    
-    frame.origin = CGPointMakeCopy([self toolbarOffset]);
+    var frame = CGRectMakeZero(),
+        toolbarOffset = [self toolbarOffset];
+
+    frame.origin = CGPointMake(toolbarOffset.width, toolbarOffset.height);
    frame.size = [_toolbarView frame].size;
-    
+
    [_toolbarBackgroundView setFrame:frame];
 }

@@ -36,6 +36,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
    CGSize      _resizeIndicatorOffset;
    
    CPView      _toolbarView;
+    CGSize      _toolbarOffset;
 //    BOOL        _isAnimatingToolbar;

    
@@ -80,8 +81,8 @@ var _CPWindowViewResizeIndicatorImage = nil;
    if (self)
    {
        _styleMask = aStyleMask;
-        _resizeIndicatorOffset = CGSizeMake(0.0, 0.0);
-        _toolbarOffset = CGSizeMake(0.0, 0.0);
+        _resizeIndicatorOffset = CGSizeMakeZero();
+        _toolbarOffset = CGSizeMakeZero();
    }
    
    return self;
@@ -269,7 +270,7 @@ var _CPWindowViewResizeIndicatorImage = nil;

 - (CGSize)toolbarOffset
 {
-    return CGSizeMakeZero();
+    return _toolbarOffset;
 }

 - (CPColor)toolbarLabelColor
@@ -322,25 +322,6 @@
    return _documents;
 }

- (void)setViewController:(CPViewController)aViewController
-{
-    var containerView = [self viewControllerContainerView] || [[self window] contentView],
-        view = [_viewController view],
-        frame = view ? [view frame] : [containerView bounds];
-
-    [view removeFromSuperview];
-
-    _viewController = aViewController;
-
-    view = [_viewController view];
-
-    if (view)
-    {
-        [view setFrame:frame];
-        [containerView addSubview:view];
-    }
-}
-
 - (void)setViewControllerContainerView:(CPView)aView
 {
    _viewControllerContainerView = aView;
@@ -171,12 +171,17 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";

 - (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)data
 {
+    // FIXME: Why aren't we getting connection:didFailWithError:
+    if (!data)
+        return [self connection:aConnection didFailWithError:nil];
+
    _data = [CPData dataWithRawString:data];
 }

 - (void)connection:(CPURLConnection)aConnection didFailWithError:(CPError)anError
 {
-    alert("cib: connection failed.");
+    if ([_loadDelegate respondsToSelector:@selector(cibDidFailToLoad:)])
+        [_loadDelegate cibDidFailToLoad:self];

    _loadDelegate = nil;
 }
@@ -118,4 +118,9 @@ var CPCibOwner = @"CPCibOwner";
    [_loadDelegate cibDidFinishLoading:aCib];
 }

+- (void)cibDidFailToLoad:(CPCib)aCib
+{
+    [_loadDelegate cibDidFailToLoad:aCib];
+}
+
@end
@@ -777,8 +777,7 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
    @ignore
 */
 + (void)runLoopUpdateLayers
-{if (window.oops) {alert(window.latest); objj_debug_print_backtrace();}
-    window.loop = true;
+{
    for (UID in CALayerRegisteredRunLoopUpdates)
    {
        var layer = CALayerRegisteredRunLoopUpdates[UID],
@@ -210,7 +210,7 @@ function CGPathAddQuadCurveToPoint(aPath, aTransform, cpx, cpy, x, y)
        
    if (aTransform)
    {
-        cp = _CGPointApplyAffineTransform(control, aTransform);
+        cp = _CGPointApplyAffineTransform(cp, aTransform);
        end = _CGPointApplyAffineTransform(end, aTransform);
    }
    
@@ -20,7 +20,7 @@ appKitTask = framework ("AppKit", function(appKitTask)
    appKitTask.setEmail("feedback @nospam@ 280north.com");
    appKitTask.setSummary("AppKit classes for Cappuccino");
    appKitTask.setIdentifier("com.280n.AppKit");
-    appKitTask.setVersion("0.8.0");
+    appKitTask.setVersion(getCappuccinoVersion());
    appKitTask.setLicense(BundleTask.License.LGPL_v2_1);
    appKitTask.setSources(AppKitFiles);
    appKitTask.setResources(new FileList("Resources/**/*"));
@@ -40,6 +40,10 @@ var screenNeedsInitialization   = NO,
        return;

    screenNeedsInitialization = [CPPlatform isBrowser];
+
+    // We do this here because doing it later breaks IE.
+    if (document.documentElement)
+        document.documentElement.style.overflow = "hidden";
 }

 + (BOOL)isBrowser
@@ -121,9 +125,6 @@ var screenNeedsInitialization   = NO,

    bodyElement.style.overflow = "hidden";

-    if (document.documentElement)
-        document.documentElement.style.overflow = "hidden";
-
    [[CPNotificationCenter defaultCenter]
        postNotificationName:CPPlatformDidClearBodyElementNotification
                      object:self];
@@ -22,9 +22,10 @@

 #include "../CoreGraphics/CGGeometry.h"

-var DOMSpanElement      = nil,
-    DOMIFrameElement    = nil,
-    DefaultFont         = nil;
+var DOMFixedWidthSpanElement    = nil,
+    DOMFlexibleWidthSpanElement = nil,
+    DOMIFrameElement            = nil,
+    DefaultFont                 = nil;

@implementation CPPlatformString : CPBasePlatformString
 {
@@ -37,25 +38,30 @@ var DOMSpanElement      = nil,

 + (void)createDOMElements
 {
+    var style;
+
    DOMIFrameElement = document.createElement("iframe");
    // necessary for Safari caching bug:
    DOMIFrameElement.name = "iframe_" + FLOOR(RAND() * 10000);
-    DOMIFrameElement.style.position = "absolute";
-    DOMIFrameElement.style.left = "-100px";
-    DOMIFrameElement.style.top = "-100px";
-    DOMIFrameElement.style.width = "1px";
-    DOMIFrameElement.style.height = "1px";
-    DOMIFrameElement.style.borderWidth = "0px";
-    DOMIFrameElement.style.overflow = "hidden";
-    DOMIFrameElement.style.zIndex = 100000000000;
    DOMIFrameElement.className = "cpdontremove";

+    style = DOMIFrameElement.style;
+    style.position = "absolute";
+    style.left = "-100px";
+    style.top = "-100px";
+    style.width = "1px";
+    style.height = "1px";
+    style.borderWidth = "0px";
+    style.overflow = "hidden";
+    style.zIndex = 100000000000;
+
    var bodyElement = [CPPlatform mainBodyElement];

    bodyElement.appendChild(DOMIFrameElement);

    var DOMIFrameDocument = (DOMIFrameElement.contentDocument || DOMIFrameElement.contentWindow.document);
-    DOMIFrameDocument.write("<html><head></head><body></body></html>");
+    DOMIFrameDocument.write('<!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"><head></head><body></body></html>');
    DOMIFrameDocument.close();

    // IE needs this wide <div> to prevent unwanted text wrapping:
@@ -65,14 +71,39 @@ var DOMSpanElement      = nil,

    DOMIFrameDocument.body.appendChild(DOMDivElement);

-    DOMSpanElement = DOMIFrameDocument.createElement("span");
-    DOMSpanElement.style.position = "absolute";
-    DOMSpanElement.style.whiteSpace = "pre";
-    DOMSpanElement.style.visibility = "visible";
-    DOMSpanElement.style.padding = "0px";
-    DOMSpanElement.style.margin = "0px";
+    DOMFlexibleWidthSpanElement = DOMIFrameDocument.createElement("span");
+    style = DOMFlexibleWidthSpanElement.style;
+    style.position = "absolute";
+    style.visibility = "visible";
+    style.padding = "0px";
+    style.margin = "0px";
+    style.whiteSpace = "pre";

-    DOMDivElement.appendChild(DOMSpanElement);
+    DOMFixedWidthSpanElement = DOMIFrameDocument.createElement("span");
+    style = DOMFixedWidthSpanElement.style;
+    style.display = "block";
+    style.position = "absolute";
+    style.visibility = "visible";
+    style.padding = "0px";
+    style.margin = "0px";
+    style.width = "1px";
+    style.wordWrap = "break-word";
+    try
+    {
+        style.whiteSpace = "pre";
+        style.whiteSpace = "-o-pre-wrap";
+        style.whiteSpace = "-pre-wrap";
+        style.whiteSpace = "-moz-pre-wrap";
+        style.whiteSpace = "pre-wrap";
+    }
+    catch(e)
+    {
+        //some versions of IE throw exceptions for unsupported properties.
+        style.whiteSpace = "pre";
+    }
+
+    DOMDivElement.appendChild(DOMFlexibleWidthSpanElement);
+    DOMDivElement.appendChild(DOMFixedWidthSpanElement);
 }

 + (CGSize)sizeOfString:(CPString)aString withFont:(CPFont)aFont forWidth:(float)aWidth
@@ -88,31 +119,23 @@ var DOMSpanElement      = nil,
    if (!DOMIFrameElement)
        [self createDOMElements];

-    var style = DOMSpanElement.style;
-
+    var span;
    if (!aWidth)
-    {
-        style.width = "";
-        style.whiteSpace = "pre";
-    }
+        span = DOMFlexibleWidthSpanElement;
    else
    {
-        style.width = ROUND(aWidth) + "px";
-        style.wordWrap = "break-word";
-        style.whiteSpace = "-o-pre-wrap";
-        style.whiteSpace = "-pre-wrap";
-        style.whiteSpace = "-moz-pre-wrap";
-        style.whiteSpace = "pre-wrap";
+        span = DOMFixedWidthSpanElement;
+        span.style.width = ROUND(aWidth) + "px";
    }

-    style.font = [aFont cssString];
+    span.style.font = [aFont cssString];

    if (CPFeatureIsCompatible(CPJavascriptInnerTextFeature))
-        DOMSpanElement.innerText = aString;
+        span.innerText = aString;
    else if (CPFeatureIsCompatible(CPJavascriptTextContentFeature))
-        DOMSpanElement.textContent = aString;
+        span.textContent = aString;

-    return _CGSizeMake(DOMSpanElement.clientWidth, DOMSpanElement.clientHeight);
+    return _CGSizeMake(span.clientWidth, span.clientHeight);
 }

@end
@@ -789,7 +789,6 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
    }
 }

-
 - (void)_checkPasteboardElement
 {
    var value = _DOMPasteboardElement.value;
@@ -1105,7 +1104,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
 }

- (CPArray)orderedWindowsAtLevel:(int)aLevel
+- (CPArray)orderedWindowsAtLevel:(int)aLevel
 {
    var layer = [self layerAtLevel:aLevel create:NO];

@@ -10,7 +10,7 @@ blendKitTask = framework ("BlendKit", function(blendKitTask)
    blendKitTask.setBuildPath(FILE.join($BUILD_DIR, $CONFIGURATION));

    blendKitTask.setIdentifier("com.280n.BlendKit");
-    blendKitTask.setVersion("0.8.0");
+    blendKitTask.setVersion(getCappuccinoVersion());
    blendKitTask.setAuthor("280 North, Inc.");
    blendKitTask.setEmail("feedback @nospam@ 280north.com");
    blendKitTask.setSummary("BlendKit classes for Cappuccino");
@@ -5,13 +5,18 @@
 {
 }

+- (void)_init
+{
+    [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 23.0))]];
+}
+
 - (id)initWithFrame:(CGRect)aFrame
 {
    if (self = [super initWithFrame:aFrame])
    {
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 23.0))]];
+        [self _init];
    }
-    
+
    return self;
 }

@@ -20,16 +25,23 @@
    var context = [[CPGraphicsContext currentContext] graphicsPort];

    CGContextSetStrokeColor(context, [CPColor colorWithHexString:@"dce0e2"]);
-    
-    var points = [ 
-                    CGPointMake(aRect.origin.x, aRect.origin.y),
-                    CGPointMake(aRect.origin.x + aRect.size.width, aRect.origin.y),
-                    
+
+    var points = [
                    CGPointMake(aRect.origin.x, aRect.origin.y + 0.5), 
                    CGPointMake(aRect.origin.x, aRect.origin.y + aRect.size.height)
                 ];
-                 
+
    CGContextStrokeLineSegments(context, points, 2);
 }

+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    {
+        [self _init];
+    }
+
+    return self;
+}
+
@end
@@ -332,7 +332,8 @@ var HORIZONTAL_MARGIN   = 3.0,
        hasDOMTextElement = !!_DOMTextElement;
    
    // Create or destroy the DOM Text Element as necessary
-    if (needsDOMTextElement !== hasDOMTextElement)    
+    if (needsDOMTextElement !== hasDOMTextElement)
+    {
        if (hasDOMTextElement)
        {
            _DOMElement.removeChild(_DOMTextElement);
@@ -361,6 +362,7 @@ var HORIZONTAL_MARGIN   = 3.0,
            // We have to set all these values now.
            _flags |= _CPImageAndTextViewTextChangedFlag | _CPImageAndTextViewFontChangedFlag | _CPImageAndTextViewLineBreakModeChangedFlag;
        }
+    }
    
    var textStyle = hasDOMTextElement ? _DOMTextElement.style : nil;
    
@@ -369,6 +371,7 @@ var HORIZONTAL_MARGIN   = 3.0,
        hasDOMTextShadowElement = !!_DOMTextShadowElement;
    
    if (needsDOMTextShadowElement !== hasDOMTextShadowElement)
+    {
        if (hasDOMTextShadowElement)
        {
            _DOMElement.removeChild(_DOMTextShadowElement);
@@ -386,6 +389,7 @@ var HORIZONTAL_MARGIN   = 3.0,
            shadowStyle.font = [_font ? _font : [CPFont systemFontOfSize:12.0] cssString];
            shadowStyle.position = "absolute";
            shadowStyle.whiteSpace = textStyle.whiteSpace;
+            shadowStyle.wordWrap = textStyle.wordWrap;
            shadowStyle.color = [_textShadowColor cssString];

            shadowStyle.zIndex = 150;
@@ -394,7 +398,6 @@ var HORIZONTAL_MARGIN   = 3.0,
            if (document.attachEvent)
            {
                shadowStyle.overflow = textStyle.overflow;
-                shadowStyle.wordWrap = textStyle.wordWrap;
            }
            else
            {
@@ -408,6 +411,7 @@ var HORIZONTAL_MARGIN   = 3.0,
            
            _flags |= _CPImageAndTextViewTextChangedFlag; //sigh...
        }
+    }
        
    var shadowStyle = hasDOMTextShadowElement ? _DOMTextShadowElement.style : nil;
        
@@ -447,9 +451,7 @@ var HORIZONTAL_MARGIN   = 3.0,
                case CPLineBreakByClipping:         textStyle.overflow = "hidden";
                                                    textStyle.textOverflow = "clip";
                                                    textStyle.whiteSpace = "pre";
-                                                    
-                                                    if (document.attachEvent)
-                                                        textStyle.wordWrap = "normal"; 
+                                                    textStyle.wordWrap = "normal"; 
                                                    
                                                    break;
                
@@ -459,26 +461,23 @@ var HORIZONTAL_MARGIN   = 3.0,
                case CPLineBreakByTruncatingTail:   textStyle.textOverflow = "ellipsis";
                                                    textStyle.whiteSpace = "nowrap";
                                                    textStyle.overflow = "hidden";
-                                                    
-                                                    if (document.attachEvent)
-                                                        textStyle.wordWrap = "normal"; 
+                                                    textStyle.wordWrap = "normal"; 
                                                                     
                                                    break;
                     
                case CPLineBreakByCharWrapping:                               
-                case CPLineBreakByWordWrapping:     if (document.attachEvent)
-                                                    {                                            
+                case CPLineBreakByWordWrapping:     textStyle.wordWrap = "break-word";
+                                                    try {
                                                        textStyle.whiteSpace = "pre";
-                                                        textStyle.wordWrap = "break-word";
-                                                    }
-                                                    
-                                                    else
-                                                    {
                                                        textStyle.whiteSpace = "-o-pre-wrap";
                                                        textStyle.whiteSpace = "-pre-wrap";
                                                        textStyle.whiteSpace = "-moz-pre-wrap";
                                                        textStyle.whiteSpace = "pre-wrap";
                                                    }
+                                                    catch (e) {
+                                                        //internet explorer doesn't like these properties
+                                                        textStyle.whiteSpace = "pre";
+                                                    }
                                                    
                                                    textStyle.overflow = "hidden";
                                                    textStyle.textOverflow = "clip";
@@ -490,7 +489,6 @@ var HORIZONTAL_MARGIN   = 3.0,
            {
                if (document.attachEvent)
                {
-                    shadowStyle.wordWrap = textStyle.wordWrap;            
                    shadowStyle.overflow = textStyle.overflow;
                }
                else
@@ -499,6 +497,7 @@ var HORIZONTAL_MARGIN   = 3.0,
                    shadowStyle.overflowY = textStyle.overflowY;
                }

+                shadowStyle.wordWrap = textStyle.wordWrap;
                shadowStyle.whiteSpace = textStyle.whiteSpace;
                shadowStyle.textOverflow = textStyle.textOverflow;
            }
@@ -510,6 +509,7 @@ var HORIZONTAL_MARGIN   = 3.0,

    // Create or destroy DOM Image element    
    if (needsDOMImageElement !== hasDOMImageElement)
+    {
        if (hasDOMImageElement)
        {
            _DOMElement.removeChild(_DOMImageElement);
@@ -539,8 +539,8 @@ var HORIZONTAL_MARGIN   = 3.0,
            _DOMElement.appendChild(_DOMImageElement);
            
            hasDOMImageElement = YES;
-        }    
-#endif
+        }
+    }

    var size = [self bounds].size,
        textRect = _CGRectMake(0.0, 0.0, size.width, size.height);
@@ -572,67 +572,54 @@ var HORIZONTAL_MARGIN   = 3.0,
            imageHeight *= scale;
        }

-#if PLATFORM(DOM)
        _DOMImageElement.width = imageWidth;
        _DOMImageElement.height = imageHeight;        
-        imageStyle.width = imageWidth + "px";
-        imageStyle.height = imageHeight + "px";
-#endif
+        imageStyle.width = MAX(imageWidth, 0) + "px";
+        imageStyle.height = MAX(imageHeight, 0) + "px";

        if (_imagePosition === CPImageBelow)
        {
-#if PLATFORM(DOM)
            imageStyle.left = FLOOR(centerX - imageWidth / 2.0) + "px";
            imageStyle.top = FLOOR(size.height - imageHeight) + "px";
-#endif

            textRect.size.height = size.height - imageHeight - VERTICAL_MARGIN;
        }
        else if (_imagePosition === CPImageAbove)
        {
-#if PLATFORM(DOM)
            CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, FLOOR(centerX - imageWidth / 2.0), 0);
-#endif
            
            textRect.origin.y += imageHeight + VERTICAL_MARGIN;
            textRect.size.height = size.height - imageHeight - VERTICAL_MARGIN;
        }
        else if (_imagePosition === CPImageLeft)
        {
-#if PLATFORM(DOM)
            imageStyle.top = FLOOR(centerY - imageHeight / 2.0) + "px";
            imageStyle.left = "0px";
-#endif

            textRect.origin.x = imageWidth + HORIZONTAL_MARGIN;
            textRect.size.width -= imageWidth + HORIZONTAL_MARGIN;
        }
        else if (_imagePosition === CPImageRight)
        {
-#if PLATFORM(DOM)
            imageStyle.top = FLOOR(centerY - imageHeight / 2.0) + "px";
            imageStyle.left = FLOOR(size.width - imageWidth) + "px";
-#endif

            textRect.size.width -= imageWidth + HORIZONTAL_MARGIN;
        }
        else if (_imagePosition === CPImageOnly)
        {
-#if PLATFORM(DOM)
            imageStyle.top = FLOOR(centerY - imageHeight / 2.0) + "px";
            imageStyle.left = FLOOR(centerX - imageWidth / 2.0) + "px";
-#endif
        }
    }

-#if PLATFORM(DOM)
    if (hasDOMTextElement)
    {
        var textRectX = _CGRectGetMinX(textRect),
            textRectY = _CGRectGetMinY(textRect),
            textRectWidth = _CGRectGetWidth(textRect),
            textRectHeight = _CGRectGetHeight(textRect);
-    
+
        if (_verticalAlignment !== CPTopVerticalTextAlignment)
        {
            if (!_textSize)
@@ -659,8 +646,8 @@ var HORIZONTAL_MARGIN   = 3.0,
        
        textStyle.top = ROUND(textRectY) + "px";
        textStyle.left = ROUND(textRectX) + "px";
-        textStyle.width = ROUND(textRectWidth) + "px";
-        textStyle.height = ROUND(textRectHeight) + "px";
+        textStyle.width = MAX(ROUND(textRectWidth), 0) + "px";
+        textStyle.height = MAX(ROUND(textRectHeight), 0) + "px";
        
        if (shadowStyle)
        {
@@ -669,8 +656,8 @@ var HORIZONTAL_MARGIN   = 3.0,
            
            shadowStyle.top = ROUND(textRectY + _textShadowOffset.height) + "px";
            shadowStyle.left = ROUND(textRectX + _textShadowOffset.width) + "px";
-            shadowStyle.width = ROUND(textRectWidth) + "px";
-            shadowStyle.height = ROUND(textRectHeight) + "px";
+            shadowStyle.width = MAX(ROUND(textRectWidth), 0) + "px";
+            shadowStyle.height = MAX(ROUND(textRectHeight), 0) + "px";
        }
    }
 #endif
@@ -8,7 +8,7 @@ new FileList("**/*").exclude("Jakefile").forEach(function(aFilename)
    if (!FILE.isFile(aFilename))
        return;

-    var buildFilename = FILE.join($BUILD_CONFIGURATION_DIR, "CommonJS", "cappuccino", aFilename);
+    var buildFilename = FILE.join($BUILD_CJS_CAPPUCCINO, aFilename);

    filedir (buildFilename, [aFilename], function ()
    {
@@ -27,3 +27,7 @@ new FileList("**/*").exclude("Jakefile").forEach(function(aFilename)
    task ("build", buildFilename);
    CLOBBER.include(buildFilename);
 });
+
+task ("build", function() {
+    setPackageMetadata(FILE.join($BUILD_CJS_CAPPUCCINO, "package.json"));
+});
@@ -8,6 +8,7 @@ require("narwhal").ensureEngine("rhino");

 var FILE = require("file");
 var OS = require("os");
+var UTIL = require("util");

 var stream = require("term").stream;
 var parser = new (require("args").Parser)();
@@ -24,6 +25,10 @@ parser.option("-F", "--framework", "frameworks")
    .push()
    .help("Add a frameworks directory, relative to INPUT_PROJECT (default: ['Frameworks'])");

+parser.option("-P", "--path", "paths")
+    .push()
+    .help("Add a path (relative to the application root) to inline.");
+
 parser.option("-f", "--force", "force")
    .def(false)
    .set(true)
@@ -34,6 +39,16 @@ parser.option("--index", "index")
    .set()
    .help("The root HTML file to modify (default: index.html)");

+parser.option("-s", "--split", "number", "split")
+    .natural()
+    .def(0)
+    .help("Split into multiple files");
+
+parser.option("-c", "--compressor", "compressor")
+    .def("shrinksafe")
+    .set()
+    .help("Select a compressor to use (closure-compiler, yuicompressor, shrinksafe), or \"none\" (default: shrinksafe)");
+
 parser.option("-v", "--verbose", "verbose")
   .def(false)
   .set(true)
@@ -81,32 +96,34 @@ function main(args)

    var flattener = new ObjectiveJFlattener(rootPath);

+    flattener.options = options;
+
    flattener.setIncludePaths(frameworks);
    flattener.setEnvironments([environment, "ObjJ"]);

+    print("Loading application.");
    flattener.load(mainPath);
-    flattener.finishLoading();

-    var rootResources = flattener.require("objective-j").StaticResource.rootResources();
+    print("Loading default theme.");
+    flattener.require("objective-j").objj_eval("("+(function() {
+        var blend = [[CPThemeBlend alloc] initWithContentsOfURL:[[CPBundle bundleForClass:[CPApplication class]] pathForResource:[CPApplication defaultThemeName] + ".blend"]];
+        [blend loadWithDelegate:nil];
+    })+")")();

-    var root = rootResources["file:"];
-
-    // FIXME: shouldn't have to do this manually
-    var components = rootPath.split("/").slice(0, -1);
-    components[0] = "/";
-    var node = root;
-    while (components.length) {
-        node = node.children()[components.shift()];
-    }
-    applicationRoot = node;
-
-    print(applicationRoot.toString());
-
-    var applicationJS = flattener.buildApplicationJS(applicationRoot);
+    var applicationJSs = flattener.buildApplicationJS();

    FILE.copyTree(rootPath, outputPath);

-    outputPath.join("Application.js").write(applicationJS);
+    applicationJSs.forEach(function(applicationJS, n) {
+        var name = "Application"+(n||"")+".js";
+        if (options.compressor === "none") {
+            print("skipping compression: " + name);
+        } else {
+            print("compressing: " + name);
+            applicationJS = require("minify/"+options.compressor).compress(applicationJS, { charset : "UTF-8", useServer : true });
+        }
+        outputPath.join(name).write(applicationJS, { charset : "UTF-8" });
+    });

    rewriteMainHTML(outputPath.join(options.index));
 }
@@ -115,117 +132,197 @@ function main(args)
 function ObjectiveJFlattener(rootPath) {
    ObjectiveJRuntimeAnalyzer.apply(this, arguments);

-    this.resourceBuffer = [];
-    this.bundleBuffer = [];
+    this.filesToCache = {};
+    this.fileCacheBuffer = [];
    this.functionsBuffer = [];
-
-    this._outputBundles = {};
 }

 ObjectiveJFlattener.prototype = Object.create(ObjectiveJRuntimeAnalyzer.prototype);

-ObjectiveJFlattener.prototype.buildApplicationJS = function(applicationRoot) {
-    this.serializeStaticResources(applicationRoot);
-    this.serializeStaticFileExecutables();
+ObjectiveJFlattener.prototype.buildApplicationJS = function() {

-    var buffer = []
+    this.setupFileCache();
+    this.serializeFunctions();
+    this.serializeFileCache();

-    buffer.push("(function(){");
+    var additions = FILE.read(FILE.join(FILE.dirname(module.path), "..", "..", "cappuccino", "lib", "cappuccino", "objj-flatten-additions.js"), { charset:"UTF-8" });

-    buffer.push("var appURL = new CFURL('.', ObjectiveJ.pageURL);")
+    var applicationJSs = [];

-    buffer.push(this.bundleBuffer.join("\n"));
+    if (this.options.split === 0) {
+        var buffer = [];
+        buffer.push("var baseURL = new CFURL(\".\", ObjectiveJ.pageURL);");
+        buffer.push(additions);
+        buffer.push(this.fileCacheBuffer.join("\n"));
+        buffer.push(this.functionsBuffer.join("\n"));
+        buffer.push("ObjectiveJ.bootstrap();");
+        applicationJSs.push(buffer.join("\n"));
+    } else {
+        var appFilesCount = this.options.split;

-    buffer.push("var nodeStack = [];");
-    buffer.push("var applicationRoot = ObjectiveJ.StaticResource.resourceAtURL(appURL, true);");
-    buffer.push("var currentNode = null;");
-    buffer.push("var newNode;");
+        var buffers = [];
+        for (var i = 0; i <= appFilesCount; i++)
+            buffers.push([]);

-    buffer.push(this.resourceBuffer.join("\n"));
+        var chunks = this.fileCacheBuffer.concat(this.functionsBuffer).sort(function(chunkA, chunkB) {
+            return chunkA.length - chunkB.length;
+        });

-    buffer.push("})();");
+        // try to equally distribute the chunks. could be better but good enough for now.
+        var n = 0;
+        while (chunks.length) {
+            buffers[(n++ % appFilesCount) + 1].push(chunks.pop());
+        }

-    buffer.push(this.functionsBuffer.join("\n"));
+        buffers[0].push("var baseURL = new CFURL(\".\", ObjectiveJ.pageURL);");
+        buffers[0].push(additions);

-    buffer.push("ObjectiveJ.bootstrap();");
+        buffers[0].push("var appFilesCount = " + appFilesCount +";");
+        buffers[0].push("for (var i = 1; i <= appFilesCount; i++) {");
+        buffers[0].push("    var script = document.createElement(\"script\");");
+        buffers[0].push("    script.src = \"Application\"+i+\".js\";");
+        buffers[0].push("    script.charset = \"UTF-8\";");
+        buffers[0].push("    script.onload = function() { if (--appFilesCount === 0) ObjectiveJ.bootstrap(); };");
+        buffers[0].push("    document.getElementsByTagName(\"head\")[0].appendChild(script);");
+        buffers[0].push("}");

-    return buffer.join("\n");
+        buffers.forEach(function(buffer) {
+            applicationJSs.push(buffer.join("\n"));
+        });
+    }
+
+    return applicationJSs;
 }

-ObjectiveJFlattener.prototype.serializeStaticFileExecutables = function() {
-    this.require("objective-j").FileExecutable.allFileExecutables().forEach(function(aFileExecutable) {
-        var deps = aFileExecutable.fileDependencies().map(function(dependency) {
-            return "new ObjectiveJ.FileDependency(new CFURL("+JSON.stringify(dependency.path())+"),"+JSON.stringify(dependency.isLocal())+")"
-        }).join(",");
+ObjectiveJFlattener.prototype.serializeFunctions = function() {
+    var inlineFunctions = true;//this.options.inlineFunctions;

-        var func = aFileExecutable._function.toString();
-        // HACK
-        func = func.replace(", require, exports, module, system, print, window", "");
+    var outputFiles = {};

-        this.functionsBuffer.push("var path = "+JSON.stringify(this.rootPath.relative(aFileExecutable.path()).toString())+";");
-        this.functionsBuffer.push("new ObjectiveJ.FileExecutable(path,"+
-            "new ObjectiveJ.Executable(null, ["+deps+"], path, "+func+"));");
+    var _cachedExecutableFunctions = {};
+
+    this.require("objective-j").FileExecutable.allFileExecutables().forEach(function(executable) {
+        var path = executable.path();
+
+        if (inlineFunctions)
+        {
+            // stringify the function, replacing arguments
+            var functionString = executable._function.toString().replace(", require, exports, module, system, print, window", ""); // HACK
+
+            var relative = this.rootPath.relative(path).toString();
+            this.functionsBuffer.push("ObjectiveJ.FileExecutable._cacheFunction(new CFURL("+JSON.stringify(relative)+", baseURL),\n"+functionString+");");
+        }
+
+        var bundle = this.context.global.CFBundle.bundleContainingURL(path);
+        if (bundle && bundle.infoDictionary())
+        {
+            var executablePath = bundle.executablePath(),
+                relativeToBundle = FILE.relative(FILE.join(bundle.path(), ""), path);
+
+            if (executablePath)
+            {
+                if (inlineFunctions)
+                {
+                    // remove the code since we're inlining the functions
+                    executable._code = "alert("+JSON.stringify(relativeToBundle)+");";
+                }
+
+                if (!outputFiles[executablePath])
+                {
+                    outputFiles[executablePath] = [];
+                    outputFiles[executablePath].push("@STATIC;1.0;");
+                }
+
+                var fileContents = executable.toMarkedString();
+
+                outputFiles[executablePath].push("p;" + relativeToBundle.length + ";" + relativeToBundle);
+                outputFiles[executablePath].push("t;" +  fileContents.length + ";" +  fileContents);
+
+                // stream.print("Adding \0green(" + this.rootPath.relative(path) + "\0) to \0cyan(" + this.rootPath.relative(executablePath) + "\0)");
+            }
+        }
+        else
+            CPLog.warn("No bundle (or info dictionary for) " + rootPath.relative(path));
+    }, this);
+
+    for (var executablePath in outputFiles)
+    {
+        var relative = this.rootPath.relative(executablePath).toString();
+        var contents = outputFiles[executablePath].join("");
+        this.filesToCache[relative] = contents;
+    }
+}
+
+ObjectiveJFlattener.prototype.serializeFileCache = function() {
+    for (var relative in this.filesToCache) {
+        var contents = this.filesToCache[relative];
+        print("caching: " + relative + " => " + (contents == null ? 404 : 200));
+        if (contents == null)
+            this.fileCacheBuffer.push("CFHTTPRequest._cacheRequest(new CFURL("+JSON.stringify(relative)+", baseURL), 404);");
+        else
+            this.fileCacheBuffer.push("CFHTTPRequest._cacheRequest(new CFURL("+JSON.stringify(relative)+", baseURL), 200, {}, "+JSON.stringify(contents)+");");
+    }
+}
+
+ObjectiveJFlattener.prototype.setupFileCache = function() {
+    var paths = {};
+
+    UTIL.update(paths, this.requestedURLs);
+
+    this.options.paths.forEach(function(relativePath) {
+       paths[this.rootPath.join(relativePath)] = true;
+    }, this);
+
+    Object.keys(paths).forEach(function(absolute) {
+        var relative = this.rootPath.relative(absolute).toString();
+        if (relative.indexOf("..") === 0)
+        {
+            print("skipping (parent of app root): " + absolute);
+            return;
+        }
+
+        if (FILE.isFile(absolute))
+        {
+            // if (this.options.maxCachedSize && FILE.size(absolute) > this.options.maxCachedSize)
+            // {
+            //     print("skipping (larger than "+this.options.maxCachedSize+" bytes): " + absolute);
+            //     return;
+            // }
+
+            var contents = FILE.read(absolute, { charset : "UTF-8" });
+            this.filesToCache[relative] = contents;
+        } else {
+            this.filesToCache[relative] = null;
+        }
    }, this);
 }

-ObjectiveJFlattener.prototype.serializeStaticResources = function(node, depth) {
-    depth = depth || 0;
-
-    var bundle = this.context.global.CFBundle.bundleContainingURL(node.URL());
-    if (!bundle) {
-        stream.print("\0yellow(Warning:\0) No bundle for path: \0cyan("+node.URL()+"\0)");
-    }
-    else if (!this._outputBundles[bundle.path()]) {
-        this._outputBundles[bundle.path()] = bundle;
-        stream.print("Writing bundle: \0cyan("+bundle.path()+"\0)");
-        print(bundle.infoDictionary())
-
-        var relative = this.rootPath.relative(bundle.path()).toString();
-        this.bundleBuffer.push("var bundle = new CFBundle("+(relative ? JSON.stringify(relative) : "appURL")+");");
-        this.bundleBuffer.push("bundle._loadStatus = " + (1<<4) + ";");
-        if (bundle.infoDictionary()) {
-            this.bundleBuffer.push("bundle._infoDictionary = CFPropertyList.propertyListFromString(" +
-                JSON.stringify(CPPropertyListCreateData(bundle.infoDictionary()).rawString()) + ");");
-        }
-    }
-
-    // not the root node:
-    if (depth > 0) {
-        this.resourceBuffer.push("newNode = new ObjectiveJ.StaticResource(" +
-            JSON.stringify(node.name()) +
-            ", currentNode, " +
-            JSON.stringify(node.isDirectory()) + ", " +
-            JSON.stringify(node.isResolved()) + ");");
-    } else {
-        this.resourceBuffer.push("newNode = applicationRoot;");
-    }
-
-    // var contents = node.contents();
-    // if (contents) {
-    //     this.resourceBuffer.push("newNode._contents = " + JSON.stringify(contents) + ";");
-    // }
-
-    if (!node.children())
-        return;
-
-    this.resourceBuffer.push("nodeStack.push(currentNode);");
-    this.resourceBuffer.push("currentNode = newNode;");
-
-    var children = node.children();
-    for (var name in children) {
-        this.serializeStaticResources(children[name], depth+1);
-    }
-
-    this.resourceBuffer.push("currentNode = nodeStack.pop();");
-}
-
 // "$1" is the matching indentation
-var scriptTagsBefore = '$1<script type = "text/javascript">\n$1    OBJJ_AUTO_BOOTSTRAP = false;\n$1</script>';
-var scriptTagsAfter  = '$1<script type = "text/javascript" src = "Application.js"></script>';
+var scriptTagsBefore =
+    '$1<script type = "text/javascript">\n'+
+    '$1    OBJJ_AUTO_BOOTSTRAP = false;\n'+
+    '$1</script>';
+
+var scriptTagsAfter =
+    '$1<script type="text/javascript" src="Application.js" charset="UTF-8"></script>';
+
+// enable CPLog:
+// scriptTagsAfter = '$1<script type="text/javascript">\n$1    CPLogRegister(CPLogConsole);\n$1</script>\n' + scriptTagsAfter;

 function rewriteMainHTML(indexHTMLPath) {
    if (indexHTMLPath.isFile()) {
-        var indexHTML = indexHTMLPath.read();
+        var indexHTML = indexHTMLPath.read({ charset : "UTF-8" });
+
+        // inline the Application.js if it's smallish
+        var applicationJSPath = indexHTMLPath.dirname().join("Application.js");
+        if (applicationJSPath.size() < 10*1024) {
+            // escape any dollar signs by replacing them with two
+            // then indent by splitting/joining on newlines
+            scriptTagsAfter =
+                '$1<script type="text/javascript">\n'+
+                '$1    ' + applicationJSPath.read({ charset : "UTF-8" }).replace(/\$/g, "$$$$").split("\n").join("\n$1    ")+'\n'+
+                '$1</script>';
+        }

        // attempt to find Objective-J script tag and add ours
        var newIndexHTML = indexHTML.replace(/([ \t]+)<script[^>]+Objective-J\.js[^>]+>(?:\s*<\/script>)?/,
@@ -233,7 +330,7 @@ function rewriteMainHTML(indexHTMLPath) {

        if (newIndexHTML !== indexHTML) {
            stream.print("\0green(Modified: "+indexHTMLPath+".\0)");
-            indexHTMLPath.write(newIndexHTML);
+            indexHTMLPath.write(newIndexHTML, { charset : "UTF-8" });
            return;
        }
    } else {
@@ -0,0 +1,23 @@
+var FILE = require("file");
+var sprintf = require("printf").sprintf;
+
+var pkg = null;
+function getPackage() {
+    if (!pkg)
+        pkg = JSON.parse(FILE.path(module.path).dirname().dirname().join("package.json").read({ charset : "UTF-8" }));
+    return pkg;
+}
+
+exports.version = function() { return getPackage()["version"]; }
+exports.revision = function() { return getPackage()["cappuccino-revision"]; }
+exports.timestamp = function() { return new Date(getPackage()["cappuccino-timestamp"]); }
+
+exports.fullVersionString = function() {
+    return sprintf("cappuccino %s (%04d-%02d-%02d %s)",
+        exports.version(),
+        exports.timestamp().getUTCFullYear(),
+        exports.timestamp().getUTCMonth()+1,
+        exports.timestamp().getUTCDate(),
+        exports.revision().slice(0,6)
+    );
+}
@@ -5,6 +5,8 @@ var Context = require("interpreter").Context;
 ObjectiveJRuntimeAnalyzer = function(rootPath)
 {
    this.rootPath = rootPath;
+    this.rootURL = new CFURL(String(rootPath));
+
    this.context = new Context();

    this.scope = setupObjectiveJ(this.context);
@@ -28,6 +30,19 @@ ObjectiveJRuntimeAnalyzer = function(rootPath)
        var url = this.executableURL();
        return url ? url.absoluteURL().path() : null;
    }
+
+    this.require("cappuccino/objj-flatten-additions");
+
+    if (!this.context.global.CFHTTPRequest._lookupCachedRequest)
+        print("Warning: CFHTTPRequest._lookupCachedRequest. Need to import objj-flatten-additions module.");
+
+    var requestedURLs = this.requestedURLs = {};
+    var _lookupCachedRequest = this.context.global.CFHTTPRequest._lookupCachedRequest;
+    this.context.global.CFHTTPRequest._lookupCachedRequest = function(aURL) {
+        var path = new CFURL(aURL, this.rootURL).absoluteURL().path();
+        requestedURLs[path] = true;
+        return _lookupCachedRequest.apply(null, arguments);
+    }
 }

 ObjectiveJRuntimeAnalyzer.prototype.setIncludePaths = function(includePaths) {
@@ -0,0 +1,57 @@
+
+var URLCache = { };
+
+CFHTTPRequest.prototype.open = function(/*String*/ method, /*String*/ url, /*Boolean*/ async, /*String*/ user, /*String*/ password)
+{
+    var cachedRequest = CFHTTPRequest._lookupCachedRequest(url);
+    if (cachedRequest)
+    {
+        var self = this;
+        this._nativeRequest = cachedRequest;
+        this._nativeRequest.onreadystatechange = function()
+        {
+            ObjectiveJ.determineAndDispatchHTTPRequestEvents(self);
+        };
+    }
+    return this._nativeRequest.open(method, url, async, user, password);
+}
+
+CFHTTPRequest._cacheRequest = function(/*CFURL|String*/ aURL, /*Number*/ status, /*Object*/ headers, /*String*/ body)
+{
+    URLCache[aURL] = new MockXMLHttpRequest(status, headers, body);
+}
+
+CFHTTPRequest._lookupCachedRequest = function(/*CFURL|String*/ aURL)
+{
+    return URLCache[aURL];
+}
+
+function MockXMLHttpRequest(status, headers, body)
+{
+    this.readyState         = CFHTTPRequest.UninitializedState;
+    this.status             = status || 200;
+    this.statusText         = "";
+    this.responseText       = body || "";
+    this._responseHeaders   = headers || {};
+};
+MockXMLHttpRequest.prototype.open = function(method, url, async, user, password)
+{
+    this.readyState = CFHTTPRequest.LoadingState;
+    this.async = async;
+};
+MockXMLHttpRequest.prototype.send = function(body)
+{
+    var self = this;
+    self.responseText = self.responseText.toString();
+    function complete() {
+        for (self.readyState = CFHTTPRequest.LoadedState; self.readyState <= CFHTTPRequest.CompleteState; self.readyState++)
+            self.onreadystatechange();
+    }
+    (self.async ? ObjectiveJ.Asynchronous(complete) : complete)();
+};
+MockXMLHttpRequest.prototype.onreadystatechange       = function() {};
+MockXMLHttpRequest.prototype.abort                    = function() {};
+MockXMLHttpRequest.prototype.setRequestHeader         = function(header, value) {};
+MockXMLHttpRequest.prototype.getAllResponseHeaders    = function() { return this._responseHeaders; };
+MockXMLHttpRequest.prototype.getResponseHeader        = function(header) { return this._responseHeaders[header]; };
+MockXMLHttpRequest.prototype.overrideMimeType         = function(mimetype) {};
@@ -4,7 +4,6 @@
    "description": "Cappuccino module",
    "keywords": ["objective-j", "objj", "objective j", "capp", "cappuccino"],
    "author": "280 North, Inc. (http://280north.com/)",
-    "version": "0.8.0",
    "objj-frameworks": ["Frameworks"],
    "objj-debug-frameworks": ["Frameworks/Debug"],
    "contributors": [
@@ -153,6 +153,12 @@
            continue;

        var value = object[key];
+        
+        if (value === null)
+        {
+            [dictionary setObject:[CPNull null] forKey:key];
+            continue;
+        }
    
        if (recursively)
        {
@@ -521,6 +527,11 @@
    return self.toString();
 }

+- (BOOL)containsKey:(id)aKey
+{
+    var value = [self objectForKey:aKey];
+    return ((value !== nil) && (value !== undefined));
+}
@end

@implementation CPDictionary (CPCoding)
@@ -739,7 +739,10 @@
            shifts = [];

        for (; j < count; ++j)
+        {
            [shifts addObject:_ranges[j]];
+            _count -= _ranges[j].length;
+        }

        if ((j = i + 1) < count)
        {
@@ -163,9 +163,15 @@ var CPArrayClass                                                            = Ni
    @param data the data from which to read the graph
    @return the unarchived object
 */
-+ (id)unarchiveObjectWithData:(CPData)data
+ (id)unarchiveObjectWithData:(CPData)aData
 {
-    var unarchiver = [[self alloc] initForReadingWithData:data],
+    if (!aData)
+    {
+        CPLog.error("Null data passed to -[CPKeyedUnarchiver unarchiveObjectWithData:].");
+        return nil;
+    }
+
+    var unarchiver = [[self alloc] initForReadingWithData:aData],
        object = [unarchiver decodeObjectForKey:@"root"];

    [unarchiver finishDecoding];
@@ -200,7 +206,7 @@ var CPArrayClass                                                            = Ni
 - (CPDictionary)_decodeDictionaryOfObjectsForKey:(CPString)aKey
 {
    var object = _plistObject.valueForKey(aKey),
-        objectClass = object && object.isa;
+        objectClass = (object != nil) && object.isa;

    if (objectClass === CPDictionaryClass || objectClass === CPMutableDictionaryClass)
    {
@@ -315,7 +321,7 @@ var CPArrayClass                                                            = Ni
 - (id)decodeObjectForKey:(CPString)aKey
 {
    var object = _plistObject.valueForKey(aKey),
-        objectClass = object && object.isa;
+        objectClass = (object != nil) && object.isa;

    if (objectClass === CPDictionaryClass || objectClass === CPMutableDictionaryClass)
        return _CPKeyedUnarchiverDecodeObjectAtIndex(self, object.valueForKey(_CPKeyedArchiverUIDKey));
@@ -465,7 +471,7 @@ var _CPKeyedUnarchiverDecodeObjectAtIndex = function(self, anIndex)

        self._plistObject = savedPlistObject;

-        if (processedObject != object)
+        if (processedObject !== object)
        {
            if (self._delegateSelectors & _CPKeyedUnarchiverWillReplaceObjectWithObjectSelector)
                [self._delegate unarchiver:self willReplaceObject:object withObject:processedObject];
@@ -519,7 +525,7 @@ var _CPKeyedUnarchiverDecodeObjectAtIndex = function(self, anIndex)

    // If this object is a member of _CPKeyedArchiverValue, then we know
    // that it is a wrapper for a primitive JavaScript object.
-    if (object.isa === _CPKeyedArchiverValueClass)
+    if ((object != nil) && (object.isa === _CPKeyedArchiverValueClass))
        object = [object JSObject];

    return object;
@@ -61,7 +61,7 @@
 - (void)forwardInvocation:(CPInvocation)anInvocation
 {
    [CPException raise:CPInvalidArgumentException
-                reason:@"-methodSignatureForSelector: called on abstract CPProxy class."];
+                reason:@"-forwardInvocation: called on abstract CPProxy class."];
 }

 // FIXME: This should be moved to the runtime?
@@ -196,8 +196,8 @@ var CPURLURLStringKey   = @"CPURLURLStringKey",

 - (id)initWithCoder:(CPCoder)aCoder
 {
-    return [self initWithURLString:[aCoder decodeObjectForKey:CPURLURLStringKey]
-                           baseURL:[aCoder decodeObjectForKey:CPURLBaseURLKey]];
+    return [self initWithString:[aCoder decodeObjectForKey:CPURLURLStringKey]
+                  relativeToURL:[aCoder decodeObjectForKey:CPURLBaseURLKey]];
 }

 - (void)encodeWithCoder:(CPCoder)aCoder
@@ -34,7 +34,7 @@ foundationTask = framework ("Foundation", function(foundationTask)
    foundationTask.setEmail("feedback @nospam@ 280north.com");
    foundationTask.setSummary("Foundation classes for Cappuccino");
    foundationTask.setIdentifier("com.280n.Foundation");
-    foundationTask.setVersion("0.8.0");
+    foundationTask.setVersion(getCappuccinoVersion());
    foundationTask.setLicense(BundleTask.License.LGPL_v2_1);
    foundationTask.setSources(new FileList("**/*.j"));
    foundationTask.setResources(new FileList("Resources/**/*"));
@@ -247,7 +247,7 @@ task ("demos", function()

 // Testing

-task("test", ["build", "test-only"]);
+task("test", ["CommonJS", "test-only"]);

 task("test-only", function()
 {
@@ -280,21 +280,23 @@ task("push-objective-j", function() {
 function pushPackage(path, remote, branch)
 {
    branch = branch || "master";
-    
+
+    var pushPackagesPath = FILE.path(".push-package");
+
+    pushPackagesPath.mkdirs();
+
+    var packagePath = pushPackagesPath.join(remote.replace(/[^\w]/g, "_"));
+
    stream.print("Pushing \0blue(" + path + "\0) to "+branch+" of \0blue(" + remote + "\0)");

-    FILE.mkdirs(".push-package");
-
-    var pushPackageDir = FILE.join(".push-package", remote.replace(/[^\w]/g, "_"));
-
-    if (FILE.exists(pushPackageDir))
-        OS.system(buildCmd([["cd", pushPackageDir], ["git", "fetch"]]));
+    if (packagePath.isDirectory())
+        OS.system(buildCmd([["cd", packagePath], ["git", "fetch"]]));
    else
-        OS.system(["git", "clone", remote, pushPackageDir]);
+        OS.system(["git", "clone", remote, packagePath]);

-    if (OS.system(buildCmd([["cd", pushPackageDir], ["git", "checkout", "origin/"+branch]]))) {
+    if (OS.system(buildCmd([["cd", packagePath], ["git", "checkout", "origin/"+branch]]))) {
        if (OS.system(buildCmd([
-            ["cd", pushPackageDir],
+            ["cd", packagePath],
            ["git", "symbolic-ref", "HEAD", "refs/heads/"+branch],
            ["rm", ".git/index"],
            ["git", "clean", "-fdx"]
@@ -302,20 +304,30 @@ function pushPackage(path, remote, branch)
            throw "pushPackage failed";
    }

-    if (OS.system("cd "+OS.enquote(pushPackageDir)+" && git rm --ignore-unmatch -r * && rm -rf *"))
+    if (OS.system("cd "+OS.enquote(packagePath)+" && git rm --ignore-unmatch -r * && rm -rf *"))
        throw "pushPackage failed";
-    if (OS.system("cp -R "+OS.enquote(path)+"/* "+OS.enquote(pushPackageDir)+"/."))
+    if (OS.system("cp -R "+OS.enquote(path)+"/* "+OS.enquote(packagePath)+"/."))
        throw "pushPackage failed";

-    OS.system(buildCmd([
-        ["cd", pushPackageDir],
+    var pkg = JSON.parse(packagePath.join("package.json").read({ charset : "UTF-8" }));
+
+    stream.print("    Version:   \0purple(" + pkg["version"] + "\0)");
+    stream.print("    Revision:  \0purple(" + pkg["cappuccino-revision"] + "\0)");
+    stream.print("    Timestamp: \0purple(" + pkg["cappuccino-timestamp"] + "\0)");
+
+    var cmd = [
+        ["cd", packagePath],
        ["git", "add", "."],
-        ["git", "commit", "-m", "Pushed on " + new Date()]
-    ]));
+        ["git", "commit", "-m", "version="+pkg.version+"; revision="+pkg["cappuccino-revision"]+"; timestamp="+pkg["cappuccino-timestamp"]+";"]
+    ];
+    if (pkg["cappuccino-revision"])
+        cmd.push(["git", "tag", "rev-"+pkg["cappuccino-revision"].slice(0,6)]);
+
+    OS.system(buildCmd(cmd));
    
    if (OS.system(buildCmd([
-        ["cd", pushPackageDir],
-        ["git", "push", "origin", "HEAD:"+branch]
+        ["cd", packagePath],
+        ["git", "push", "--tags", "origin", "HEAD:"+branch]
    ])))
        throw "pushPackage failed";
 }
@@ -81,7 +81,36 @@ function resolveMainBundleURL()
        Executable.fileImporterForURL(mainBundleURL)(mainFileURL.lastPathComponent(), YES, function()
        {
            disableCFURLCaching();
-            afterDocumentLoad(main);
+            afterDocumentLoad(function()
+            {
+                var hashString = window.location.hash.substring(1),
+                    args = [];
+
+                if (hashString.length)
+                {
+                    args = hashString.split("/");
+                    for (var i = 0, count = args.length; i < count; i++)
+                        args[i] = decodeURIComponent(args[i]);
+                }
+
+                var namedArgsArray = window.location.search.substring(1).split("&"),
+                    namedArgs = new CFMutableDictionary();
+
+                for (var i = 0, count = namedArgsArray.length; i < count; i++)
+                {
+                    var thisArg = namedArgsArray[i].split("=");
+
+                    if (!thisArg[0])
+                        continue;
+
+                    if (thisArg[1] == null)
+                        thisArg[1] = true;
+
+                    namedArgs.setValueForKey(decodeURIComponent(thisArg[0]), decodeURIComponent(thisArg[1]));
+                }
+
+                main(args, namedArgs);
+            });
        });
    });
 }
@@ -49,6 +49,7 @@ GLOBAL(CFBundle) = function(/*CFURL|String*/ aURL)
    this._resourcesDirectoryURL = new CFURL("Resources/", aURL);

    this._staticResource = NULL;
+    this._isValid = NO;

    this._loadStatus = CFBundleUnloaded;
    this._loadRequests = [];
@@ -58,34 +59,47 @@ GLOBAL(CFBundle) = function(/*CFURL|String*/ aURL)
    this._eventDispatcher = new EventDispatcher(this);
 }

+DISPLAY_NAME(CFBundle);
+
 CFBundle.environments = function()
 {
    // Passed in by GCC.
    return ENVIRONMENTS;
 }

+DISPLAY_NAME(CFBundle.environments);
+
 CFBundle.bundleContainingURL = function(/*CFURL|String*/ aURL)
 {
    aURL = new CFURL(".", makeAbsoluteURL(aURL));

-    while (aURL.path() !== "/")
-    {
-        var bundle = CFBundlesForURLStrings[aURL.absoluteString()];
+    var previousURLString,
+        URLString = aURL.absoluteString();

-        if (bundle)
+    while (!previousURLString || previousURLString !== URLString)
+    {
+        var bundle = CFBundlesForURLStrings[URLString];
+
+        if (bundle && bundle._isValid)
            return bundle;

        aURL = new CFURL("..", aURL);
+        previousURLString = URLString;
+        URLString = aURL.absoluteString();
    }

    return NULL;
 }

+DISPLAY_NAME(CFBundle.bundleContainingURL);
+
 CFBundle.mainBundle = function()
 {
    return new CFBundle(mainBundleURL);
 }

+DISPLAY_NAME(CFBundle.mainBundle);
+
 function addClassToBundle(aClass, aBundle)
 {
    if (aBundle)
@@ -97,16 +111,22 @@ CFBundle.bundleForClass = function(/*Class*/ aClass)
    return CFBundlesForClasses[aClass.name] || CFBundle.mainBundle();
 }

+DISPLAY_NAME(CFBundle.bundleForClass);
+
 CFBundle.prototype.bundleURL = function()
 {
    return this._bundleURL;
 }

+DISPLAY_NAME(CFBundle.prototype.bundleURL);
+
 CFBundle.prototype.resourcesDirectoryURL = function()
 {
    return this._resourcesDirectoryURL;
 }

+DISPLAY_NAME(CFBundle.prototype.resourcesDirectoryURL);
+
 CFBundle.prototype.resourceURL = function(/*String*/ aResourceName, /*String*/ aType, /*String*/ aSubDirectory)
 {
    if (aType)
@@ -120,6 +140,8 @@ CFBundle.prototype.resourceURL = function(/*String*/ aResourceName, /*String*/ a
    return resourceURL.absoluteURL();
 }

+DISPLAY_NAME(CFBundle.prototype.resourceURL);
+
 CFBundle.prototype.mostEligibleEnvironmentURL = function()
 {
    if (this._mostEligibleEnvironmentURL === undefined)
@@ -128,6 +150,8 @@ CFBundle.prototype.mostEligibleEnvironmentURL = function()
    return this._mostEligibleEnvironmentURL;
 }

+DISPLAY_NAME(CFBundle.prototype.mostEligibleEnvironmentURL);
+
 CFBundle.prototype.executableURL = function()
 {
    if (this._executableURL === undefined)
@@ -143,16 +167,22 @@ CFBundle.prototype.executableURL = function()
    return this._executableURL;
 }

+DISPLAY_NAME(CFBundle.prototype.executableURL);
+
 CFBundle.prototype.infoDictionary = function()
 {
    return this._infoDictionary;
 }

+DISPLAY_NAME(CFBundle.prototype.infoDictionary);
+
 CFBundle.prototype.valueForInfoDictionaryKey = function(/*String*/ aKey)
 {
    return this._infoDictionary.valueForKey(aKey);
 }

+DISPLAY_NAME(CFBundle.prototype.valueForInfoDictionaryKey);
+
 CFBundle.prototype.hasSpritedImages = function()
 {
    var environments = this._infoDictionary.valueForKey("CPBundleEnvironmentsWithImageSprites") || [],
@@ -166,11 +196,15 @@ CFBundle.prototype.hasSpritedImages = function()
    return NO;
 }

+DISPLAY_NAME(CFBundle.prototype.hasSpritedImages);
+
 CFBundle.prototype.environments = function()
 {
    return this._infoDictionary.valueForKey("CPBundleEnvironments") || ["ObjJ"];
 }

+DISPLAY_NAME(CFBundle.prototype.environments);
+
 CFBundle.prototype.mostEligibleEnvironment = function(/*Array*/ environments)
 {
    environments = environments || this.environments();
@@ -194,11 +228,15 @@ CFBundle.prototype.mostEligibleEnvironment = function(/*Array*/ environments)
    return NULL;
 }

+DISPLAY_NAME(CFBundle.prototype.mostEligibleEnvironment);
+
 CFBundle.prototype.isLoading = function()
 {
    return this._loadStatus & CFBundleLoading;
 }

+DISPLAY_NAME(CFBundle.prototype.isLoading);
+
 CFBundle.prototype.load = function(/*BOOL*/ shouldExecute)
 {
    if (this._loadStatus !== CFBundleUnloaded)
@@ -223,7 +261,13 @@ CFBundle.prototype.load = function(/*BOOL*/ shouldExecute)
        function onsuccess(/*Event*/ anEvent)
        {
            self._loadStatus &= ~CFBundleLoadingInfoPlist;
-            self._infoDictionary = anEvent.request.responsePropertyList();
+
+            var infoDictionary = anEvent.request.responsePropertyList();
+
+            self._isValid = !!infoDictionary || CFBundle.mainBundle() === self;
+
+            if (infoDictionary)
+                self._infoDictionary = infoDictionary;

            if (!self._infoDictionary)
            {
@@ -240,6 +284,7 @@ CFBundle.prototype.load = function(/*BOOL*/ shouldExecute)

        function onfailure()
        {
+            self._isValid = CFBundle.mainBundle() === self;
            self._loadStatus = CFBundleUnloaded;

            finishBundleLoadingWithError(self, new Error("Could not load bundle at \"" + self.bundleURL() + "\""));
@@ -249,6 +294,8 @@ CFBundle.prototype.load = function(/*BOOL*/ shouldExecute)
    });
 }

+DISPLAY_NAME(CFBundle.prototype.load);
+
 function finishBundleLoadingWithError(/*CFBundle*/ aBundle, /*Event*/ anError)
 {
    resolveStaticResource(aBundle._staticResource);
@@ -390,12 +437,13 @@ function loadSpritedImagesForBundle(/*Bundle*/ aBundle, success, failure)
            CFTotalBytesLoaded += anEvent.request.responseText().length;
            decompileStaticFile(aBundle, anEvent.request.responseText(), spritedImagesURL);
            aBundle._loadStatus &= ~CFBundleLoadingSpritedImages;
-            success();
        }
        catch(anException)
        {
            failure(anException);
        }
+
+        success();
    }, failure);
 }

@@ -514,11 +562,11 @@ function executeBundle(/*Bundle*/ aBundle, /*Function*/ aCallback)

                else
                {
-                    executable.addEventListener("dependenciesload", function()
+                    executable.loadFileDependencies(function()
                    {
                        executeStaticResources(index);
                    });
-                    executable.loadFileDependencies();
+
                    return;
                }
            }
@@ -615,16 +663,22 @@ CFBundle.prototype.addEventListener = function(/*String*/ anEventName, /*Functio
    this._eventDispatcher.addEventListener(anEventName, anEventListener);
 }

+DISPLAY_NAME(CFBundle.prototype.addEventListener);
+
 CFBundle.prototype.removeEventListener = function(/*String*/ anEventName, /*Function*/ anEventListener)
 {
    this._eventDispatcher.removeEventListener(anEventName, anEventListener);
 }

+DISPLAY_NAME(CFBundle.prototype.removeEventListener);
+
 CFBundle.prototype.onerror = function(/*Event*/ anEvent)
 {
    throw anEvent.error;
 }

+DISPLAY_NAME(CFBundle.prototype.onerror);
+
 CFBundle.prototype.bundlePath = function()
 {
    return this._bundleURL.absoluteURL().path();
@@ -196,9 +196,9 @@ CFHTTPRequest.prototype.overrideMimeType = function(/*String*/ aMimeType)
        return this._nativeRequest.overrideMimeType(aMimeType);
 }

-CFHTTPRequest.prototype.open = function(/*...*/)
+CFHTTPRequest.prototype.open = function(/*String*/ aMethod, /*String*/ aURL, /*Boolean*/ isAsynchronous, /*String*/ aUser, /*String*/ aPassword)
 {
-    return this._nativeRequest.open(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4]);
+    return this._nativeRequest.open(aMethod, aURL, isAsynchronous, aUser, aPassword);
 }

 CFHTTPRequest.prototype.send = function(/*Object*/ aBody)
@@ -254,43 +254,32 @@ function determineAndDispatchHTTPRequestEvents(/*CFHTTPRequest*/ aRequest)

 function FileRequest(/*CFURL*/ aURL, onsuccess, onfailure)
 {
-#ifdef BROWSER
    var request = new CFHTTPRequest();

-    request.onsuccess = Asynchronous(onsuccess);
-    request.onfailure = Asynchronous(onfailure);
-
    if (aURL.pathExtension() === "plist")
        request.overrideMimeType("text/xml");

-    request.open("GET", aURL.absoluteString(), YES);
+    if (exports.asyncLoader)
+    {
+        request.onsuccess = Asynchronous(onsuccess);
+        request.onfailure = Asynchronous(onfailure);
+    }
+    else
+    {
+        request.onsuccess = onsuccess;
+        request.onfailure = onfailure;
+    }
+
+    request.open("GET", aURL.absoluteString(), exports.asyncLoader);
    request.send("");
+}
+
+#ifdef BROWSER
+exports.asyncLoader = YES;
 #else
-    var FILE = require("file"),
-        filePath = aURL.absoluteURL().path();
-
-    if (!FILE.exists(filePath))
-        return onfailure();
-
-    this._responseText = FILE.read(filePath, { charset:"UTF-8" });
-
-    onsuccess({ type:"success", request:this });
+exports.asyncLoader = NO;
 #endif
-}

-#ifdef COMMONJS
-FileRequest.prototype.responseText = function()
-{
-    return this._responseText;
-}
-
-FileRequest.prototype.responseXML = function()
-{
-    return new DOMParser().parseFromString(anXMLString, "text/xml");
-}
-
-FileRequest.prototype.responsePropertyList = function()
-{
-    return CFPropertyList.propertyListFromString(this.responseText());
-}
-#endif
+// FIXME: Get rid of these when we no longer need Mock requests in flatten.
+exports.Asynchronous = Asynchronous;
+exports.determineAndDispatchHTTPRequestEvents = determineAndDispatchHTTPRequestEvents;
@@ -314,7 +314,7 @@ function resolveURL(aURL)
                resolvedPathComponents.splice(basePathComponents.length - 1, 1);

            // If this doesn't start with a "..", then we're simply appending to already standardized paths.
-            if (pathComponents.length && pathComponents[0] === "..")
+            if (pathComponents.length && (pathComponents[0] === ".." || pathComponents[0] === "."))
                standardizePathComponents(resolvedPathComponents, YES);

            resolvedParts.pathComponents = resolvedPathComponents;
@@ -352,19 +352,26 @@ function standardizePathComponents(/*Array*/ pathComponents, /*BOOL*/ inPlace)
    var index = 0,
        resultIndex = 0,
        count = pathComponents.length,
-        result = inPlace ? pathComponents : [];
+        result = inPlace ? pathComponents : [],
+        startsWithPeriod = NO;

    for (; index < count; ++index)
    {
        var component = pathComponents[index];

-        if (component === "" || component === ".")
+        if (component === "")
             continue;

+        if (component === ".")
+        {
+            startsWithPeriod = resultIndex === 0;
+
+            continue;
+        }
+
        if (component !== ".." || resultIndex === 0 || result[resultIndex - 1] === "..")
        {
-            //if (resultIndex !== index)
-                result[resultIndex] = component;
+            result[resultIndex] = component;

            resultIndex++;

@@ -375,6 +382,9 @@ function standardizePathComponents(/*Array*/ pathComponents, /*BOOL*/ inPlace)
            --resultIndex;
    }

+    if (startsWithPeriod && resultIndex === 0)
+        result[resultIndex++] = ".";
+
    result.length = resultIndex;

    return result;
@@ -505,10 +515,11 @@ CFURL.prototype.hasDirectoryPath = function()
        var lastPathComponent = this.lastPathComponent();

        hasDirectoryPath = lastPathComponent === "." || lastPathComponent === "..";
+
        this._hasDirectoryPath = hasDirectoryPath;
    }

-    return this._hasDirectoryPath;
+    return hasDirectoryPath;
 }

 DISPLAY_NAME(CFURL.prototype.hasDirectoryPath);
@@ -646,7 +657,14 @@ CFURL.prototype.asDirectoryPathURL = function()
    if (this.hasDirectoryPath())
        return this;

-    return new CFURL(this.lastPathComponent() + "/", this);
+    var lastPathComponent = this.lastPathComponent();
+
+    // We do this because on Windows the path may start with C: and be
+    // misinterpreted as a scheme.
+    if (lastPathComponent !== "/")
+        lastPathComponent = "./" + lastPathComponent;
+
+    return new CFURL(lastPathComponent + "/", this);
 }

 DISPLAY_NAME(CFURL.prototype.asDirectoryPathURL);
@@ -357,3 +357,10 @@ function _CPLogInitPopup(logWindow)
    }, false);
 }
 #endif
+
+
+#if COMMONJS
+CPLogDefault = CPLogPrint;
+#else
+CPLogDefault = (typeof window === "object" && window.console) ? CPLogConsole : CPLogPopup;
+#endif
@@ -1,5 +1,7 @@

 var FILE = require("file");
+var sprintf = require("printf").sprintf;
+
 var window = exports.window = require("browser/window");

 if (system.engine === "rhino")
@@ -7,7 +9,7 @@ if (system.engine === "rhino")
    window.__parent__ = null;
    window.__proto__ = global;
 }
-
+ 
 // setup OBJJ_HOME, OBJJ_INCLUDE_PATHS, etc
 window.OBJJ_HOME = exports.OBJJ_HOME = FILE.resolve(module.path, "..");

@@ -77,6 +79,12 @@ exports.run = function(args)
        // copy the args since we're going to modify them
        var argv = args.slice(1);

+        if (argv[0] === "--version")
+        {
+            print(exports.fullVersionString());
+            return;
+        }
+
        while (argv.length && argv[0].indexOf('-I') === 0)
            OBJJ_INCLUDE_PATHS.unshift.apply(OBJJ_INCLUDE_PATHS, argv.shift().substr(2).split(':'));
    }
@@ -140,37 +148,12 @@ exports.repl = function()
    }
 }

-exports.objj_eval = function(/*String*/ aString)
-{
-    // We need this while code still refers to window.
-    Executable.setCommonJSArguments(require, exports, module, system, print, window);
-
-    var executable = exports.preprocess(aString, "", 0);
-
-    if (!executable.hasLoadedFileDependencies())
-        executable.loadFileDependencies();
-
-    // A bit of a hack. Executable compiles the code itself into a function, but we want
-    // the raw code to eval here.
-    var code = executable._code;
-
-    // Not clear why these should be global, varing them doesn't seem to take effect with evaluateString.
-    global.objj_executeFile = Executable.fileExecuterForURL(FILE.cwd());
-    global.objj_importFile = Executable.fileImporterForURL(FILE.cwd());
-
-    if (typeof system !== "undefined" && system.engine === "rhino")
-        return Packages.org.mozilla.javascript.Context.getCurrentContext().evaluateString(global, code, "objj_eval", 0, NULL);
-
-    return eval(code);
-}
-
-Executable.setCommonJSParameters("require", "exports", "module", "system", "print", "window");
-
 // creates a narwhal factory function in the objj module scope
 exports.make_narwhal_factory = function(path)
 {
    return function(require, exports, module, system, print)
    {
+        Executable.setCommonJSParameters("require", "exports", "module", "system", "print", "window");
        Executable.setCommonJSArguments(require, exports, module, system, print, window);
        Executable.fileImporterForURL(FILE.dirname(path))(path, YES);
    }
@@ -178,5 +161,26 @@ exports.make_narwhal_factory = function(path)

 } // end "with"

+var pkg = null;
+function getPackage() {
+    if (!pkg)
+        pkg = JSON.parse(FILE.path(module.path).dirname().dirname().join("package.json").read({ charset : "UTF-8" }));
+    return pkg;
+}
+
+exports.version = function() { return getPackage()["version"]; }
+exports.revision = function() { return getPackage()["cappuccino-revision"]; }
+exports.timestamp = function() { return new Date(getPackage()["cappuccino-timestamp"]); }
+
+exports.fullVersionString = function() {
+    return sprintf("objective-j %s (%04d-%02d-%02d %s)",
+        exports.version(),
+        exports.timestamp().getUTCFullYear(),
+        exports.timestamp().getUTCMonth()+1,
+        exports.timestamp().getUTCDate(),
+        exports.revision().slice(0,6)
+    );
+}
+
 if (require.main == module.id)
    exports.run(system.args);
@@ -16,8 +16,7 @@ var Task = Jake.Task,

 function isImage(/*String*/ aFilename)
 {
-    return  FILE.isFile(aFilename) &&
-            UTIL.has([".png", ".jpg", ".jpeg", ".gif", ".tif", ".tiff"], FILE.extension(aFilename).toLowerCase());
+    return UTIL.has([".png", ".jpg", ".jpeg", ".gif", ".tif", ".tiff"], FILE.extension(aFilename).toLowerCase());
 }

 function mimeType(/*String*/ aFilename)
@@ -370,14 +369,17 @@ BundleTask.prototype.infoPlist = function()
        return anEnvironment.name();
    }));
    infoPlist.setValueForKey("CPBundleExecutable", this.productName() + ".sj");
-    infoPlist.setValueForKey("CPBundleEnvironmentsWithImageSprites", this.environments().filter(
+
+    var environmentsWithImageSprites = this.environments().filter(
    function(anEnvironment)
    {
-        return anEnvironment.spritesImages();
-    }).map(function(anEnvironment)
+        return anEnvironment.spritesImages() && task(this.buildProductDataURLPathForEnvironment(anEnvironment)).prerequisites().filter(isImage).length > 0;
+    }, this).map(function(anEnvironment)
    {
        return anEnvironment.name();
-    }));
+    });
+
+    infoPlist.setValueForKey("CPBundleEnvironmentsWithImageSprites", environmentsWithImageSprites);

    var principalClass = this.principalClass();

@@ -581,7 +583,6 @@ BundleTask.prototype.defineResourceTasks = function()
    }, this);
 }

-
 var RESOURCES_PATH  = FILE.join(FILE.absolute(FILE.dirname(module.path)), "RESOURCES"),
    MHTMLTestPath   = FILE.join(RESOURCES_PATH, "MHTMLTest.txt");

@@ -595,27 +596,29 @@ BundleTask.prototype.defineSpritedImagesTask = function()
        var folder = anEnvironment.name() + ".environment",
            resourcesPath = FILE.join(this.buildIntermediatesProductPath(), folder, "Resources", "");

-        function isDataResource(/*String*/ aFilename)
-        {
-            return FILE.isFile(aFilename) && aFilename.indexOf(resourcesPath) === 0 && isImage(aFilename);
-        }
-
        var productName = this.productName(),
            dataURLPath = this.buildProductDataURLPathForEnvironment(anEnvironment);

        filedir (dataURLPath, function(aTask)
        {
+            var prerequisites = aTask.prerequisites().filter(isImage);
+
+            if (!prerequisites.length)
+            {
+                if (FILE.exists(dataURLPath))
+                    FILE.remove(dataURLPath);
+
+                return;
+            }
+
            TERM.stream.print("Creating data URLs file... \0green(" + dataURLPath +"\0)");

            var dataURLStream = FILE.open(dataURLPath, "w+", { charset:"UTF-8" });

            dataURLStream.write("@STATIC;1.0;");

-            aTask.prerequisites().forEach(function(aFilename)
+            prerequisites.forEach(function(aFilename)
            {
-                if (!isDataResource(aFilename))
-                    return;
-
                var resourcePath = "Resources/" + FILE.relative(resourcesPath, aFilename);

                dataURLStream.write("u;" + resourcePath.length + ";" + resourcePath);
@@ -636,17 +639,24 @@ BundleTask.prototype.defineSpritedImagesTask = function()

        filedir (MHTMLPath, function(aTask)
        {
+            var prerequisites = aTask.prerequisites().filter(isImage);
+
+            if (!prerequisites.length)
+            {
+                if (FILE.exists(MHTMLPath))
+                    FILE.remove(MHTMLPath);
+
+                return;
+            }
+
            TERM.stream.print("Creating MHTML paths file... \0green(" + MHTMLPath +"\0)");

            var MHTMLStream = FILE.open(MHTMLPath, "w+", { charset:"UTF-8" });

            MHTMLStream.write("@STATIC;1.0;");

-            aTask.prerequisites().forEach(function(aFilename)
+            prerequisites.forEach(function(aFilename)
            {
-                if (!isDataResource(aFilename))
-                    return;
-
                var resourcePath = "Resources/" + FILE.relative(resourcesPath, aFilename),
                    MHTMLResourcePath = "mhtml:" + FILE.join(folder, "MHTMLData.txt!") + resourcePath;

@@ -663,17 +673,24 @@ BundleTask.prototype.defineSpritedImagesTask = function()

        filedir (MHTMLDataPath, function(aTask)
        {
+            var prerequisites = aTask.prerequisites().filter(isImage);
+
+            if (!prerequisites.length)
+            {
+                if (FILE.exists(MHTMLDataPath))
+                    FILE.remove(MHTMLDataPath);
+
+                return;
+            }
+
            TERM.stream.print("Creating MHTML images file... \0green(" + MHTMLDataPath +"\0)");

            var MHTMLDataStream = FILE.open(MHTMLDataPath, "w+", { charset:"UTF-8" });

            MHTMLDataStream.write("/*\r\nContent-Type: multipart/related; boundary=\"_ANY_STRING_WILL_DO_AS_A_SEPARATOR\"\r\n\r\n");

-            aTask.prerequisites().forEach(function(aFilename)
+            prerequisites.forEach(function(aFilename)
            {
-                if (!isDataResource(aFilename))
-                    return;
-
                var resourcePath = "Resources/" + FILE.relative(resourcesPath, aFilename);

                MHTMLDataStream.write("--_ANY_STRING_WILL_DO_AS_A_SEPARATOR\r\n");
@@ -5,7 +5,6 @@
    "description": "Objective-J and Cappuccino module",
    "keywords": ["objective-j", "objj", "objective j", "cappuccino"],
    "author": "280 North, Inc. (http://280north.com/)",
-    "version": "0.8.0",
    "contributors": [
        "Francisco Tolmasky (http://tolmasky.com/)",
        "Ross Boucher (http://rossboucher.com/)",
@@ -27,7 +27,7 @@ if (typeof window !== "undefined")
    window.setNativeTimeout = window.setTimeout;
    window.clearNativeTimeout = window.clearTimeout;
    window.setNativeInterval = window.setInterval;
-    window.clearNativeInterval = window.clearNativeInterval;
+    window.clearNativeInterval = window.clearInterval;
 }

 // Objective-J Constants
@@ -20,6 +20,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#ifdef BROWSER
+CPLogRegister(CPLogDefault);
+#endif
+
 // formatting helpers

 function objj_debug_object_format(aReceiver)
@@ -0,0 +1,55 @@
+GLOBAL(objj_eval) = function(/*String*/ aString)
+{
+#if COMMONJS
+    var url = FILE.join(FILE.cwd(), "/");
+    Executable.setCommonJSParameters("require", "exports", "module", "system", "print", "window");
+    Executable.setCommonJSArguments(require, exports, module, system, print, window);
+#else
+    var url = exports.pageURL;
+#endif
+
+    // Temporarily switch the loader to sychronous mode since objj_eval must be synchronous
+    // therefore you shouldn't use @imports in objj_eval the browser
+    var asyncLoaderSaved = exports.asyncLoader;
+    exports.asyncLoader = NO;
+
+    var executable = exports.preprocess(aString, url, 0);
+
+    if (!executable.hasLoadedFileDependencies())
+        executable.loadFileDependencies();
+
+    // here we setup a scope object containing the free variables that would normally be arguments to the module function
+    global._objj_eval_scope = {};
+
+    global._objj_eval_scope.objj_executeFile = Executable.fileExecuterForURL(url);
+    global._objj_eval_scope.objj_importFile = Executable.fileImporterForURL(url);
+#if COMMONJS
+    global._objj_eval_scope.require = require;
+    global._objj_eval_scope.exports = exports;
+    global._objj_eval_scope.module  = module;
+    global._objj_eval_scope.system  = system;
+    global._objj_eval_scope.print   = print;
+    global._objj_eval_scope.window  = window;
+#endif
+
+    // A bit of a hack. Executable compiles the code itself into a function, but we want
+    // the raw code to eval here so we can get the result.
+    // No known way to get the result of a statement except via eval.
+    var code = "with(_objj_eval_scope){" + executable._code + "\n//*/\n}";
+
+    var result;
+#if COMMONJS
+    if (typeof system !== "undefined" && system.engine === "rhino")
+        result = Packages.org.mozilla.javascript.Context.getCurrentContext().evaluateString(global, code, "objj_eval", 0, NULL);
+    else
+#endif
+        result = eval(code);
+
+    // restore async loader setting
+    exports.asyncLoader = asyncLoaderSaved;
+
+    return result;
+}
+
+// deprecated, use global
+exports.objj_eval = objj_eval;
@@ -137,6 +137,7 @@ Executable.prototype.execute = function()
 #endif
    var oldContextBundle = CONTEXT_BUNDLE;

+    // FIXME: Should we have stored this?
    CONTEXT_BUNDLE = CFBundle.bundleContainingURL(this.URL());

    var result = this._function.apply(global, this.functionArguments());
@@ -217,10 +218,13 @@ Executable.prototype.loadFileDependencies = function(aCallback)
 {
    var status = this._fileDependencyStatus;

-    if (status === ExecutableLoadedFileDependencies)
-        return aCallback();
+    if (aCallback)
+    {
+        if (status === ExecutableLoadedFileDependencies)
+            return aCallback();

-    this._fileDependencyCallbacks.push(aCallback)
+        this._fileDependencyCallbacks.push(aCallback);
+    }

    if (status === ExecutableUnloadedFileDependencies)
    {
@@ -280,15 +284,18 @@ function fileExecutableSearchFinished(/*FileExecutable*/ aFileExecutable)

 function fileExecutableDependencyLoadFinished()
 {
-    var index = 0,
-        count = fileDependencyExecutables.length;
+    var executables = fileDependencyExecutables,
+        index = 0,
+        count = executables.length;
+
+    fileDependencyExecutables = [];

    for (; index < count; ++index)
-        fileDependencyExecutables[index]._fileDependencyStatus = ExecutableLoadedFileDependencies;
+        executables[index]._fileDependencyStatus = ExecutableLoadedFileDependencies;

    for (index = 0; index < count; ++index)
    {
-        var executable = fileDependencyExecutables[index],
+        var executable = executables[index],
            callbacks = executable._fileDependencyCallbacks,
            callbackIndex = 0,
            callbackCount = callbacks.length;
@@ -22,7 +22,7 @@

 var FileExecutablesForURLStrings = { };

-function FileExecutable(/*CFURL|String*/ aURL, /*Executable*/ anExecutable)
+function FileExecutable(/*CFURL|String*/ aURL)
 {
    aURL = makeAbsoluteURL(aURL);

@@ -38,10 +38,7 @@ function FileExecutable(/*CFURL|String*/ aURL, /*Executable*/ anExecutable)
        executable = NULL,
        extension = aURL.pathExtension();

-    if (anExecutable)
-        executable = anExecutable;
-
-    else if (fileContents.match(/^@STATIC;/))
+    if (fileContents.match(/^@STATIC;/))
        executable = decompile(fileContents, aURL);

    else if (extension === "j" || !extension)
@@ -117,5 +114,23 @@ function decompile(/*String*/ aString, /*CFURL*/ aURL)
            dependencies.push(new FileDependency(new CFURL(text), YES));
    }

+    var fn = FileExecutable._lookupCachedFunction(aURL)
+    if (fn)
+        return new Executable(code, dependencies, aURL, fn);
+
    return new Executable(code, dependencies, aURL);
 }
+
+var FunctionCache = { };
+
+FileExecutable._cacheFunction = function(/*CFURL|String*/ aURL, /*Function*/ fn)
+{
+    aURL = typeof aURL === "string" ? aURL : aURL.absoluteString();
+    FunctionCache[aURL] = fn;
+}
+
+FileExecutable._lookupCachedFunction = function(/*CFURL|String*/ aURL)
+{
+    aURL = typeof aURL === "string" ? aURL : aURL.absoluteString();
+    return FunctionCache[aURL];
+}
@@ -47,6 +47,7 @@
 #include "Executable.js"
 #include "FileExecutable.js"
 #include "Runtime.js"
+#include "Eval.js"
 #if defined(DEBUG) || defined(COMMONJS)
 #include "Debug.js"
 #endif
@@ -87,6 +87,10 @@ new FileList("CommonJS/**/*").forEach(function(aFilename)
    CLOBBER.include(buildFilename);
 });

+task ("build", function() {
+    setPackageMetadata(FILE.join($BUILD_CJS_OBJECTIVE_J, "package.json"));
+});
+
 $BUILD_CJS_OBJECTIVE_J_FRAMEWORK = FILE.join($BUILD_CJS_OBJECTIVE_J, "Frameworks", "Objective-J");

 filedir($BUILD_CJS_OBJECTIVE_J_FRAMEWORK, function()
@@ -143,8 +143,14 @@ StaticResource.resourceAtURL = function(/*CFURL|String*/ aURL, /*BOOL*/ resolveA
            resource = resource._children[name];
        
        else if (resolveAsDirectoriesIfNecessary)
-            resource = new StaticResource(new CFURL(name, resource.URL()), resource, YES, YES);
+        {
+            // We do this because on Windows the path may start with C: and be
+            // misinterpreted as a scheme.
+            if (name !== "/")
+                name = "./" + name;

+            resource = new StaticResource(new CFURL(name, resource.URL()), resource, YES, YES);
+        }
        else
            throw new Error("Static Resource at " + aURL + " is not resolved (\"" + name + "\")");
    }
@@ -2,6 +2,9 @@

@implementation CPDictionaryTest : OJTestCase
 {
+    CPDictionary    string_dict;
+    CPDictionary    json_dict;
+    JSObject        json;
 }

 - (void)setUp
@@ -54,14 +57,28 @@
 - (void)testDictionaryWithJSObjectRecursive
 {
    var dict = [CPDictionary dictionaryWithJSObject:json recursively:YES];
-    [self assert:[dict count] equals:3];
+    [self assert:[json_dict count] equals:3];
    [self assert:[[dict objectForKey:@"key3"] count] equals:1];
 }

+- (void)testDictionaryWithJSObjectRecursiveWithNull
+{
+    var json_with_nulls = {
+        "key1": ['1', '2', '3'],
+        "key2": "This is a string",
+        "key3": null
+    }
+ 
+    var dict = [CPDictionary dictionaryWithJSObject:json_with_nulls recursively:YES];
+ 
+    [self assert:3 equals:[dict count]];
+    [self assert:[@"key1", @"key2", @"key3"] equals:[dict allKeys]];
+    [self assert:[CPNull null] equals:[dict objectForKey:@"key3"]];
+}
+
 - (void)testDictionaryWithJSObjectNonRecursive
 {
    var non_recursive_dict = [CPDictionary dictionaryWithJSObject:json recursively:NO];
-    [self assertThrows:[non_recursive_dict objectForKey:@"key3"]];
 }

 - (void)testCopy
@@ -141,8 +158,6 @@
    [json_dict removeObjectForKey:@"key1"];
    [self assert:[string_dict count] equals:1];
    [self assert:[json_dict count] equals:2];
-    [self assertThrows:[string_dict objectForKey:@"key1"]];
-    [self assertThrows:[json_dict objectForKey:@"key1"]];
 }

 - (void)testRemoveObjectsForKeys
@@ -151,9 +166,6 @@
    [json_dict removeObjectsForKeys:[@"key1", @"key2"]];
    [self assert:[string_dict count] equals:1];
    [self assert:[json_dict count] equals:1];
-    [self assertThrows:[string_dict objectForKey:@"key1"]];
-    [self assertThrows:[json_dict objectForKey:@"key1"]];
-    [self assertThrows:[json_dict objectForKey:@"key2"]];
 }

 - (void)testSetObjectForKey
@@ -173,4 +185,21 @@
    [self assert:[json_dict count] equals:5];
 }

-@end
+- (void)testDictionaryWithFalsyValues
+{
+    var dict = [[CPDictionary alloc] initWithObjects:["", 0, [CPNull null]] forKeys:["1", "2", "3"]];
+    [self assertTrue:[dict containsKey:"1"]];
+    [self assertTrue:[dict containsKey:"2"]];
+    [self assertTrue:[dict containsKey:"3"]];
+    [self assertFalse:[dict containsKey:"4"]];
+}
+
+- (void)testThrowsOnNilValue
+{
+    [self assertThrows:function(){
+        var dict = [[CPDictionary alloc] initWithObjects:[1, nil] forKeys:["1", "2"]];
+        [self assertFalse:dict];
+    }];
+}
+
+@end
@@ -12,6 +12,11 @@ function descriptionWithoutEntity(aString)
    CPIndexSet _set;
 }

+- (void)setUp
+{
+    _set = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(10, 10)];
+}
+
 - (void)testAddIndexes
 {
    var indexSet = [CPIndexSet indexSet];
@@ -177,16 +182,6 @@ function descriptionWithoutEntity(aString)
    [self assert:[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59] equals:array];
 }

- (void)setUp
-{
-    _set = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(10, 10)];
-}
-
- (void)tearDown
-{
-    _set = nil;
-}
-
 - (void)testIndexSet:(CPIndexSet)set containsRange:(CPRange)range
 {
    [self assertFalse:[set containsIndex:range.location -1]];
@@ -358,5 +353,24 @@ function descriptionWithoutEntity(aString)
    [self assertFalse:[_set containsIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(9, 2)]]];
 }

-@end
+- (void)testShiftIndexesStartingAtIndex
+{
+    var startRange = CPMakeRange(1, 5),
+        shiftRange = CPMakeRange(2, 5);
+    _set = [CPIndexSet indexSetWithIndexesInRange:startRange];
+    
+    // positive delta for downward shift
+    [_set shiftIndexesStartingAtIndex:1 by:1];
+    [self assertTrue:[_set containsIndexes:[CPIndexSet indexSetWithIndexesInRange:shiftRange]]];
+    
+    // negative delta for downward shift
+    [_set shiftIndexesStartingAtIndex:1 by:-1];
+    [self assertTrue:[_set containsIndexes:[CPIndexSet indexSetWithIndexesInRange:startRange]]];
+}

+- (void)tearDown
+{
+    _set = nil;
+}
+
+@end
@@ -32,7 +32,7 @@ CPLogRegister(CPLogConsole);

 - (int)numberOfRowsInTableView:(CPTableView)tableView
 {
-    return 700000;
+    return 100000;
 }

 - (id)tableView:(CPTableView)tableView objectValueForTableColumn:(CPTableColumn)tableColumn row:(int)row
@@ -43,4 +43,4 @@ CPLogRegister(CPLogConsole);
        return String((row + 1) * [[tableColumn identifier] intValue]);
 }

-@end
+@end
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="372"/>
+			<integer value="371"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -84,6 +84,7 @@
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="534516850">
+													<string key="NSIdentifier">1</string>
 													<double key="NSWidth">101</double>
 													<double key="NSMinWidth">40</double>
 													<double key="NSMaxWidth">1000</double>
@@ -142,6 +143,7 @@
 													<reference key="NSTableView" ref="86489736"/>
 												</object>
 												<object class="NSTableColumn" id="870554271">
+													<string key="NSIdentifier">2</string>
 													<double key="NSWidth">154</double>
 													<double key="NSMinWidth">40</double>
 													<double key="NSMaxWidth">1000</double>
@@ -168,6 +170,7 @@
 													<reference key="NSTableView" ref="86489736"/>
 												</object>
 												<object class="NSTableColumn" id="192893327">
+													<string key="NSIdentifier">3</string>
 													<double key="NSWidth">188</double>
 													<double key="NSMinWidth">10</double>
 													<double key="NSMaxWidth">3.4028234663852886e+38</double>
@@ -214,8 +217,8 @@
 													<bytes key="NSWhite">MC41AA</bytes>
 												</object>
 											</object>
-											<double key="NSRowHeight">17</double>
-											<int key="NSTvFlags">-702545920</int>
+											<double key="NSRowHeight">23</double>
+											<int key="NSTvFlags">-694157312</int>
 											<reference key="NSDelegate"/>
 											<reference key="NSDataSource"/>
 											<int key="NSColumnAutoresizingStyle">4</int>
@@ -277,7 +280,7 @@
 							<reference key="NSContentView" ref="331394667"/>
 							<reference key="NSHeaderClipView" ref="471528550"/>
 							<reference key="NSCornerView" ref="167646100"/>
-							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+							<bytes key="NSScrollAmts">QSAAAEEgAABByAAAQcgAAA</bytes>
 						</object>
 					</object>
 					<string key="NSFrameSize">{558, 348}</string>
@@ -475,9 +478,9 @@
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{47, 268}, {558, 348}}</string>
+					<string>{{370, 244}, {558, 348}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{47, 268}, {558, 348}}</string>
+					<string>{{370, 244}, {558, 348}}</string>
 					<integer value="1"/>
 					<string>{{33, 99}, {480, 360}}</string>
 					<string>{3.40282e+38, 3.40282e+38}</string>
@@ -1,12 +1,6 @@
-
@import <Foundation/CPObject.j>

-@import <Foundation/CPIndexSet.j>
-@import <AppKit/CPTableColumn.j>
-@import <AppKit/CPTableView.j>
-
 tableTestDragType = @"CPTableViewTestDragType";
-CPLogRegister(CPLogConsole);

@implementation AppController : CPObject
 {
@@ -20,6 +14,7 @@ CPLogRegister(CPLogConsole);

 - (void)applicationDidFinishLaunching:(CPNotification)aNotification
 {
+    
    dataSet1 = [],
    dataSet2 = [],
    dataSet3 = [];
@@ -31,40 +26,40 @@ CPLogRegister(CPLogConsole);
        dataSet3[i - 1] = [CPNumber numberWithInt:i+20];
    }

-    
-    var window1 = [[CPWindow alloc] initWithContentRect:CGRectMake(50, 50, 500, 400) styleMask:CPTitledWindowMask | CPResizableWindowMask],
-        view = [window1 contentView];
-    
-    [view setBackgroundColor:[CPColor whiteColor]];
-    
+    var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(50,50,400,400) styleMask:CPClosableWindowMask],
+        contentView = [theWindow contentView];
+
    tableView = [[CPTableView alloc] initWithFrame:CGRectMake(0.0, 0.0, 500.0, 500.0)];

    [tableView setAllowsMultipleSelection:YES];
    [tableView setAllowsColumnSelection:YES];
    [tableView setUsesAlternatingRowBackgroundColors:YES];
    [tableView setAlternatingRowBackgroundColors:[[CPColor whiteColor], [CPColor colorWithHexString:@"e4e7ff"], [CPColor colorWithHexString:@"f4e7ff"]]];
-    [tableView setGridStyleMask:CPTableViewSolidHorizontalGridLineMask | CPTableViewSolidVerticalGridLineMask];
+    [tableView setGridStyleMask:CPTableViewSolidHorizontalGridLineMask | CPTableViewSolidVerticalGridLineMask];    
+    [tableView setVerticalMotionCanBeginDrag:NO];
+    [tableView setDraggingDestinationFeedbackStyle:CPTableViewDropOn];
+    [tableView registerForDraggedTypes:[CPArray arrayWithObject:tableTestDragType]];
+    [tableView setColumnAutoresizingStyle:CPTableViewLastColumnOnlyAutoresizingStyle];
+    [tableView setDelegate:self];
+    [tableView setDataSource:self];

+    
    var iconView = [[CPImageView alloc] initWithFrame:CGRectMake(16,16,0,0)];
-
    [iconView setImageScaling:CPScaleNone];
-
    var iconColumn = [[CPTableColumn alloc] initWithIdentifier:"icons"];
-
    [iconColumn setWidth:32.0];
    [iconColumn setMinWidth:32.0];
    [iconColumn setDataView:iconView];
-
    [tableView addTableColumn:iconColumn];
-
    iconImage = [[CPImage alloc] initWithContentsOfFile:"http://cappuccino.org/images/favicon.png" size:CGSizeMake(16,16)];

+
    var desc = [CPSortDescriptor sortDescriptorWithKey:@"self" ascending:YES];
    for (var i = 1; i <= 2; i++)
    {
        var column = [[CPTableColumn alloc] initWithIdentifier:String(i)];
        [column setSortDescriptorPrototype:desc];
-        [[column headerView] setStringValue:"Number "+i];
+        [[column headerView] setStringValue:"Number " + i];

        [column setMinWidth:50.0];
        [column setMaxWidth:500.0];
@@ -74,24 +69,14 @@ CPLogRegister(CPLogConsole);
        [tableView addTableColumn:column];
    }

-    [tableView setColumnAutoresizingStyle:CPTableViewLastColumnOnlyAutoresizingStyle];
-
-    var scrollView = [[CPScrollView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth([view bounds]), CGRectGetHeight([view bounds]))];
-    [tableView setRowHeight:22.0];
+    var scrollView = [[CPScrollView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth([contentView bounds]), CGRectGetHeight([contentView bounds]))];
+   
    [scrollView setDocumentView:tableView];
    [scrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
    
-    [view addSubview:scrollView];
+    [contentView addSubview:scrollView];

-    [scrollView setAutohidesScrollers:YES];
-
-    [tableView setDelegate:self];
-    [tableView setDataSource:self];
-    [tableView setVerticalMotionCanBeginDrag:NO];
-    [tableView setDraggingDestinationFeedbackStyle:CPTableViewDropOn];
-    [tableView registerForDraggedTypes:[CPArray arrayWithObject:tableTestDragType]];
-    [window1 setAcceptsMouseMovedEvents:YES];
-    [window1 orderFront:self];
+    [theWindow orderFront:self];
    [self newWindow];
    [self sourceList];
 }
@@ -106,39 +91,22 @@ CPLogRegister(CPLogConsole);
    [tableView2 setAllowsMultipleSelection:YES];
    [tableView2 setUsesAlternatingRowBackgroundColors:YES];
    [tableView2 setGridStyleMask:CPTableViewSolidHorizontalGridLineMask | CPTableViewSolidVerticalGridLineMask];
-
-
-    var iconView = [[CPImageView alloc] initWithFrame:CGRectMake(16,16,0,0)];
-
-    [iconView setImageScaling:CPScaleNone];
-
-    var iconColumn = [[CPTableColumn alloc] initWithIdentifier:"icons"];
-
-    [iconColumn setWidth:32.0];
-    [iconColumn setMinWidth:32.0];
-    [iconColumn setDataView:iconView];
-    [iconColumn setResizingMask:CPTableColumnNoResizing];
-
-    //[tableView2 addTableColumn:iconColumn];
-
-    iconImage = [[CPImage alloc] initWithContentsOfFile:"http://cappuccino.org/images/favicon.png" size:CGSizeMake(16,16)];
-
-    var textDataView = [CPTextField new];
-    
-    [textDataView setValue:[CPColor whiteColor] forThemeAttribute:@"text-color" inState:CPThemeStateHighlighted];
-    [textDataView setValue:[CPFont systemFontOfSize:12] forThemeAttribute:@"font" inState:CPThemeStateHighlighted];
+    [tableView2 setVerticalMotionCanBeginDrag:NO];
+    [tableView2 registerForDraggedTypes:[CPArray arrayWithObject:tableTestDragType]];
+    [tableView2 setDraggingDestinationFeedbackStyle:CPTableViewDropAbove];
+    [tableView2 setDelegate:self];
+    [tableView2 setDataSource:self];

    var desc = [CPSortDescriptor sortDescriptorWithKey:@"self" ascending:YES];
-
    for (var i = 1; i <= 3; i++)
    {
        var column = [[CPTableColumn alloc] initWithIdentifier:String(i)];
+        [column setSortDescriptorPrototype:desc];
        [[column headerView] setStringValue:"Number "+i];

        [column setWidth:i*75];
        [column setMinWidth:50.0];

-        [column setDataView:textDataView];
        [column setEditable:YES];
        
        [tableView2 addTableColumn:column];
@@ -153,14 +121,8 @@ CPLogRegister(CPLogConsole);
    
    [[window2 contentView] addSubview:scrollView];

-    [scrollView setAutohidesScrollers:YES];
+    //[scrollView setAutohidesScrollers:YES];

-    [tableView2 setDelegate:self];
-    [tableView2 setDataSource:self];
-    
-    [tableView2 setVerticalMotionCanBeginDrag:NO];
-    [tableView2 registerForDraggedTypes:[CPArray arrayWithObject:tableTestDragType]];
-    [tableView2 setDraggingDestinationFeedbackStyle:CPTableViewDropAbove];
    
    [window2 orderFront:self];
 }
@@ -176,19 +138,19 @@ CPLogRegister(CPLogConsole);
    [tableView3 setUsesAlternatingRowBackgroundColors:NO];
    [tableView3 setGridStyleMask:CPTableViewGridNone];
    [tableView3 setSelectionHighlightStyle:CPTableViewSelectionHighlightStyleSourceList];
+    [tableView3 setColumnAutoresizingStyle:CPTableViewUniformColumnAutoresizingStyle];
+    [tableView3 setVerticalMotionCanBeginDrag:NO];
+    [tableView3 setDelegate:self];
+    [tableView3 setDataSource:self];

    var column = [[CPTableColumn alloc] initWithIdentifier:"sourcelist"];
    [[column headerView] setStringValue:"Source List"];

    [column setWidth:200.0];
    [column setMinWidth:50.0];
-
    [column setEditable:YES];
-    
    [tableView3 addTableColumn:column];

-    [tableView3 setColumnAutoresizingStyle:CPTableViewUniformColumnAutoresizingStyle];
-
    var scrollView3 = [[CPScrollView alloc] initWithFrame:[[window3 contentView] bounds]];
    [tableView3 setRowHeight:32.0];
    [scrollView3 setDocumentView:tableView3];
@@ -197,15 +159,8 @@ CPLogRegister(CPLogConsole);
    [[window3 contentView] addSubview:scrollView3];

    [scrollView3 setAutohidesScrollers:YES];
-
-    [tableView3 setDelegate:self];
-    [tableView3 setDataSource:self];
-    
-    [tableView3 setVerticalMotionCanBeginDrag:NO];
-    //[tableView3 registerForDraggedTypes:[CPArray arrayWithObject:tableTestDragType]];
-    //[tableView3 setDraggingDestinationFeedbackStyle:CPTableViewDropAbove];*/
-    
-    [window3 orderFront:self];
+  
+  [window3 orderFront:self];
 }

 - (int)numberOfRowsInTableView:(CPTableView)atableView
@@ -218,37 +173,30 @@ CPLogRegister(CPLogConsole);
        return dataSet3.length;
 }

- (id)tableView:(CPTableView)atableView objectValueForTableColumn:(CPTableColumn)tableColumn row:(int)row
+- (id)tableView:(CPTableView)aTableView objectValueForTableColumn:(CPTableColumn)aColumn row:(int)aRow
 {
-
-    if(atableView === tableView)
-    {
-         if ([tableColumn identifier] === "icons")
-             return iconImage;
-         else
-             return String(dataSet1[row]);
-    }
-    else if(atableView === tableView2)
-    {
-        if ([tableColumn identifier] === "icons")
-             return iconImage;
-         else
-             return String(dataSet2[row]);
-    }
-    else if(atableView === tableView3)
-    {
-        if ([tableColumn identifier] === "icons")
-             return iconImage;
-         else
-             return String(dataSet3[row]);
-    }
+    if ([aColumn identifier] === "icons")
+        return iconImage;
+    
+    if (aTableView === tableView)
+        return String(dataSet1[aRow]);
+    else if (aTableView === tableView2)
+        return String(dataSet2[aRow]);
+    else if(aTableView === tableView3)
+        return String(dataSet3[row]);
 }

- (id)tableView:(CPTableView)tableView heightOfRow:(int)row
+- (void)tableView:(CPTableView)aTableView sortDescriptorsDidChange:(CPArray)oldDescriptors
 {
-    return 50;
+    CPLogConsole(_cmd + [oldDescriptors description]);
+    
+    var newDescriptors = [aTableView sortDescriptors];
+    
+    [(aTableView === tableView) ? dataSet1:dataSet2 sortUsingDescriptors:newDescriptors];
+	[aTableView reloadData];
 }

+
 - (void)tableViewSelectionIsChanging:(CPNotification)aNotification
 {
 	CPLog.debug(@"changing! %@", [aNotification description]);
@@ -261,13 +209,13 @@ CPLogRegister(CPLogConsole);

 - (BOOL)tableView:(CPTableView)aTableView shouldSelectRow:(int)rowIndex
 {
-    //CPLog.debug(@"tableView:shouldSelectRow");
+    CPLog.debug(@"tableView:shouldSelectRow");
    return true;
 }

 - (BOOL)selectionShouldChangeInTableView:(CPTableView)aTableView
 {
-	//CPLog.debug(@"selectionShouldChangeInTableView");
+	CPLog.debug(@"selectionShouldChangeInTableView");
 	return YES;
 }

@@ -285,14 +233,6 @@ CPLogRegister(CPLogConsole);
 {
    CPLogConsole(_cmd + [notification description]);
 }
-
-//- (CPIndexSet)tableView:(CPTableView)tableView selectionIndexesForProposedSelection:(CPIndexSet)proposedSelectionIndexes
-//{
-//	CPLog.debug(@"selectionIndexesForProposedSelection %@", [proposedSelectionIndexes description]);
-//	return proposedSelectionIndexes;
-//}
-
-
 - (BOOL)tableView:(CPTableView)aTableView shouldEditTableColumn:(CPTableColumn)tableColumn row:(int)row
 {
    if(aTableView === tableView3)
@@ -405,7 +345,7 @@ CPLogRegister(CPLogConsole);

 - (void)tableView:(CPTableView)aTableView didClickTableColumn:(CPTableColumn)aColumn
 {
-    console.log("table: "+aTableView+" clicked column: "+aColumn);
+    CPLog.debug("table: "+aTableView+" clicked column: "+aColumn);
 }

@end
@@ -60,4 +60,33 @@
        }
 }

+- (void)testPeriods
+{
+    var URLStrings =
+    {
+        "."             : "./",
+        "./"            : "./",
+        ".//"           : "./",
+        "/."            : "/",
+        "/./"           : "/",
+        "/.//"          : "/",
+        "./a/"          : "a/",
+        "./a"           : "a",
+        ".."            : "../",
+        "../"           : "../",
+        "..//"          : "../",
+        "/.."           : "/",
+        "/../"          : "/",
+        "/..//"         : "/",
+        "../a/"         : "../a/",
+        "../a"          : "../a"
+    };
+
+    var URLString;
+
+    for (URLString in URLStrings)
+        if (URLStrings.hasOwnProperty(URLString))
+            [self assert:new CFURL(URLString).absoluteString() equals:URLStrings[URLString]];
+}
+
@end
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+PACKAGE_BRANCH="nightly" jake push-packages
+code=$?
+if [ $code -ne 0 ]; then
+    echo "NIGHTLY BUILD PUSH FAILED ($code)"
+    exit $code
+else
+    echo "NIGHTLY BUILD PUSH SUCCEEDED"
+fi
@@ -1,11 +1,12 @@
 #!/bin/bash

 project_home="$(dirname "$PWD")"
+extras="$project_home/ci-extra.sh"

 export PATH="$HOME/narwhal/bin:$PATH"
 export CAPP_AUTO_UPGRADE="yes"

-export CAPP_BUILD=$project_home/build_incremental
+export CAPP_BUILD="$project_home/build_incremental"
 time jake test
 code=$?
 if [ $code -ne 0 ]; then
@@ -15,8 +16,8 @@ else
    echo "INCREMENTAL BUILD SUCCEEDED"
 fi

-export CAPP_BUILD=$project_home/build_clean
-rm -rf $CAPP_BUILD
+export CAPP_BUILD="$project_home/build_clean"
+rm -rf "$CAPP_BUILD"

 time jake CommonJS test
 code=$?
@@ -27,13 +28,9 @@ else
    echo "CLEAN BUILD SUCCEEDED"
 fi

-PACKAGE_BRANCH="nightly" jake push-packages
-code=$?
-if [ $code -ne 0 ]; then
-    echo "NIGHTLY BUILD PUSH FAILED ($code)"
-    exit $code
-else
-    echo "NIGHTLY BUILD PUSH SUCCEEDED"
+# run any additional ci commands not common to all branches (like nightly builds)
+if [ -f "$extras" ]; then
+	source "$extras"
 fi

-exit 0
+exit 0
@@ -0,0 +1,6 @@
+Project.configure do |project|
+  
+  project.email_notifier.emails = ['objjbuild@googlegroups.com']
+  project.build_command = 'Tools/Scripts/ci.sh'
+
+end
@@ -14,7 +14,7 @@ app ("capp", function(cappTask)
    cappTask.setSummary("Setup up Cappuccino projects");
    cappTask.setIdentifier("com.280n.capp");
    cappTask.setLicense(BundleTask.License.LGPL_v2_1);
-    cappTask.setVersion("0.8.0");
+    cappTask.setVersion(getCappuccinoVersion());
    cappTask.setSources(new FileList("*.j"));
    cappTask.setResources(new FileList("Resources/*"));
    cappTask.setIncludesNibsAndXibs(true);
@@ -27,7 +27,7 @@ app ("__project.nameasidentifier__", function(task)
    task.setEmail("__organization.email__");
    task.setSummary("__project.name__");
    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
-    task.setResources(new FileList("Resources/*"));
+    task.setResources(new FileList("Resources/**"));
    task.setIndexFilePath("index.html");
    task.setInfoPlistPath("Info.plist");

@@ -39,9 +39,9 @@ app ("__project.nameasidentifier__", function(task)

 function printResults(configuration)
 {
-    print("----------------------------")
+    print("----------------------------");
    print(configuration+" app built at path: "+FILE.join("Build", configuration, "__project.nameasidentifier__"));
-    print("----------------------------")
+    print("----------------------------");
 }

 task ("default", ["__project.nameasidentifier__"], function()
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!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">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <!--
 index-debug.html
 __project.name__
@@ -11,34 +10,41 @@
 Copyright __project.year__, __organization.name__ All rights reserved.
 -->
    <head>
-        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />

        <title>__project.name__</title>

-        <script type = "text/javascript">
+        <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"></script>
+        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
        
-        <script type = "text/javascript">
+        <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">
+        <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;}
@@ -57,8 +63,8 @@

    <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">
+            <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 __project.name__...</p></div>");
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!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">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <!--
 index.html
 __project.name__
@@ -11,18 +10,18 @@
 Copyright __project.year__, __organization.name__ All rights reserved.
 -->
    <head>
-        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />

        <title>__project.name__</title>

-        <script type = "text/javascript">
+        <script type="text/javascript">
            OBJJ_MAIN_FILE = "main.j";
        </script>
        
-        <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>

-        <style type = "text/css">
+        <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;}
@@ -41,8 +40,8 @@

    <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">
+            <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 __project.name__...</p></div>");
@@ -27,7 +27,7 @@ app ("__project.nameasidentifier__", function(task)
    task.setEmail("__organization.email__");
    task.setSummary("__project.name__");
    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
-    task.setResources(new FileList("Resources/*"));
+    task.setResources(new FileList("Resources/**"));
    task.setIndexFilePath("index.html");
    task.setInfoPlistPath("Info.plist");
    task.setNib2CibFlags("-R Resources/");
@@ -40,9 +40,9 @@ app ("__project.nameasidentifier__", function(task)

 function printResults(configuration)
 {
-    print("----------------------------")
+    print("----------------------------");
    print(configuration+" app built at path: "+FILE.join("Build", configuration, "__project.nameasidentifier__"));
-    print("----------------------------")
+    print("----------------------------");
 }

 task ("default", ["__project.nameasidentifier__"], function()
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!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">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <!--
 index-debug.html
 __project.name__
@@ -11,19 +10,41 @@
 Copyright __project.year__, __organization.name__ All rights reserved.
 -->
    <head>
-        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />

        <title>__project.name__</title>

-        <script type = "text/javascript">
+        <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"></script>
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>

-        <style type = "text/css">
+        <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;}
@@ -42,8 +63,8 @@

    <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">
+            <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 __project.name__...</p></div>");
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!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">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <!--
 index.html
 __project.name__
@@ -11,18 +10,18 @@
 Copyright __project.year__, __organization.name__ All rights reserved.
 -->
    <head>
-        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />

        <title>__project.name__</title>

-        <script type = "text/javascript">
+        <script type="text/javascript">
            OBJJ_MAIN_FILE = "main.j";
        </script>
        
-        <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>

-        <style type = "text/css">
+        <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;}
@@ -41,8 +40,8 @@

    <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">
+            <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 __project.name__...</p></div>");
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!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">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <!--
 index-debug.html
 __project.name__
@@ -11,19 +10,19 @@
 Copyright __project.year__, __organization.name__ All rights reserved.
 -->
    <head>
-        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />

        <title>__project.name__</title>

-        <script type = "text/javascript">
+        <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"></script>
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>

-        <style type = "text/css">
+        <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;}
@@ -42,8 +41,8 @@

    <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">
+            <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 __project.name__...</p></div>");
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!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">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <!--
 index.html
 __project.name__
@@ -11,18 +10,18 @@
 Copyright __project.year__, __organization.name__ All rights reserved.
 -->
    <head>
-        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />

        <title>__project.name__</title>

-        <script type = "text/javascript">
+        <script type="text/javascript">
            OBJJ_MAIN_FILE = "main.j";
        </script>
        
-        <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>

-        <style type = "text/css">
+        <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;}
@@ -41,8 +40,8 @@

    <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">
+            <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 __project.name__...</p></div>");
@@ -22,7 +22,7 @@ function main(args)
        switch (argument)
        {
            case "version":
-            case "--version":   return print("capp version 0.8.0");
+            case "--version":   return print(require("cappuccino").fullVersionString());

            case "-h":
            case "--help":      return printUsage();
@@ -13,7 +13,7 @@ app ("nib2cib", function(nib2cibTask)

    nib2cibTask.setIdentifier("com.280n.nib2cib");
    nib2cibTask.setLicense(BundleTask.License.LGPL_v2_1);
-    nib2cibTask.setVersion("0.8.0");
+    nib2cibTask.setVersion(getCappuccinoVersion());
    nib2cibTask.setAuthor("280 North, Inc.");
    nib2cibTask.setEmail("feedback @nospam@ 280north.com");
    nib2cibTask.setSummary("nib2cib converts Cocoa nib and xibs to Cappuccino cibs");
@@ -23,8 +23,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import <Foundation/CPData.j>
@import <AppKit/CPColor.j>
-@import <AppKit/CPData.j>
+

 var NSUnknownColorSpaceModel    = -1,
    NSGrayColorSpaceModel       = 0,
@@ -45,7 +45,11 @@

 - (id)initWithCoder:(CPCoder)aCoder
 {
-    return [self NS_initWithCoder:aCoder];
+    self = [self NS_initWithCoder:aCoder];
+
+    [self _initWithFrame:[self frame]];
+
+    return self;
 }

 - (Class)classForKeyedArchiver
@@ -37,7 +37,7 @@
        //var dataViewCell = [aCoder decodeObjectForKey:@"NSDataCell"];

        _dataView = [[CPTextField alloc] initWithFrame:CPRectMakeZero()];
-        [_dataView setValue:[CPColor whiteColor] forThemeAttribute:"text-color" inState:CPThemeStateHighlighted];
+        [_dataView setValue:[CPColor whiteColor] forThemeAttribute:@"text-color" inState:CPThemeStateSelected];

        var headerCell = [aCoder decodeObjectForKey:@"NSHeaderCell"],
            headerView = [[_CPTableColumnHeaderView alloc] initWithFrame:CPRectMakeZero()];
@@ -29,7 +29,13 @@
    if (self = [super NS_initWithCoder:aCoder])
    {
        _tableView = [aCoder decodeObjectForKey:"NSTableView"];
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
+
+        // change the default height
+        if (_bounds.size.height === 17)
+        {
+            _bounds.size.height = 23;
+            _frame.size.height = 23;
+        }
    }
    
    return self;
@@ -35,18 +35,21 @@
        
        //_dataSource = [aCoder decodeObjectForKey:CPTableViewDataSourceKey];
        //_delegate = [aCoder decodeObjectForKey:CPTableViewDelegateKey];
-        
-        _headerView = [aCoder decodeObjectForKey:@"NSHeaderView"];        
-        _cornerView = [aCoder decodeObjectForKey:@"NSCornerView"];
-    
-        _tableColumns = [aCoder decodeObjectForKey:@"NSTableColumns"];
-        [_tableColumns makeObjectsPerformSelector:@selector(setTableView:) withObject:self];

        _rowHeight = [aCoder decodeFloatForKey:@"NSRowHeight"];
        
        // Convert xib default to cib default
        if (_rowHeight == 17)
            _rowHeight = 23;
+
+        if ([_gridColor isEqual:[CPColor colorWithRed:127.0 / 255.0 green:127.0 / 255.0 blue:127.0 / 255.0 alpha:1.0]])
+            _gridColor = [CPColor colorWithRed:229.0 / 255.0 green:229.0 / 255.0 blue:229.0 / 255.0 alpha:1.0];
+        
+        _headerView = [aCoder decodeObjectForKey:@"NSHeaderView"];     
+        _cornerView = [aCoder decodeObjectForKey:@"NSCornerView"];
+    
+        _tableColumns = [aCoder decodeObjectForKey:@"NSTableColumns"];
+        [_tableColumns makeObjectsPerformSelector:@selector(setTableView:) withObject:self];
        
        _intercellSpacing = CGSizeMake(0.0, 0.0);//CGSizeMake([aCoder decodeFloatForKey:"NSIntercellSpacingWidth"], [aCoder decodeFloatForKey:"NSIntercellSpacingHeight"]);
        
@@ -54,6 +57,7 @@
        _gridStyleMask = [aCoder decodeIntForKey:@"NSGridStyleMask"];
        
        _usesAlternatingRowBackgroundColors = (flags & 0x00800000) ? YES : NO;
+        _alternatingRowBackgroundColors =[[CPColor whiteColor], [CPColor colorWithHexString:@"e4e7ff"]];
        
        _allowsMultipleSelection = (flags & 0x08000000) ? YES : NO;
        _allowsEmptySelection = (flags & 0x10000000) ? YES : NO;
@@ -37,7 +37,14 @@

 - (id)initWithCoder:(CPCoder)aCoder
 {
-    return [self NS_initWithCoder:aCoder];
+    self =  [super NS_initWithCoder:aCoder];
+    if (self)
+    {
+        _frame.size.height = 23.0;
+        _bounds.size.height = 23.0;
+    }
+
+    return self;
 }

 - (Class)classForKeyedArchiver
@@ -78,6 +78,32 @@ function check_and_exit () {
    fi
 }

+function check_build_environment () {
+    # make sure user is running HotSpot JVM
+    java -version 2>&1 | grep HotSpot &> /dev/null
+    if [ ! "$?" = "0" ]; then
+        java_ver=`java -version 2>&1 | egrep "(Client|Server)"`
+        if [ "$java_ver" = "" ]; then
+            java_ver="your JVM"
+        fi
+        echo "Error: Narwhal is not compatible with $java_ver. Please switch to the Sun (HotSpot) JVM and re-run bootstrap.sh."
+        exit 1
+    fi
+
+    # make sure other dependencies are installed and on the $PATH
+    OTHER_DEPS=(gcc unzip curl)
+
+    for dep in ${OTHER_DEPS[@]}; do
+        which "$dep" &> /dev/null
+        if [ ! "$?" = "0" ]; then
+            echo "Error: $dep is required to build Cappuccino. Please install $dep and re-run bootstrap.sh."
+            exit 1
+        fi
+    done
+}
+
+check_build_environment
+
 if [ -w "/usr/local" ]; then
    default_directory="/usr/local/narwhal"
 else
@@ -2,6 +2,7 @@ var SYSTEM = require("system");
 var FILE = require("file");
 var OS = require("os");
 var UTIL = require("util");
+var stream = require("term").stream;

 var requiresSudo = false;

@@ -288,6 +289,31 @@ global.symlink_executable = function(source)
    FILE.symlink(relative, destination);
 }

+global.getCappuccinoVersion = function() {
+    var versionFile = FILE.path(module.path).dirname().join("version.json");
+    return JSON.parse(versionFile.read({ charset : "UTF-8" })).version;
+}
+
+global.setPackageMetadata = function(packagePath) {
+    var pkg = JSON.parse(FILE.read(packagePath, { charset : "UTF-8" }));
+
+    var p = OS.popen(["git", "rev-parse", "--verify", "HEAD"]);
+    if (p.wait() === 0) {
+        var sha = p.stdout.read().split("\n")[0];
+        if (sha.length === 40)
+            pkg["cappuccino-revision"] = sha;
+    }
+
+    pkg["cappuccino-timestamp"] = new Date().getTime();
+    pkg["version"] = getCappuccinoVersion();
+
+    stream.print("    Version:   \0purple(" + pkg["version"] + "\0)");
+    stream.print("    Revision:  \0purple(" + pkg["cappuccino-revision"] + "\0)");
+    stream.print("    Timestamp: \0purple(" + pkg["cappuccino-timestamp"] + "\0)");
+
+    FILE.write(packagePath, JSON.stringify(pkg, null, 4), { charset : "UTF-8" });
+}
+
 global.subtasks = function(subprojects, taskNames)
 {
    taskNames.forEach(function(aTaskName)
@@ -0,0 +1,3 @@
+{
+    "version": "0.8.1"
+}
Author	SHA1	Message	Date
Francisco Ryan Tolmasky I	b2fdc89e1d	Upped the version number to 0.8.1. Reviewed by me.	2010-04-09 22:21:37 -07:00
Francisco Ryan Tolmasky I	70ea654c60	One additional fix for IE not loading in certain occasions. Reviewed by me.	2010-04-08 23:54:20 -07:00
Francisco Ryan Tolmasky I	1e0c3b73a8	Fix for IE not loading bug. Reviewed by me.	2010-04-07 19:50:35 -07:00
Tom Robinson	e719978079	Re-enable flatten compression by default.	2010-04-01 23:49:23 -07:00
Tom Robinson	fe3e7795b2	Add charset attributes to all external script tags, including flatten. Fixes unicode bugs in flatten.	2010-04-01 23:39:14 -07:00
Tom Robinson	8f1972799d	Add some charset options, and disable compressor by default.	2010-04-01 23:16:25 -07:00
Tom Robinson	5858360b4c	Add comrpessor support to flatten.	2010-04-01 12:01:45 -07:00
Tom Robinson	a9d71ca6dd	Fixes flatten, splitting mode. Also escape dollar signs before replacing.	2010-04-01 11:08:47 -07:00
Tom Robinson	f2be5b49d0	Fixes flatten, non-splitting mode.	2010-04-01 10:57:17 -07:00
Tom Robinson	f90e98baaa	Only enable debug logger in browsers, not command line utilities.	2010-03-31 17:29:09 -07:00
Francisco Ryan Tolmasky I	6d150e6609	Fix for menu bar being broken if displayed after a window is ordered front in IE. Reviewed by me.	2010-03-31 17:08:05 -07:00
Paul BaumgartandTom Robinson	222900aa2a	Add some dependency checking to bootstrap.sh: make sure correct JVM is being used and ensure other dependencies are installed and on the $PATH.	2010-03-31 15:02:17 -07:00
Tom Robinson	0e18551500	Use "CommonJS" task as the dependency for "test" task for now.	2010-03-31 13:52:17 -07:00
Randall Luecke	3ec5c2fc6c	Made drag feedback view in the tableview more correct, fixed encoding issues.	2010-03-31 16:06:35 -04:00
Ross Boucher	2e6061a5f3	Fix for a potential error in IE when setting a width to a negative value.	2010-03-31 11:09:14 -07:00
Francisco Ryan Tolmasky I	f67dfd85ef	Fix for loading Cappuccino apps locally on Windows. Reviewed by me.	2010-03-30 16:30:45 -07:00
Tom Robinson	3712da3bba	Enable default logger in debug frameworks. Add configurable options to index-debug.html.	2010-03-30 14:16:10 -07:00
Ross Boucher	862e8db063	Sprite images recursively.	2010-03-30 12:09:35 -07:00
Ross Boucher	db13748e6c	Revert "Add guard div to protect against iframes consuming events during tracking." This reverts commit `0e4d476d76`.	2010-03-30 10:59:53 -07:00
Ross Boucher	77a648db94	Fix a nil variable error that caused problems in Firefox 2.	2010-03-30 10:58:54 -07:00
Francisco Ryan Tolmasky I	e3cb8c4264	One more fix for image spriting. Reviewed by me.	2010-03-30 00:46:01 -07:00
Francisco Ryan Tolmasky I	83fade3b29	Fail more gracefully when main cib is not found. Reviewed by me.	2010-03-29 23:28:48 -07:00
Randall Luecke	f9a111bfec	Fixed nib2cib bug with cornerview where resources were not loaded from the correct location.	2010-03-30 01:42:24 -04:00
Francisco Ryan Tolmasky I	12433558fa	Fix for a few minor regressions: 1. Split out flatten specific code to get file size back down. 2. Fix for non-native string URL not working with the URLCache (typeof x !=== "string") 3. Fix for slight IE performance regression. Reviewed by me.	2010-03-28 15:04:42 -07:00
Francisco Ryan Tolmasky I	466593e820	Fix for HelloWorld not flattening correctly. Reviewed by me.	2010-03-28 15:04:42 -07:00
Francisco Ryan Tolmasky I	bbfc1feaaf	Fix for user code errors during load not being reported (Cappuccino failing silently). Reviewed by me.	2010-03-28 15:04:42 -07:00
Francisco Ryan Tolmasky I	ee36e8ba5c	Don't generate image files if there aren't any. Reviewed by me.	2010-03-28 15:04:42 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	f51ed977a2	Update the CPDictionary test suite.	2010-03-28 15:04:42 -07:00
Emmanuel MaillardandFrancisco Ryan Tolmasky I	e5a37f69dd	- add containsKey: method	2010-03-28 15:04:42 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	cb1440d550	define out DOM code from _CPImageAndTextView. Closes #562.	2010-03-28 15:04:42 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	ce9fb31b80	CPBox should autoresize its content view.	2010-03-28 15:04:42 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	f568629685	Whitespace fix.	2010-03-28 15:04:42 -07:00
Emmanuel MaillardandFrancisco Ryan Tolmasky I	9975c1f20f	- CGPathAddQuadCurveToPoint fix for an unknown variable when using a transformation matrix	2010-03-28 15:04:42 -07:00
Francisco Ryan Tolmasky I	f4585dc2f0	Fix for unrecognized selector in CPURL's initWithCoder:. Reviewed by me.	2010-03-28 15:04:42 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	baa7946039	Typo. Closes #572 .	2010-03-28 15:04:42 -07:00
Scott KyleandFrancisco Ryan Tolmasky I	9cc2d40a8a	Some somewhat minor style fixes	2010-03-28 15:04:42 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	0f3fd2ddb7	Remove duplicate method declaration.	2010-03-28 15:04:42 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	63845c9015	Missing - on a method.	2010-03-28 15:04:41 -07:00
Francisco Ryan Tolmasky I	62c87d1236	Fixed a bug where CPKeyedUnarchiver would incorrectly unarchive 0 as null. Reviewed by me.	2010-03-28 15:04:41 -07:00
Randall LueckeandFrancisco Ryan Tolmasky I	b1c633c18b	Fixed black background of dragview in Opera and IE.	2010-03-28 15:04:41 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	d7a17811dc	Use === not ==.	2010-03-28 15:04:41 -07:00
Alan RogersandFrancisco Ryan Tolmasky I	d5cea283d4	Updated test and fix for gh issue #539	2010-03-28 15:04:41 -07:00
Alan RogersandFrancisco Ryan Tolmasky I	564399c78b	Little fix for CPDictionary, we should not try and recursively convert null JSON objects.	2010-03-28 15:04:41 -07:00
Alan RogersandFrancisco Ryan Tolmasky I	d5dcedcb4a	Adding a unit test to verify fix to +[CPDictionary dictionaryWithJSObject:(JSObject)object recursively:(BOOL)recursively]	2010-03-28 15:04:41 -07:00
Emmanuel MaillardandFrancisco Ryan Tolmasky I	6c24828c40	- fix typo	2010-03-28 15:04:41 -07:00
Emmanuel MaillardandFrancisco Ryan Tolmasky I	620e7f9306	- fix a typo in documentation	2010-03-28 15:04:41 -07:00
Scott KyleandFrancisco Ryan Tolmasky I	f27fe2011b	deleteBackwards: => deleteBackward:	2010-03-28 15:04:41 -07:00
aburkhalterandFrancisco Ryan Tolmasky I	bdcc112797	Trivial syntax fixes.	2010-03-28 15:04:41 -07:00
Francisco Ryan Tolmasky I	9dfec49b09	Fix for empty data URLs, MHTML, etc. files being created when no image resources exist, causing a useless xhr. Reviewed by me.	2010-03-28 15:04:41 -07:00
Randall LueckeandFrancisco Ryan Tolmasky I	851632c2d5	Fixed default height in tableheader for Nib2Cib.	2010-03-28 15:04:41 -07:00
Tom RobinsonandFrancisco Ryan Tolmasky I	d47cbc4453	Add --split option to flatten. Asynchronously load multiple flattened files.	2010-03-28 15:04:41 -07:00
Tom RobinsonandFrancisco Ryan Tolmasky I	32605ccd12	Fix for flatten in Firefox (silly security restriction makes onreadystatechange not readable)	2010-03-28 15:04:41 -07:00
Francisco Ryan Tolmasky I	9cb7951624	Slight fix for collectionView:canDragItemsAtIndexes:withEvent: not passing the correct event. Reviewed by me.	2010-03-28 15:04:41 -07:00
Francisco Ryan Tolmasky I	a1f0437555	Added collectionView:canDragItemAtIndexes:forEvent:. Reviewed by me.	2010-03-28 15:04:41 -07:00
Francisco Ryan Tolmasky I	85693139a6	Added itemAtIndex: to CPCollectionView and updates API names. Reviewed by me.	2010-03-28 15:04:40 -07:00
Randall LueckeandFrancisco Ryan Tolmasky I	c11bf5aae1	Fixed TableTest for IE.	2010-03-28 15:04:40 -07:00
Tom RobinsonandFrancisco Ryan Tolmasky I	cb6ef75283	Refactor objj_eval to work in the browser. Move from CommonJS-specific code to Objective-J proper.	2010-03-28 15:04:40 -07:00
Tom RobinsonandFrancisco Ryan Tolmasky I	8d02ba7b53	Add default theme to flattened app, "-P" option for specifying other inlined files.	2010-03-28 15:04:40 -07:00
Tom RobinsonandFrancisco Ryan Tolmasky I	47f596935a	Make asyncLoader a configurable option on exports.	2010-03-28 15:04:40 -07:00
Tom RobinsonandFrancisco Ryan Tolmasky I	ca0eda08a4	Fix objj_eval (used in objj REPL, etc).	2010-03-28 15:04:40 -07:00
Randall LueckeandFrancisco Ryan Tolmasky I	22afcd453c	Fixed failed TableCibTest in Firefox.	2010-03-28 15:04:40 -07:00
Randall LueckeandFrancisco Ryan Tolmasky I	55fd42c2ce	Various nib2cib improvements on the tableview.	2010-03-28 15:04:40 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	bed1485aef	Remove two calls to a dead function.	2010-03-28 15:04:40 -07:00
Randall LueckeandFrancisco Ryan Tolmasky I	23840b1230	Fixed Nib2Cib selection color for the tableview.	2010-03-28 15:04:40 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	49e0b2ba9f	Fix for sizeWithFont: in Internet Explorer.	2010-03-28 15:04:40 -07:00
Tom RobinsonandFrancisco Ryan Tolmasky I	02462cdca6	Typo in window.clearNativeInterval.	2010-03-28 15:04:40 -07:00
Randall LueckeandFrancisco Ryan Tolmasky I	7a5f8cacb0	Fixed bug with nib2cib tableviews loading incorrect resources.	2010-03-28 15:04:40 -07:00
Ross BoucherandFrancisco Ryan Tolmasky I	98d9f43a44	A few minor bug fixes for key/main window handling.	2010-03-28 15:04:40 -07:00
Tom RobinsonandFrancisco Ryan Tolmasky I	4f5f4b187d	Update flatten to use new file/function caching system.	2010-03-28 15:04:40 -07:00
Tom RobinsonandFrancisco Ryan Tolmasky I	7db5411f25	Add CFHTTPRequest and FileExecutable hooks for inlining files and module functions (for flatten). Removed hook used by flatten.	2010-03-28 15:04:40 -07:00
Tom Robinson	ece7996895	Cleanup flatten, use resourceAtURL instead of manually walking path.	2010-03-13 01:17:47 -08:00
Tom Robinson	677cf9e1df	Change FileRequest to always use CFHTTPRequest and make async/sync configurable. Preparation for "flatten" changes.	2010-03-12 19:40:27 -08:00
Ross Boucher	a08d4c6a06	Whitespace error.	2010-03-12 18:55:44 -08:00
aburkhalterandRoss Boucher	e1e344dad1	Missing semi-colon.	2010-03-12 18:54:05 -08:00
aburkhalterandRoss Boucher	b9427f84ae	Fixes testShiftIndexesStartingAtIndex. Upward shifting no longer throws.	2010-03-12 18:53:58 -08:00
Andrew BurkhalterandRoss Boucher	dc9d79bc3d	Adding failing test demonstrating that CPIndexSet throws with negative delta (e.g. shifting indexes at starting point upwards). Simple downward shift example included and working successfully. Misc method reorganization with test suite so it's a bit more intuitive.	2010-03-12 18:50:35 -08:00
Ross Boucher	503ce5502e	Fix nib2cib support for CPSearchField	2010-03-12 18:49:37 -08:00
Tom Robinson	0e4d476d76	Add guard div to protect against iframes consuming events during tracking.	2010-03-12 17:25:19 -08:00
Tom Robinson	94bf2a36cf	Updated flatten to work with new loader changes.	2010-03-11 15:56:58 -08:00
Tom Robinson	63127bf9c3	Fix CFBundle path deprecation warning and absoluteString not found.	2010-03-11 14:35:06 -08:00
Ross Boucher	033765e866	temporary fix for whiteSpace style issue in IE.	2010-03-11 14:28:31 -08:00
Ross Boucher	1634e4562a	Update the template files to more modern standards.	2010-03-11 14:28:22 -08:00
Randall Luecke	10b7eb83f1	Fixed previous commit so it doesn't break buttons in the tableview.	2010-03-09 23:52:08 -05:00
Tom Robinson	bd21153300	Typo in CI script.	2010-03-09 16:07:39 -08:00
Tom Robinson	4b1bf1fe65	Factor out nightly build portion of CI script so not all branches push builds	2010-03-09 15:32:13 -08:00
Randall Luecke	cc2bb8f496	Fixed bug where editable tableview would not honor setEditable:NO for columns unless resized. closes #426	2010-03-09 14:39:26 -05:00
cacaodevandRandall Luecke	20853e3ad7	CPTableView & al. : change CPThemeStateHighlighted to CPThemeStateSelected to avoid conflicts with CPControl -highlight: method.	2010-03-09 11:43:37 -05:00
appdenandRandall Luecke	54549b61e1	Added semi-colons to global vars and removed accidental gloabl variable.	2010-03-09 03:20:00 -05:00
Francisco Ryan Tolmasky I	9e7d0d3183	Merge branch 'master' of git@github.com:280north/cappuccino	2010-03-08 18:23:36 -08:00
Francisco Ryan Tolmasky I	3ae4b1cf19	Fix for classes declared in subfolders reporting wrong bundle (fictional). Reviewed by me.	2010-03-08 18:22:53 -08:00
Ross Boucher	2841223c9d	Create the args and namedArgs objects in Bootstrap.js, pass them along up to CPApplication.	2010-03-08 15:14:09 -08:00
Tom Robinson	ba713b8b06	Use getCappuccinoVersion() in various Jakefiles instead of hardcoded versions.	2010-03-08 15:10:08 -08:00
Tom Robinson	c53bff288a	Add a central version.json file. Change package building to insert version, revision, and timestamp. Auto-push tags.	2010-03-08 15:10:08 -08:00
Randall Luecke	6dbb4eedb7	Merge branch 'master' of git://github.com/280north/cappuccino	2010-03-08 10:56:56 -05:00
Francisco Ryan Tolmasky I	33b4b94426	Fix for loading bundles generating multiple did load callbacks. Reviewed by me.	2010-03-08 01:03:52 -08:00
Francisco Ryan Tolmasky I	3fc99095e2	Fix bug in keyed unarchiving. Reviewed by me.	2010-03-07 23:48:23 -08:00
Randall Luecke	8410198c37	Merge branch 'master' of git://github.com/280north/cappuccino	2010-03-08 00:58:28 -05:00
Francisco Ryan Tolmasky I	d1b325052d	Fixed incorrect import. Reviewed by me.	2010-03-07 21:56:29 -08:00
Randall Luecke	4c4b42833a	Added -selectedColumn to the tableview.	2010-03-08 00:00:28 -05:00
Randall Luecke	519a9300e2	Merge branch 'master' of git://github.com/280north/cappuccino	2010-03-07 23:39:41 -05:00
Randall Luecke	7522751fd2	Merge branch 'master' of git://github.com/280north/cappuccino	2010-03-07 20:50:29 -05:00
Randall Luecke	f2165af48f	Merge branch 'master' of git://github.com/280north/cappuccino	2010-03-07 10:30:17 -05:00
Randall Luecke	e3a65a1847	Added preparatory support for group items in CPOutlineView.	2010-03-06 18:46:49 -05:00