sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -12,21 +12,21 @@ sc_require("views/toolbar");
 /** @class
   Master/Detail view is a simple view which manages a master view and a detail view.
   This is not all that different from a SplitView, except that, for the moment (this
-  will hopefully change when SplitView becomes more palatable) the split point is not 
+  will hopefully change when SplitView becomes more palatable) the split point is not
   actually changeable and the split is always vertical.
-  
+
   So, why use it when it is limited? Well, simple: it can hide the left side. Completely.
   As in, there will be no split divider anymore. There will be no nothing. It will be gone.
   Removed from DOM. Gone on to meet its maker, bereft of life, it rests in peace. If it weren't
   for the possibility of opening it up in a picker it would be pushing up the daisies!
-  
+
   Yes, it has a built-in option for opening the master portion in a PickerPane. This is THE KILLER
   FEATURES. It is a command on the view: popupMasterPicker. And it is really really easy to call:
   make a toolbar button with an action "popupMasterPicker". That's it.
-  
+
   An interesting feature is that it sets the master and detail views' masterIsVisible settings,
   allowing them to know if the master is visible.
-  
+
   @since SproutCore 1.2
 */
 SC.MasterDetailView = SC.View.extend(
@@ -38,22 +38,22 @@ SC.MasterDetailView = SC.View.extend(
     @see SC.View#classNames
   */
   classNames: ["sc-master-detail-view"],
-  
+
   /**
     @type String
     @default 'masterDetailRenderDelegate'
   */
   renderDelegateName: 'masterDetailRenderDelegate',
-  
-  
+
+
   // ..........................................................
   // Properties
-  // 
-  
+  //
+
   /**
     The master view. For your development pleasure, it defaults to a
     WorkspaceView with a top toolbar.
-    
+
     @type SC.View
     @default SC.WorkspaceView
   */
@@ -62,12 +62,12 @@ SC.MasterDetailView = SC.View.extend(
     }),
     contentView: SC.View.extend({ backgroundColor: "white" })
   }),
-  
+
   /**
     The detail view. For your development experience, it defaults to holding
     a top toolbar view with a button that closes/shows master. Come take a peek at
     the code to see what it looks like--it is so simple.
-    
+
     @type SC.View
     @default SC.WorkspaceView
   */
@@ -84,15 +84,15 @@ SC.MasterDetailView = SC.View.extend(
       })
     })
   }),
-  
+
   /**
-    Whether to automatically hide the master panel in portrait orientation. 
-    
+    Whether to automatically hide the master panel in portrait orientation.
+
     By default, this property is a computed property based on whether the browser is a touch
     browser. Your purpose in overriding it is either to disable it from automatically
     disappearing on iPad and other touch devices, or force it to appear when a desktop
     browser changes.
-    
+
     @field
     @type Boolean
     @default NO
@@ -101,7 +101,7 @@ SC.MasterDetailView = SC.View.extend(
     if (SC.platform.touch) return YES;
     return NO;
   }.property().cacheable(),
-  
+
   /**
     The width of the 'master' side of the master/detail view.
 
@@ -117,10 +117,10 @@ SC.MasterDetailView = SC.View.extend(
     @default From theme, or 1.
   */
   dividerWidth: SC.propertyFromRenderDelegate('dividerWidth', 1),
-  
+
   /**
     A property (computed) that says whether the master view is hidden.
-    
+
     @field
     @type Boolean
     @default NO
@@ -132,38 +132,38 @@ SC.MasterDetailView = SC.View.extend(
     if (this.get("orientation") === SC.HORIZONTAL_ORIENTATION) return NO;
     return YES;
   }.property("autoHideMaster", "orientation"),
-  
+
   /**
     Tracks the orientation of the view. Possible values:
-    
+
       - SC.VERTICAL_ORIENTATION
       - SC.HORIZONTAL_ORIENTATION
-    
+
     @type String
     @default SC.VERTICAL_ORIENTATION
   */
   orientation: SC.VERTICAL_ORIENTATION,
-  
+
   /** @private */
   _scmd_frameDidChange: function() {
     var f = this.get("frame"), ret;
     if (f.width > f.height) ret = SC.HORIZONTAL_ORIENTATION;
     else ret = SC.VERTICAL_ORIENTATION;
-    
+
     this.setIfChanged('orientation', ret);
   }.observes('frame'),
