Fix "jake release"

Fix regression
Revert "Fixed: token field scrolling away from selected token." This reverts commit 26c26914da. Conflicts: AppKit/CPTokenField.j
2026-09-10 12:47:13 +00:00 · 2012-10-25 15:35:21 +02:00 · 2012-10-24 18:36:08 +02:00 · 2012-10-23 17:24:58 +02:00 · 2012-08-29 15:55:17 +02:00 · 2012-07-31 23:35:16 +02:00
334 changed files with 566 additions and 4989 deletions
@@ -1,8 +0,0 @@
-language: node_js
-node_js:
-    - 0.8
-before_install:
-    - jdk_switcher use openjdk6
-install: ./bootstrap.sh --quiet --noprompt --directory ./narwhal
-script: jake test
-env: PATH=/home/travis/builds/cappuccino/cappuccino/narwhal/bin:$PATH CAPP_BUILD=/home/travis/builds/cappuccino/cappuccino/Build NARWHAL_ENGINE=rhino
@@ -75,33 +75,32 @@ CPCriticalAlertStyle        = 2;
           representing the first button added to the alert which appears on the
           right, 1 representing the next button to the left and so on)
 */
-@implementation CPAlert : CPObject
+@implementation CPAlert : CPView
 {
-    BOOL                _showHelp               @accessors(property=showsHelp);
-    BOOL                _showSuppressionButton  @accessors(property=showsSuppressionButton);
+    BOOL            _showHelp               @accessors(property=showsHelp);
+    BOOL            _showSuppressionButton  @accessors(property=showsSuppressionButton);

-    CPAlertStyle        _alertStyle             @accessors(property=alertStyle);
-    CPString            _title                  @accessors(property=title);
-    CPView              _accessoryView          @accessors(property=accessoryView);
-    CPImage             _icon                   @accessors(property=icon);
+    CPAlertStyle    _alertStyle             @accessors(property=alertStyle);
+    CPString        _title                  @accessors(property=title);
+    CPView          _accessoryView          @accessors(property=accessoryView);
+    CPImage         _icon                   @accessors(property=icon);

-    CPArray             _buttons                @accessors(property=buttons,readonly);
-    CPCheckBox          _suppressionButton      @accessors(property=suppressionButton,readonly);
+    CPArray         _buttons                @accessors(property=buttons,readonly);
+    CPCheckBox      _suppressionButton      @accessors(property=suppressionButton,readonly);

-    id                  _delegate               @accessors(property=delegate);
-    id                  _modalDelegate;
-    SEL                 _didEndSelector;
+    id              _delegate               @accessors(property=delegate);
+    id              _modalDelegate;
+    SEL             _didEndSelector;

-    _CPAlertThemeView   _themeView              @accessors(property=themeView, readonly);
-    CPWindow            _window                 @accessors(property=window,readonly);
-    int                 _defaultWindowStyle;
+    CPWindow        _window                 @accessors(property=window,readonly);
+    int             _defaultWindowStyle;

-    CPImageView         _alertImageView;
-    CPTextField         _informativeLabel;
-    CPTextField         _messageLabel;
-    CPButton            _alertHelpButton;
+    CPImageView     _alertImageView;
+    CPTextField     _informativeLabel;
+    CPTextField     _messageLabel;
+    CPButton        _alertHelpButton;

-    BOOL                _needsLayout;
+    BOOL            _needsLayout;
 }

 #pragma mark Creating Alerts
@@ -165,7 +164,6 @@ CPCriticalAlertStyle        = 2;
        _showHelp           = NO;
        _needsLayout        = YES;
        _defaultWindowStyle = CPTitledWindowMask;
-        _themeView          = [_CPAlertThemeView new];

        _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
        _alertImageView     = [[CPImageView alloc] init];
@@ -182,11 +180,6 @@ CPCriticalAlertStyle        = 2;

 #pragma mark Accessors

- (CPTheme)theme
-{
-    return [_themeView theme];
-}
-
 /*!
    set the theme to use

@@ -204,20 +197,9 @@ CPCriticalAlertStyle        = 2;

    _window = nil; // will be regenerated at next layout
    _needsLayout = YES;
-    [_themeView setTheme:aTheme];
+    [super setTheme:aTheme];
 }

- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName
-{
-    [_themeView setValue:aValue forThemeAttribute:aName];
-}
-
- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(CPThemeState)aState
-{
-    [_themeView setValue:aValue forThemeAttribute:aName inState:aState];
-}
-
-
 /*! @deprecated
 */
 - (void)setWindowStyle:(int)aStyle
@@ -352,16 +334,16 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_layoutMessageView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
        sizeWithFontCorrection = 6.0,
        messageLabelWidth,
        messageLabelTextSize;

-    [_messageLabel setTextColor:[_themeView currentValueForThemeAttribute:@"message-text-color"]];
-    [_messageLabel setFont:[_themeView currentValueForThemeAttribute:@"message-text-font"]];
-    [_messageLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"message-text-shadow-color"]];
-    [_messageLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"message-text-shadow-offset"]];
-    [_messageLabel setAlignment:[_themeView currentValueForThemeAttribute:@"message-text-alignment"]];
+    [_messageLabel setTextColor:[self currentValueForThemeAttribute:@"message-text-color"]];
+    [_messageLabel setFont:[self currentValueForThemeAttribute:@"message-text-font"]];
+    [_messageLabel setTextShadowColor:[self currentValueForThemeAttribute:@"message-text-shadow-color"]];
+    [_messageLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"message-text-shadow-offset"]];
+    [_messageLabel setAlignment:[self currentValueForThemeAttribute:@"message-text-alignment"]];
    [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];

    messageLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
@@ -375,18 +357,18 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_layoutInformativeView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
        sizeWithFontCorrection = 6.0,
        informativeLabelWidth,
        informativeLabelOriginY,
        informativeLabelTextSize;

