@breakside/jskit 2022.9.0 → 2022.22.0

package/Root/Frameworks/SecurityKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.SecurityKit
-JSBundleVersion: 2022.9.0
+JSBundleVersion: 2022.22.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ServerKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ServerKit
-JSBundleVersion: 2022.9.0
+JSBundleVersion: 2022.22.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ServerKitTesting/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ServerKitTesting
-JSBundleVersion: 2022.9.0
+JSBundleVersion: 2022.22.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/TestKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.TestKit
-JSBundleVersion: 2022.9.0
+JSBundleVersion: 2022.22.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/UIKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.UIKit
-JSBundleVersion: 2022.9.0
+JSBundleVersion: 2022.22.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/UIKit/UIApplication.js

@@ -126,7 +126,7 @@ JSClass('UIApplication', UIResponder, {
                 JSFont.Size[size] = Math.round(JSFont.Size[size] * 1.2);
             }
         }
-        this.windowServer.displayServer.registerFontDescriptors(descriptors, function(error){
+        this.registerFontDescriptors(descriptors, function(error){
             completion.call(target, error);
         }, this);
     },
@@ -427,9 +427,23 @@ JSClass('UIApplication', UIResponder, {
         this.windowServer.createMouseEvent(UIEvent.Type.leftMouseUp, event.timestamp, location);
     },
 
+    // MARK: - Fonts
+
+    registerFontDescriptor: function(descriptor, completion, target){
+        return this.registerFontDescriptors([descriptor], completion, target);
+    },
+
+    registerFontDescriptors: function(descriptors, completion, target){
+        return this.windowServer.displayServer.registerFontDescriptors(descriptors, completion, target);
+    },
+
+    // MARK: - URLs
+
     openURL: function(url, options){
     },
 
+    // MARK: - Environment
+
     getenv: function(name, defaultValue){
         return this.environment.get(name, defaultValue);
     },

package/Root/Frameworks/UIKit/UICollectionReusableView.js

@@ -69,7 +69,7 @@ JSClass("UICollectionReusableView", UIView, {
         var view;
         var i, l;
         while (stack.length > 0){
-            view = stack.pop();
+            view = stack.shift();
             if (view.isKindOfClass(UILabel)){
                 return view.text;
             }

package/Root/Frameworks/UIKit/UICollectionView.js

@@ -17,6 +17,7 @@
 // #import "UIScrollView.js"
 // #import "UIPlatform.js"
 // #import "UICollectionViewLayout.js"
+// #import "UIPressGestureRecognizer.js"
 "use strict";
 
 (function(){
@@ -36,7 +37,13 @@ JSProtocol("UICollectionViewDelegate", JSProtocol, {
     // Dragging cells
     collectionViewShouldDragCellAtIndexPath: function(collectionView, indexPath){},
     pasteboardItemsForCollectionViewAtIndexPath: function(collectionView, indexPath){},
-    collectionViewWillBeginDraggingSession: function(collectionView, session){}
+    collectionViewWillBeginDraggingSession: function(collectionView, session){},
+
+    // Dragging destination
+    collectionViewDraggingSessionDidEnter: function(collectionView, sesssion){},
+    collectionViewDraggingSessionDidUpdate: function(collectionView, sesssion, indexPath){},
+    collectionViewDraggingSessionDidExit: function(collectionView, sesssion){},
+    collectionViewPerformDragOperation: function(collectionView, sesssion, operation, indexPath){}
 
 });
 
@@ -288,6 +295,9 @@ JSClass("UICollectionView", UIScrollView, {
     },
 
     reloadCellsAtIndexPaths: function(indexPaths, animator){
+        if (this._needsReload){
+            return;
+        }
         if (this._visibleElements.length === 0){
             return;
         }
@@ -343,6 +353,9 @@ JSClass("UICollectionView", UIScrollView, {
     deleteCellsAtIndexPaths: function(indexPaths, animation){
         // TODO:
         this.reloadData();
+        if (this.selectedIndexPaths.length > 0){
+            this._setSelectedIndexPaths([], {notifyDelegate: true});
+        }
     },
 
     insertSection: function(section, animation){
@@ -361,6 +374,9 @@ JSClass("UICollectionView", UIScrollView, {
     deleteSections: function(sections, animation){
         // TODO:
         this.reloadData();
+        if (this.selectedIndexPaths.length > 0){
+            this._setSelectedIndexPaths([], {notifyDelegate: true});
+        }
     },
 
     // -------------------------------------------------------------------------
@@ -811,6 +827,10 @@ JSClass("UICollectionView", UIScrollView, {
         if (cell === null){
             return;
         }
+        this._contextSelectCell(cell, location);
+    },
+
+    _contextSelectCell: function(cell, location){
         if (this.delegate && this.delegate.menuForCollectionViewCellAtIndexPath){
             var contextSelectedIndexPaths;
             if (this._selectionContainsIndexPath(cell.indexPath)){
@@ -834,11 +854,13 @@ JSClass("UICollectionView", UIScrollView, {
         this._updateVisibleCellStates();
     },
 
+
     mouseDragged: function(event){
         var location = event.locationInView(this);
         var cell = this._cellHitTest(location);
         if (this._shouldDrag){
             var dragItems = [];
+            var indexPaths = [];
             if (cell !== null){
                 var cellItems = [];
                 if (this.allowsMultipleSelection && this._selectionContainsIndexPath(cell.indexPath)){
@@ -850,6 +872,7 @@ JSClass("UICollectionView", UIScrollView, {
                             if (cellItems !== null){
                                 dragItems = dragItems.concat(cellItems);
                             }
+                            indexPaths.push(indexPath);
                         }
                     }
                 }else{
@@ -858,13 +881,14 @@ JSClass("UICollectionView", UIScrollView, {
                         if (cellItems !== null){
                             dragItems = cellItems;
                         }
+                        indexPaths.push(cell.indexPath);
                     }
                 }
             }
             if (dragItems.length > 0){
                 var session = this.beginDraggingSessionWithItems(dragItems, event);
                 if (this.delegate && this.delegate.collectionViewWillBeginDraggingSession){
-                    this.delegate.collectionViewWillBeginDraggingSession(this, session);
+                    this.delegate.collectionViewWillBeginDraggingSession(this, session, indexPaths, location);
                 }
             }
         }else{
@@ -952,7 +976,7 @@ JSClass("UICollectionView", UIScrollView, {
         this._touch = null;
     },
 
-    _makeTouchActiveCell: function(touch){
+    _makeTouchActiveCell: function(touch, waitForLongPress){
         var location = touch.locationInView(this);
         var cell = this._cellHitTest(location);
         if (cell === null){
@@ -964,6 +988,19 @@ JSClass("UICollectionView", UIScrollView, {
         }
         cell.active = true;
         this._touch.cell = cell;
+        if (waitForLongPress){
+            this._touch.timer = JSTimer.scheduledTimerWithInterval(UIPressGestureRecognizer.PressInterval.long, function(){
+                this._touch.timer = null;
+                this._longPressCell(location);
+            }, this);
+        }
+    },
+
+    _longPressCell: function(location){
+        var cell = this._touch.cell;
+        var indexPath = cell.indexPath;
+        this._cancelTouchSelection();
+        this._contextSelectCell(cell, location);
     },
 
     touchesBegan: function(touches, event){
@@ -976,7 +1013,7 @@ JSClass("UICollectionView", UIScrollView, {
             cell: null,
             timer: JSTimer.scheduledTimerWithInterval(0.05, function(){
                 this._touch.timer = null;
-                this._makeTouchActiveCell(touches[0]);
+                this._makeTouchActiveCell(touches[0], true);
             }, this)
         };
     },
@@ -1015,6 +1052,62 @@ JSClass("UICollectionView", UIScrollView, {
         this._cancelTouchSelection();
     },
 
+    // ----------------------------------------------------------------------
+    // MARK: - Drag Destination
+
+    draggingEntered: function(session){
+        if (this.delegate && this.delegate.collectionViewDraggingSessionDidEnter){
+            this.delegate.collectionViewDraggingSessionDidEnter(this, session);
+        }
+        return UIDragOperation.none;
+    },
+
+    draggingUpdated: function(session){
+        var location = this.convertPointFromScreen(session.screenLocation);
+        var indexPath = null;
+        var cell = this._cellHitTest(location);
+        if (cell !== null){
+            indexPath = cell.indexPath;
+        }
+        var operation = UIDragOperation.none;
+        if (this.delegate && this.delegate.collectionViewDraggingSessionDidUpdate){
+            operation = this.delegate.collectionViewDraggingSessionDidUpdate(this, session, indexPath);
+        }
+        if (operation === UIDragOperation.none){
+            this._updateDropTarget(null);
+        }else{
+            this._updateDropTarget(cell);
+        }
+        return operation;
+    },
+
+    draggingExited: function(session){
+        this._updateDropTarget(null);
+        if (this.delegate && this.delegate.collectionViewDraggingSessionDidExit){
+            this.delegate.collectionViewDraggingSessionDidExit(this, session);
+        }
+    },
+
+    performDragOperation: function(session, operation){
+        var location = this.convertPointFromScreen(session.screenLocation);
+        var cell = this._cellHitTest(location);
+        this._updateDropTarget(null);
+        if (cell && this.delegate && this.delegate.collectionViewPerformDragOperation){
+            this.delegate.collectionViewPerformDragOperation(this, session, operation, cell.indexPath);
+        }
+    },
+
+    _updateDropTarget: function(cell){
+        var i, l;
+        var item;
+        for (i = 0, l = this._visibleElements.length; i < l; ++i){
+            item = this._visibleElements[i];
+            if (item.attributes.elementCategory === UICollectionView.ElementCategory.cell){
+                item.view.dropTarget = item.view === cell;
+            }
+        }
+    },
+
     // --------------------------------------------------------------------
     // MARK: - Finding Cells by Location
 
@@ -1114,6 +1207,7 @@ JSClass("UICollectionView", UIScrollView, {
     // MARK: - Scrolling
 
     scrollToCellAtIndexPath: function(indexPath, position){
+        this.layoutIfNeeded();
         if (position === undefined){
             position = UICollectionView.ScrollPosition.auto;
         }
@@ -1222,15 +1316,7 @@ VisibleElement.prototype = Object.create(Function.prototype, {
     indexPath: { value: null, writable: true },
     rect: { value: null, writable: true, configurable: true },
     kind: { value: null, writable: true },
-    view: {
-        configurable: true,
-        set: function(view){
-            Object.defineProperty(this, 'view', {value: view});
-        },
-        get: function(){
-            return null;
-        }
-    },
+    view: { value: null, writable: true },
     state: { value: null, writable: true },
     animation: { value: null, writable: true },
 

package/Root/Frameworks/UIKit/UICollectionViewCell.js

@@ -36,6 +36,7 @@ JSClass("UICollectionViewCell", UICollectionReusableView, {
     active: JSDynamicProperty(null, null, 'isActive'),
     selected: JSDynamicProperty(null, null, 'isSelected'),
     contextSelected: JSDynamicProperty(null, null, 'isContextSelected'),
+    dropTarget: JSDynamicProperty(null, null, 'isDropTarget'),
 
     _updateState: function(newState){
         if (newState != this._state){
@@ -94,6 +95,14 @@ JSClass("UICollectionViewCell", UICollectionReusableView, {
         this._toggleState(UICollectionViewCell.State.contextSelected, isContextSelected);
     },
 
+    isDropTarget: function(){
+        return (this._state & UICollectionViewCell.State.dropTarget) === UICollectionViewCell.State.dropTarget;
+    },
+
+    setDropTarget: function(isDropTarget){
+        this._toggleState(UICollectionViewCell.State.dropTarget, isDropTarget);
+    },
+
     // --------------------------------------------------------------------
     // MARK: - Accessibility
 
@@ -117,5 +126,6 @@ UICollectionViewCell.State = {
     active:   1 << 1,
     selected: 1 << 2,
     contextSelected: 1 << 3,
-    firstUserState: 1 << 4
+    dropTarget: 1 << 4,
+    firstUserState: 1 << 5
 };

package/Root/Frameworks/UIKit/UICollectionViewLayout.js

@@ -35,7 +35,7 @@ JSClass("UICollectionViewLayout", JSObject, {
     layoutAttributesForCellAtIndexPath: function(indexPath){
     },
 
-    layoutAttributesForSupplimentaryViewAtIndexPath: function(indexPath){
+    layoutAttributesForSupplimentaryViewAtIndexPath: function(indexPath, kind){
     },
 
     shouldInvalidateLayoutForBounds: function(bounds){

package/Root/Frameworks/UIKit/UIColorPanel.js

@@ -257,7 +257,9 @@ JSClass("UIColorPanelViewController", UIViewController, {
 
     viewDidAppear: function(animated){
         UIColorPanelViewController.$super.viewDidAppear.call(this, animated);
-        this.view.window.firstResponder = this.hexField;
+        if (UIDevice.shared !== null && UIDevice.shared.primaryPointerType !== UIUserInterface.PointerType.touch){
+            this.view.window.firstResponder = this.hexField;
+        }
     },
 
     viewWillDisappear: function(animated){
@@ -656,6 +658,7 @@ JSClass("UIColorPanelViewController", UIViewController, {
     componentFieldSpacing: 4,
 
     contentSizeThatFitsSize: function(maxSize){
+        var view = this.view; // force view load
         var size = JSSize(this.contentInsets.width + 220, this.contentInsets.height);
         if (size.width > maxSize.width){
             size.width = maxSize.width;

package/Root/Frameworks/UIKit/UIDraggingSession.js

@@ -83,6 +83,9 @@ JSClass("UIDraggingSession", JSObject, {
     },
 
     cancel: function(){
+        if (this.destination){
+            this.destination.draggingExited(this);
+        }
     },
 
     isValidDestination: function(destination){
@@ -95,6 +98,10 @@ JSClass("UIDraggingSession", JSObject, {
         this.imageOffset = JSPoint(offset);
     },
 
+    setImageFromView: function(view, offset){
+        this.imageOffset = JSPoint(offset);
+    },
+
     centerImageScreenLocation: JSReadOnlyProperty(),
 
     getCenterImageScreenLocation: function(){

package/Root/Frameworks/UIKit/UIHTMLTextField.js

@@ -239,7 +239,7 @@ JSClass("UIHTMLTextField", UIControl, {
         this.didChangeValueForBinding('text');
         this.didChangeValueForBinding('integerValue');
         this.postAccessibilityNotification(UIAccessibility.Notification.valueChanged);
-        this.sendActionsForEvents(UIControl.Event.valueChanged);
+        this.sendActionsForEvents(UIControl.Event.editingChanged);
         if (this.delegate && this.delegate.textFieldDidChange){
             this.delegate.textFieldDidChange(this);
         }
@@ -904,6 +904,8 @@ UIHTMLTextField.layerClass = UIHTMLElementLayer;
 
 UIHTMLTextField.sharedStyleElement = null;
 
+UIHTMLTextField.Styler = UITextField.Styler;
+
 var htmlInputModeByKeyboardType = {};
 htmlInputModeByKeyboardType[UITextInput.KeyboardType.default] = "";
 htmlInputModeByKeyboardType[UITextInput.KeyboardType.url] = "url";

package/Root/Frameworks/UIKit/UIHTMLWindowServer.js

@@ -562,7 +562,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
     dragend: function(e){
         // dragend is not cancelable, so no need for preventDefault()
         if (this._dragImageElement !== null){
-            if (this._dragImageElement.parentNode !== null){
+            if (this._dragImageElement.parentNode !== null && this._createdDragImageElement){
                 this._dragImageElement.parentNode.removeChild(this._dragImageElement);
             }
             this._dragImageElement = null;
@@ -839,6 +839,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
     // MARK: - Drag & Drop Support
 
     _dragImageElement: null,
+    _createdDragImageElement: false,
 
     prerenderDragImage: function(image){
         // Safari is picky here and requires that the image element be in the document and
@@ -852,6 +853,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
         imageElement.src = image.htmlURLString();
         this.rootElement.appendChild(imageElement);
         this._dragImageElement = imageElement;
+        this._createdDragImageElement = true;
     },
 
     createDraggingSessionWithItems: function(items, event, view){
@@ -863,6 +865,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
             context.element.draggable = true;
             // Could use a subclass here, but this seems to work too
             var originalSetImage = session.setImage;
+            var originalSetImageFromView = session.setImageFromView;
             var windowServer = this;
             Object.defineProperties(session, {
                 setImage: {
@@ -871,6 +874,15 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
                         originalSetImage.call(this, image, imageOffset);
                         windowServer.prerenderDragImage(image);
                     }
+                },
+                setImageFromView: {
+                    configurable: true,
+                    value: function UIHTMLWindowServer_UIDragSession_setImageFromView(view, imageOffset){
+                        originalSetImageFromView.call(this, view, imageOffset);
+                        var context = windowServer.displayServer.contextForLayer(view.layer);
+                        windowServer._dragImageElement = context.element;
+                        windowServer._createdDragImageElement = false;
+                    }
                 }
             });
         }

package/Root/Frameworks/UIKit/UIMenu.js

@@ -747,10 +747,6 @@ JSClass("UIMenuWindowStyler", UIMenuStyler, {
         }
 
         // Figure out how much space we have on either side of the target rect
-        // IMPORTANT: target rect is assumed to leave enough room on at least
-        // one side.   In our two uses cases 1) submenus, and 2) context menus,
-        // menu must be true because 1) a menu is < 1/3 screen wide, leaving
-        // at least 1/3 on one side, and 2) context menu rects are Zero size
         var viewFrame = view.convertRectToScreen(rect);
 
         // If our rect if offscreen to the left or right, move it over
@@ -779,6 +775,11 @@ JSClass("UIMenuWindowStyler", UIMenuStyler, {
             origin.x = viewFrame.origin.x - size.width;
         }
 
+        // Adjust our x position if we've overflowed
+        if (origin.x < screenMetrics.safeFrame.origin.x){
+            origin.x = screenMetrics.safeFrame.origin.x;
+        }
+
         // Prefer the y origin at the top of our rect
         origin.y = viewFrame.origin.y;
 
@@ -840,9 +841,15 @@ JSClass("UIMenuWindowStyler", UIMenuStyler, {
 
     metricsForScreen: function(screen){
         var safeFrame = screen.availableFrame.rectWithInsets(4, 7);
+        if (screen.traitCollection.horizontalSizeClass === UIUserInterface.SizeClass.compact){
+            return {
+                safeFrame: safeFrame,
+                maximumWidth: Math.floor(safeFrame.size.width * 0.75)
+            };
+        }
         return {
             safeFrame: safeFrame,
-            maximumWidth: Math.floor(safeFrame.size.width * 0.3)
+            maximumWidth: Math.min(450, Math.floor(safeFrame.size.width * 0.5))
         };
     },
 

package/Root/Frameworks/UIKit/UIMenuItem.js

@@ -101,6 +101,12 @@ JSClass("UIMenuItem", JSObject, {
         this.target = target || null;
     },
 
+    initWithView: function(view, action, target){
+        this.view = view;
+        this.action = action || null;
+        this.target = target || null;
+    },
+
     initSeparator: function(){
         this._isSeparator = true;
         this._isEnabled = false;

package/Root/Frameworks/UIKit/UIMenuView.js

@@ -646,9 +646,13 @@ JSClass("UIMenuView", UIView, {
 
     addViewForItem: function(item){
         var view = item.view;
+        var separatorInsets = this.menuWindow.itemContentInsets.insetsWithInsets(0, item.menu.showStatusColumn ? (item.menu.font.displayLineHeight + this.menuWindow.itemContentInsets.left) : 0, 0, 0);
+        if (UIDevice.shared !== null && UIDevice.shared.primaryPointerType === UIUserInterface.PointerType.touch){
+            separatorInsets = JSInsets.Zero;
+        }
         if (view === null){
             if (item.separator){
-                view = UIMenuItemSeparatorView.initWithColor(this.menuWindow.separatorColor, this.menuWindow.separatorLineWidth, this.menuWindow.itemContentInsets.insetsWithInsets(0, item.menu.showStatusColumn ? (item.menu.font.displayLineHeight + this.menuWindow.itemContentInsets.left) : 0, 0, 0));
+                view = UIMenuItemSeparatorView.initWithColor(this.menuWindow.separatorColor, this.menuWindow.separatorLineWidth, separatorInsets);
                 view.frame = JSRect(0, 0, 1, this.menuWindow.separatorSize);
             }else{
                 view = UIMenuItemView.init();
@@ -662,6 +666,13 @@ JSClass("UIMenuView", UIView, {
                 view.setItem(item);
             }
         }
+        if (UIDevice.shared !== null && UIDevice.shared.primaryPointerType === UIUserInterface.PointerType.touch){
+            if (!item.separator && this.itemViews.length > 0 && !(this.itemViews[this.itemViews.length - 1] instanceof UIMenuItemSeparatorView)){
+                view.borderWidth = 1;
+            }
+            view.maskedBorders = UIView.Sides.minY;
+            view.borderColor = this.menuWindow.separatorColor;
+        }
         view.hidden = item.alternate;
         this.addSubview(view);
         this.itemViews.push(view);

package/Root/Frameworks/UIKit/UIPressGestureRecognizer.js

@@ -18,14 +18,21 @@
 
 JSClass("UIPressGestureRecognizer", UIGestureRecognizer, {
 
+    init: function(){
+        UIPressGestureRecognizer.$super.init.call(this);
+        this.minimumPressInterval = UIPressGestureRecognizer.PressInterval.long;
+    },
+
     initWithSpec: function(spec){
         UIPressGestureRecognizer.$super.initWithSpec.call(this, spec);
         if (spec.containsKey("minimumPressInterval")){
             this.minimumPressInterval = spec.valueForKey("minimumPressInterval");
+        }else{
+            this.minimumPressInterval = UIPressGestureRecognizer.PressInterval.long;
         }
     },
 
-    minimumPressInterval: 1.0,
+    minimumPressInterval: 0,
 
     // MARK: - Events
 
@@ -106,4 +113,8 @@ JSClass("UIPressGestureRecognizer", UIGestureRecognizer, {
         this.end(UIGestureRecognizer.State.failed);
     }
 
-});
+});
+
+UIPressGestureRecognizer.PressInterval = {
+    long: 1
+};

package/Root/Frameworks/UIKit/UIScrollView.js

@@ -37,16 +37,19 @@ JSClass('UIScrollView', UIView, {
     initWithSpec: function(spec){
         UIScrollView.$super.initWithSpec.call(this, spec);
 
-        // 1. If any subviews were added directly to this view, we'll move them
-        //    to the contentView once it's ready
-        var contentSubviews = JSCopy(this.subviews);
-
-        // 2. If the content view and scrollers are specified in the spec, create them
-        //    before doing the _commonScrollViewInit, so it won't try to create them itself.
-        //    These properties are optional in the spec, and are typically only provided if
-        //    the user wants to provide specialized customization
+        var contentSubviews = [];
+
+        // If the content view and scrollers are specified in the spec, create them
+        // before doing the _commonScrollViewInit, so it won't try to create them itself.
+        // These properties are optional in the spec, and are typically only provided if
+        // the user wants to provide specialized customization
         if (spec.containsKey('contentView')){
             this._contentView = spec.valueForKey("contentView", UIView);
+        }else{
+            // If any subviews were added directly to this view, and a 
+            // contentView was not provided, treat the subviews as children
+            // of the contentView
+            contentSubviews = JSCopy(this.subviews);
         }
         if (spec.containsKey('verticalScroller')){
             this._verticalScroller = spec.valueForKey("verticalScroller", UIScroller);
@@ -59,13 +62,13 @@ JSClass('UIScrollView', UIView, {
         }
         this._commonScrollViewInit();
 
-        // 3. Finish the work from step #1 after _commonScrollViewInit, when we can be sure that
-        //    a contentView has been created
+        // Finish the contentSubvies work after _commonScrollViewInit,
+        // when we can be sure that a contentView has been created
         for (var i = 0, l = contentSubviews.length; i < l; ++i){
             this._contentView.addSubview(contentSubviews[i]);
         }
 
-        // 4. Handle all the other properties
+        // Handle all the other properties
         if (spec.containsKey('contentInsets')){
             this.contentInsets = spec.valueForKey("contentInsets", JSInsets);
         }
@@ -105,7 +108,7 @@ JSClass('UIScrollView', UIView, {
         this._maxContentOffset = JSPoint.Zero;
         this._horizontalScroller.addAction("_horizontalScrollerValueChanged", this, UIControl.Event.valueChanged);
         this._verticalScroller.addAction("_verticalScrollerValueChanged", this, UIControl.Event.valueChanged);
-        this.addSubview(this._contentView);
+        this.insertSubviewAtIndex(this._contentView, 0);
         this.addSubview(this._verticalScroller);
         this.addSubview(this._horizontalScroller);
         this._updateScrollers();

package/Root/Frameworks/UIKit/UISegmentedControl.js

@@ -769,6 +769,21 @@ JSClass("UISegmentedControlDefaultStyler", UISegmentedControlStyler, {
         }
     },
 
+    sizeControlToFitSize: function(control, maxSize){
+        var intrinsicSize = this.intrinsicSizeOfControl(control);
+        var size = JSSize(control.bounds.size);
+        if (maxSize.width < Number.MAX_VALUE){
+            size.width = maxSize.width;
+        }
+        if (intrinsicSize.width < maxSize.width){
+            size.width = intrinsicSize.width;
+        }
+        if (intrinsicSize.height < maxSize.height){
+            size.height = intrinsicSize.height;
+        }
+        control.bounds = JSRect(JSPoint.Zero, size);
+    },
+
     intrinsicSizeOfControl: function(control){
         var itemView;
         var size = JSSize.Zero;