-  
+
   /** @private */
   init: function() {
     sc_super();
     this._scmd_frameDidChange();
     this._scmd_masterIsHiddenDidChange();
   },
-  
+
   /**
     If the master is hidden, this toggles the master picker pane.
     Of course, since pickers are modal, this actually only needs to handle showing.
-    
+
     @param {SC.View} view The view to anchor the picker to
   */
   toggleMasterPicker: function(view) {
@@ -174,7 +174,7 @@ SC.MasterDetailView = SC.View.extend(
       this.showMasterPicker(view);
     }
   },
-  
+
   /**
     @param {SC.View} view The view to anchor the picker to
   */
@@ -184,19 +184,19 @@ SC.MasterDetailView = SC.View.extend(
       var pp = this.get("pickerPane");
       this._picker = pp.create({ });
     }
-    
+
     this._picker.set("contentView", this.get("masterView"));
     this._picker.set("extraRightOffset", this.get("pointerDistanceFromEdge"));
-    
+
     this.showPicker(this._picker, view);
   },
-  
+
   hideMasterPicker: function() {
     if (this._picker && this._picker.get("isVisibleInWindow")) {
       this.hidePicker(this._picker);
     }
   },
-  
+
   /**
     @param {SC.PickerPane} picker The picker to popup
     @param {SC.View} view The view to anchor the picker to
@@ -204,19 +204,19 @@ SC.MasterDetailView = SC.View.extend(
   showPicker: function(picker, view) {
     picker.popup(view, SC.PICKER_POINTER, [3, 0, 1, 2, 3], [9, -9, -18, 18]);
   },
-  
+
   /**
     @param {SC.PickerPane} picker The picker to popup
   */
   hidePicker: function(picker) {
     picker.remove();
   },
-  
+
   /**
     The picker pane class from which to create a picker pane.
-    
+
     This defaults to one with a special theme.
-    
+
     @type SC.PickerPane
     @default SC.PickerPane
   */
@@ -224,18 +224,18 @@ SC.MasterDetailView = SC.View.extend(
     layout: { width: 250, height: 480 },
     themeName: 'popover'
   }),
-  
-  
+
+
   // ..........................................................
   // Internal Support
-  // 
-  
+  //
+
   /** @private */
   _picker: null,
-  
+
   /** @private */
   pointerDistanceFromEdge: 46,
-  
+
   /** @private
     Updates masterIsHidden in child views.
   */
@@ -244,7 +244,7 @@ SC.MasterDetailView = SC.View.extend(
     this.get("masterView").set("masterIsHidden", mih);
     this.get("detailView").set("masterIsHidden", mih);
   }.observes("masterIsHidden"),
-  
+
   /** @private
     When the frame changes, we don't need to do anything. We use smart positioning.
     However, if the orientation were to change, well, then we might need to do something.
@@ -252,14 +252,14 @@ SC.MasterDetailView = SC.View.extend(
   _scmd_orientationDidChange: function() {
     this.invokeOnce("_scmd_tile");
   }.observes("orientation"),
-  
+
   /** @private
     Observes properties which require retiling.
   */
   _scmd_retileProperties: function() {
     this.invokeOnce("_scmd_tile");
   }.observes("masterIsHidden", "masterWidth"),
-  
+
   /** @private
     Instantiates master and detail views.
   */
@@ -273,48 +273,49 @@ SC.MasterDetailView = SC.View.extend(
 
     this.invokeOnce("_scmd_tile");
   },
-  
+
   /** @private */
   _masterIsDrawn: NO, // whether the master is in the view