-    [_informativeLabel setTextColor:[_themeView currentValueForThemeAttribute:@"informative-text-color"]];
-    [_informativeLabel setFont:[_themeView currentValueForThemeAttribute:@"informative-text-font"]];
-    [_informativeLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-color"]];
-    [_informativeLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
-    [_informativeLabel setAlignment:[_themeView currentValueForThemeAttribute:@"informative-text-alignment"]];
+    [_informativeLabel setTextColor:[self currentValueForThemeAttribute:@"informative-text-color"]];
+    [_informativeLabel setFont:[self currentValueForThemeAttribute:@"informative-text-font"]];
+    [_informativeLabel setTextShadowColor:[self currentValueForThemeAttribute:@"informative-text-shadow-color"]];
+    [_informativeLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
+    [_informativeLabel setAlignment:[self currentValueForThemeAttribute:@"informative-text-alignment"]];
    [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];

    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
@@ -404,8 +386,8 @@ CPCriticalAlertStyle        = 2;
    if (!_accessoryView)
        return;

-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
        accessoryViewWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
        accessoryViewOriginY = CGRectGetMaxY([_informativeLabel frame]) + defaultElementsMargin;

@@ -421,16 +403,16 @@ CPCriticalAlertStyle        = 2;
    if (!_showSuppressionButton)
        return;

-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        suppressionViewXOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-x-offset"],
-        suppressionViewYOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-y-offset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        suppressionViewXOffset = [self currentValueForThemeAttribute:@"suppression-button-x-offset"],
+        suppressionViewYOffset = [self currentValueForThemeAttribute:@"suppression-button-y-offset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
        suppressionButtonViewOriginY = CGRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + defaultElementsMargin + suppressionViewYOffset;

-    [_suppressionButton setTextColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-color"]];
-    [_suppressionButton setFont:[_themeView currentValueForThemeAttribute:@"suppression-button-text-font"]];
-    [_suppressionButton setTextShadowColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
-    [_suppressionButton setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
+    [_suppressionButton setTextColor:[self currentValueForThemeAttribute:@"suppression-button-text-color"]];
+    [_suppressionButton setFont:[self currentValueForThemeAttribute:@"suppression-button-text-font"]];
+    [_suppressionButton setTextShadowColor:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
+    [_suppressionButton setTextShadowOffset:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
    [_suppressionButton sizeToFit];

    [_suppressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
@@ -442,12 +424,12 @@ CPCriticalAlertStyle        = 2;
 */
 - (CGSize)_layoutButtonsFromView:(CPView)lastView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        minimumSize = [_themeView currentValueForThemeAttribute:@"size"],
-        buttonOffset = [_themeView currentValueForThemeAttribute:@"button-offset"],
-        helpLeftOffset = [_themeView currentValueForThemeAttribute:@"help-image-left-offset"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        minimumSize = [self currentValueForThemeAttribute:@"size"],
+        buttonOffset = [self currentValueForThemeAttribute:@"button-offset"],
+        helpLeftOffset = [self currentValueForThemeAttribute:@"help-image-left-offset"],
        aRepresentativeButton = [_buttons objectAtIndex:0],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
        panelSize = [[_window contentView] frame].size,
        buttonsOriginY,
        offsetX;
@@ -479,8 +461,8 @@ CPCriticalAlertStyle        = 2;

    if (_showHelp)
    {
-        var helpImage = [_themeView currentValueForThemeAttribute:@"help-image"],
-            helpImagePressed = [_themeView currentValueForThemeAttribute:@"help-image-pressed"],
+        var helpImage = [self currentValueForThemeAttribute:@"help-image"],
+            helpImagePressed = [self currentValueForThemeAttribute:@"help-image-pressed"],
            helpImageSize = helpImage ? [helpImage size] : CGSizeMakeZero(),
            helpFrame = CGRectMake(helpLeftOffset, buttonsOriginY, helpImageSize.width, helpImageSize.height);

@@ -505,7 +487,7 @@ CPCriticalAlertStyle        = 2;
    if (!_window)
        [self _createWindowWithStyle:nil];

-    var iconOffset = [_themeView currentValueForThemeAttribute:@"image-offset"],
+    var iconOffset = [self currentValueForThemeAttribute:@"image-offset"],
        theImage = _icon,
        finalSize;

@@ -513,13 +495,13 @@ CPCriticalAlertStyle        = 2;
        switch (_alertStyle)
        {
            case CPWarningAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"warning-image"];
+                theImage = [self currentValueForThemeAttribute:@"warning-image"];
                break;
            case CPInformationalAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"information-image"];
+                theImage = [self currentValueForThemeAttribute:@"information-image"];
                break;
            case CPCriticalAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"error-image"];
+                theImage = [self currentValueForThemeAttribute:@"error-image"];
                break;
        }

@@ -610,10 +592,9 @@ CPCriticalAlertStyle        = 2;
 - (void)_createWindowWithStyle:(int)forceStyle
 {
    var frame = CGRectMakeZero();
-    frame.size = [_themeView currentValueForThemeAttribute:@"size"];
+    frame.size = [self currentValueForThemeAttribute:@"size"];

    _window = [[CPWindow alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
-    [_window setLevel:CPStatusWindowLevel];

    if (_title)
        [_window setTitle:_title];
@@ -651,8 +632,8 @@ CPCriticalAlertStyle        = 2;
 {
    if ([_window isSheet])
    {
-        [_window orderOut:nil];
        [CPApp endSheet:_window returnCode:[aSender tag]];
+        [_window orderOut:nil];
    }
    else
    {
@@ -668,19 +649,17 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
 {
+    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
+            [_delegate alertDidEnd:self returnCode:returnCode];
+
    if (_didEndSelector)
        objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);

    _modalDelegate = nil;
    _didEndSelector = nil;
-
-    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
-        [_delegate alertDidEnd:self returnCode:returnCode];
 }

-@end
-
-@implementation _CPAlertThemeView : CPView
+#pragma mark Theme Attributes

 + (CPString)defaultThemeClass
 {
@@ -20,8 +20,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#import "../Foundation/CPRange.h"
-
@import <Foundation/CPBundle.j>

@import "CPCompatibility.j"
@@ -141,7 +139,9 @@ CPRunContinuesResponse  = -1002;
    {
        _eventListeners = [];

-        _windows = [[CPNull null]];
+        _windows = [];
+
+        [_windows addObject:nil];
    }

    return self;
@@ -250,13 +250,8 @@ CPRunContinuesResponse  = -1002;
        _documentController = [CPDocumentController sharedDocumentController];

    var needsUntitled = !!_documentController,
-        URLStrings = nil;
-
-#if PLATFORM(DOM)
-    URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings();
-#endif
-
-    var index = 0,
+        URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings(),
+        index = 0,
        count = [URLStrings count];

    for (; index < count; ++index)
@@ -583,14 +578,12 @@ CPRunContinuesResponse  = -1002;
    _currentEvent = anEvent;
    CPEventModifierFlags = [anEvent modifierFlags];

-    var theWindow = [anEvent window];
-
 #if PLATFORM(DOM)
-    var willPropagate = [[theWindow platformWindow] _willPropagateCurrentDOMEvent];
+    var willPropagate = [[[anEvent window] platformWindow] _willPropagateCurrentDOMEvent];

    // temporarily pretend we won't propagate the event. we'll restore the saved value later
    // we do this outside the if so that changes user code might make in _handleKeyEquiv. are preserved
-    [[theWindow platformWindow] _propagateCurrentDOMEvent:NO];
+    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO];
 #endif

    // Check if this is a candidate for key equivalent...
@@ -602,7 +595,7 @@ CPRunContinuesResponse  = -1002;

        // Unconditionally propagate on these keys to solve browser copy paste bugs
        if ((characters == "c" || characters == "x" || characters == "v") && (modifierFlags & CPPlatformActionKeyMask))
-            [[theWindow platformWindow] _propagateCurrentDOMEvent:YES];
+            [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:YES];
 #endif

        return;
@@ -610,7 +603,7 @@ CPRunContinuesResponse  = -1002;

 #if PLATFORM(DOM)
    // if we make it this far, then restore the original willPropagate value
-    [[theWindow platformWindow] _propagateCurrentDOMEvent:willPropagate];
+    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:willPropagate];
 #endif

    if (_eventListeners.length)
@@ -621,10 +614,7 @@ CPRunContinuesResponse  = -1002;
        return;
    }

-    if (theWindow)
-        [theWindow sendEvent:anEvent];
-    else if ([anEvent type] == CPMouseMoved)
-        [[CPCursor arrowCursor] set];
+    [[anEvent window] sendEvent:anEvent];
 }

 /*!
@@ -660,10 +650,6 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPWindow)windowWithWindowNumber:(int)aWindowNumber
 {
-    // Never allow _windows[0] to be returned - it's an internal CPNull placeholder.
-    if (!aWindowNumber)
-        return nil;
-
    return _windows[aWindowNumber];
 }

@@ -672,8 +658,7 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPArray)windows
 {
-    // Return all windows, but not the CPNull placeholder in _windows[0].
-    return [_windows subarrayWithRange:_CPMakeRange(1, [_windows count] - 1)];
+    return _windows;
 }

 /*!
@@ -1024,8 +1009,7 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPArray)arguments
 {
-    // FIXME This should probably not access the window object #if !PLATFORM(DOM), but the unit tests rely on it.
-    if (window && window.location && _fullArgsString !== window.location.hash)
+    if (_fullArgsString !== window.location.hash)
        [self _reloadArguments];

    return _args;
@@ -1052,9 +1036,8 @@ CPRunContinuesResponse  = -1002;
    if (!args || args.length == 0)
    {
        _args = [];
-        // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
-        if (window && window.location)
-            window.location.hash = @"#";
+        window.location.hash = @"#";
+
        return;
    }

@@ -1069,15 +1052,12 @@ CPRunContinuesResponse  = -1002;

    var hash = [toEncode componentsJoinedByString:@"/"];

-    // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
-    if (window && window.location)
-        window.location.hash = @"#" + hash;
+    window.location.hash = @"#" + hash;
 }

 - (void)_reloadArguments
 {
-    // FIXME This should probably not access the window object #if !PLATFORM(DOM), but the unit tests rely on it.
-    _fullArgsString = (window && window.location) ? window.location.hash : "";
+    _fullArgsString = window.location.hash;

    if (_fullArgsString.length)
    {
@@ -1238,17 +1218,7 @@ function CPApplicationMain(args, namedArgs)
 #if PLATFORM(DOM)
    // hook to allow recorder, etc to manipulate things before starting AppKit
    if (window.parent !== window && typeof window.parent._childAppIsStarting === "function")
-    {
-        try
-        {
-            window.parent._childAppIsStarting(window);
-        }
-        catch(err)
-        {
-            // This could happen if we're in an iframe without access to the parent frame.
-            CPLog.warn("Failed to call parent frame's _childAppIsStarting().");
-        }
-    }
+        window.parent._childAppIsStarting(window);
 #endif

    var mainBundle = [CPBundle mainBundle],
@@ -332,16 +332,6 @@ CPBelowBottom = 6;
    [_titleView setFont:aFont];
 }

-/*!
-    Return the text field used to display the receiver's title.
-
-    This is the Cappuccino equivalent to the `titleCell` method.
-*/
- (CPTextField)titleView
-{
-    return _titleView;
-}
-
 - (void)_manageTitlePositioning
 {
    if (_titlePosition == CPNoTitle)
@@ -83,8 +83,7 @@ CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;
 var USER_AGENT                          = "",
    PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
    PLATFORM_FEATURES                   = 0,
-    PLATFORM_BUGS                       = 0,
-    PLATFORM_STYLE_JS_PROPERTIES        = {};
+    PLATFORM_BUGS                       = 0;

 // default these features to true

@@ -274,87 +273,3 @@ else
    CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
    CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
 }
-
-/*!
-    Return the properly prefixed JS property for the given name. E.g. in a webkit browser,
-    CPBrowserStyleProperty('transition') -> WebkitTransition
-
-    While technically not a style property, style related event handler names are also supported.
-    CPBrowserStyleProperty('transitionend') -> 'webkitTransitionEnd'
-
-    CSS is only available in platform(dom), so don't rely too heavily on it.
-*/
-function CPBrowserStyleProperty(aProperty)
-{
-    var lowerProperty = aProperty.toLowerCase();
-
-    if (PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] === undefined)
-    {
-        var r = nil;
-
-#if PLATFORM(DOM)
-        var testElement = document.createElement('div');
-
-        switch (lowerProperty)
-        {
-            case 'transitionend':
-                var candidates = {
-                        'WebkitTransition' : 'webkitTransitionEnd',
-                        'MozTransition'    : 'transitionend',
-                        'OTransition'      : 'oTransitionEnd',
-                        'msTransition'     : 'MSTransitionEnd',
-                        'transition'       : 'transitionend'
-                    };
-
-                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transition']] || nil;
-                break;
-            default:
-                var prefixes = ["Webkit", "Moz", "O", "ms"],
-                    capProperty = [aProperty capitalizedString];
-
-                for (var i = 0; i < prefixes.length; i++)
-                {
-                    if (prefixes[i] + capProperty in testElement.style)
-                    {
-                        r = prefixes[i] + capProperty;
-                        break;
-                    }
-                }
-
-                if (!r && lowerProperty in testElement.style)
-                    r = lowerProperty;
-
-                break;
-        }
-#endif
-
-        PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] = r;
-    }
-
-    return PLATFORM_STYLE_JS_PROPERTIES[lowerProperty];
-}
-
-function CPBrowserCSSProperty(aProperty)
-{
-    var browserProperty = CPBrowserStyleProperty(aProperty);
-
-    if (!browserProperty)
-        return nil;
-
-    var prefixes = {
-            'Webkit': '-webkit-',
-            'Moz': '-moz-',
-            'O': '-o-',
-            'ms': '-ms-'
-        };
-
-    for (var prefix in prefixes)
-    {
-        if (browserProperty.substring(0, prefix.length) == prefix)
-        {
-            return prefixes[prefix] + browserProperty.substring(prefix.length).toLowerCase();
-        }
-    }
-
-    return browserProperty.toLowerCase();
-}
@@ -25,8 +25,7 @@ Cursor support by browser:

 var currentCursor = nil,
    cursorStack = [],
-    cursors = {},
-    ieCursorMap = {};
+    cursors = {};

@implementation CPCursor : CPObject
 {
@@ -37,20 +36,6 @@ var currentCursor = nil,
    BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
 }

-+ (void)initialize
-{
-    if (self !== CPCursor)
-        return;
-
-    // IE < 9 does not support some CSS cursors, we map them to supported ones
-    ieCursorMap = {
-        "ew-resize":   "e-resize",
-        "ns-resize":   "n-resize",
-        "nesw-resize": "ne-resize",
-        "nwse-resize": "nw-resize"
-    };
-}
-
 - (id)initWithCSSString:(CPString)aString
 {
    if (self = [super init])
@@ -59,30 +44,23 @@ var currentCursor = nil,
    return self;
 }

-/*!
-    Init a cursor with the given image and hotspot.
-    hotspot is supported in CSS3 (but not IE).
-*/
- (id)initWithImage:(CPImage)image hotSpot:(CGPoint)hotSpot
+// hotspot is supported in CSS3 (but not IE).
+- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
 {
    _hotSpot = hotSpot;
    _image = image;
    return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
 }

-/*!
-    Init a cursor with the given image and hotspot. This is provided
-    for compliance with Cocoa. Note that foregroundColor and backgroundColor are ignored
-    (as they are in Cocoa). See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
-*/
- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CGPoint)aHotSpot
+// foregroundColor and backgroundColor are ignored in Cocoa as well.  See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
+- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CPPoint)aHotSpot
 {
    return [self initWithImage:image hotSpot:hotSpot];
 }

 + (void)hide
 {
-    [self _setCursorCSS:@"none"]; // Not supported in IE < 9
+    [self _setCursorCSS:"none"]; // Not supported in IE
 }

 + (void)unhide
@@ -143,7 +121,6 @@ var currentCursor = nil,
 {
 #if PLATFORM(DOM)
    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
-
    for (var i = 0, count = [platformWindows count]; i < count; i++)
        platformWindows[i]._DOMBodyElement.style.cursor = aString;
 #endif
@@ -153,34 +130,22 @@ var currentCursor = nil,
 + (CPCursor)_systemCursorWithName:(CPString)cursorName cssString:(CPString)aString hasImage:(BOOL)doesHaveImage
 {
    var cursor = cursors[cursorName];
-
-    if (typeof cursor === "undefined")
+    if (typeof cursor === 'undefined')
    {
        var cssString;
-
        if (doesHaveImage)
-            cssString = [CPString stringWithFormat:@"url(%@/CPCursor/%@.cur), %@", [[CPBundle bundleForClass:self] resourcePath], cursorName, aString];
+            cssString = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/" + cursorName + ".cur), " + aString;
        else
-        {
-            // IE <= 8 does not support some cursors, map them to supported cursors
-            var ieLessThan9 = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) && !CPFeatureIsCompatible(CPHTMLCanvasFeature);
-
-            if (ieLessThan9)
-                cssString = ieCursorMap[aString] || aString;
-            else
-                cssString = aString;
-        }
-
+            cssString = aString
        cursor = [[CPCursor alloc] initWithCSSString:cssString];
        cursors[cursorName] = cursor;
    }
-
    return cursor;
 }

 + (CPCursor)arrowCursor
 {
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"default" hasImage:NO];
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:"default" hasImage:NO];
 }

 + (CPCursor)crosshairCursor
@@ -198,36 +163,6 @@ var currentCursor = nil,
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"pointer" hasImage:NO];
 }

-+ (CPCursor)resizeNorthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNorthwestSoutheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nwse-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNortheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ne-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNortheastSouthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nesw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeSouthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"sw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeSoutheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"se-resize" hasImage:NO];
-}
-
 + (CPCursor)resizeDownCursor
 {
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"s-resize" hasImage:NO];
@@ -253,21 +188,11 @@ var currentCursor = nil,
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"col-resize" hasImage:NO];
 }

