sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -1,58 +1,40 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
+sc_require('mixins/split_child');
+sc_require('mixins/split_thumb');
 
 /**
   @class
 
-  A SplitDividerView displays a divider between two views within a SplitView.
-  Clicking and dragging the divider will change the thickness of each view
-  either to the top/left or bottom/right of the divider.
-
-  Double-clicking on the SplitDividerView will try to collapse the first
-  view within the SplitView that has property canCollapse set to true,
-  so it is not visible, unless you have canCollapse disabled on the SplitView.
-
-  This view must be a direct child of the split view it works with. It must
-  be surrounded by two other views.
+  A SplitDividerView sits between any two other views in a SplitView.
+  The SplitDivider mixes in SC.SplitThumb to allow the user to drag
+  it around. The dragging process will cause SC.SplitView to adjust
+  other children as needed.
 
   @extends SC.View
-  @author Charles Jolley
-  @author Lawrence Pit
-  @author Erich Ocean
-  @test in split
+  @author Alex Iskander
 */
-SC.SplitDividerView = SC.View.extend(
-/** @scope SC.SplitDividerView.prototype */ {
-
-  /**
-    @type Array
-    @default ['sc-split-divider-view']
-    @see SC.View#classNames
-  */
+SC.SplitDividerView = SC.View.extend(SC.SplitChild, SC.SplitThumb,
+{
+  /** @scope SC.SplitDividerView.prototype */
   classNames: ['sc-split-divider-view'],
   
-  /** @private */
+  // set to prevent SC.SplitView from automatically creating dividers
+  // to sit between this divider and another view.
+  isSplitDivider: YES,
 
-  /** @private */
-  mouseDown: function(evt) {
-    var splitView = this.get('splitView');
-    return (splitView) ? splitView.mouseDownInThumbView(evt, this) : sc_super();
-  },
+  // NOTE: 'sc-fixed-size' is only hard-coded because SC.SplitView requires
+  // this file, and SC.FIXED_SIZE is defined inside SC.SplitView.
+  autoResizeStyle: 'sc-fixed-size',
   
-  /** @private */
-  doubleClick: function(evt) {
-    var splitView = this.get('splitView');
-    return (splitView) ? splitView.doubleClickInThumbView(evt, this) : sc_super();
-  },
-  
-  /** @private */
-  touchStart: function(evt){
-    return this.mouseDown(evt);
-  }
+  movesSibling: SC.MOVES_CHILD,
   
+  size: SC.propertyFromRenderDelegate('dividerSize', 10),
+
+  renderDelegateName: 'splitDividerRenderDelegate'
 });

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

@@ -5,117 +5,121 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-sc_require('views/collection') ;
+sc_require('views/collection');
 
 /**
-  @class 
+  @class
 
-  A StackedView is a CollectionView that expects its content to use static 
-  layout to stack vertically.  This type of collection view is not designed 
-  for use with large size collections, but it can be very useful for 
+  A StackedView is a CollectionView that expects its content to use static
+  layout to stack vertically.  This type of collection view is not designed
+  for use with large size collections, but it can be very useful for
   collections with complex displays and variable heights such as comments or
   small notification queues.
-  
+
   ## Static Layout
-  
+
   This view makes no attempt to size or position your child views.  It assumes
   you are using StaticLayout for your child views.  If you don't enable static
-  layout your views will probably overlay on top of each other and will look 
+  layout your views will probably overlay on top of each other and will look
   incorrect.
 
   Note also that the default layout for this view set's the height to "auto".
-  This is usually the behavior you will want. 
-  
+  This is usually the behavior you will want.
+
   @extends SC.CollectionView
   @since SproutCore 0.9
 */
 SC.StackedView = SC.CollectionView.extend(
 /** @scope SC.StackedView.prototype */ {
-  
+
   /**
     @type Array
     @default ['sc-stacked-view']
     @see SC.View#classNames
   */
   classNames: ['sc-stacked-view'],
-  
-  /** 
+
+  /**
     Default layout for a stacked view will fill the parent view but auto-
     adjust the height of the view.
-    
+
     @type Hash
     @default `{ top: 0, left: 0, right: 0, height: 1 }`
     @see SC.View#layout
   */
   layout: { top: 0, left: 0, right: 0, height: 1 },
-  
+
   /**
     Return full range of its indexes for nowShowing
-    
+
     @param {Rect} rect
     @returns {SC.IndexSet} full range of indexes
   */
-  computeNowShowing: function(rect) {
+  computeNowShowing: function () {
     return this.get('allContentIndexes');
-  },  
+  },
 
   /**
-    Updates the height of the stacked view to reflect the current content of 
+    Updates the height of the stacked view to reflect the current content of
     the view.  This is called automatically whenever an item view is reloaded.
     You can also call this method directly if the height of one of your views
     has changed.
-    
+
     The height will be recomputed based on the actual location and dimensions
     of the last child view.
-    
+
     Note that normally this method will defer actually updating the height
-    of the view until the end of the run loop.  You can force an immediate 
+    of the view until the end of the run loop.  You can force an immediate
     update by passing YES to the "immediately" parameter.
-    
+
     @param {Boolean} immediately YES to update immediately
     @returns {SC.StackedView} receiver
   */
-  updateHeight: function(immediately) {
+  updateHeight: function (immediately) {
     if (immediately) this._updateHeight();
     else this.invokeLast(this._updateHeight);
-    // ^ use invokeLast() here because we need to wait until all rendering has 
+    // ^ use invokeLast() here because we need to wait until all rendering has
     //   completed.
-    
+
     return this;
   },
-  
+
   /** @private */
-  _updateHeight: function() {
-    
+  _updateHeight: function () {
+
     var childViews = this.get('childViews'),
         len        = childViews.get('length'),
         view, layer, height;
-        
+
     if (len === 0) {
-      height = 1; 
+      height = 1;
     } else {
-      view = childViews.objectAt(len-1);
-      layer = view ? view.get('layer') : null ;
-      height = layer ? (layer.offsetTop + layer.offsetHeight) : 1 ;
-      layer = null ; // avoid memory leaks
+      view = childViews.objectAt(len - 1);
+      layer = view ? view.get('layer') : null;
+      height = layer ? (layer.offsetTop + layer.offsetHeight) : 1;
+      layer = null; // avoid memory leaks
     }
     this.adjust('height', height);
   },
-  
+
   // ..........................................................
   // INTERNAL SUPPORT
-  // 
+  //
 
   /** @private
     Whenever the collection view reloads some views, reset the cache on the
     frame as well so that it will recalculate.
   */
-  didReload: function(set) { return this.updateHeight(); },
+  reloadIfNeeded: function () {
+    sc_super();
+
+    return this.updateHeight();
+  },
 
   /** @private
-    When layer is first created, make sure we update the height using the 
+    When layer is first created, make sure we update the height using the
     newly calculated value.
   */
-  didCreateLayer: function() { return this.updateHeight(); }
-  
+  didCreateLayer: function () { return this.updateHeight(); }
+
 });

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

@@ -26,7 +26,7 @@
   @since SproutCore 1.2
   @author Tom Dale
 */
-SC.StaticContentView = SC.View.extend(SC.StaticLayout,
+SC.StaticContentView = SC.View.extend(
 /** @scope SC.StaticContentView.prototype */ {
 
   /**

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

@@ -73,12 +73,6 @@ SC.TabView = SC.View.extend(
   */
   items: [],
 
-  /**
-    @type Boolean
-    @default YES
-  */
-  isEnabled: YES,
-
   /**
     @type String
     @default null
@@ -215,7 +209,7 @@ SC.TabView = SC.View.extend(
     });
 
     this.containerView = this.createChildView(containerView) ;
-    
+
     //  The segmentedView managed by this tab view.  Note that this TabView uses
     //  a custom segmented view.  You can access this view but you cannot change
     // it.
@@ -250,10 +244,10 @@ SC.TabView = SC.View.extend(
     });
 
     this.segmentedView = this.createChildView(this.segmentedView) ;
-    
-    childViews.push(this.segmentedView);
+
     childViews.push(this.containerView);
-    
+    childViews.push(this.segmentedView);
+
     this.set('childViews', childViews);
     return this;
   },

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

@@ -1,65 +1,27 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /**
   @class
+  @deprecated Use a normal view and mix-in SC.SplitThumb.
 
-  A ThumbView works in concert with SC.SplitView to adjust the divider 
-  position from an arbitrary subview of the SplitView. Simply make an
-  instance of ThumbView a child somewhere in the childViews (or 
-  descendants) of the split view and add the path to the ThumbView to the
-  SplitView's thumbViews array.
-  
-  SplitView will automatically set the splitView property of the views in
-  its thumbViews array.
+  Kept to allow a modicum of backwards-compatibility. Please use
+  a normal view and mix in SC.SplitThumb instead.
 
   @extends SC.View
-  @author Erich Ocean
+  @author Alex Iskander
   @test in split
 */
-SC.ThumbView = SC.View.extend(
+SC.ThumbView = SC.View.extend(SC.SplitThumb,
 /** @scope SC.ThumbView.prototype */ {
-
-  /**
-    @type Array
-    @default ['sc-thumb-view']
-    @see SC.View#classNames
-  */
   classNames: ['sc-thumb-view'],
   
-  /**
-    Enable this thumb view to control its parent split view.
-    
-    @type Boolean
-    @default YES
-  */
-  isEnabled: YES,
-  
-  /** @private */
-  isEnabledBindingDefault: SC.Binding.bool(),
-  
-  /** @private */
-  prepareContext: function(context, firstTime) {
-    var splitView = this.get('splitView') ;
-    if (splitView) this.set('cursor', splitView.get('thumbViewCursor')) ;
-    return sc_super() ;
-  },
-  
-  /** @private */
-  mouseDown: function(evt) {
-    if (!this.get('isEnabled')) return NO ;
-    
-    var splitView = this.get('splitView');
-    return (splitView) ? splitView.mouseDownInThumbView(evt, this) : sc_super();
-  },
-  
-  /** @private */
-  touchStart: function(evt) {
-    return this.mouseDown(evt);
+  init: function() {
+    sc_super();
+    console.warn("SC.ThumbView is deprecated. Please use a normal view and mix in SC.SplitThumb instead.");
   }
-
 });

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

@@ -7,7 +7,7 @@
 
 /**
   Layout properties needed to anchor a view to the top.
-  
+
   @static
   @constant
   @type Hash
@@ -17,7 +17,7 @@ SC.ANCHOR_TOP = { top: 0 };
 
 /**
   Layout properties needed to anchor a view to the left.
-  
+
   @static
   @constant
   @type Hash
@@ -27,7 +27,7 @@ SC.ANCHOR_LEFT = { left: 0 };
 
 /*
   Layout properties to anchor a view to the top left
-  
+
   @static
   @constant
   @type Hash
@@ -37,7 +37,7 @@ SC.ANCHOR_TOP_LEFT = { top: 0, left: 0 };
 
 /**
   Layout properties to anchoe view to the bottom.
-  
+
   @static
   @constant
   @type Hash
@@ -47,17 +47,17 @@ SC.ANCHOR_BOTTOM = { bottom: 0 };
 
 /**
   Layout properties to anchor a view to the right.
-  
+
   @static
   @constant
   @type Hash
   @default `{ right: 0 }`
 */
-SC.ANCHOR_RIGHT = { right: 0 } ;
+SC.ANCHOR_RIGHT = { right: 0 };
 
 /**
   Layout properties to anchor a view to the bottom right.
-  
+
   @static
   @constant
   @type Hash
@@ -67,12 +67,23 @@ SC.ANCHOR_BOTTOM_RIGHT = { bottom: 0, right: 0 };
 
 /** @class
 
-  A toolbar view can be anchored at the top or bottom of the window to contain
-  your main toolbar buttons.
+  SC.ToolbarView is a simple horizontal view that has been styled like a
+  toolbar and can be easily anchored at the top or bottom of a parent view.
+
+  To anchor to the top of the parent view, set `anchorLocation` to
+  `SC.ANCHOR_TOP` or to anchor to the bottom, set `anchorLocation` to
+  `SC.ANCHOR_BOTTOM`.  The default layout of SC.Toolbar is
+  `{ left: 0, right: 0, height: 32, zIndex: 10 }` and so by setting the value of
+  `anchorLocation`, the layout will be modified to either:
 
-  You can also override the layout property yourself or simply set the
-  anchorLocation to `SC.ANCHOR_TOP` or `SC.ANCHOR_BOTTOM`.  This will configure
-  the layout of your toolbar automatically when it is created.
+  `SC.ANCHOR_TOP:`
+      { borderBottom: 1, top: 0, left: 0, right: 0, height: 32, zIndex: 10 }
+
+  `SC.ANCHOR_BOTTOM:`
+      { borderTop: 1, bottom: 0, left: 0, right: 0, height: 32, zIndex: 10 }
+
+  Of course, you can always override the layout property yourself in order to
+  adjust the height, border and zIndex values.
 
   @extends SC.View
   @since SproutCore 1.0
@@ -105,14 +116,14 @@ SC.ToolbarView = SC.View.extend(
   /**
     Default anchor location.  This will be applied automatically to the
     toolbar layout if you set it. Possible values:
-    
+
       - SC.ANCHOR_TOP
       - SC.ANCHOR_LEFT
       - SC.ANCHOR_TOP_LEFT
       - SC.ANCHOR_BOTTOM
       - SC.ANCHOR_RIGHT
       - SC.ANCHOR_BOTTOM_RIGHT
-    
+
     @type String
     @default null
   */
@@ -123,14 +134,27 @@ SC.ToolbarView = SC.View.extend(
   //
 
   /** @private */
-  layout: { left: 0, height: 32, right: 0 },
+  layout: { left: 0, right: 0, height: 32, zIndex: 10 },
 
   /** @private */
-  init: function() {
+  init: function () {
     // apply anchor location before setting up the rest of the view.
     if (this.anchorLocation) {
       this.layout = SC.merge(this.layout, this.anchorLocation);
+
+      switch (this.anchorLocation) {
+      case SC.ANCHOR_TOP:
+      case SC.ANCHOR_TOP_LEFT:
+        this.layout.borderBottom = 1;
+        break;
+      case SC.ANCHOR_BOTTOM:
+      case SC.ANCHOR_BOTTOM_RIGHT:
+        this.layout.borderTop = 1;
+        break;
+      default:
+      }
     }
+
     sc_super();
   }