-  
+
   /** @private
     Tiles the views as necessary.
   */
   _scmd_tile: function() {
     // first, determine what is and is not visible.
     var masterIsVisible = !this.get('masterIsHidden');
-    
+
     // now, tile
     var masterWidth = this.get('masterWidth'),
         master = this.get('masterView'),
         detail = this.get('detailView');
-    
+
     if (masterIsVisible) {
       // hide picker if needed
       this.hideMasterPicker();
-      
+
       // draw master if needed
       if (!this._masterIsDrawn) {
         if (this._picker) this._picker.set('contentView', null);
         this.appendChild(master);
         this._masterIsDrawn = YES;
       }
-      
+
       // set master layout
       master.set('layout', {
         left: 0, top: 0, bottom: 0, width: masterWidth
       });
-      
+
       // and child, naturally
       var extra = this.get('dividerWidth');
       detail.set("layout", { left: masterWidth + extra, right: 0, top: 0, bottom: 0 });
     } else {
       // remove master if needed
       if (this._masterIsDrawn) {
+        // Removes the child from the document, but doesn't destroy it or its layer.
         this.removeChild(master);
         this._masterIsDrawn = NO;
       }
-      
+
       // and child, naturally
       detail.set('layout', { left: 0, right: 0, top: 0, bottom: 0 });
     }

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

@@ -164,6 +164,10 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
     this.contentDidChange();
   },
 
+  /** SC.MenuItemView is not able to update itself in place at this time. */
+  // TODO: add update: support.
+  isReusable: false,
+
   /** @private
     Fills the passed html-array with strings that can be joined to form the
     innerHTML of the receiver element.  Also populates an array of classNames
@@ -185,11 +189,11 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
     //addressing accessibility
     if (this.get('isSeparator')) {
       //assign the role of separator
-      context.attr('role', 'separator');
+      context.setAttr('role', 'separator');
     } else if (this.get('isChecked')) {
       //assign the role of menuitemcheckbox
-      context.attr('role', 'menuitemcheckbox');
-      context.attr('aria-checked', true);
+      context.setAttr('role', 'menuitemcheckbox');
+      context.setAttr('aria-checked', true);
     }
 
     context = context.begin('a').addClass('menu-item');
@@ -245,7 +249,7 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
       url = SC.BLANK_IMAGE_URL;
     }
     // generate the img element...
-    context.begin('img').addClass('image').addClass(className).attr('src', url).end() ;
+    context.begin('img').addClass('image').addClass(className).setAttr('src', url).end() ;
   },
 
   /** @private

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

@@ -11,11 +11,11 @@ sc_require('views/scroll');
 
   Implements a complete scroller view for menus.  This class implements the
   arrows displayed in a menu to scroll.
-  
-  The main difference with SC.ScrollerView is that there is only vertical 
+
+  The main difference with SC.ScrollerView is that there is only vertical
   scrollers. Value Syncing between SC.MenuScrollView and SC.MenuScrollerView
   is done using valueBinding.
-  
+
   @extends SC.ScrollerView
   @since SproutCore 1.0
 */