-+ (CPCursor)resizeEastWestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ew-resize" hasImage:NO];
-}
-
 + (CPCursor)resizeUpDownCursor
 {
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"row-resize" hasImage:NO];
 }

-+ (CPCursor)resizeNorthSouthCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ns-resize" hasImage:NO];
-}
-
 + (CPCursor)operationNotAllowedCursor
 {
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"not-allowed" hasImage:NO];
@@ -99,9 +99,6 @@ var CPSharedFontManager     = nil,
 {
    if (!_availableFonts)
    {
-        _availableFonts = [];
-
-#if PLATFORM(DOM)
        _CPFontDetectSpan = document.createElement("span");
        _CPFontDetectSpan.fontSize = "24px";
        _CPFontDetectSpan.appendChild(document.createTextNode("mmmmmmmmmml"));
@@ -113,16 +110,13 @@ var CPSharedFontManager     = nil,

        _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);

+        _availableFonts = [];
        for (var i = 0; i < _CPFontDetectAllFonts.length; i++)
        {
            var available = _CPFontDetectFontAvailable(_CPFontDetectAllFonts[i]);
            if (available)
                _availableFonts.push(_CPFontDetectAllFonts[i]);
        }
-#else
-        // If there's no font detection, just assume all fonts are available.
-        _availableFonts = _CPFontDetectAllFonts;
-#endif
    }
    return _availableFonts;
 }
@@ -131,7 +131,7 @@ var CPBindingOperationAnd = 0,
        if (options)
            [_info setObject:options forKey:CPOptionsKey];

-        [self _updatePlaceholdersWithOptions:options forBinding:aName];
+        [self _updatePlaceholdersWithOptions:options];

        [aDestination addObserver:self forKeyPath:aKeyPath options:CPKeyValueObservingOptionNew context:aBinding];

@@ -321,11 +321,6 @@ var CPBindingOperationAnd = 0,
    }
 }

- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    [self _updatePlaceholdersWithOptions:options];
-}
-
 - (void)_placeholderForMarker:aMarker
 {
    var placeholder = _placeholderForMarker[aMarker];
@@ -569,8 +564,6 @@ CPFontNameBinding                         = @"fontName";
 CPFontBoldBinding                         = @"fontBold";
 CPHiddenBinding                           = @"hidden";
 CPFilterPredicateBinding                  = @"filterPredicate";
-CPMaxValueBinding                         = @"maxValue";
-CPMinValueBinding                         = @"minValue";
 CPPredicateBinding                        = @"predicate";
 CPSelectedIndexBinding                    = @"selectedIndex";
 CPSelectedLabelBinding                    = @"selectedLabel";
@@ -114,9 +114,4 @@ CPDocModalWindowMask    = 1 << 6;
    return NO;
 }

- (BOOL)canBecomeKeyWindow
-{
-  return YES;
-}
-
@end
@@ -234,7 +234,7 @@ Set the behavior of the CPPopover. It can be:
    [_attachedWindow setContentView:[_contentViewController view]];
    [_attachedWindow positionRelativeToRect:positioningRect ofView:positioningView preferredEdge:preferredEdge];

-    if (!_animates && _implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
        [_delegate popoverDidShow:self];
 }

@@ -311,13 +311,6 @@ Set the behavior of the CPPopover. It can be:
        [_delegate popoverDidClose:self];
 }

-/*! @ignore */
- (void)attachedWindowDidShow:(_CPAttachedWindow)anAttachedWindow
-{
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
-        [_delegate popoverDidShow:self];
-}
-

 #pragma mark -
 #pragma mark Notifications
@@ -213,7 +213,7 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,

    @param aStyle the scroller style to set all scroller views to use (CPScrollerStyleLegacy or CPScrollerStyleOverlay)
 */
-+ (void)setGlobalScrollerStyle:(int)aStyle
+ (int)setGlobalScrollerStyle:(int)aStyle
 {
    CPScrollerStyleGlobal = aStyle;
    [[CPNotificationCenter defaultCenter] postNotificationName:CPScrollerStyleGlobalChangeNotification object:nil];
@@ -76,22 +76,6 @@
    return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
 }

-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding == CPValueBinding || theBinding == CPMinValueBinding || theBinding == CPMaxValueBinding)
-        return [_CPStepperValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
- (id)_replacementKeyPathForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return @"doubleValue";
-
-    return [super _replacementKeyPathForBinding:aBinding];
-}
-
 /*!
    Initializes a CPStepper.
    @param aFrame the frame of the control
@@ -227,7 +211,8 @@
    else
        [self setDoubleValue:([self doubleValue] - _increment)];

-    [self sendAction:[self action] to:[self target]];
+    if (_target && _action && [_target respondsToSelector:_action])
+        [self sendAction:_action to:_target];
 }

 /*!
@@ -265,24 +250,6 @@

@end

-@implementation _CPStepperValueBinder : CPBinder
-{
-}
-
- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    var placeholder = (aBinding == CPMaxValueBinding) ? [_source maxValue] : [_source minValue];
-
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:placeholder forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNullMarker isDefault:YES];
-}
-
-@end
-
 var CPStepperMinValue   = @"CPStepperMinValue",
    CPStepperMaxValue   = @"CPStepperMaxValue",
    CPStepperValueWraps = @"CPStepperValueWraps",
@@ -88,6 +88,9 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    _box = [[CPBox alloc] initWithFrame:[self  bounds]];
    [self setBackgroundColor:[CPColor colorWithCalibratedWhite:0.95 alpha:1.0]];

+    [_box setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+    [_tabs setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin];
+
    [self addSubview:_box];
    [self addSubview:_tabs];
 }
@@ -340,9 +343,21 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    _type = aTabViewType;

    if (_type !== CPTopTabsBezelBorder && _type !== CPBottomTabsBezelBorder)
+    {
+        [_box setFrame:[self bounds]];
        [_tabs removeFromSuperview];
+    }
    else
+    {
+        var aFrame = [self frame],
+            segmentedHeight = _CGRectGetHeight([_tabs frame]),
+            origin = _type === CPTopTabsBezelBorder ? segmentedHeight / 2 : 0;
+
+        [_box setFrame:_CGRectMake(0, origin, _CGRectGetWidth(aFrame),
+                                   _CGRectGetHeight(aFrame) - segmentedHeight / 2)];
+
        [self addSubview:_tabs];
+    }

    switch (_type)
    {
@@ -358,29 +373,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
            [_box setBorderType:CPNoBorder];
            break;
    }
-
-    [self setNeedsLayout];
-}
-
- (void)layoutSubviews
-{
-    // Even if CPTabView's autoresizesSubviews is NO, _tabs and _box has to be laid out.
-    // This means we can't rely on autoresize masks.
-    if (_type !== CPTopTabsBezelBorder && _type !== CPBottomTabsBezelBorder)
-    {
-        [_box setFrame:[self bounds]];
-    }
-    else
-    {
-        var aFrame = [self frame],
-            segmentedHeight = _CGRectGetHeight([_tabs frame]),
-            origin = _type === CPTopTabsBezelBorder ? segmentedHeight / 2 : 0;
-
-        [_box setFrame:_CGRectMake(0, origin, _CGRectGetWidth(aFrame),
-                                   _CGRectGetHeight(aFrame) - segmentedHeight / 2)];
-
-        [self _repositionTabs];
-    }
 }

 /*!
@@ -505,6 +497,7 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
        [_items makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];

        [self _updateItems];
+        [self _repositionTabs];

        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];

@@ -513,8 +506,6 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
            [self selectTabViewItem:selected];

        [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
-
-        [self setNeedsLayout];
    }

    return self;
@@ -138,7 +138,7 @@ CPPressedTab    = 2;
    _view = aView;

    if ([_tabView selectedTabViewItem] == self)
-        [_tabView _setContentViewFromItem:self];
+        [_tabView _setContentViewForItem:self];
 }

 /*!
@@ -308,11 +308,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    if (shouldBeEditable)
        _isSelectable = YES;

-    if (_isEditable)
-        [self setThemeState:CPThemeStateEditable];
-    else
-        [self unsetThemeState:CPThemeStateEditable];
-
    // We only allow first responder status if the field is editable and enabled.
    if (!shouldBeEditable && [[self window] firstResponder] === self)
        [[self window] makeFirstResponder:nil];
@@ -495,13 +490,13 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 - (BOOL)becomeFirstResponder
 {
 #if PLATFORM(DOM)
-    // FIXME Why do we care about who's the first responder in a different window?
    if (CPTextFieldInputOwner && [CPTextFieldInputOwner window] !== [self window])
        [[CPTextFieldInputOwner window] makeFirstResponder:nil];
 #endif

    // As long as we are the first responder we need to monitor the key status of our window.
-    [self _setObserveWindowKeyNotifications:YES];
+    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidResignKey:) name:CPWindowDidResignKeyNotification object:[self window]];
+    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidBecomeKey:) name:CPWindowDidBecomeKeyNotification object:[self window]];

    _isEditing = NO;

@@ -618,6 +613,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 /* @ignore */
 - (BOOL)resignFirstResponder
 {
+    // When we are no longer the first responder we don't worry about the key status of our window anymore.
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidResignKeyNotification object:[self window]];
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidBecomeKeyNotification object:[self window]];
+
 #if PLATFORM(DOM)

    var element = [self _inputElement],
@@ -639,9 +638,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

 #endif

-    // When we are no longer the first responder we don't worry about the key status of our window anymore.
-    [self _setObserveWindowKeyNotifications:NO];
-
    [self _resignFirstKeyResponder];

    _isEditing = NO;
@@ -665,6 +661,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    _willBecomeFirstResponderByClick = NO;

    [self _updatePlaceholderState];
