sproutcore 1.8.1 → 1.8.2.1

data/lib/frameworks/sproutcore/frameworks/desktop/views/scroller.js

@@ -56,24 +56,24 @@ SC.ScrollerView = SC.View.extend(
     @readOnly
   */
   ariaRole: 'scrollbar',
-  
-  
+
+
   // ..........................................................
   // PROPERTIES
   //
-  
+
   /**
     If YES, a click on the track will cause the scrollbar to scroll to that position.
     Otherwise, a click on the track will cause a page down.
-    
+
     In either case, alt-clicks will perform the opposite behavior.
-    
+
     @type Boolean
     @default NO
   */
   shouldScrollToClick: NO,
-  
-  
+
+
   /** @private
     The in-touch-scroll value.
   */
@@ -83,7 +83,7 @@ SC.ScrollerView = SC.View.extend(
     The value of the scroller.
 
     The value represents the position of the scroller's thumb.
-    
+
     @field
     @type Number
     @observes maximum
@@ -98,7 +98,7 @@ SC.ScrollerView = SC.View.extend(
     val = this._scs_value || minimum; // default value is at top/left
     return Math.max(Math.min(val, this.get('maximum')), minimum) ;
   }.property('maximum', 'minimum').cacheable(),
-  
+
   /**
     @type Number
     @observes value
@@ -173,7 +173,7 @@ SC.ScrollerView = SC.View.extend(
     appear horizontal or vertical.  This must be set when the view is created.
     Changing this once the view has been created will have no effect. Possible
     values:
-    
+
       - SC.LAYOUT_VERTICAL
       - SC.LAYOUT_HORIZONTAL
 
@@ -196,14 +196,14 @@ SC.ScrollerView = SC.View.extend(
   //
 
   /**
-    The width (if vertical scroller) or height (if horizontal scroller) of the 
+    The width (if vertical scroller) or height (if horizontal scroller) of the
     scrollbar.
 
     @type Number
     @default 14
   */
   scrollbarThickness: 14,
-  
+
   /**
     The width or height of the cap that encloses the track.
 
@@ -239,7 +239,7 @@ SC.ScrollerView = SC.View.extend(
     @default 11
   */
   buttonOverlap: 11,
-  
+
   /**
     The minimium length that the thumb will be, regardless of how much content
     is in the scroll view.
@@ -265,7 +265,8 @@ SC.ScrollerView = SC.View.extend(
     @private
   */
   render: function(context, firstTime) {
-    var classNames = {},
+    var ariaOrientation = 'vertical',
+        classNames = {},
         buttons = '',
         parentView = this.get('parentView'),
         layoutDirection = this.get('layoutDirection'),
@@ -280,6 +281,7 @@ SC.ScrollerView = SC.View.extend(
         break;
       case SC.LAYOUT_HORIZONTAL:
         classNames['sc-horizontal'] = YES;
+        ariaOrientation = 'horizontal';
         break;
     }
 
@@ -304,7 +306,7 @@ SC.ScrollerView = SC.View.extend(
       this.renderThumb(context, layoutDirection, thumbLength, thumbPosition);
 
       //addressing accessibility
-      context.attr('aria-orientation', 'vertical');
+      context.attr('aria-orientation', ariaOrientation);
 
       //addressing accessibility
       context.attr('aria-valuemax', this.get('maximum'));
@@ -353,12 +355,12 @@ SC.ScrollerView = SC.View.extend(
   touchScrollDidStart: function(value) {
     this.set("_touchScrollValue", value);
   },
-  
+
   /** @private */
   touchScrollDidEnd: function(value) {
     this.set("_touchScrollValue", NO);
   },
-  
+
   /** @private */
   touchScrollDidChange: function(value) {
     this.set("_touchScrollValue", value);
@@ -367,7 +369,7 @@ SC.ScrollerView = SC.View.extend(
   // ..........................................................
   // THUMB MANAGEMENT
   //
-  
+
   /** @private
     Adjusts the thumb (for backwards-compatibility calls adjustThumbPosition+adjustThumbSize by default)
   */
@@ -485,7 +487,7 @@ SC.ScrollerView = SC.View.extend(
         thumbLength = this.get('thumbLength'),
         capLength = this.get('capLength'),
         capOverlap = this.get('capOverlap'), position;
-        
+
     position = (value/max)*(trackLength-thumbLength);
     position += capLength - capOverlap; // account for the top/left cap
 
@@ -507,7 +509,7 @@ SC.ScrollerView = SC.View.extend(
   // ..........................................................
   // MOUSE EVENTS
   //
-  
+
   /** @private
     Returns the value for a position within the scroller's frame.
   */
@@ -516,8 +518,8 @@ SC.ScrollerView = SC.View.extend(
         trackLength = this.get('trackLength'),
         thumbLength = this.get('thumbLength'),
         capLength = this.get('capLength'),
-        capOverlap = this.get('capOverlap'), value; 
-    
+        capOverlap = this.get('capOverlap'), value;
+
     value = pos - (capLength - capOverlap);
     value = value / (trackLength - thumbLength);
     value = value * max;
@@ -546,7 +548,7 @@ SC.ScrollerView = SC.View.extend(
   */
   mouseDown: function(evt) {
     if (!this.get('isEnabled')) return NO;
-    
+
     // keep note of altIsDown for later.
     this._altIsDown = evt.altKey;
     this._shiftIsDown = evt.shiftKey;
@@ -591,7 +593,7 @@ SC.ScrollerView = SC.View.extend(
       // User clicked in the track
       var scrollToClick = this.get("shouldScrollToClick");
       if (evt.altKey) scrollToClick = !scrollToClick;
-      
+
       var trackLength = this.get('trackLength'),
           thumbLength = this.get('thumbLength'),
           frame = this.convertFrameFromView({ x: evt.pageX, y: evt.pageY }),
@@ -605,13 +607,13 @@ SC.ScrollerView = SC.View.extend(
           this._mouseDownLocation = mousePosition = frame.x;
           break;
       }
-      
+
       if (scrollToClick) {
         this.set('value', this.valueForPosition(mousePosition - (thumbLength / 2)));
-        
+
         // and start a normal mouse down
         thumbPosition = this.get('thumbPosition');
-        
+
         this._thumbDragging = YES;
         this._thumbOffset = {x: frame.x - thumbPosition, y: frame.y - thumbPosition };
         this._mouseDownLocation = {x:evt.pageX, y:evt.pageY};
@@ -628,7 +630,7 @@ SC.ScrollerView = SC.View.extend(
           this.startMouseDownTimer('page');
         }
       }
-      
+
     }
 
     return YES;
@@ -669,7 +671,7 @@ SC.ScrollerView = SC.View.extend(
     If the user began the drag on the thumb, we calculate the difference
     between the mouse position at click and where it is now.  We then
     offset the thumb by that amount, within the bounds of the track.
-    
+
     If the user began scrolling up/down using the buttons, this will track
     what component they are currently over, changing the scroll direction.
 
@@ -686,7 +688,7 @@ SC.ScrollerView = SC.View.extend(
 
     // Only move the thumb if the user clicked on the thumb during mouseDown
     if (this._thumbDragging) {
-      
+
       switch (this.get('layoutDirection')) {
         case SC.LAYOUT_VERTICAL:
           delta = (evt.pageY - this._mouseDownLocation.y);
@@ -695,7 +697,7 @@ SC.ScrollerView = SC.View.extend(
           delta = (evt.pageX - this._mouseDownLocation.x);
           break;
       }
-      
+
       // if we are in alt now, but were not before, update the old thumb position to the new one
       if (evt.altKey) {
         if (!this._altIsDown || (this._shiftIsDown !== evt.shiftKey)) {
@@ -704,24 +706,24 @@ SC.ScrollerView = SC.View.extend(
           this._mouseDownLocation = { x: evt.pageX, y: evt.pageY };
           this._valueAtDragStart = this.get("value");
         }
-        
+
         // because I feel like it. Probably almost no one will find this tiny, buried feature.
         // Too bad.
         if (evt.shiftKey) delta = -delta;
-        
+
         this.set('value', Math.round(this._valueAtDragStart + delta * 2));
       } else {
         thumbPosition = thumbPositionAtDragStart + delta;
         length = this.get('trackLength') - this.get('thumbLength');
         this.set('value', Math.round( (thumbPosition/length) * this.get('maximum')));
       }
-    
+
     } else if (isScrollingUp || isScrollingDown) {
       var nowScrollingUp = NO, nowScrollingDown = NO;
-      
+
       var topButtonRect = this.$('.button-top')[0].getBoundingClientRect();
       var bottomButtonRect = this.$('.button-bottom')[0].getBoundingClientRect();
-      
+
       switch (this.get('layoutDirection')) {
         case SC.LAYOUT_VERTICAL:
           if (evt.clientY < topButtonRect.bottom) nowScrollingUp = YES;
@@ -732,12 +734,12 @@ SC.ScrollerView = SC.View.extend(
           else nowScrollingDown = YES;
           break;
       }
-      
+
       if ((nowScrollingUp || nowScrollingDown) && nowScrollingUp !== isScrollingUp){
         //
         // STOP OLD
         //
-        
+
         // If we have an element that was set as active in mouseDown,
         // remove its active state
         if (active) {
@@ -746,19 +748,19 @@ SC.ScrollerView = SC.View.extend(
 
         // Stop firing repeating events after mouseup
         this._mouseDownTimerAction = nowScrollingUp ? "scrollUp" : "scrollDown";
-        
+
         if (nowScrollingUp) {
           this.makeButtonActive('.button-top');
         } else if (nowScrollingDown) {
           this.makeButtonActive('.button-bottom');
         }
-        
+
          this._isScrollingUp = nowScrollingUp;
          this._isScrollingDown = nowScrollingDown;
       }
     }
-    
-    
+
+
     this._altIsDown = evt.altKey;
     this._shiftIsDown = evt.shiftKey;
     return YES;
@@ -769,7 +771,7 @@ SC.ScrollerView = SC.View.extend(
     clicks a button or inside the track to move a page at a time. If they
     continue holding the mouse button down, we want to repeat that action
     after a small delay.  This timer will be invalidated in mouseUp.
-    
+
     Specify "immediate" as YES if it should not wait.
   */
   startMouseDownTimer: function(action, immediate) {
@@ -849,52 +851,52 @@ SC.TouchScrollerView = SC.ScrollerView.extend(
     @see SC.View#classNames
   */
   classNames: ['sc-touch-scroller-view'],
-  
+
   /**
     @type Number
     @default 12
   */
   scrollbarThickness: 12,
-  
+
   /**
     @type Number
     @default 5
   */
   capLength: 5,
-  
+
   /**
     @type Number
     @default 0
   */
   capOverlap: 0,
-  
+
   /**
     @type Boolean
     @default NO
   */
   hasButtons: NO,
-  
+
   /**
     @type Number
     @default 36
   */
   buttonOverlap: 36,
-  
+
   /** @private */
   adjustThumb: function(thumb, position, length) {
     var thumbInner = this.$('.thumb-inner');
     var max = this.get("scrollerLength") - this.capLength, min = this.get("minimum") + this.capLength;
-    
+
     if (position + length > max) {
       position = Math.min(max - 20, position);
       length = max - position;
     }
-    
+
     if (position < min) {
       length -= min - position;
       position = min;
     }
-    
+
     switch (this.get('layoutDirection')) {
       case SC.LAYOUT_VERTICAL:
         if (this._thumbPosition !== position) thumb.css('-webkit-transform', 'translate3d(0px,' + position + 'px,0px)');
@@ -913,7 +915,7 @@ SC.TouchScrollerView = SC.ScrollerView.extend(
     this._thumbPosition = position;
     this._thumbSize = length;
   },
-  
+
   /** @private */
   render: function(context, firstTime) {
     var classNames = [],

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/mixins/split_child.js

@@ -214,7 +214,7 @@ SC.SplitChild =
    * @property SC.SplitView
   */
   splitView: function() {
-    var view = this ;
+    var view = this.get('parentView') ;
     while (view && !view.isSplitView) view = view.get('parentView') ;
     return view ;
   }.property('parentView').cacheable(),

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/split_child.js

@@ -33,7 +33,14 @@ module("SplitView - SplitChild (" + (layoutDirection === SC.LAYOUT_HORIZONTAL ?
       
       left:  SC.View.extend(SC.SplitChild, { name: 'left', size: 100 }),
       middle: SC.View.extend(SC.SplitChild, { name: 'middle', size: 300, positionOffset: -10, sizeOffset: 20 }),
-      right: SC.View.extend(SC.SplitChild, { name: 'right', size: 100 }),
+      right: SC.SplitView.extend(SC.SplitChild, {
+        name: 'right',
+        size: 100,
+        splitDividerView: null,
+        childViews: ['top', 'bottom'],
+        top: SC.View.extend(SC.SplitChild, { name: 'top', size: 100 }),
+        bottom: SC.View.extend(SC.SplitChild, { name: 'bottom', size: 400 })
+      }),
       
       layout: { 
         left: 0, top: 0, 
@@ -129,6 +136,18 @@ test("Check that changing orientation changes layouts.", function() {
   verifyChildren(splitView, 100, 100, 100);
 });
 
+test("Check that the `splitView` computed is correct on SC.SplitChilds", function () {
+  equals(splitView, splitView.childViews[0].get('splitView'));
+  equals(splitView, splitView.childViews[1].get('splitView'));
+  equals(splitView, splitView.childViews[2].get('splitView'),
+         'the splitView should the closest parent splitView');
+
+  var nestedSplitView = splitView.childViews[2];
+
+  equals(nestedSplitView, nestedSplitView.childViews[0].get('splitView'));
+  equals(nestedSplitView, nestedSplitView.childViews[1].get('splitView'));
+});
+
 }
 
 setupSuite(SC.LAYOUT_HORIZONTAL);

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/views/split.js

@@ -29,67 +29,67 @@ SC.RESIZE_AUTOMATIC = 'sc-automatic-resize';
 
 /**
   @class
-  
+
   SC.SplitView arranges multiple views side-by-side or on top of each
   other.
-  
-  SplitView can resize its children to fit (the default behavior), 
+
+  SplitView can resize its children to fit (the default behavior),
   or resize itself to fit its children--allowing you to build column-
-  based file browsers and the like. As one child (a divider, most likely) 
+  based file browsers and the like. As one child (a divider, most likely)
   is moved, SplitView can move additional children to get them out of the way.
-  
+
   Setting Up SplitViews
   =======================================
   You can set up a split view like any other view in SproutCore:
-  
+
       SplitView.design({
         childViews: 'leftPanel rightPanel'.w(),
-        
+
         leftPanel: SC.View.design(SC.SplitChild, {
           minimumSize: 200
         }),
-        
+
         rightPanel: SC.View.design(SC.SplitChild, {
-          // it is usually the right panel you want to resize 
+          // it is usually the right panel you want to resize
           // as the SplitView resizes:
           autoResizeStyle: SC.RESIZE_AUTOMATIC
         })
       })
-  
+
   Dividers
   ------------------------------------------
-  Dividers are automatically added between every child view. 
-  
+  Dividers are automatically added between every child view.
+
   You can specify what dividers to create in two ways:
-  
+
   - Set splitDividerView to change the default divider view class to use.
-  
+
   - Override splitDividerViewBetween(splitView, view1, view2), either in
     your subclass of SC.SplitView or in a delegate, and return the divider
     view instance that should go between the two views.
-  
+
   As far as SplitView is concerned, dividers are actually just ordinary
   child views. They usually have an autoResizeStyle of SC.FIXED_SIZE, and
   usually mixin SC.SplitThumb to relay mouse and touch events to the SplitView.
   To prevent adding dividers between dividers and views or dividers and dividers,
   SC.SplitView marks all dividers with an isSplitDivider property.
-  
+
   If you do not want to use split dividers at all, or wish to set them up
   manually in your childViews array, set splitDividerView to null.
-  
+
   @extends SC.View
   @author Alex Iskander
 */
 SC.SplitView = SC.View.extend({
   /**@scope SC.SplitView.prototype*/
-  
+
   classNames: ['sc-split-view'],
-  
+
   childViews: ['topLeftView', 'bottomRightView'],
-  
+
   // used by the splitView computed property to find the nearest SplitView.
   isSplitView: YES,
-  
+
   /**
    * The type of view to create for the divider views. SC.SplitDividerView by default.
    *
@@ -98,12 +98,12 @@ SC.SplitView = SC.View.extend({
    * @type {SC.View}
   */
   splitDividerView: SC.SplitDividerView,
-  
+
   /**
    * Determines whether the SplitView should lay out its children
    * horizontally or vertically.
    *
-   * Possible values: 
+   * Possible values:
    *
    * - SC.LAYOUT_HORIZONTAL: side-by-side
    * - SC.LAYOUT_VERTICAL: on top of each other
@@ -111,10 +111,10 @@ SC.SplitView = SC.View.extend({
    * @type LayoutDirection
   */
   layoutDirection: SC.LAYOUT_HORIZONTAL,
-  
+
   /**
    * Determines whether the SplitView should attempt to resize its
-   * child views to fit within the SplitView's own frame (the default). 
+   * child views to fit within the SplitView's own frame (the default).
    *
    * If NO, the SplitView will decide its own size based on its children.
    *
@@ -122,7 +122,7 @@ SC.SplitView = SC.View.extend({
    * @default YES
   */
   shouldResizeChildrenToFit: YES,
-  
+
   /**
    * The cursor of the child view currently being dragged (if any).
    * This allows the cursor to be used even if the user drags "too far",
@@ -131,7 +131,7 @@ SC.SplitView = SC.View.extend({
    * @type {String}
   */
   splitChildCursorStyle: null,
-  
+
   /**
     @private
     Only occurs during drag, which only happens after render, so we
@@ -140,8 +140,8 @@ SC.SplitView = SC.View.extend({
   _scsv_splitChildCursorDidChange: function() {
     this.get('cursor').set('cursorStyle', this.get('splitChildCursorStyle'));
   }.observes('splitChildCursorStyle'),
-  
-  
+
+
   // set up the SC.Cursor instance that this view and all the subviews
   // will share.
   init: function() {
@@ -156,7 +156,7 @@ SC.SplitView = SC.View.extend({
   //
   displayProperties: ['layoutDirection'],
   renderDelegateName: 'splitRenderDelegate',
-  
+
   //
   // UTILITIES
   //
@@ -182,23 +182,23 @@ SC.SplitView = SC.View.extend({
     this.scheduleTiling();
     orig();
   }.enhance(),
-  
+
   layoutDirectionDidChange: function() {
     this.scheduleTiling();
   }.observes('layoutDirection'),
-  
-  // 
+
+  //
   // PUBLIC CHILD VIEW ADJUSTMENT API
   //
   /**
    * Attempts to adjust the position of a child view, such as a divider.
-   * 
+   *
    * The implementation for this may be overridden in the delegate method
    * splitViewAdjustPositionForChild.
    *
    * You may use this method to automatically collapse the view by setting
    * the view's position to the position of the next or previous view (accessible
-   * via the child's nextView and previousView properties and the 
+   * via the child's nextView and previousView properties and the
    * getPositionForChild method).
    *
    * @param {SC.View} child The child to move.
@@ -208,14 +208,14 @@ SC.SplitView = SC.View.extend({
   adjustPositionForChild: function(child, position){
     return this.invokeDelegateMethod(this.get('delegate'), 'splitViewAdjustPositionForChild', this, child, position);
   },
-  
+
   /**
-   * Returns the position within the split view for a child view, 
+   * Returns the position within the split view for a child view,
    * such as a divider. This position is not necessarily identical
    * to the view's actual layout 'left' or 'right'; that position could
    * be offset--for instance, to give a larger grab area to the divider.
    *
-   * The implementation for this is in the delegate method 
+   * The implementation for this is in the delegate method
    * splitViewGetPositionForChild.
    *
    * @param {SC.View} child The child whose position to find.
@@ -224,11 +224,11 @@ SC.SplitView = SC.View.extend({
   getPositionForChild: function(child){
     return this.invokeDelegateMethod(this.get('delegate'), 'splitViewGetPositionForChild', this, child);
   },
-  
+
   //
   // CHILD VIEW MANAGEMENT
   //
-  
+
   // When children are added and removed, we must re-run the setup process that
   // sets the SplitView child properties such as nextView, previousView, etc.,
   // and which adds dividers.
@@ -239,12 +239,12 @@ SC.SplitView = SC.View.extend({
     // setupChildViews, because of the invokeOnce.
     if (this._scsv_settingUpChildViews) return;
     this._scsv_settingUpChildViews = YES;
-    
+
     this.invokeOnce('_scsv_setupChildViews');
-    
+
     this._scsv_settingUpChildViews = NO;
   },
-  
+
   didRemoveChild: function() {
     // we have to add a guard because _scsv_setupChildViews may add or remove
     // dividers, causing this method to be called again uselessly.
@@ -252,23 +252,23 @@ SC.SplitView = SC.View.extend({
     // setupChildViews, because of the invokeOnce.
     if (this._scsv_settingUpChildViews) return;
     this._scsv_settingUpChildViews = YES;
-    
+
     this.invokeOnce('_scsv_setupChildViews');
-    
+
     this._scsv_settingUpChildViews = NO;
   },
-  
+
   createChildViews: function() {
     sc_super();
 
     if (this._scsv_settingUpChildViews) return;
     this._scsv_settingUpChildViews = YES;
-    
+
     this.invokeOnce('_scsv_setupChildViews');
-    
+
     this._scsv_settingUpChildViews = NO;
   },
-  
+
   /**
    * @private
    * During initialization and whenever the child views change, SplitView needs
@@ -276,17 +276,17 @@ SC.SplitView = SC.View.extend({
    *
    * Note: If dividers are added, childViews changes, causing this to be called again;
    * this is proper, because this updates the nextView, etc. properties appropriately.
-   * 
+   *
    * The helper properties are: previousView, nextView, viewIndex.
   */
   _scsv_setupChildViews: function() {
     var del = this.get('delegate'),
-    
+
         children = this.get('childViews').copy(), len = children.length, idx,
         child, lastChild, lastNonDividerChild,
-        
+
         oldDividers = this._scsv_dividers || {}, newDividers = {}, divider, dividerId;
-    
+
     // loop through all children, keeping track of the previous child
     // as we loop using the lastChild variable.
     for (idx = 0; idx < len; idx++) {
@@ -300,7 +300,7 @@ SC.SplitView = SC.View.extend({
           child.set('autoResizeStyle', SC.RESIZE_AUTOMATIC);
         }
       }
-      
+
       // we initialize the size first thing in case the size is empty (fill)
       // if it is empty, the way we position the views would lead to inconsistent
       // sizes. In addition, we will constrain all initial sizes so they'll be valid
@@ -308,31 +308,31 @@ SC.SplitView = SC.View.extend({
       var size = this.invokeDelegateMethod(del, 'splitViewGetSizeForChild', this, child);
       size = this.invokeDelegateMethod(del, 'splitViewConstrainSizeForChild', this, child, size);
       this.invokeDelegateMethod(del, 'splitViewSetSizeForChild', this, child, size);
-      
+
       child.previousView = lastChild;
       child.nextView = undefined;
       child.viewIndex = idx;
-      
+
       if (lastChild) {
         lastChild.nextView = child;
       }
-      
+
       if (lastNonDividerChild && !child.isSplitDivider) {
         dividerId = SC.guidFor(lastNonDividerChild) + "-" + SC.guidFor(child);
-        
+
         divider = oldDividers[dividerId];
-        
+
         // if the previous view is a divider, but is not in our set of dividers,
         // then it is manually created. If it is manually created, we should not
         // create a new one.
         if (!divider && !lastChild.isSplitDivider) {
           divider = this.invokeDelegateMethod(del, 'splitViewDividerBetween', this, lastNonDividerChild, child);
         }
-        
+
         if (divider) {
           divider.isSplitDivider = YES;
           newDividers[dividerId] = divider;
-          
+
           if (oldDividers[dividerId]) {
             delete oldDividers[dividerId];
           } else {
@@ -341,32 +341,32 @@ SC.SplitView = SC.View.extend({
         }
       }
 
-      
+
       lastChild = child;
       if (!child.isSplitDivider) lastNonDividerChild = child;
     }
-    
+
     // finally, remove all dividers that we didn't keep
     for (dividerId in oldDividers) {
       oldDividers[dividerId].destroy();
     }
-    
+
     this._scsv_dividers = newDividers;
-    
-    // retile immediately. 
+
+    // retile immediately.
     this._scsv_tile();
   },
-  
+
   //
   // BASIC LAYOUT CODE
   //
-  
+
   /**
     Whether the SplitView needs to be re-laid out. You can change this by
     calling scheduleTiling.
   */
   needsTiling: YES,
-  
+
   /**
     Schedules a retile of the SplitView.
   */
@@ -374,12 +374,12 @@ SC.SplitView = SC.View.extend({
     this.set('needsTiling', YES);
     this.invokeOnce('_scsv_tile');
   },
-  
+
   tileIfNeeded: function() {
     if (!this.get('needsTiling')) return;
     this._scsv_tile();
   },
-  
+
   /**
    * @private
    * Tiling is the simpler of two layout paths. Tiling lays out all of the
@@ -392,29 +392,29 @@ SC.SplitView = SC.View.extend({
   */
   _scsv_tile: function() {
     var del = this.get('delegate');
-    
+
     // LOGIC:
     //
-    // - Call splitViewLayoutChildren delegate method to position views and 
+    // - Call splitViewLayoutChildren delegate method to position views and
     //   find total size.
-    // 
+    //
     // - If meant to automatically resize children to fit, run the
     //   splitViewResizeChildrenToFit delegate method.
-    // 
+    //
     // - Call splitViewLayoutChildren again if splitViewResizeChildrenToFit was called.
-    // 
+    //
     // - If not meant to automatically resize children to fit, change the SplitView
     //   size to match the total size of all children.
-    
+
     var size, frameSize = this.get('_frameSize');
-    
+
     size = this.invokeDelegateMethod(del, 'splitViewLayoutChildren', this);
-    
+
     if (this.get('shouldResizeChildrenToFit') && size !== frameSize) {
       this.invokeDelegateMethod(del, 'splitViewResizeChildrenToFit', this, size);
       size = this.invokeDelegateMethod(del, 'splitViewLayoutChildren', this);
     }
-    
+
     if (!this.get('shouldResizeChildrenToFit')) {
       if (this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL) {
         this.adjust('width', size);
@@ -422,10 +422,10 @@ SC.SplitView = SC.View.extend({
         this.adjust('height', size);
       }
     }
-    
+
     this.set('needsTiling', NO);
   },
-  
+
   /**
    * Lays out the children one next to each other or one on top of the other,
    * based on their sizes. It returns the total size.
@@ -437,20 +437,20 @@ SC.SplitView = SC.View.extend({
   */
   splitViewLayoutChildren: function(splitView) {
     var del = this.get('delegate');
-    
-    var children = this.get('childViews'), len = children.length, idx, 
+
+    var children = this.get('childViews'), len = children.length, idx,
         child, pos = 0;
 
     for (idx = 0; idx < len; idx++) {
       child = children[idx];
-      
+
       this.invokeDelegateMethod(del, 'splitViewSetPositionForChild', this, children[idx], pos);
       pos += this.invokeDelegateMethod(del, 'splitViewGetSizeForChild', this, children[idx]);
     }
 
     return pos;
   },
-  
+
   /**
    * Attempts to resize the child views of the split view to fit in the SplitView's
    * frame. So it may proportionally adjust the child views, the current size of the
@@ -463,37 +463,37 @@ SC.SplitView = SC.View.extend({
   */
   splitViewResizeChildrenToFit: function(splitView, contentSize) {
     var del = this.get('delegate');
-    
+
     // LOGIC:
     //
     //   - 1) Size auto-resizable children in proportion to their existing sizes to attempt
     //     to fit within the target size— auto-resizable views have autoResizeStyle set
     //     to SC.RESIZE_AUTOMATIC.
-    // 
+    //
     //   - 2) Size non-auto-resizable children in proportion to their existing sizes—these
     //     views will _not_ have an autoResizeStyle of SC.RESIZE_AUTOMATIC.
     //
-    
+
     var frameSize = this.get('_frameSize');
     var children = this.get('childViews'), len = children.length, idx,
         child, resizableSize = 0, nonResizableSize = 0, childSize;
-    
+
     // To do this sizing while keeping things proportionate, the total size of resizable
     // views and the total size of non-auto-resizable views must be calculated independently.
     for (idx = 0; idx < len; idx++) {
       child = children[idx];
-      
+
       childSize = this.invokeDelegateMethod(del, 'splitViewGetSizeForChild', this, child);
-      
+
       if (this.invokeDelegateMethod(del, 'splitViewShouldResizeChildToFit', this, child)) {
         resizableSize += childSize;
       } else {
         nonResizableSize += childSize;
       }
     }
-    
+
     var runningSize = contentSize;
-    
+
     // we run through each twice: non-aggressively, then aggressively. This is controlled by providing
     // a -1 for the outOfSize. This tells the resizing to not bother with proportions and just resize
     // whatever it can.
@@ -502,7 +502,7 @@ SC.SplitView = SC.View.extend({
     runningSize = this._resizeChildrenForSize(runningSize, frameSize, NO, nonResizableSize);
     runningSize = this._resizeChildrenForSize(runningSize, frameSize, NO, -1);
   },
-  
+
   /**
    * @private
    * Utility method used by splitViewResizeChildrenToFit to do the proportionate
@@ -514,40 +514,40 @@ SC.SplitView = SC.View.extend({
     var del = this.get('delegate');
 
     var children = this.get('childViews'), idx, len = children.length, child;
-    
-    var diff = targetSize - runningSize;    
+
+    var diff = targetSize - runningSize;
     for (idx = 0; idx < len; idx++) {
       child = children[idx];
-      
+
       var originalChildSize = this.invokeDelegateMethod(del, 'splitViewGetSizeForChild', this, child),
           size = originalChildSize;
-            
+
       var isResizable = this.invokeDelegateMethod(del, 'splitViewShouldResizeChildToFit', this, child);
       if (isResizable === useResizable) {
         // if outOfSize === -1 then we are aggressively resizing (not resizing proportionally)
         if (outOfSize === -1) size += diff
         else size += (size / outOfSize) * diff;
-        
+
         size = Math.round(size);
 
         size = this.invokeDelegateMethod(del, 'splitViewConstrainSizeForChild', this, child, size);
-        this.invokeDelegateMethod(del, 'splitViewSetSizeForChild', this, child, size);        
-        
-        
+        this.invokeDelegateMethod(del, 'splitViewSetSizeForChild', this, child, size);
+
+
         // we remove the original child size—but we don't add it back.
         // we don't add it back because the load is no longer shared.
         if (outOfSize !== -1) outOfSize -= originalChildSize;
       }
 
-      // We modify the old size to account for our changes so we can keep a running diff      
+      // We modify the old size to account for our changes so we can keep a running diff
       runningSize -= originalChildSize;
       runningSize += size;
       diff = targetSize - runningSize;
     }
-    
+
     return runningSize;
   },
-  
+
   /**
    * Determines whether the SplitView should attempt to resize the specified
    * child view when the SplitView's size changes.
@@ -586,20 +586,20 @@ SC.SplitView = SC.View.extend({
     //  - resize the child itself to compensate for its movement if
     //    child.compensatesForMovement is YES.
     //  - adjust position of next child.
-    // 
+    //
     // As the process is recursive in both directions (resizing a child may attempt
     // to move it if it cannot be resized further), adjusting one child view could
     // affect many _if not all_ of the SplitView's children.
-    // 
-    // For safety, sanity, and stability, the recursive chain-reactions only travel 
+    //
+    // For safety, sanity, and stability, the recursive chain-reactions only travel
     // in one direction; for instance, resizing the previous view may attempt to adjust
     // its position, but that adjustment will not propagate to views after it.
-    // 
+    //
     // This process, while powerful, has one complication: if you change a bunch of views
     // before a view, and then _fail_ to move views after it, the views before must be
     // moved back to their starting points. But if their positions were changed directly,
     // this would be impossible.
-    // 
+    //
     // As such, the positions are not changed directly. Rather, the changes are written
     // to a _plan_, and changes only committed once everything is finalized.
     //
@@ -609,23 +609,23 @@ SC.SplitView = SC.View.extend({
     var plan = this._scsv_createPlan();
     var finalPosition = this._scsv_adjustPositionForChildInPlan(plan, child, position, child);
     this._scsv_commitPlan(plan);
-    
+
     return finalPosition;
   },
-  
+
   /**
    * @private
    * Creates a plan in which to prepare changes to the SplitView's children.
    *
    * A plan is an array with the same number of elements as the SplitView has children.
    * Each element is a hash containing these properties:
-   * 
+   *
    * - child: the view the hash represents
    * - originalPosition: the position before the planning process
    * - position: the planned new position.
    * - originalSize: the size before the planning process
    * - size: the planned new size.
-   * 
+   *
    * The repositioning and resizing logic can, at any time, reset part of the plan
    * to its original state, allowing layout processes to be run non-destructively.
    * In addition, storing the original positions and sizes is more performant
@@ -635,14 +635,14 @@ SC.SplitView = SC.View.extend({
   */
   _scsv_createPlan: function() {
     var del = this.get('delegate'),
-        plan = [], children = this.get('childViews'), idx, len = children.length, 
+        plan = [], children = this.get('childViews'), idx, len = children.length,
         child, childPosition, childSize;
-    
+
     for (idx = 0; idx < len; idx++) {
       child = children[idx];
       childPosition = this.invokeDelegateMethod(del, 'splitViewGetPositionForChild', this, child);
       childSize = this.invokeDelegateMethod(del, 'splitViewGetSizeForChild', this, child);
-      
+
       plan[idx] = {
         child: child,
         originalPosition: childPosition,
@@ -651,10 +651,10 @@ SC.SplitView = SC.View.extend({
         size: childSize
       };
     }
-    
+
     return plan;
   },
-  
+
   /**
     * @private
     * Resets a range of the plan to its original settings.
@@ -669,7 +669,7 @@ SC.SplitView = SC.View.extend({
        plan[idx].size = plan[idx].originalSize;
      }
    },
-  
+
   /**
    * @private
    * Commits the changes specified in the plan to the child views.
@@ -678,21 +678,21 @@ SC.SplitView = SC.View.extend({
   */
   _scsv_commitPlan: function(plan) {
     var del = this.get('delegate'), len = plan.length, idx, item, end = 0;
-    
+
     for (idx = 0; idx < len; idx++) {
       item = plan[idx];
       if (item.size !== item.originalSize) {
         this.invokeDelegateMethod(del, 'splitViewSetSizeForChild', this, item.child, item.size);
       }
-      
+
       if (item.position !== item.originalPosition) {
         this.invokeDelegateMethod(del, 'splitViewSetPositionForChild', this, item.child, item.position);
       }
-      
+
       end = item.position + item.size;
     }
-    
-    
+
+
     if (!this.get('shouldResizeChildrenToFit')) {
       if (this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL) {
         this.adjust('width', end);
@@ -701,13 +701,13 @@ SC.SplitView = SC.View.extend({
       }
     }
   },
-  
+
   /**
    * Moves the specified child view as close as it can to the specified
    * position, saving all changes this causes into the plan.
    *
    * The "directness" of the action also comes into play. An action is direct if:
-   * 
+   *
    * - The child being modified is the originating child (the one being dragged, most likely)
    * - The child is being _positioned_ as is immediately _after_ the originating child.
    * - The child is being _sized_ and is immediately _before_ the originating child.
@@ -726,40 +726,40 @@ SC.SplitView = SC.View.extend({
   */
   _scsv_adjustPositionForChildInPlan: function(plan, child, position, source) {
     var del = this.get('delegate');
-    
+
     if (
       !child.get('allowsIndirectAdjustments') &&
       source !== child && source !== child.previousView
     ) {
       return plan[child.viewIndex].position;
     }
-    
+
     // since the process is recursive, we need to prevent the processing from
     // coming back in this direction.
     if (child._splitViewIsAdjusting) {
       return plan[child.viewIndex].position;
     }
-    
+
     child._splitViewIsAdjusting = YES;
-    
+
     //
     // STEP 1: attept to resize the previous child.
-    // 
+    //
     var previousChild = child.previousView, nextChild = child.nextView,
-        previousChildPosition, previousChildSize, 
+        previousChildPosition, previousChildSize,
         nextChildPosition, nextChildSize,
         size = plan[child.viewIndex].size;
-    
+
     if (previousChild && !previousChild._splitViewIsAdjusting) {
       // we determine the size we would like it to be by subtracting its position
       // from the position _we_ would like to have.
       previousChildPosition = plan[previousChild.viewIndex].position;
       previousChildSize = position - previousChildPosition;
-      
+
       previousChildSize = this._scsv_adjustSizeForChildInPlan(
         plan, previousChild, previousChildSize, source
       );
-            
+
       // the child may not have resized/moved itself all the way, so we will
       // recalculate the target position based on how much it _was_ able to.
       position = previousChildPosition + previousChildSize;
@@ -768,7 +768,7 @@ SC.SplitView = SC.View.extend({
       // as such _must_ be at 0.
       position = 0;
     }
-    
+
     // further steps deal with children _after_ this one; these steps should
     // not be performed if those children are already being taken care of.
     if (nextChild && nextChild._splitViewIsAdjusting) {
@@ -776,11 +776,11 @@ SC.SplitView = SC.View.extend({
       plan[child.viewIndex].position = position;
       return position;
     }
-    
-    
+
+
     //
     // STEP 2: attempt to resize this view to avoid moving the next one.
-    // Only occurs if the view's settings tell it to compensate _and_ there is a 
+    // Only occurs if the view's settings tell it to compensate _and_ there is a
     // next view to compensate for, or we are resizing to fit and there _is no_ next child.
     //
     if (child.get('compensatesForMovement') && nextChild) {
@@ -797,32 +797,32 @@ SC.SplitView = SC.View.extend({
       nextChildPosition = position + size;
       nextChildPosition = this._scsv_adjustPositionForChildInPlan(plan, nextChild, nextChildPosition, source);
     }
-    
+
     // if we were unable to position the next child, or there is no next
     // child but we need to resize children to fit, we have to undo some
     // of our previous work.
     if (nextChildPosition && position !== nextChildPosition - size) {
       position = nextChildPosition - size;
-    
+
       // then, for whatever is left, we again resize the previous view, after throwing
-      // away the previous calculations.  
+      // away the previous calculations.
       if (previousChild && !previousChild._splitViewIsAdjusting) {
         this._scsv_resetPlanRange(plan, 0, previousChild.viewIndex);
         previousChildSize = position - plan[previousChild.viewIndex].position;
         this._scsv_adjustSizeForChildInPlan(plan, previousChild, previousChildSize, child);
       }
-      
+
     }
-    
-    
+
+
     plan[child.viewIndex].position = position;
     child._splitViewIsAdjusting = NO;
     return position;
   },
-  
+
   _scsv_adjustSizeForChildInPlan: function(plan, child, size, source) {
     var del = this.get('delegate');
-    
+
     if (
       source &&
       !child.get('allowsIndirectAdjustments') &&
@@ -830,26 +830,26 @@ SC.SplitView = SC.View.extend({
     ) {
       return plan[child.viewIndex].size;
     }
-    
+
     // First, see if resizing alone will do the job.
     var actualSize = this.invokeDelegateMethod(del, 'splitViewConstrainSizeForChild', this, child, size);
-    
+
     plan[child.viewIndex].size = actualSize;
-    
+
     if (size === actualSize) return size;
-    
+
     // if not, attempt to move the view.
     var currentPosition = plan[child.viewIndex].position,
         targetPosition = currentPosition + size - actualSize;
 
     var position = this._scsv_adjustPositionForChildInPlan(plan, child, targetPosition, source);
-    
+
     // the result is the new right edge minus the old left edge—that is,
     // the size we can pretend we are for the caller, now that we have
     // resized some other views.
     return position + actualSize - currentPosition;
   },
-  
+
   /**
    * Returns a view instance to be used as a divider between two other views,
    * or null if no divider should be used.
@@ -863,15 +863,15 @@ SC.SplitView = SC.View.extend({
    * @param {SC.SplitView} splitView The split view that is hte parent of the
    * two views.
    * @param {SC.View} view1 The first view.
-   * @param {SC.View} view2 The second view. 
+   * @param {SC.View} view2 The second view.
    * @returns {SC.View} The view instance to use as a divider.
   */
   splitViewDividerBetween: function(splitView, view1, view2){
     if (!this.get('splitDividerView')) return null;
-    
+
     return this.get('splitDividerView').create();
   },
-  
+
   /**
    * Returns the current position for the specified child.
    *
@@ -884,7 +884,7 @@ SC.SplitView = SC.View.extend({
   splitViewGetPositionForChild: function(splitView, child) {
     return child.get('position');
   },
-  
+
   /**
    * Sets the position for the specified child.
    *
@@ -897,7 +897,7 @@ SC.SplitView = SC.View.extend({
   splitViewSetPositionForChild: function(splitView, child, position) {
     child.set('position', position);
   },
-  
+
   /**
    * Returns the current size for the specified child.
    *
@@ -910,10 +910,10 @@ SC.SplitView = SC.View.extend({
   splitViewGetSizeForChild: function(splitView, child) {
     var size = child.get('size');
     if (SC.none(size)) return 100;
-    
+
     return size;
   },
-  
+
   /**
    * Sets the size for the specified child.
    *
@@ -926,13 +926,13 @@ SC.SplitView = SC.View.extend({
   splitViewSetSizeForChild: function(splitView, child, size) {
     child.set('size', size);
   },
-  
+
   /**
-   * Returns the nearest valid size to a proposed size for a child view. 
-   * By default, constrains the size to the range specified by the child's 
+   * Returns the nearest valid size to a proposed size for a child view.
+   * By default, constrains the size to the range specified by the child's
    * minimumSize and maximumSize properties, and returns 0 if the child
    * has canCollapse set and the size is less than the child's collapseAtSize.
-   * 
+   *
    * You may override this in a delegate.
    *
    * @param {SC.SplitView} splitView The SplitView which owns the child.
@@ -944,18 +944,18 @@ SC.SplitView = SC.View.extend({
     if (child.get('autoResizeStyle') === SC.FIXED_SIZE) {
       return this.invokeDelegateMethod(this.get('delegate'), 'splitViewGetSizeForChild', this, child);
     }
-    
+
     if (child.get('canCollapse')) {
       var collapseAtSize = child.get('collapseAtSize');
       if (collapseAtSize && size < collapseAtSize) return 0;
     }
-    
+
     var minSize = child.get('minimumSize') || 0;
     if (minSize !== undefined && minSize !== null) size = Math.max(minSize, size);
-    
+
     var maxSize = child.get('maximumSize');
     if (maxSize !== undefined && maxSize !== null) size = Math.min(maxSize, size);
-    
+
     return size;
   }
 });