sproutcore 1.4.5-java → 1.5.0-java

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

@@ -1,11 +1,10 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-sc_require('views/split');
 
 /**
   @class
@@ -22,7 +21,6 @@ sc_require('views/split');
   be surrounded by two other views.
 
   @extends SC.View
-
   @author Charles Jolley
   @author Lawrence Pit
   @author Erich Ocean
@@ -31,25 +29,28 @@ sc_require('views/split');
 SC.SplitDividerView = SC.View.extend(
 /** @scope SC.SplitDividerView.prototype */ {
 
+  /**
+    @type Array
+    @default ['sc-split-divider-view']
+    @see SC.View#classNames
+  */
   classNames: ['sc-split-divider-view'],
   
   /** @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) {
     var splitView = this.get('splitView');
     return (splitView) ? splitView.mouseDownInThumbView(evt, this) : sc_super();
   },
   
+  /** @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);
   }

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -16,7 +16,7 @@ sc_require('views/collection') ;
   collections with complex displays and variable heights such as comments or
   small notification queues.
   
-  h2. Static Layout
+  ## 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
@@ -29,20 +29,30 @@ sc_require('views/collection') ;
   @extends SC.CollectionView
   @since SproutCore 0.9
 */
-SC.StackedView = SC.CollectionView.extend( 
-/** SC.StackedView.prototype */ {
+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) {
@@ -74,6 +84,7 @@ SC.StackedView = SC.CollectionView.extend(
     return this;
   },
   
+  /** @private */
   _updateHeight: function() {
     
     var childViews = this.get('childViews'),

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -26,13 +26,24 @@
   @since SproutCore 1.2
   @author Tom Dale
 */
+SC.StaticContentView = SC.View.extend(SC.StaticLayout,
+/** @scope SC.StaticContentView.prototype */ {
 
-SC.StaticContentView = SC.View.extend(SC.StaticLayout, {
-/** @scope SC.StaticContentView.prototype */
+  /**
+    @type Array
+    @default ['sc-static-content-view']
+    @see SC.View#classNames
+  */
   classNames: ['sc-static-content-view'],
 
+  /**
+    @type Array
+    @default ['content']
+    @see SC.View#displayProperties
+  */
   displayProperties: ['content'],
 
+
   // ..........................................................
   // PROPERTIES
   //
@@ -42,6 +53,7 @@ SC.StaticContentView = SC.View.extend(SC.StaticLayout, {
     the DOM, so ensure that any user-generated content has been escaped.
 
     @type String
+    @default null
   */
   content: null,
 
@@ -103,7 +115,7 @@ SC.StaticContentView = SC.View.extend(SC.StaticLayout, {
   /** @private
     If the layer changes, make sure we recalculate the frame.
   */
-  didCreateLayer: function() {
+  didUpdateLayer: function() {
     this.contentLayoutDidChange();
   },
 
@@ -121,11 +133,13 @@ SC.StaticContentView = SC.View.extend(SC.StaticLayout, {
     }
   },
   
+  /** @private */
   touchStart: function(evt){
     evt.allowDefault();
     return YES;
   },
   
+  /** @private */
   touchEnd: function(evt){
     evt.allowDefault();
     return YES;

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

@@ -1,14 +1,31 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('views/segmented');
 
+/**
+  @static
+  @type String
+  @constant
+*/
 SC.TOP_LOCATION = 'top';
+
+/**
+  @static
+  @type String
+  @constant
+*/
 SC.TOP_TOOLBAR_LOCATION = 'top-toolbar';
+
+/**
+  @static
+  @type String
+  @constant
+*/
 SC.BOTTOM_LOCATION = 'bottom';
 
 /** 
@@ -24,8 +41,18 @@ SC.BOTTOM_LOCATION = 'bottom';
 SC.TabView = SC.View.extend(
 /** @scope SC.TabView.prototype */ {
 
+  /**
+    @type Array
+    @default ['sc-tab-view']
+    @see SC.View#classNames
+  */
   classNames: ['sc-tab-view'],
   
+  /**
+    @type Array
+    @default ['nowShowing']
+    @see SC.View#displayProperties
+  */
   displayProperties: ['nowShowing'],
 
   // ..........................................................
@@ -34,27 +61,85 @@ SC.TabView = SC.View.extend(
 
  /** 
     Set nowShowing with the page you want to display.
+    
+    @type String
+    @default null
   */
   nowShowing: null,
   
+  /**
+    @type Array
+    @default []
+  */
   items: [],
   
+  /**
+    @type Boolean
+    @default YES
+  */
   isEnabled: YES,
   
+  /**
+    @type String
+    @default null
+  */
   itemTitleKey: null,
+  
+  /**
+    @type String
+    @default null
+  */
   itemValueKey: null,
+  
+  /**
+    @type String
+    @default null
+  */
   itemIsEnabledKey: null,
+  
+  /**
+    @type String
+    @default null
+  */
   itemIconKey: null,
+  
+  /**
+    @type String
+    @default null
+  */
   itemWidthKey: null,
+  
+  /**
+    @type String
+    @default null
+  */
   itemToolTipKey: null,
+  
+  /**
+    @type Number
+    @default SC.REGULAR_BUTTON_HEIGHT
+  */
   tabHeight: SC.REGULAR_BUTTON_HEIGHT,
   
+  /**
+    Possible values:
+    
+      - SC.TOP_LOCATION
+      - SC.TOP_TOOLBAR_LOCATION
+      - SC.BOTTOM_LOCATION
+    
+    @type String
+    @default SC.TOP_LOCATION
+  */
   tabLocation: SC.TOP_LOCATION,
   
   /** 
     If set, then the tab location will be automatically saved in the user
     defaults.  Browsers that support localStorage will automatically store
     this information locally.
+    
+    @type String
+    @default null
   */
   userDefaultKey: null,
   
@@ -64,6 +149,7 @@ SC.TabView = SC.View.extend(
   // 
   
   // forward important changes on to child views
+  /** @private */
   _tab_nowShowingDidChange: function() {
     var v = this.get('nowShowing');
     this.get('containerView').set('nowShowing',v);
@@ -71,6 +157,7 @@ SC.TabView = SC.View.extend(
     return this ;
   }.observes('nowShowing'),
 
+  /** @private */
   _tab_saveUserDefault: function() {
     // if user default is set, save also
     var v = this.get('nowShowing');
@@ -80,6 +167,7 @@ SC.TabView = SC.View.extend(
     }
   }.observes('nowShowing'),
   
+  /** @private */
   _tab_itemsDidChange: function() {
     this.get('segmentedView').set('items', this.get('items'));
     return this ;    
@@ -93,6 +181,7 @@ SC.TabView = SC.View.extend(
     this._tab_nowShowingDidChange()._tab_itemsDidChange();
   },
 
+  /** @private */
   awake: function() {
     sc_super();  
     var defaultKey = this.get('userDefaultKey');
@@ -104,20 +193,24 @@ SC.TabView = SC.View.extend(
 
   },
   
+  /** @private */
   createChildViews: function() {
     var childViews  = [], view, containerView, layout,
         tabLocation = this.get('tabLocation'),
         tabHeight   = this.get('tabHeight');
-    
-    layout = (tabLocation === SC.TOP_LOCATION) ?
-             { top: tabHeight/2+1, left: 0, right: 0, bottom: 0 } :
-             (tabLocation === SC.TOP_TOOLBAR_LOCATION) ?
-             { top: tabHeight+1, left: 0, right: 0, bottom: 0 } :
-             { top: 0, left: 0, right: 0, bottom: tabHeight-1 } ;
-    
-    containerView = this.containerView.extend(SC.Border, {
+
+    if (tabLocation === SC.TOP_LOCATION) {
+      layout = { top: tabHeight/2+1, left: 0, right: 0, bottom: 0, border: 1 };
+    } else if (tabLocation === SC.TOP_TOOLBAR_LOCATION) {
+      layout = { top: tabHeight+1, left: 0, right: 0, bottom: 0, border: 1 };
+    } else {
+      layout = { top: 0, left: 0, right: 0, bottom: (tabHeight/2) - 1, border: 1 };
+    }
+
+    containerView = this.containerView.extend({
       layout: layout,
-      borderStyle: SC.BORDER_BLACK
+      //adding the role
+      ariaRole: 'tabpanel'
     });
 
     view = this.containerView = this.createChildView(containerView) ;
@@ -148,6 +241,7 @@ SC.TabView = SC.View.extend(
         this.invokeOnce(this.updateLayerIfNeeded) ;
       }.observes('value'),
 
+      /** @private */
       init: function() {
         // before we setup the rest of the view, copy key config properties 
         // from the owner view...
@@ -174,11 +268,19 @@ SC.TabView = SC.View.extend(
     The containerView managed by this tab view.  Note that TabView uses a 
     custom container view.  You can access this view but you cannot change 
     it.
+    
+    @type SC.View
+    @default SC.ContainerView
+    @readOnly
   */
-  containerView: SC.ContainerView,
+  containerView: SC.ContainerView.extend({ renderDelegateName: 'wellRenderDelegate' }),
   
+  /**
+    @type SC.View
+    @default SC.SegmentedView
+  */
   segmentedView: SC.SegmentedView
   
 }) ;
 
-SC._TAB_ITEM_KEYS = 'itemTitleKey itemValueKey itemIsEnabledKey itemIconKey itemWidthKey itemToolTipKey itemActionKey itemTargetKey'.w();
+SC._TAB_ITEM_KEYS = ['itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'itemIconKey', 'itemWidthKey', 'itemToolTipKey', 'itemActionKey', 'itemTargetKey'];

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -24,12 +24,22 @@
 SC.ThumbView = SC.View.extend(
 /** @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 */
@@ -39,6 +49,7 @@ SC.ThumbView = SC.View.extend(
     return sc_super() ;
   },
   
+  /** @private */
   mouseDown: function(evt) {
     if (!this.get('isEnabled')) return NO ;
     
@@ -46,8 +57,9 @@ SC.ThumbView = SC.View.extend(
     return (splitView) ? splitView.mouseDownInThumbView(evt, this) : sc_super();
   },
   
+  /** @private */
   touchStart: function(evt) {
     return this.mouseDown(evt);
   }
-    
+
 });