@@ -28,23 +28,23 @@ SC.MenuScrollerView = SC.ScrollerView.extend(
     @see SC.View#classNames
   */
   classNames: ['sc-menu-scroller-view'],
-  
+
   // ..........................................................
   // PROPERTIES
-  // 
-  
+  //
+
   /**
     Used to set the scrolling direction of the scroller.
-    
+
     @type Boolean
     @default NO
   */
   scrollDown: NO,
-  
-  /** 
+
+  /**
     The scroller offset value.  This value will adjust between the minimum
     and maximum values that you set. Default is 0.
-    
+
     @field
     @type Number
     @observes maximum
@@ -59,54 +59,54 @@ SC.MenuScrollerView = SC.ScrollerView.extend(
       return Math.min(value, this.get('maximum')) ;
     }
   }.property('maximum').cacheable(),
-  
+
   /**
     The maximum offset value for the scroller.  This will be used to calculate
     the internal height/width of the scroller itself. It is not necessarily
     the same as the height of a scroll view's content view.
-    
+
     When set less than the height of the scroller, the scroller is disabled.
-    
+
     @type Number
     @default 0
   */
   maximum: 0,
-  
+
   /**
-    YES if enable scrollbar, NO to disable it.  Scrollbars will automatically 
+    YES if enable scrollbar, NO to disable it.  Scrollbars will automatically
     disable if the maximum scroll width does not exceed their capacity.
-    
+
     @type Boolean
     @default YES
   */
   isEnabled: YES,
-  
+
   /**
-    Determine the layout direction.  Determines whether the scrollbar should 
+    Determine the layout direction.  Determines whether the scrollbar should
     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
-    
+
     @type String
     @default SC.LAYOUT_VERTICAL
   */
   layoutDirection: SC.LAYOUT_VERTICAL,
-  
-  /** 
+
+  /**
      Amount to scroll one vertical line.
-     
+
      @type Number
      @default 20
   */
   verticalLineScroll: 20,
 
   /**
-    This function overrides the default function in SC.Scroller as 
+    This function overrides the default function in SC.Scroller as
     menus only have vertical scrolling.
-    
+
     @field
     @type String
     @default 'verticalScrollOffset'
@@ -143,7 +143,7 @@ SC.MenuScrollerView = SC.ScrollerView.extend(
 
     return sc_super();
   },
-  
+
   /** @private */
   render: function(context, firstTime) {
     context.addClass('sc-vertical') ;
@@ -151,48 +151,47 @@ SC.MenuScrollerView = SC.ScrollerView.extend(
     if (firstTime) {
       var direction = this.get('scrollDown') ? 'arrowDown' : 'arrowUp' ;
       context.push('<span class="scrollArrow '+direction+'">&nbsp;</span>') ;
-    } 
-    context.setClass('disabled', !this.get('isEnabled')) ;
+    }
   },
-  
+
   /** @private */
   didCreateLayer: function() {
     // var callback, amt, layer;
-    // 
+    //
     // callback = this._sc_scroller_scrollDidChange ;
     // SC.Event.add(this.$(), 'scroll', this, callback) ;
-    // 
+    //
     // // set scrollOffset first time
     // amt = this.get('value') ;
     // layer = this.get('layer') ;
-    // 
+    //
     // layer.scrollTop = amt ;
   },
-  
+
   /** @private */
   willDestroyLayer: function() {
     var callback = this._sc_scroller_scrollDidChange ;
     SC.Event.remove(this.$(), 'scroll', this, callback) ;
   },
-  
+
   /** @private */
   mouseEntered: function(evt) {
     this.set('isMouseOver', YES);
     this._invokeScrollOnMouseOver();
   },
-  
+
   /** @private */
   mouseExited: function(evt) {
     this.set('isMouseOver', NO);
   },
-  
+
   /**
     This function overrides the default function in SC.Scroller.
     SC.MenuScroller and SC.MenuScroll use valueBinding so this function is
     not necessary.
   */
   _sc_scroller_valueDidChange: function() {}.observes('value'),
-  
+
 
   /** @private */
   _sc_scroller_armScrollTimer: function() {
@@ -203,29 +202,29 @@ SC.MenuScrollerView = SC.ScrollerView.extend(
       SC.RunLoop.end() ;
     }
   },
-  
+
   /** @private */
   _sc_scroller_scrollDidChange: function() {
-    var now = Date.now(), 
-        last = this._sc_lastScroll, 
-        layer = this.get('layer'), 
+    var now = Date.now(),
+        last = this._sc_lastScroll,
+        layer = this.get('layer'),
         scroll = 0 ;
-    
+
     if (last && (now-last)<50) return this._sc_scroller_armScrollTimer() ;
     this._sc_scrollTimer = null ;
     this._sc_lastScroll = now ;
-    
+
     SC.RunLoop.begin();
-    
-    if (!this.get('isEnabled')) return ; // nothing to do.
-    
+
+    if (!this.get('isEnabledInPane')) return ; // nothing to do.
+
     this._sc_scrollValue = scroll = layer.scrollTop ;
     this.set('value', scroll) ; // will now enforce minimum and maximum
-    
+
     SC.RunLoop.end();
   },
-  
-  
+
+
   /** @private
     Scroll the menu if it is is an up or down arrow. This is called by
     the function that simulates mouseOver.
@@ -248,12 +247,12 @@ SC.MenuScrollerView = SC.ScrollerView.extend(
     }
     return YES;
   },
-  
+
   /** @private
-    
-    We use this function to simulate mouseOver. It checks for the flag 
+
+    We use this function to simulate mouseOver. It checks for the flag
     isMouseOver which is turned on when mouseEntered is called and turned off
-    when mouseExited is called. 
+    when mouseExited is called.
   */
   _invokeScrollOnMouseOver: function(){
     this._scrollMenu();
@@ -261,7 +260,7 @@ SC.MenuScrollerView = SC.ScrollerView.extend(
       this.invokeLater(this._invokeScrollOnMouseOver, 50);
     }
   }
-  
+
 });
 
 /**
@@ -302,13 +301,13 @@ SC.MenuScrollerView.HUGE_SCROLLER_THICKNESS    = 26;
 
 /** @class
 
-  Implements a scroll view for menus.  This class extends SC.ScrollView for 
-  menus. 
-  
-  The main difference with SC.ScrollView is that there is only vertical 
+  Implements a scroll view for menus.  This class extends SC.ScrollView for
+  menus.
+
+  The main difference with SC.ScrollView is that there is only vertical
   scrolling. Value Syncing between SC.MenuScrollView and SC.MenuScrollerView
   is done using valueBinding.
-  
+
   @extends SC.ScrollView
   @since SproutCore 1.0
 */