+
    [self setNeedsLayout];

 #if PLATFORM(DOM)
@@ -699,20 +696,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 #endif
 }

- (void)_setObserveWindowKeyNotifications:(BOOL)shouldObserve
-{
-    if (shouldObserve)
-    {
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidResignKey:) name:CPWindowDidResignKeyNotification object:[self window]];
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidBecomeKey:) name:CPWindowDidBecomeKeyNotification object:[self window]];
-    }
-    else
-    {
-        [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidResignKeyNotification object:[self window]];
-        [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidBecomeKeyNotification object:[self window]];
-    }
-}
-
 - (void)_windowDidResignKey:(CPNotification)aNotification
 {
    if (![[self window] isKeyWindow])
@@ -138,23 +138,18 @@ var CPScrollDestinationNone             = 0,
    return _autocompleteMenu;
 }

- (void)_complete:(_CPAutocompleteMenu)anAutocompleteMenu
-{
-    [self _autocompleteWithEvent:nil];
-}
-
 - (void)_autocompleteWithEvent:(CPEvent)anEvent
 {
-    if (![self _editorValue] && (![_autocompleteMenu contentArray] || ![self hasThemeState:CPThemeStateAutocompleting]))
+    if (![self _inputElement].value && (![_autocompleteMenu contentArray] || ![self hasThemeState:CPThemeStateAutocompleting]))
        return;

    [self _hideCompletions];

    var token = [_autocompleteMenu selectedItem],
-        shouldRemoveLastObject = token !== @"" && [self _editorValue] !== @"";
+        shouldRemoveLastObject = token !== @"" && [self _inputElement].value !== @"";

    if (!token)
-        token = [self _editorValue];
+        token = [self _inputElement].value;

    // Make sure the user typed an actual token to prevent the previous token from being emptied
    // If the input area is empty, we want to fall back to the normal behavior, resigning first
@@ -312,22 +307,9 @@ var CPScrollDestinationNone             = 0,

 - (BOOL)becomeFirstResponder
 {
-#if PLATFORM(DOM)
    if (CPTokenFieldInputOwner && [CPTokenFieldInputOwner window] !== [self window])
        [[CPTokenFieldInputOwner window] makeFirstResponder:nil];
-#endif

-    // As long as we are the first responder we need to monitor the key status of our window.
-    [self _setObserveWindowKeyNotifications:YES];
-
-    if ([[self window] isKeyWindow])
-        [self _becomeFirstKeyResponder];
-
-    return YES;
-}
-
- (void)_becomeFirstKeyResponder
-{
    [self setThemeState:CPThemeStateEditing];

    [self _updatePlaceholderState];
@@ -386,6 +368,8 @@ var CPScrollDestinationNone             = 0,
    }

 #endif
+
+    return YES;
 }

 - (BOOL)resignFirstResponder
@@ -393,31 +377,9 @@ var CPScrollDestinationNone             = 0,
    if (_preventResign)
        return NO;

-    [self _autocomplete];
-
-    // From CPTextField superclass.
-    [self _setObserveWindowKeyNotifications:NO];
-
-    [self _resignFirstKeyResponder];
-
-    if (_shouldNotifyTarget)
-    {
-        _shouldNotifyTarget = NO;
-        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
-
-        if ([self sendsActionOnEndEditing])
-            [self sendAction:[self action] to:[self target]];
-    }
-
-    return YES;
-}
-
- (void)_resignFirstKeyResponder
-{
    [self unsetThemeState:CPThemeStateEditing];

-    [self _updatePlaceholderState];
-    [self setNeedsLayout];
+    [self _autocomplete];

 #if PLATFORM(DOM)

@@ -447,6 +409,21 @@ var CPScrollDestinationNone             = 0,
    }

 #endif
+
+    [self _updatePlaceholderState];
+
+    [self setNeedsLayout];
+
+    if (_shouldNotifyTarget)
+    {
+        _shouldNotifyTarget = NO;
+        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
+
+        if ([self sendsActionOnEndEditing])
+            [self sendAction:[self action] to:[self target]];
+    }
+
+    return YES;
 }

 - (void)mouseDown:(CPEvent)anEvent
@@ -515,9 +492,9 @@ var CPScrollDestinationNone             = 0,

 #if PLATFORM(DOM)

-    if ([self _editorValue])
+    if ([self _inputElement].value != @"")
    {
-        var token = [self _representedObjectForEditingString:[self _editorValue]];
+        var token = [self _representedObjectForEditingString:[self _inputElement].value];
        [objectValue insertObject:token atIndex:_selectedRange.location];
    }

@@ -570,7 +547,6 @@ var CPScrollDestinationNone             = 0,
                [newToken setTokenField:self];
                [newToken setRepresentedObject:tokenObject];
                [newToken setStringValue:tokenValue];
-                [newToken setEditable:[self isEditable]];
                [contentView addSubview:newToken];
            }

@@ -616,13 +592,6 @@ var CPScrollDestinationNone             = 0,
    }
 }

- (void)setEditable:(BOOL)shouldBeEditable
-{
-    [super setEditable:shouldBeEditable];
-
-    [[self _tokens] makeObjectsPerformSelector:@selector(setEditable:) withObject:shouldBeEditable];
-}
-
 - (void)sendAction:(SEL)anAction to:(id)anObject
 {
    _shouldNotifyTarget = NO;
@@ -660,13 +629,10 @@ var CPScrollDestinationNone             = 0,
            if (CPTokenFieldInputOwner && CPTokenFieldInputOwner._preventResign)
                return false;

-            if (!CPTokenFieldInputResigning && [[CPTokenFieldInputOwner window] isKeyWindow])
+            if (!CPTokenFieldInputResigning && !CPTokenFieldFocusInput)
            {
-                // If we lost focus somehow but we're not resigning and we're still in the key window, we'll need to take it back.
-                window.setTimeout(function()
-                {
-                    CPTokenFieldDOMInputElement.focus();
-                }, 0.0);
+                [[CPTokenFieldInputOwner window] makeFirstResponder:nil];
+                return;
            }

            CPTokenFieldHandleBlur(anEvent, CPTokenFieldDOMInputElement);
@@ -702,17 +668,6 @@ var CPScrollDestinationNone             = 0,
 }
 #endif

- (CPString)_editorValue
-{
-    if (![self hasThemeState:CPThemeStateEditing])
-        return @"";
-#if PLATFORM(DOM)
-    return [self _inputElement].value;
-#else
-    return @"";
-#endif
-}
-
 - (void)moveUp:(id)sender
 {
    [[self _autocompleteMenu] selectPrevious];
@@ -792,7 +747,7 @@ var CPScrollDestinationNone             = 0,
 - (void)moveLeft:(id)sender
 {
    // Left arrow
-    if ((_selectedRange.location > 0 || _selectedRange.length) && [self _editorValue] == "")
+    if ((_selectedRange.location > 0 || _selectedRange.length) && CPTokenFieldDOMInputElement.value == "")
    {
        if (_selectedRange.length)
            // Simply collapse the range.
@@ -811,7 +766,7 @@ var CPScrollDestinationNone             = 0,

 - (void)moveLeftAndModifySelection:(id)sender
 {
-    if (_selectedRange.location > 0 && [self _editorValue] == "")
+    if (_selectedRange.location > 0 && CPTokenFieldDOMInputElement.value == "")
    {
        _selectedRange.location--;
        // When shift is depressed, select the next token backwards.
@@ -829,7 +784,7 @@ var CPScrollDestinationNone             = 0,
 - (void)moveRight:(id)sender
 {
    // Right arrow
-    if ((_selectedRange.location < [[self _tokens] count] || _selectedRange.length) && [self _editorValue] == "")
+    if ((_selectedRange.location < [[self _tokens] count] || _selectedRange.length) && CPTokenFieldDOMInputElement.value == "")
    {
        if (_selectedRange.length)
        {
@@ -855,7 +810,7 @@ var CPScrollDestinationNone             = 0,

 - (void)moveRightAndModifySelection:(id)sender
 {
-    if (_CPMaxRange(_selectedRange) < [[self _tokens] count] && [self _editorValue] == "")
+    if (_CPMaxRange(_selectedRange) < [[self _tokens] count] && CPTokenFieldDOMInputElement.value == "")
    {
        // Leave the selection location in place but include the next token to the right.
        _selectedRange.length++;
@@ -873,7 +828,7 @@ var CPScrollDestinationNone             = 0,
 {
    // TODO Even if the editor isn't empty you should be able to delete the previous token by placing the cursor
    // at the beginning of the editor.
-    if ([self _editorValue] == @"")
+    if (CPTokenFieldDOMInputElement.value == @"")
    {
        [self _hideCompletions];

@@ -899,7 +854,7 @@ var CPScrollDestinationNone             = 0,
 {
    // TODO Even if the editor isn't empty you should be able to delete the next token by placing the cursor
    // at the end of the editor.
-    if ([self _editorValue] == @"")
+    if (CPTokenFieldDOMInputElement.value == @"")
    {
        // Delete forward if nothing is selected, else delete all selected.
        [self _hideCompletions];
@@ -1015,7 +970,8 @@ var CPScrollDestinationNone             = 0,

    var frame = [self frame],
        contentView = [_tokenScrollView documentView],
-        tokens = [self _tokens];
+        tokens = [self _tokens],
+        shouldShowAutoComplete = [self hasThemeState:CPThemeStateAutocompleting];

    // Hack to make sure we are handling an array
    if (![tokens isKindOfClass:[CPArray class]])
@@ -1033,9 +989,6 @@ var CPScrollDestinationNone             = 0,
        lineHeight = [font defaultLineHeightForFont],
        editorInset = [self currentValueForThemeAttribute:@"editor-inset"];

-    // Put half a spacing above the tokens.
-    offset.y += CEIL(spaceBetweenTokens.height / 2.0);
-
    // Get the height of a typical token, or a token token if you will.
    [tokenToken sizeToFit];

@@ -1123,19 +1076,12 @@ var CPScrollDestinationNone             = 0,
    if (isEditing && _selectedRange.length)
    {
        _inputFrame = nil;
-        var inputElement = [self _inputElement];
-        inputElement.style.display = "none";
-    }
-    else if (isEditing)
-    {
-        var inputElement = [self _inputElement];
-        inputElement.style.display = "block";
-        if (document.activeElement !== inputElement)
-            inputElement.focus();
+        [self _inputElement].style.left = "-10000px";
+        [self _inputElement].focus();
    }

    // Trim off any excess height downwards (in case we shrank).
-    var scrollHeight = offset.y + tokenHeight;
+    var scrollHeight = offset.y + tokenHeight + CEIL(spaceBetweenTokens.height / 2.0);
    if (_CGRectGetHeight([contentView bounds]) > scrollHeight)
        [contentView setFrameSize:_CGSizeMake(_CGRectGetWidth([_tokenScrollView bounds]), scrollHeight)];

@@ -1303,11 +1249,6 @@ var CPScrollDestinationNone             = 0,
    return "tokenfield-token";
 }

- (BOOL)acceptsFirstResponder
-{
-    return NO;
-}
-
 - (id)initWithFrame:(CPRect)frame
 {
    if (self = [super initWithFrame:frame])
@@ -1343,34 +1284,6 @@ var CPScrollDestinationNone             = 0,
    _representedObject = representedObject;
 }

- (void)setEditable:(BOOL)shouldBeEditable
-{
-    [super setEditable:shouldBeEditable];
-    [self setNeedsLayout];
-}
-
- (BOOL)setThemeState:(CPThemeState)aState
-{
-    var r = [super setThemeState:aState];
-
-    // Share hover state with the delete button.
-    if (r && aState === CPThemeStateHovered)
-        [_deleteButton setThemeState:aState];
-
-    return r;
-}
-
- (BOOL)unsetThemeState:(CPThemeState)aState
-{
-    var r = [super unsetThemeState:aState];
-
-    // Share hover state with the delete button.
-    if (r && aState === CPThemeStateHovered)
-        [_deleteButton unsetThemeState:aState];
-
-    return r;
-}
-
 - (CGSize)_minimumFrameSize
 {
    var size = _CGSizeMakeZero(),
@@ -1396,7 +1309,6 @@ var CPScrollDestinationNone             = 0,
    {
        [_deleteButton setTarget:self];
        [_deleteButton setAction:@selector(_delete:)];
-        [_deleteButton setEnabled:[self isEditable]];

        var frame = [bezelView frame],
            buttonOffset = [_deleteButton currentValueForThemeAttribute:@"offset"],
@@ -1418,8 +1330,7 @@ var CPScrollDestinationNone             = 0,

 - (void)_delete:(id)sender
 {
-    if ([self isEditable])
-        [_tokenField _deleteToken:self];
+    [_tokenField _deleteToken:self];
 }

@end
@@ -247,7 +247,7 @@ var CPToolbarsByIdentifier              = nil,
    _window = aWindow;

    if (_window)
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_autoValidateVisibleItems) name:_CPWindowDidChangeFirstResponderNotification object:aWindow];
+        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_autovalidate) name:_CPWindowDidChangeFirstResponderNotification object:aWindow];
 }

 /*!
@@ -400,15 +400,14 @@ var CPToolbarsByIdentifier              = nil,
 */
 - (void)validateVisibleItems
 {
-    [self _validateVisibleItems:NO]
+    var toolbarItems = [self visibleItems],
+        count = [toolbarItems count];
+
+    while (count--)
+        [toolbarItems[count] validate];
 }

- (void)_autoValidateVisibleItems
-{
-    [self _validateVisibleItems:YES]
-}
-
- (void)_validateVisibleItems:(BOOL)isAutovalidation
+- (void)_autovalidate
 {
    var toolbarItems = [self visibleItems],
        count = [toolbarItems count];
@@ -416,7 +415,7 @@ var CPToolbarsByIdentifier              = nil,
    while (count--)
    {
        var item = [toolbarItems objectAtIndex:count];
-        if (!isAutovalidation || [item autovalidates])
+        if ([item autovalidates])
            [item validate];
    }
 }
@@ -651,9 +651,6 @@ var CPViewFlags                     = { },
    if (_window === aWindow)
        return;

-    // Unlike in Cocoa you can observe the window of a view.
-    [self willChangeValueForKey:@"window"];
-
    [[self window] _dirtyKeyViewLoop];

    // Clear out first responder if we're the first responder and leaving.
@@ -681,8 +678,6 @@ var CPViewFlags                     = { },
    [self viewDidMoveToWindow];

    [[self window] _dirtyKeyViewLoop];
-
-    [self didChangeValueForKey:@"window"];
 }

 /*!
@@ -186,11 +186,6 @@ CPWindowShadowStyleStandard = 0;
 CPWindowShadowStyleMenu     = 1;
 CPWindowShadowStylePanel    = 2;

-CPWindowResizeStyleModern = 0;
-CPWindowResizeStyleLegacy = 1;
-CPWindowResizeStyle = CPWindowResizeStyleModern;
-CPWindowResizeSlop = 3;
-
 var SHADOW_MARGIN_LEFT      = 20.0,
    SHADOW_MARGIN_RIGHT     = 19.0,
    SHADOW_MARGIN_TOP       = 10.0,
@@ -202,8 +197,7 @@ var SHADOW_MARGIN_LEFT      = 20.0,
 var CPWindowSaveImage       = nil,
    CPWindowSavingImage     = nil,

-    CPWindowResizeTime      = 0.2,
-    CPWindowResizeStyleGlobalChangeNotification = @"CPWindowResizeStyleGlobalChangeNotification";
+    CPWindowResizeTime      = 0.2;

 /*
    Keys for which action messages will be sent by default when unhandled, e.g. complete:.
@@ -483,11 +477,6 @@ CPTexturedBackgroundWindowMask
        _keyViewLoopIsDirty = YES;

        [self setShowsResizeIndicator:_styleMask & CPResizableWindowMask];
-
-        [[CPNotificationCenter defaultCenter] addObserver:self
-                                 selector:@selector(_didReceiveResizeStyleChange:)
-                                     name:CPWindowResizeStyleGlobalChangeNotification
-                                   object:nil];
    }

    return self;
@@ -912,8 +901,6 @@ CPTexturedBackgroundWindowMask

    [_platformWindow orderFront:self];
    [_platformWindow order:CPWindowAbove window:self relativeTo:nil];
-#else
-    _isVisible = YES;
 #endif

    if (!CPApp._keyWindow)
@@ -959,8 +946,6 @@ CPTexturedBackgroundWindowMask

 #if PLATFORM(DOM)
    [_platformWindow order:CPWindowOut window:self relativeTo:nil];
-#else
-    _isVisible = NO;
 #endif

    [self _updateMainAndKeyWindows];
@@ -1011,33 +996,6 @@ CPTexturedBackgroundWindowMask
    return _isVisible;
 }

-/*!
-    Globally sets whether windows resize following the legacy style (using a resize thumb
-    in the bottom right corner), or the modern style (no resize thumb, resizing
-    can be done on all edges).
-*/
-+ (void)setGlobalResizeStyle:(int)aStyle
-{
-    if (CPWindowResizeStyle === aStyle)
-        return;
-
-    CPWindowResizeStyle = aStyle;
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPWindowResizeStyleGlobalChangeNotification object:nil];
-}
-
- (void)_didReceiveResizeStyleChange:(CPNotification)aNotification
-{
-    [_windowView setShowsResizeIndicator:_styleMask & CPResizableWindowMask];
-}
-
-/*!
-    Returns the global window resizing style.
-*/
-+ (int)globalResizeStyle
-{
-    return CPWindowResizeStyle;
-}
-
 /*!
    Returns \c YES if the window's resize indicator is showing. \c NO otherwise.
 */
@@ -1684,7 +1642,6 @@ CPTexturedBackgroundWindowMask
    // CPLeftMouseDown is needed for window moving and resizing to work.
    // CPMouseMoved is needed for rollover effects on title bar buttons.
    var sheet = [self attachedSheet];
-
    if (sheet)
    {
        switch (type)
@@ -1706,175 +1663,144 @@ CPTexturedBackgroundWindowMask

    switch (type)
    {
-        case CPFlagsChanged:
-            return [[self firstResponder] flagsChanged:anEvent];
+        case CPFlagsChanged:        return [[self firstResponder] flagsChanged:anEvent];

-        case CPKeyUp:
-            return [[self firstResponder] keyUp:anEvent];
+        case CPKeyUp:               return [[self firstResponder] keyUp:anEvent];

-        case CPKeyDown:
-            if ([anEvent charactersIgnoringModifiers] === CPTabCharacter)
-            {
-                if ([anEvent modifierFlags] & CPShiftKeyMask)
-                    [self selectPreviousKeyView:self];
-                else
-                    [self selectNextKeyView:self];
-#if PLATFORM(DOM)
-                // Make sure the browser doesn't try to do its own tab handling.
-                // This is important or the browser might blur the shared text field or token field input field,
-                // even that we just moved it to a new first responder.
-                [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
-#endif
-                return;
-            }
-            else if ([anEvent charactersIgnoringModifiers] === CPBackTabCharacter)
-            {
-                var didTabBack = [self selectPreviousKeyView:self];
+        case CPKeyDown:             if ([anEvent charactersIgnoringModifiers] === CPTabCharacter)
+                                    {
+                                        if ([anEvent modifierFlags] & CPShiftKeyMask)
+                                            [self selectPreviousKeyView:self];
+                                        else
+                                            [self selectNextKeyView:self];

-                if (didTabBack)
-                {
-#if PLATFORM(DOM)
-                    // Make sure the browser doesn't try to do its own tab handling.
-                    // This is important or the browser might blur the shared text field or token field input field,
-                    // even that we just moved it to a new first responder.
-                    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
-#endif
-                }
+                                        return;
+                                    }
+                                    else if ([anEvent charactersIgnoringModifiers] === CPBackTabCharacter)
+                                        return [self selectPreviousKeyView:self];

-                return didTabBack;
-            }
+                                    [[self firstResponder] keyDown:anEvent];

-            [[self firstResponder] keyDown:anEvent];
+                                    // Trigger the default button if needed
+                                    // FIXME: Is this only applicable in a sheet? See isse: #722.
+                                    if (![self disableKeyEquivalentForDefaultButton])
+                                    {
+                                        var defaultButton = [self defaultButton],
+                                            keyEquivalent = [defaultButton keyEquivalent],
+                                            modifierMask = [defaultButton keyEquivalentModifierMask];

-            // Trigger the default button if needed
-            // FIXME: Is this only applicable in a sheet? See isse: #722.
-            if (![self disableKeyEquivalentForDefaultButton])
-            {
-                var defaultButton = [self defaultButton],
-                    keyEquivalent = [defaultButton keyEquivalent],
-                    modifierMask = [defaultButton keyEquivalentModifierMask];
+                                        if ([anEvent _triggersKeyEquivalent:keyEquivalent withModifierMask:modifierMask])
+                                            [[self defaultButton] performClick:self];
+                                    }

-                if ([anEvent _triggersKeyEquivalent:keyEquivalent withModifierMask:modifierMask])
-                    [[self defaultButton] performClick:self];
-            }
+                                    return;

-            return;
-
-        case CPScrollWheel:
-            return [[_windowView hitTest:point] scrollWheel:anEvent];
+        case CPScrollWheel:         return [[_windowView hitTest:point] scrollWheel:anEvent];

        case CPLeftMouseUp:
-        case CPRightMouseUp:
-            var hitTestedView = _leftMouseDownView,
-                selector = type == CPRightMouseUp ? @selector(rightMouseUp:) : @selector(mouseUp:);
+        case CPRightMouseUp:        var hitTestedView = _leftMouseDownView,
+                                        selector = type == CPRightMouseUp ? @selector(rightMouseUp:) : @selector(mouseUp:);

-            if (!hitTestedView)
-                hitTestedView = [_windowView hitTest:point];
+                                    if (!hitTestedView)
+                                        hitTestedView = [_windowView hitTest:point];

-            [hitTestedView performSelector:selector withObject:anEvent];
+                                    [hitTestedView performSelector:selector withObject:anEvent];

-            _leftMouseDownView = nil;
-
-            return;
+                                    _leftMouseDownView = nil;

+                                    return;
        case CPLeftMouseDown:
-        case CPRightMouseDown:
-            _leftMouseDownView = [_windowView hitTest:point] || _windowView;
+        case CPRightMouseDown:      _leftMouseDownView = [_windowView hitTest:point];

-            if (_leftMouseDownView != _firstResponder && [_leftMouseDownView acceptsFirstResponder])
-                [self makeFirstResponder:_leftMouseDownView];
+                                    if (_leftMouseDownView != _firstResponder && [_leftMouseDownView acceptsFirstResponder])
+                                        [self makeFirstResponder:_leftMouseDownView];

-            [CPApp activateIgnoringOtherApps:YES];
+                                    [CPApp activateIgnoringOtherApps:YES];

-            var theWindow = [anEvent window],
-                selector = type == CPRightMouseDown ? @selector(rightMouseDown:) : @selector(mouseDown:);
+                                    var theWindow = [anEvent window],
+                                        selector = type == CPRightMouseDown ? @selector(rightMouseDown:) : @selector(mouseDown:);

-            if ([theWindow isKeyWindow] || [theWindow becomesKeyOnlyIfNeeded] && ![_leftMouseDownView needsPanelToBecomeKey])
-                return [_leftMouseDownView performSelector:selector withObject:anEvent];
-            else
-            {
-                // FIXME: delayed ordering?
-                [self makeKeyAndOrderFront:self];
+                                    if ([theWindow isKeyWindow] || [theWindow becomesKeyOnlyIfNeeded] && ![_leftMouseDownView needsPanelToBecomeKey])
+                                        return [_leftMouseDownView performSelector:selector withObject:anEvent];
+                                    else
+                                    {
+                                        // FIXME: delayed ordering?
+                                        [self makeKeyAndOrderFront:self];

-                if ([_leftMouseDownView acceptsFirstMouse:anEvent])
-                    return [_leftMouseDownView performSelector:selector withObject:anEvent];
-            }
-            break;
+                                        if ([_leftMouseDownView acceptsFirstMouse:anEvent])
+                                            return [_leftMouseDownView performSelector:selector withObject:anEvent];
+                                    }
+                                    break;

        case CPLeftMouseDragged:
-        case CPRightMouseDragged:
-            if (!_leftMouseDownView)
-                return [[_windowView hitTest:point] mouseDragged:anEvent];
+        case CPRightMouseDragged:   if (!_leftMouseDownView)
+                                        return [[_windowView hitTest:point] mouseDragged:anEvent];

-            var selector;
+                                    var selector;
+                                    if (type == CPRightMouseDragged)
+                                    {
+                                        selector = @selector(rightMouseDragged:)
+                                        if (![_leftMouseDownView respondsToSelector:selector])
+                                            selector = nil;
+                                    }

-            if (type == CPRightMouseDragged)
-            {
-                selector = @selector(rightMouseDragged:)
-                if (![_leftMouseDownView respondsToSelector:selector])
-                    selector = nil;
-            }
+                                    if (!selector)
+                                        selector = @selector(mouseDragged:)

-            if (!selector)
-                selector = @selector(mouseDragged:)
+                                    return [_leftMouseDownView performSelector:selector withObject:anEvent];

-            return [_leftMouseDownView performSelector:selector withObject:anEvent];
+        case CPMouseMoved:          if (!_acceptsMouseMovedEvents)
+                                        return;

-        case CPMouseMoved:
-            [_windowView setCursorForLocation:point resizing:NO];
+                                    if (!_mouseEnteredStack)
+                                        _mouseEnteredStack = [];

-            if (!_acceptsMouseMovedEvents)
-                return;
+                                    var hitTestView = [_windowView hitTest:point];

-            if (!_mouseEnteredStack)
-                _mouseEnteredStack = [];
+                                    if ([_mouseEnteredStack count] && [_mouseEnteredStack lastObject] === hitTestView)
+                                        return [hitTestView mouseMoved:anEvent];

-            var hitTestView = [_windowView hitTest:point];
+                                    var view = hitTestView,
+                                        mouseEnteredStack = [];

-            if ([_mouseEnteredStack count] && [_mouseEnteredStack lastObject] === hitTestView)
-                return [hitTestView mouseMoved:anEvent];
+                                    while (view)
+                                    {
+                                        mouseEnteredStack.unshift(view);

-            var view = hitTestView,
-                mouseEnteredStack = [];
+                                        view = [view superview];
+                                    }

-            while (view)
-            {
-                mouseEnteredStack.unshift(view);
+                                    var deviation = MIN(_mouseEnteredStack.length, mouseEnteredStack.length);

-                view = [view superview];
-            }
+                                    while (deviation--)
+                                        if (_mouseEnteredStack[deviation] === mouseEnteredStack[deviation])
+                                            break;

-            var deviation = MIN(_mouseEnteredStack.length, mouseEnteredStack.length);
+                                    var index = deviation + 1,
+                                        count = _mouseEnteredStack.length;

-            while (deviation--)
-                if (_mouseEnteredStack[deviation] === mouseEnteredStack[deviation])
-                    break;
+                                    if (index < count)
+                                    {
+                                        var event = [CPEvent mouseEventWithType:CPMouseExited location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];

-            var index = deviation + 1,
-                count = _mouseEnteredStack.length;
+                                        for (; index < count; ++index)
+                                            [_mouseEnteredStack[index] mouseExited:event];
+                                    }

-            if (index < count)
-            {
-                var event = [CPEvent mouseEventWithType:CPMouseExited location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
+                                    index = deviation + 1;
+                                    count = mouseEnteredStack.length;

-                for (; index < count; ++index)
-                    [_mouseEnteredStack[index] mouseExited:event];
-            }
+                                    if (index < count)
+                                    {
+                                        var event = [CPEvent mouseEventWithType:CPMouseEntered location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];

-            index = deviation + 1;
-            count = mouseEnteredStack.length;
+                                        for (; index < count; ++index)
+                                            [mouseEnteredStack[index] mouseEntered:event];
+                                    }

-            if (index < count)
-            {
-                var event = [CPEvent mouseEventWithType:CPMouseEntered location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
+                                    _mouseEnteredStack = mouseEnteredStack;

-                for (; index < count; ++index)
-                    [mouseEnteredStack[index] mouseEntered:event];
-            }
-
-            _mouseEnteredStack = mouseEnteredStack;
-
-            [hitTestView mouseMoved:anEvent];
+                                    [hitTestView mouseMoved:anEvent];
    }
 }

@@ -1912,9 +1838,7 @@ CPTexturedBackgroundWindowMask
 */
 - (BOOL)canBecomeKeyWindow
 {
-    // In Cocoa only resizable or titled windows return YES here by default. But the main browser window in Cappuccino
-    // doesn't have these masks even that it's both titled and resizable, so we return YES when isFullPlatformWindow too.
-    return (_styleMask & CPTitledWindowMask) || (_styleMask & CPResizableWindowMask) || [self isFullPlatformWindow];
+    return YES;
 }

 /*!
@@ -2214,7 +2138,6 @@ CPTexturedBackgroundWindowMask
        return;

    var documents = [_windowController documents];
-
    if ([documents count])
    {
        var index = [documents indexOfObject:[_windowController document]];
@@ -3286,15 +3209,6 @@ var keyViewComparator = function(lhs, rhs, context)
    return CGRectContainsPoint(_frame, aPoint);
 }

- (BOOL)_isValidMousePoint:(CGPoint)aPoint
-{
-    // If we are using the new resizing mode, mouse events are valid
-    // outside the window's frame.
-    var mouseFrame = ((_styleMask & CPResizableWindowMask) && (CPWindowResizeStyle === CPWindowResizeStyleModern)) ? _CGRectInset(_frame, -CPWindowResizeSlop, -CPWindowResizeSlop) : _frame;
-
-    return CGRectContainsPoint(mouseFrame, aPoint);
-}
-
@end

@implementation CPWindow (Deprecated)
@@ -53,20 +53,15 @@ var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10),
 */
 - (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
 {
-    var contentRect = CGRectMakeCopy(aFrameRect),
-        modifierX = 16,
-        modifierY = 19;
+    var contentRect = CGRectMakeCopy(aFrameRect);

    // @todo change border art and remove this pixel perfect adaptation
-    //
-    // @comment: If we use this, each time we open the popover, the content
-    // view is reduced a little over and over
-    // return CGRectInset(contentRect, modifierX, modifierY);
+    // return CGRectInset(contentRect, 20, 20);

-    contentRect.origin.x += modifierX;
-    contentRect.origin.y += modifierY;
-    contentRect.size.width -= modifierX * 2;
-    contentRect.size.height -= modifierY * 2;
+    contentRect.origin.x += 18;
+    contentRect.origin.y += 17;
+    contentRect.size.width -= 35;
+    contentRect.size.height -= 37;

    return contentRect;
 }
@@ -78,21 +73,15 @@ var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10),
 */
 + (CGRect)frameRectForContentRect:(CGRect)aContentRect
 {
-    var frameRect = CGRectMakeCopy(aContentRect),
-        modifierX = 16,
-        modifierY = 19;
+    var frameRect = CGRectMakeCopy(aContentRect);

    // @todo change border art and remove this pixel perfect adaptation
-    // @comment: If we use this, each time we open the popover, the content
-    //
-    // view is reduced a little over and over
-    // return CGRectOffset(frameRect, modifierX, modifierY);
-
-    frameRect.origin.x -= modifierX;
-    frameRect.origin.y -= modifierY;
-    frameRect.size.width += modifierX * 2;
-    frameRect.size.height += modifierY * 2;
+    //return CGRectOffset(frameRect, 20, 20);

+    frameRect.origin.x -= 18;
+    frameRect.origin.y -= 17;
+    frameRect.size.width += 35;
+    frameRect.size.height += 37;
    return frameRect;
 }

@@ -152,6 +152,38 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
    return _CPStandardWindowViewDividerBackgroundColor;
 }

+- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    var contentRect = [[self class] contentRectForFrameRect:aFrameRect],
+        theToolbar = [[self window] toolbar];
+
+    if ([theToolbar isVisible])
+    {
+        var toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
+
+        contentRect.origin.y += toolbarHeight;
+        contentRect.size.height -= toolbarHeight;
+    }
+
+    return contentRect;
+}
+
+- (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    var frameRect = [[self class] frameRectForContentRect:aContentRect],
+        theToolbar = [[self window] toolbar];
+
+    if ([theToolbar isVisible])
+    {
+        var toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
+
+        frameRect.origin.y -= toolbarHeight;
+        frameRect.size.height += toolbarHeight;
+    }
+
+    return frameRect;
+}
+
 - (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
 {
    self = [super initWithFrame:aFrame styleMask:aStyleMask];
@@ -334,13 +366,13 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
    [self _updateCloseButton];
 }

- (BOOL)couldBeMoveEvent:(CPEvent)anEvent
+- (void)mouseDown:(CPEvent)anEvent
 {
    if (![_headView isHidden])
        if (CGRectContainsPoint([_headView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]))
-            return YES;
+            return [self trackMoveWithEvent:anEvent];

-    return [super couldBeMoveEvent:anEvent];
+    [super mouseDown:anEvent];
 }

 - (void)_enableSheet:(BOOL)enable
@@ -24,18 +24,7 @@
@import "CPView.j"


-var _CPWindowViewResizeIndicatorImage = nil,
-    _CPWindowViewCornerResizeRectWidth = 10,
-
-    _CPWindowViewResizeRegionNone = -1,
-    _CPWindowViewResizeRegionTopLeft = 0,
-    _CPWindowViewResizeRegionTop = 1,
-    _CPWindowViewResizeRegionTopRight = 2,
-    _CPWindowViewResizeRegionRight = 3,
-    _CPWindowViewResizeRegionBottomRight = 4,
-    _CPWindowViewResizeRegionBottom = 5,
-    _CPWindowViewResizeRegionBottomLeft = 6,
-    _CPWindowViewResizeRegionLeft = 7;
+var _CPWindowViewResizeIndicatorImage = nil;

@implementation _CPWindowView : CPView
 {
@@ -49,7 +38,6 @@ var _CPWindowViewResizeIndicatorImage = nil,
 //    BOOL        _isAnimatingToolbar;

    CGRect      _resizeFrame;
-    int         _resizeRegion;
    CGPoint     _mouseDraggedPoint;

    CGRect      _cachedScreenFrame;
@@ -62,17 +50,17 @@ var _CPWindowViewResizeIndicatorImage = nil,
    if (self !== [_CPWindowView class])
        return;

-    _CPWindowViewResizeIndicatorImage = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPWindow class]] pathForResource:@"_CPWindowView/_CPWindowViewResizeIndicator.png"] size:_CGSizeMake(12.0, 12.0)];
+    _CPWindowViewResizeIndicatorImage = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPWindow class]] pathForResource:@"_CPWindowView/_CPWindowViewResizeIndicator.png"] size:CGSizeMake(12.0, 12.0)];
 }

 + (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
 {
-    return _CGRectMakeCopy(aFrameRect);
+    return CGRectMakeCopy(aFrameRect);
 }

 + (CGRect)frameRectForContentRect:(CGRect)aContentRect
 {
-    return _CGRectMakeCopy(aContentRect);
+    return CGRectMakeCopy(aContentRect);
 }

 + (CPString)defaultThemeClass
@@ -88,34 +76,12 @@ var _CPWindowViewResizeIndicatorImage = nil,

 - (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
 {
-    var contentRect = [[self class] contentRectForFrameRect:aFrameRect],
-        theToolbar = [[self window] toolbar];
-
-    if ([theToolbar isVisible])
-    {
-        var toolbarHeight = _CGRectGetHeight([[theToolbar _toolbarView] frame]);
-
-        contentRect.origin.y += toolbarHeight;
-        contentRect.size.height -= toolbarHeight;
-    }
-
-    return contentRect;
+    return [[self class] contentRectForFrameRect:aFrameRect];
 }

 - (CGRect)frameRectForContentRect:(CGRect)aContentRect
 {
-    var frameRect = [[self class] frameRectForContentRect:aContentRect],
-        theToolbar = [[self window] toolbar];
-
-    if ([theToolbar isVisible])
-    {
-        var toolbarHeight = _CGRectGetHeight([[theToolbar _toolbarView] frame]);
-
-        frameRect.origin.y -= toolbarHeight;
-        frameRect.size.height += toolbarHeight;
-    }
-
-    return frameRect;
+    return [[self class] frameRectForContentRect:aContentRect];
 }

 - (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
@@ -125,8 +91,8 @@ var _CPWindowViewResizeIndicatorImage = nil,
    if (self)
    {
        _styleMask = aStyleMask;
-        _resizeIndicatorOffset = _CGSizeMakeZero();
-        _toolbarOffset = _CGSizeMakeZero();
+        _resizeIndicatorOffset = CGSizeMakeZero();
+        _toolbarOffset = CGSizeMakeZero();
    }

    return self;
@@ -147,301 +113,48 @@ var _CPWindowViewResizeIndicatorImage = nil,

 - (void)mouseDown:(CPEvent)anEvent
 {
-    var theWindow = [self window],
-        couldResize = _styleMask & CPResizableWindowMask;
+    var theWindow = [self window];

-    couldResize = couldResize && (
-        (CPWindowResizeStyle === CPWindowResizeStyleModern) ||
-        ((CPWindowResizeStyle === CPWindowResizeStyleLegacy) && _resizeIndicator));
-
-    if (couldResize)
+    if ((_styleMask & CPResizableWindowMask) && _resizeIndicator)
    {
-        var theWindow = [self window],
-            windowFrame = [theWindow frame],
-            shouldResize = NO;
+        // FIXME: This should be better
+        var frame = [_resizeIndicator frame];

-        if (CPWindowResizeStyle === CPWindowResizeStyleModern)
-        {
-            var globalPoint = [theWindow convertBaseToGlobal:[anEvent locationInWindow]];
-
-            _resizeRegion = [self resizeRegionForPoint:globalPoint];
-            shouldResize = _resizeRegion !== _CPWindowViewResizeRegionNone;
-        }
-        else
-        {
-            // Extend the resize frame to the edge of the window frame
-            var resizeFrame = [_resizeIndicator frame];
-            resizeFrame.size.width = _CGRectGetWidth(windowFrame) - _CGRectGetMinX(resizeFrame);
-            resizeFrame.size.height = _CGRectGetHeight(windowFrame) - _CGRectGetMinY(resizeFrame);
-
-            var localPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-            shouldResize = CGRectContainsPoint(resizeFrame, localPoint);
-
-            // When in legacy mode, the only possible resize region is lower right
-            _resizeRegion = shouldResize ? _CPWindowViewResizeRegionBottomRight : _CPWindowViewResizeRegionNone;
-        }
-
-        if (shouldResize)
+        if (CGRectContainsPoint(frame, [self convertPoint:[anEvent locationInWindow] fromView:nil]))
            return [self trackResizeWithEvent:anEvent];
    }

-    if ([self couldBeMoveEvent:anEvent])
+    if ([theWindow isMovable] && [theWindow isMovableByWindowBackground])
        [self trackMoveWithEvent:anEvent];
    else
        [super mouseDown:anEvent];
 }

- (BOOL)couldBeMoveEvent:(CPEvent)anEvent
-{
-    var theWindow = [self window];
-
-    return [theWindow isMovable] && [theWindow isMovableByWindowBackground];
-}
-
-/*
-    aPoint should be in global coordinates
-*/
- (int)resizeRegionForPoint:(CGPoint)aPoint
-{
-    /*
-        There are 8 possible resize rects, 1 for each side and 1 for each corner.
-        The four corner rects are the same size, and the top/bottom and left/right
-        rects are the same size. So to save calculations, we can just create
-        3 rects and move them around to do hit testing. Start with the corners
-        and then do left/right and top/bottom.
-    */
-    var frame = [[self window] frame],
-        rect = _CGRectMake(frame.origin.x - CPWindowResizeSlop,
-                           frame.origin.y - CPWindowResizeSlop,
-                           _CPWindowViewCornerResizeRectWidth + CPWindowResizeSlop,
-                           _CPWindowViewCornerResizeRectWidth + CPWindowResizeSlop);
-
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionTopLeft;
-
-    rect.origin.x = _CGRectGetMaxX(frame) - _CPWindowViewCornerResizeRectWidth;
-
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionTopRight;
-
-    rect.origin.y = _CGRectGetMaxY(frame) - _CPWindowViewCornerResizeRectWidth;
-
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionBottomRight;
-
-    rect.origin.x = frame.origin.x - CPWindowResizeSlop;
-
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionBottomLeft;
-
-    rect = _CGRectMake(rect.origin.x,
-                       frame.origin.y + _CPWindowViewCornerResizeRectWidth,
-                       CPWindowResizeSlop * 2,
-                       _CGRectGetHeight(frame) - (_CPWindowViewCornerResizeRectWidth * 2));
-
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionLeft;
-
-    rect.origin.x = _CGRectGetMaxX(frame) - CPWindowResizeSlop;
-
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionRight;
-
-    rect = _CGRectMake(frame.origin.x + _CPWindowViewCornerResizeRectWidth,
-                       frame.origin.y - CPWindowResizeSlop,
-                       _CGRectGetWidth(frame) - (_CPWindowViewCornerResizeRectWidth * 2),
-                       CPWindowResizeSlop * 2);
-
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionTop;
-
-    rect.origin.y = _CGRectGetMaxY(frame) - CPWindowResizeSlop;
-
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionBottom;
-
-    return _CPWindowViewResizeRegionNone;
-}
-
-/*
-    aPoint is in window coordinates
-*/
- (void)setCursorForLocation:(CGPoint)aPoint resizing:(BOOL)isResizing
-{
-    if (!(_styleMask & CPResizableWindowMask) ||
-        (CPWindowResizeStyle !== CPWindowResizeStyleModern))
-        return;
-
-    var theWindow = [self window],
-        resizeRegion = isResizing ? _resizeRegion : [self resizeRegionForPoint:[theWindow convertBaseToGlobal:aPoint]],
-        minSize = nil,
-        maxSize = nil,
-        frameSize;
-
-    if (resizeRegion !== _CPWindowViewResizeRegionNone)
-    {
-        minSize = [theWindow minSize];
-        maxSize = [theWindow maxSize];
-        frameSize = [theWindow frame].size;
-    }
-
-    switch (resizeRegion)
-    {
-        case _CPWindowViewResizeRegionTopLeft:
-            if (minSize && _CGSizeEqualToSize(frameSize, minSize))
-                [[CPCursor resizeNorthwestCursor] set];
-            else if (maxSize && _CGSizeEqualToSize(frameSize, maxSize))
-                [[CPCursor resizeSoutheastCursor] set];
-            else
-                [[CPCursor resizeNorthwestSoutheastCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionTop:
-            if (minSize && (frameSize.height === minSize.height))
-                [[CPCursor resizeUpCursor] set];
-            else if (maxSize && (frameSize.height === maxSize.height))
-                [[CPCursor resizeDownCursor] set];
-            else
-                [[CPCursor resizeNorthSouthCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionTopRight:
-            if (minSize && _CGSizeEqualToSize(frameSize, minSize))
-                [[CPCursor resizeNortheastCursor] set];
-            else if (maxSize && _CGSizeEqualToSize(frameSize, maxSize))
-                [[CPCursor resizeSouthwestCursor] set];
-            else
-                [[CPCursor resizeNortheastSouthwestCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionRight:
-            if (minSize && (frameSize.width === minSize.width))
-                [[CPCursor resizeRightCursor] set];
-            else if (maxSize && (frameSize.width === maxSize.width))
-                [[CPCursor resizeLeftCursor] set];
-            else
-                [[CPCursor resizeEastWestCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionBottomRight:
-            if (minSize && _CGSizeEqualToSize(frameSize, minSize))
-                [[CPCursor resizeSoutheastCursor] set];
-            else if (maxSize && _CGSizeEqualToSize(frameSize, maxSize))
-                [[CPCursor resizeNorthwestCursor] set];
-            else
-                [[CPCursor resizeNorthwestSoutheastCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionBottom:
-            if (minSize && (frameSize.height === minSize.height))
-                [[CPCursor resizeDownCursor] set];
-            else if (maxSize && (frameSize.height === maxSize.height))
-                [[CPCursor resizeUpCursor] set];
-            else
-                [[CPCursor resizeNorthSouthCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionBottomLeft:
-            if (minSize && _CGSizeEqualToSize(frameSize, minSize))
-                [[CPCursor resizeSouthwestCursor] set];
-            else if (maxSize && _CGSizeEqualToSize(frameSize, maxSize))
-                [[CPCursor resizeNortheastCursor] set];
-            else
-                [[CPCursor resizeNortheastSouthwestCursor] set];
-            break;
-
-        case _CPWindowViewResizeRegionLeft:
-            if (minSize && (frameSize.width === minSize.width))
-                [[CPCursor resizeLeftCursor] set];
-            else if (maxSize && (frameSize.width === maxSize.width))
-                [[CPCursor resizeRightCursor] set];
-            else
-                [[CPCursor resizeEastWestCursor] set];
-            break;
-
-        default:
-            [[CPCursor arrowCursor] set];
-    }
-}
-
 - (void)trackResizeWithEvent:(CPEvent)anEvent
 {
-    var type = [anEvent type];
+    var location = [anEvent locationInWindow],
+        type = [anEvent type];

    if (type === CPLeftMouseUp)
        return;

-    var location = [anEvent locationInWindow],
-        theWindow = [self window],
-        globalLocation = [theWindow convertBaseToGlobal:location],
-        frame = [theWindow frame];
+    var theWindow = [self window];

    if (type === CPLeftMouseDown)
    {
-        _mouseDraggedPoint = _CGPointMakeCopy(globalLocation);
-        _resizeFrame = _CGRectMakeCopy(frame);
+        var frame = [theWindow frame];
+
+        _resizeFrame = CGRectMake(location.x, location.y, CGRectGetWidth(frame), CGRectGetHeight(frame));
    }

    else if (type === CPLeftMouseDragged)
    {
-        var diffX = globalLocation.x - _mouseDraggedPoint.x,
-            diffY = globalLocation.y - _mouseDraggedPoint.y,
-            newX = _CGRectGetMinX(_resizeFrame),
-            newY = _CGRectGetMinY(_resizeFrame),
-            newWidth = _CGRectGetWidth(_resizeFrame),
-            newHeight = _CGRectGetHeight(_resizeFrame),
-            minSize = [theWindow minSize],
-            maxSize = [theWindow maxSize];
+        var newSize = CGSizeMake(CGRectGetWidth(_resizeFrame) + location.x - CGRectGetMinX(_resizeFrame), CGRectGetHeight(_resizeFrame) + location.y - CGRectGetMinY(_resizeFrame));

-        // Calculate x and width first
-        switch (_resizeRegion)
-        {
-            case _CPWindowViewResizeRegionTopLeft:
-            case _CPWindowViewResizeRegionLeft:
-            case _CPWindowViewResizeRegionBottomLeft:
-                if (minSize && diffX > 0)
-                    diffX = MIN(newWidth - minSize.width, diffX);
-                else if (maxSize && diffX < 0)
-                    diffX = MAX(newWidth - maxSize.width, diffX);
-
-                newX += diffX,
-                newWidth -= diffX;
-                break;
-
-            case _CPWindowViewResizeRegionTopRight:
-            case _CPWindowViewResizeRegionRight:
-            case _CPWindowViewResizeRegionBottomRight:
-                newWidth += diffX;
-                break;
-        }
-
-        // Now calculate y and height
-        switch (_resizeRegion)
-        {
-            case _CPWindowViewResizeRegionTopLeft:
-            case _CPWindowViewResizeRegionTop:
-            case _CPWindowViewResizeRegionTopRight:
-                if (minSize && diffY > 0)
-                    diffY = MIN(newHeight - minSize.height, diffY);
-                else if (maxSize && diffY < 0)
-                    diffY = MAX(newHeight - maxSize.height, diffY);
-
-                newY += diffY,
-                newHeight -= diffY;
-                break;
-
-            case _CPWindowViewResizeRegionBottomLeft:
-            case _CPWindowViewResizeRegionBottom:
-            case _CPWindowViewResizeRegionBottomRight:
-                newHeight += diffY;
-                break;
-        }
-
-        if (theWindow._isSheet && theWindow._parentView && (frame.size.width !== newWidth))
+        if (theWindow._isSheet && theWindow._parentView && (theWindow._frame.size.width !== newSize.width))
            [theWindow._parentView _setAttachedSheetFrameOrigin];

-        [theWindow setFrame:_CGRectMake(newX, newY, newWidth, newHeight)];
-        [self setCursorForLocation:location resizing:YES];
+        [theWindow setFrameSize:newSize];
    }

    [CPApp setTarget:self selector:@selector(trackResizeWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
@@ -465,8 +178,8 @@ var _CPWindowViewResizeIndicatorImage = nil,

    var restrictedPoint = CGPointMake(0, 0);

-    restrictedPoint.x = MIN(MAX(aPoint.x, -_frame.size.width + 4.0), _CGRectGetMaxX(visibleFrame) - 4.0);
-    restrictedPoint.y = MIN(MAX(aPoint.y, minPointY), _CGRectGetMaxY(visibleFrame) - 8.0);
+    restrictedPoint.x = MIN(MAX(aPoint.x, -_frame.size.width + 4.0), CGRectGetMaxX(visibleFrame) - 4.0);
+    restrictedPoint.y = MIN(MAX(aPoint.y, minPointY), CGRectGetMaxY(visibleFrame) - 8.0);

    return restrictedPoint;
 }
@@ -516,12 +229,12 @@ var _CPWindowViewResizeIndicatorImage = nil,

 - (void)setShowsResizeIndicator:(BOOL)shouldShowResizeIndicator
 {
-    if (shouldShowResizeIndicator && CPWindowResizeStyle === CPWindowResizeStyleLegacy)
+    if (shouldShowResizeIndicator)
    {
        var size = [_CPWindowViewResizeIndicatorImage size],
            boundsSize = [self frame].size;

-        _resizeIndicator = [[CPImageView alloc] initWithFrame:_CGRectMake(boundsSize.width - size.width - _resizeIndicatorOffset.width, boundsSize.height - size.height - _resizeIndicatorOffset.height, size.width, size.height)];
+        _resizeIndicator = [[CPImageView alloc] initWithFrame:CGRectMake(boundsSize.width - size.width - _resizeIndicatorOffset.width, boundsSize.height - size.height - _resizeIndicatorOffset.height, size.width, size.height)];

        [_resizeIndicator setImage:_CPWindowViewResizeIndicatorImage];
        [_resizeIndicator setAutoresizingMask:CPViewMinXMargin | CPViewMinYMargin];
@@ -590,7 +303,7 @@ var _CPWindowViewResizeIndicatorImage = nil,
    if (!_toolbarView || [_toolbarView isHidden])
        return [self toolbarOffset].height;

-    return _CGRectGetMaxY([_toolbarView frame]);
+    return CGRectGetMaxY([_toolbarView frame]);
 }

 - (_CPToolbarView)toolbarView
@@ -602,14 +315,14 @@ var _CPWindowViewResizeIndicatorImage = nil,
 {
    var theWindow = [self window],
        bounds = [self bounds],
-        width = _CGRectGetWidth(bounds);
+        width = CGRectGetWidth(bounds);

    if ([[theWindow toolbar] isVisible])
    {
        var toolbarView = [self toolbarView],
            toolbarOffset = [self toolbarOffset];

-        [toolbarView setFrame:_CGRectMake(toolbarOffset.width, toolbarOffset.height, width, _CGRectGetHeight([toolbarView frame]))];
+        [toolbarView setFrame:CGRectMake(toolbarOffset.width, toolbarOffset.height, width, CGRectGetHeight([toolbarView frame]))];
    }

    if ([self showsResizeIndicator])
@@ -285,7 +285,7 @@

    // Change of document means toolbar items may no longer make sense.
    // FIXME: DOCUMENT ARCHITECTURE Should we setToolbar: as well?
-    [[[self window] toolbar] _autoValidateVisibleItems];
+    [[[self window] toolbar] validateVisibleItems];
 }

 - (void)setSupportsMultipleDocuments:(BOOL)shouldSupportMultipleDocuments
@@ -1208,7 +1208,7 @@ var resizeTimer = nil;
        windowNumber = [_mouseDownWindow windowNumber];
    else
    {
-        var theWindow = [self _mouseHitTest:location];
+        var theWindow = [self hitTest:location];

        if ((aDOMEvent.type === CPDOMEventMouseDown) && theWindow)
            _mouseDownWindow = theWindow;
@@ -1486,17 +1486,7 @@ var resizeTimer = nil;
    return StopContextMenuDOMEventPropagation;
 }

- (CPWindow)_mouseHitTest:(CPPoint)location
-{
-    return [self _hitTest:location withTest:@selector(_isValidMousePoint:)]
-}
-
 - (CPWindow)hitTest:(CPPoint)location
-{
-    return [self _hitTest:location withTest:@selector(containsPoint:)]
-}
-
- (CPWindow)_hitTest:(CPPoint)location withTest:(SEL)aTest
 {
    if (self._only)
        return self._only;
@@ -1515,7 +1505,7 @@ var resizeTimer = nil;
        {
            var candidateWindow = windows[windowCount];

-            if (!candidateWindow._ignoresMouseEvents && [candidateWindow performSelector:aTest withObject:location])
+            if (!candidateWindow._ignoresMouseEvents && [candidateWindow containsPoint:location])
                theWindow = candidateWindow;
        }
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stefan Eilers	f1cb388827	Fix "jake release"	2012-10-25 15:35:21 +02:00
Stefan Eilers	2e1a0da0e4	Fix regression Revert "Fixed: token field scrolling away from selected token." This reverts commit `26c26914da`. Conflicts: AppKit/CPTokenField.j	2012-10-24 18:36:08 +02:00
Stefan Eilers	47d0537ae4	Merge remote-tracking branch 'origin/master' into upstream_master	2012-10-23 17:24:58 +02:00
Stefan Eilers	81c2f219ee	Merge branch 'refs/heads/master' into upstream_master	2012-08-29 15:55:17 +02:00
Stefan Eilers	5e53a2326c	Merge branch 'refs/heads/master' into upstream_master	2012-07-31 23:35:16 +02:00
Stefan Eilers	0394731fdf	Merge branch 'refs/heads/master' into master_upstream	2012-07-23 11:43:20 +02:00
Stefan Eilers	a426aec2c9	Merge remote-tracking branch 'origin/master' into master_upstream	2012-07-20 10:40:53 +02:00
Stefan Eilers	dbad10f060	Merge remote-tracking branch 'origin/master' into master_upstream	2012-07-13 14:34:45 +02:00
Stefan Eilers	3985ef24e3	Merge remote-tracking branch 'origin/master' into master_upstream	2012-06-19 14:04:18 +02:00
Stefan Eilers	ff4a79d6cd	Merge remote-tracking branch 'refs/remotes/origin/master' into master_upstream	2012-05-01 23:35:44 +02:00
Stefan Eilers	9b017de39c	Fix incorrect _isLocalFileConnection if a locally called web application calls a remote server. If a locally called web application (called with file://foo/index.html) is doing a http get request call using "http://whatever/", we receive a connection:didReceiveResponse: of response type CPURLResponse instead CPHTTPURLResponse as expected.	2012-04-26 12:13:46 +02:00