@@ -321,54 +320,54 @@ SC.MenuScrollView = SC.ScrollView.extend(
     @see SC.View#classNames
   */
   classNames: ['sc-menu-scroll-view'],
-  
-  
+
+
   // ..........................................................
   // PROPERTIES
-  // 
-  
-  
+  //
+
+
   /**
-    The maximum horizontal scroll offset allowed given the current contentView 
-    size and the size of the scroll view.  If horizontal scrolling is 
+    The maximum horizontal scroll offset allowed given the current contentView
+    size and the size of the scroll view.  If horizontal scrolling is
     disabled, this will always return 0.
-    
+
     @type Number
     @default 0
   */
   maximumHorizontalScrollOffset: 0,
-    
-       
+
+
   // ..........................................................
   // SCROLLERS
-  // 
-  
-  /** 
-    YES if the view should maintain a horizontal scroller.   This property 
+  //
+
+  /**
+    YES if the view should maintain a horizontal scroller.   This property
     must be set when the view is created.
-    
+
     @type Boolean
     @default NO
   */
   hasHorizontalScroller: NO,
-  
+
   /**
-    The horizontal scroller view class. This will be replaced with a view 
-    instance when the ScrollView is created unless hasHorizontalScroller is 
+    The horizontal scroller view class. This will be replaced with a view
+    instance when the ScrollView is created unless hasHorizontalScroller is
     NO.
-    
+
     @type SC.View
     @default SC.MenuScrollerView
   */
   horizontalScrollerView: SC.MenuScrollerView,
-  
+
   /**
-    YES if the horizontal scroller should be visible.  You can change this 
-    property value anytime to show or hide the horizontal scroller.  If you 
-    do not want to use a horizontal scroller at all, you should instead set 
-    hasHorizontalScroller to NO to avoid creating a scroller view in the 
+    YES if the horizontal scroller should be visible.  You can change this
+    property value anytime to show or hide the horizontal scroller.  If you
+    do not want to use a horizontal scroller at all, you should instead set
+    hasHorizontalScroller to NO to avoid creating a scroller view in the
     first place.
-    
+
     @type Boolean
     @default NO
   */
@@ -377,45 +376,45 @@ SC.MenuScrollView = SC.ScrollView.extend(
   /**
     Returns YES if the view both has a horizontal scroller, the scroller is
     visible.
-    
+
     @type Boolean
     @default NO
   */
   canScrollHorizontal: NO,
-   
+
   /**
     If YES, the horizontal scroller will autohide if the contentView is
-    smaller than the visible area.  You must set hasHorizontalScroller to YES 
+    smaller than the visible area.  You must set hasHorizontalScroller to YES
     for this property to have any effect.
-    
+
     @type Boolean
     @default NO
   */
   autohidesHorizontalScroller: NO,
-  
-  /** 
-    YES if the view should maintain a vertical scroller.   This property must 
+
+  /**
+    YES if the view should maintain a vertical scroller.   This property must
     be set when the view is created.
-    
+
     @type Boolean
     @default YES
   */
   hasVerticalScroller: YES,
-  
+
   /**
-    The vertical scroller view class. This will be replaced with a view 
+    The vertical scroller view class. This will be replaced with a view
     instance when the ScrollView is created unless hasVerticalScroller is NO.
-    
+
     @type SC.View
     @default SC.MenuScrollerView
   */
   verticalScrollerView: SC.MenuScrollerView,
   verticalScrollerView2: SC.MenuScrollerView,
-  
+
   /**
     YES if the vertical scroller should be visible.  For SC.MenuScroll the
     vertical scroller is always there we just hide the arrows to scroll.
-    
+
     @type Boolean
     @default YES
   */
@@ -429,40 +428,40 @@ SC.MenuScrollView = SC.ScrollView.extend(
 
   /**
     If YES, the vertical scroller will autohide if the contentView is
-    smaller than the visible area.  You must set hasVerticalScroller to YES 
+    smaller than the visible area.  You must set hasVerticalScroller to YES
     for this property to have any effect.
-    
+
     @type Boolean
     @default YES
   */
   autohidesVerticalScroller: YES,
-  
+
   /**
-    Use this property to set the 'bottom' offset of your vertical scroller, 
+    Use this property to set the 'bottom' offset of your vertical scroller,
     to make room for a thumb view or other accessory view. Default is 0.
-    
+
     @type Number
     @default 0
   */
   verticalScrollerBottom: 0,
-  
-  
+
+
   // ..........................................................
   // CUSTOM VIEWS
-  // 
+  //
 
   /**
     Control Size for Menu content: change verticalLineScroll
-    
+
     @type String
     @default SC.REGULAR_CONTROL_SIZE
   */
   controlSize: SC.REGULAR_CONTROL_SIZE,
-  
+
   /**
-    The container view that will contain your main content view.  You can 
+    The container view that will contain your main content view.  You can
     replace this property with your own custom subclass if you prefer.
-    
+
     @type SC.ContainerView
     @default SC.ContainerView
   */
@@ -471,7 +470,7 @@ SC.MenuScrollView = SC.ScrollView.extend(
   // ..........................................................
   // METHODS
   //
-  
+
   /**
     @param {SC.View} view
   */
@@ -508,7 +507,7 @@ SC.MenuScrollView = SC.ScrollView.extend(
     Adjusts the layout for the various internal views.  This method is called
     once when the scroll view is first configured and then anytime a scroller
     is shown or hidden.  You can call this method yourself as well to retile.
-    
+
     You may also want to override this method to handle layout for any
     additional controls you have added to the view.
   */
@@ -519,16 +518,16 @@ SC.MenuScrollView = SC.ScrollView.extend(
     vscroll = hasScroller ? this.get('verticalScrollerView') : null ;
     vscroll2 = hasScroller ? this.get('verticalScrollerView2') : null ;
     hasVertical = vscroll && this.get('isVerticalScrollerVisible') ;
-    
+
     // get the containerView
     clip = this.get('containerView') ;
     clipLayout = { left: 0, top: 0 } ;
-    
+
     if (hasVertical) {
       viewportHeight =0;
       var scrollerThickness = vscroll.get('scrollerThickness') || vscroll2.get('scrollerThickness');
-      var view   = this.get('contentView'), view2, 
-            f      = (view) ? view.get('frame') : null, 
+      var view   = this.get('contentView'), view2,
+            f      = (view) ? view.get('frame') : null,
             height = (f) ? f.height : 0,
             elem = this.containerView.$()[0],
             verticalOffset = this.get('verticalScrollOffset'),
@@ -536,9 +535,9 @@ SC.MenuScrollView = SC.ScrollView.extend(
             topArrowVisible = { height: scrollerThickness, top: 0, right: 0, left: 0 },
             bottomArrowVisible = { height: scrollerThickness, bottom: 0, right: 0, left: 0 },
             bottomArrowInvisible = { height: 0, bottom: 0, right: 0, left: 0 };
-      
+
       if(elem) viewportHeight = elem.offsetHeight;
-      
+
       if(verticalOffset===0){
         clipLayout.top = 0 ;
         clipLayout.bottom = scrollerThickness;
@@ -555,45 +554,45 @@ SC.MenuScrollView = SC.ScrollView.extend(
         vscroll.set('layout', topArrowVisible) ;
         vscroll2.set('layout', bottomArrowVisible) ;
       }
-    } 
+    }
     if (vscroll){
      vscroll.set('isVisible', hasVertical) ;
      vscroll2.set('isVisible', hasVertical) ;
     }
     clip.set('layout', clipLayout) ;
   },
-  
+
   /** @private
     Called whenever a scroller visibility changes.  Calls the tile() method.
   */
   scrollerVisibilityDidChange: function() {
     this.tile();
   }.observes('isVerticalScrollerVisible', 'isHorizontalScrollerVisible', 'verticalScrollOffset'),
-    
-  
+
+
   // ..........................................................
   // INTERNAL SUPPORT
-  // 
-  
+  //
+
   /** @private
     Instantiate scrollers & container views as needed.  Replace their classes
     in the regular properties.
   */
   createChildViews: function() {
     var childViews = [], view, view2, controlSize = this.get('controlSize') ;
-    
-    // create the containerView.  We must always have a container view. 
+
+    // create the containerView.  We must always have a container view.
     // also, setup the contentView as the child of the containerView...
     if (SC.none(view = this.containerView)) view = SC.ContainerView;
-    
+
     childViews.push(this.containerView = this.createChildView(view, {
       contentView: this.contentView
     }));
-    
+
     // and replace our own contentView...
     this.contentView = this.containerView.get('contentView');
-    
-    // create a vertical scroller 
+
+    // create a vertical scroller
     if ((view=this.verticalScrollerView) && (view2=this.verticalScrollerView2)) {
       if (this.get('hasVerticalScroller')) {
         view = this.verticalScrollerView = this.createChildView(view, {
@@ -614,20 +613,20 @@ SC.MenuScrollView = SC.ScrollView.extend(
         this.verticalScrollerView2 = null ;
       }
     }
-    
+
     // set childViews array.
     this.childViews = childViews ;
-    
+
     this.contentViewFrameDidChange() ; // setup initial display...
     this.tile() ; // set up initial tiling
   },
-  
+
   /** @private */
   init: function() {
     sc_super();
-    
+
     // start observing initial content view.  The content view's frame has
-    // already been setup in prepareDisplay so we don't need to call 
+    // already been setup in prepareDisplay so we don't need to call
     // viewFrameDidChange...
     this._scroll_contentView = this.get('contentView') ;
     var contentView = this._scroll_contentView ;
@@ -638,32 +637,32 @@ SC.MenuScrollView = SC.ScrollView.extend(
 
     if (this.get('isVisibleInWindow')) this._scsv_registerAutoscroll() ;
   },
-  
+
   /** @private Registers/deregisters view with SC.Drag for autoscrolling */
   _scsv_registerAutoscroll: function() {
     if (this.get('isVisibleInWindow')) SC.Drag.addScrollableView(this);
     else SC.Drag.removeScrollableView(this);
   }.observes('isVisibleInWindow'),
-  
+
   /** @private
-    Invoked whenever the contentView's frame changes.  This will update the 
+    Invoked whenever the contentView's frame changes.  This will update the
     scroller maximum and optionally update the scroller visibility if the
     size of the contentView changes.  We don't care about the origin since
     that is tracked separately from the offset values.
   */
   contentViewFrameDidChange: function() {
-    var view   = this.get('contentView'), view2, 
+    var view   = this.get('contentView'), view2,
         f      = (view) ? view.get('frame') : null,
         width  = (f) ? f.width : 0,
         height = (f) ? f.height : 0,
         dim    = this.get('frame'),
         viewportHeight, elem ;
-        
+
     // cache out scroll settings...
     //if ((width === this._scroll_contentWidth) && (height === this._scroll_contentHeight)) return ;
     this._scroll_contentWidth = width;
     this._scroll_contentHeight = height ;
-    
+
     if (this.get('hasVerticalScroller') && (view = this.get('verticalScrollerView')) && (view2 = this.get('verticalScrollerView2'))) {
       height -= 1 ; // accurately account for our layout
       // decide if it should be visible or not
@@ -679,24 +678,24 @@ SC.MenuScrollView = SC.ScrollView.extend(
       view2.setIfChanged('maximum', height) ;
     }
   },
-  
+
   /** @private
-    Whenever the horizontal scroll offset changes, update the scrollers and 
+    Whenever the horizontal scroll offset changes, update the scrollers and
     edit the location of the contentView.
   */
   _scroll_horizontalScrollOffsetDidChange: function() {},
-   
+
   /** @private
-    Whenever the vertical scroll offset changes, update the scrollers and 
+    Whenever the vertical scroll offset changes, update the scrollers and
     edit the location of the contentView.
   */
   _scroll_verticalScrollOffsetDidChange: function() {
     var offset = this.get('verticalScrollOffset') ;
-    
+
     // update the offset for the contentView...
     var contentView = this.get('contentView');
     if (contentView) contentView.$().css('top', (0-offset) + "px");
-    
+
   }.observes('verticalScrollOffset')
 
 });