sproutcore 1.10.3.1 → 1.11.0.rc1

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

@@ -61,14 +61,14 @@ SC.RESIZE_AUTOMATIC = 'sc-automatic-resize';
       })
 
   Dividers
-  ------------------------------------------
+  =======================================
   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
+  - Override splitViewDividerBetween(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.
 
@@ -87,19 +87,21 @@ SC.RESIZE_AUTOMATIC = 'sc-automatic-resize';
 SC.SplitView = SC.View.extend({
   /**@scope SC.SplitView.prototype*/
 
+  /** @private */
   classNames: ['sc-split-view'],
 
+  /** @private */
   childViews: ['topLeftView', 'bottomRightView'],
 
-  // used by the splitView computed property to find the nearest SplitView.
+  // 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.
-   *
-   * Should be a class, not an instance.
-   *
-   * @type {SC.View}
+   The class of view to create for the divider views. Override this to use a subclass of SC.SplitDividerView,
+   or to implment your own.
+   
+   @type {SC.View}
+   @default SC.SplitDividerView
   */
   splitDividerView: SC.SplitDividerView,
 
@@ -136,8 +138,7 @@ SC.SplitView = SC.View.extend({
   */
   splitChildCursorStyle: null,
 
-  /**
-    @private
+  /** @private
     Only occurs during drag, which only happens after render, so we
     update directly.
   */
@@ -145,15 +146,14 @@ SC.SplitView = SC.View.extend({
     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.
+  /** @private */
   init: function() {
+    // set up the SC.Cursor instance that this view and all the subviews
+    // will share.
     this.cursor = SC.Cursor.create();
     sc_super();
   },
 
-  //
   // RENDERING
   // Things like layoutDirection must be rendered as class names.
   // We delegate to a render delegate.
@@ -182,14 +182,26 @@ SC.SplitView = SC.View.extend({
     }
   }.property('frame', 'layoutDirection').cacheable(),
 
+  /** @private */
   viewDidResize: function () {
     this.scheduleTiling();
 
     sc_super();
   },
 
+  /** @private */
   layoutDirectionDidChange: function() {
+    // Schedule tiling.
     this.scheduleTiling();
+    // Propagate to dividers.
+    var layoutDirection = this.get('layoutDirection'),
+        childViews = this.get('childViews'),
+        len = childViews ? childViews.get('length') : 0,
+        i, view;
+    for (i = 0; i < len; i++) {
+      view = childViews[i];
+      if (view.get('isSplitDivider')) view.setIfChanged('layoutDirection', layoutDirection);
+    }
   }.observes('layoutDirection'),
 
   //
@@ -286,6 +298,7 @@ SC.SplitView = SC.View.extend({
   */
   _scsv_setupChildViews: function() {
     var del = this.get('delegate'),
+        layoutDirection = this.get('layoutDirection'),
 
         children = this.get('childViews').copy(), len = children.length, idx,
         child, lastChild, lastNonDividerChild,
@@ -335,7 +348,9 @@ SC.SplitView = SC.View.extend({
         }
 
         if (divider) {
-          divider.isSplitDivider = YES;
+          divider.setIfChanged('isSplitDivider', YES);
+          divider.setIfChanged('layoutDirection', layoutDirection);
+
           newDividers[dividerId] = divider;
 
           if (oldDividers[dividerId]) {

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

@@ -20,18 +20,44 @@ sc_require('mixins/split_thumb');
   @author Alex Iskander
 */
 SC.SplitDividerView = SC.View.extend(SC.SplitChild, SC.SplitThumb,
-{
-  /** @scope SC.SplitDividerView.prototype */
+/** @scope SC.SplitDividerView.prototype */ {
+
+  /** @private */
   classNames: ['sc-split-divider-view'],
+
+  /** @private */
+  classNameBindings: ['layoutDirection'],
   
-  // set to prevent SC.SplitView from automatically creating dividers
-  // to sit between this divider and another view.
+  /**
+    Walks like a duck. Used and maintained by SC.SplitView to keep track
+    of which of its childViews are dividers.
+
+    @type Boolean
+  */
   isSplitDivider: YES,
 
-  // NOTE: 'sc-fixed-size' is only hard-coded because SC.SplitView requires
-  // this file, and SC.FIXED_SIZE is defined inside SC.SplitView.
+  /**
+    The layout direction of the parent SplitView. May be SC.LAYOUT_VERTICAL
+    or SC.LAYOUT_HORIZONTAL. This property is also added as a class on this
+    view.
+    
+    You generally will not set this property yourself; it is managed by the
+    parent SplitView.
+
+    @type String
+    @default SC.LAYOUT_HORIZONTAL
+   */
+  layoutDirection: SC.LAYOUT_HORIZONTAL,
+
+  /** @private
+    This indicates that the view should not resize while being dragged; this
+    is generally the desired behavior.
+
+    (NOTE: SC.FIXED_SIZE is hard-coded here. It is defined on SC.SplitView,
+    which requires this file.)
+   */
   autoResizeStyle: 'sc-fixed-size',
-  
+
   movesSibling: SC.MOVES_CHILD,
   
   size: SC.propertyFromRenderDelegate('dividerSize', 10),

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

@@ -99,9 +99,29 @@ SC.StaticContentView = SC.View.extend(
     if (layer.getBoundingClientRect && !SC.browser.isIE8OrLower) {
       rect = layer.getBoundingClientRect();
 
-      return { x: 0, y: 0, width: rect.width, height: rect.height };
+      return {
+        x: 0,
+        y: 0,
+        width: rect.width,
+        originalWidth: rect.width,
+        height: rect.height,
+        originalHeight: rect.height,
+        scale: 1,
+        transformOriginX: 0.5,
+        transformOriginY: 0.5
+      };
     } else {
-      return { x: 0, y: 0, width: layer.clientWidth, height: layer.clientHeight };
+      return {
+        x: 0,
+        y: 0,
+        width: layer.clientWidth,
+        originalWidth: rect.width,
+        height: layer.clientHeight,
+        originalHeight: rect.height,
+        scale: 1,
+        transformOriginX: 0.5,
+        transformOriginY: 0.5
+      };
     }
   }.property('content').cacheable(),
 

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

@@ -41,14 +41,14 @@ SC.BOTTOM_LOCATION = 'bottom';
 SC.TabView = SC.View.extend(
 /** @scope SC.TabView.prototype */ {
 
-  /**
+  /** @private
     @type Array
     @default ['sc-tab-view']
     @see SC.View#classNames
   */
   classNames: ['sc-tab-view'],
 
-  /**
+  /** @private
     @type Array
     @default ['nowShowing']
     @see SC.View#displayProperties
@@ -60,7 +60,9 @@ SC.TabView = SC.View.extend(
   //
 
  /**
-    Set nowShowing with the page you want to display.
+    Set nowShowing with the view you want to display. (You may specify globally-accessible views
+    like `MyApp.tabsPage.myTabView`, local views defined on the TabView itself like `myLocalTabView`,
+    or deep local views like `.myLocalPage.myTabView`.)
 
     @type String
     @default null
@@ -68,6 +70,16 @@ SC.TabView = SC.View.extend(
   nowShowing: null,
 
   /**
+    The list of items for the SegmentedView, and specifying the associated view to display. For example:
+
+        items: [
+          { title: "Tab 1", value: "MyApp.tabsPage.view1" },
+          { title: "Tab 2", value: "MyApp.tabsPage.view2" }
+        ]
+
+    (Note that if needed you can specify the item keys by specifying `itemTitleKey`, `itemValueKey`, et
+    cetera, on your TabView.)
+
     @type Array
     @default []
   */
@@ -142,23 +154,41 @@ SC.TabView = SC.View.extend(
   // FORWARDING PROPERTIES
   //
 
-  // forward important changes on to child views
-  /** @private */
+  /** @private Sync important changes with the child views. */
   _tab_nowShowingDidChange: function() {
-    var v = this.get('nowShowing');
-    this.get('containerView').set('nowShowing',v);
-    this.get('segmentedView').set('value',v);
-    return this ;
-  }.observes('nowShowing'),
+    var content = this.get('nowShowing');
 
-  /** @private */
-  _tab_saveUserDefault: function() {
-    // if user default is set, save also
-    var v = this.get('nowShowing');
+    // Sync the segmented view.
+    this.get('segmentedView').set('value', content);
+
+    // If the user default is set, save it.
     var defaultKey = this.get('userDefaultKey');
     if (defaultKey) {
-      SC.userDefaults.set([defaultKey,'nowShowing'].join(':'), v);
+      SC.userDefaults.set([defaultKey,'nowShowing'].join(':'), content);
     }
+
+    // If it's a string, try to turn it into the object it references...
+    if (SC.typeOf(content) === SC.T_STRING && content.length > 0) {
+      var dotspot = content.indexOf('.');
+      // No dot means a local property, either to this view or this view's page.
+      if (dotspot === -1) {
+        var tempContent = this.get(content);
+        content = SC.kindOf(tempContent, SC.CoreView) ? tempContent : SC.objectForPropertyPath(content, this.get('page'));
+      }
+      // Dot at beginning means local property path.
+      else if (dotspot === 0) {
+        content = this.getPath(content.slice(1));
+      }
+      // Dot after the beginning
+      else {
+        content = SC.objectForPropertyPath(content);
+      }
+    }
+
+    // Sync the container view.
+    this.get('containerView').set('nowShowing', content);
+
+    return this;
   }.observes('nowShowing'),
 
   /** @private */
@@ -173,18 +203,13 @@ SC.TabView = SC.View.extend(
   init: function() {
     sc_super();
     this._tab_nowShowingDidChange()._tab_itemsDidChange();
-  },
-
-  /** @private */
-  awake: function() {
-    sc_super();
+    // Wake up the userDefaults support, if in use.
     var defaultKey = this.get('userDefaultKey');
     if (defaultKey) {
       defaultKey = [defaultKey,'nowShowing'].join(':');
       var nowShowing = SC.userDefaults.get(defaultKey);
       if (!SC.none(nowShowing)) this.set('nowShowing', nowShowing);
     }
-
   },
 
   /** @private */
@@ -243,7 +268,7 @@ SC.TabView = SC.View.extend(
       }
     });
 
-    this.segmentedView = this.createChildView(this.segmentedView) ;
+    this.segmentedView = this.createChildView(this.segmentedView);
 
     childViews.push(this.containerView);
     childViews.push(this.segmentedView);

data/lib/frameworks/sproutcore/frameworks/experimental/Buildfile

@@ -1,7 +1 @@
 config :forms, :required => :desktop
-
-config :scroll_view, :required => [:runtime, :foundation, :desktop]
-
-config :menu, :required => [:'experimental/scroll_view']
-
-config :polymorphism, :required => :datastore

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form.js

@@ -13,7 +13,8 @@ sc_require("views/form_row");
 /** 
   @class
   FormView lays out rows, manages their label widths, binds their
-  content properties, and sets up their contentValueKeys as needed.
+  content properties, and sets up their contentValueKeys as needed. This class is 
+  experimental and not available out of the box. 
 
   Usually, you will place rows into the FormView:
   

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form_row.js

@@ -5,18 +5,18 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
+sc_require("mixins/emptiness");
+sc_require("mixins/edit_mode");
+
 /*globals Forms */
 
 /** @class
   Represents a single row in a form. Rows have label and any number of other child views.
 
-  
-  @extends SC.FormView
+
+  @extends SC.View
   @author Alex Iskander
 */
-sc_require("mixins/emptiness");
-sc_require("mixins/edit_mode");
-
 SC.FormRowView = SC.View.extend(SC.FlowedLayout, SC.CalculatesEmptiness, SC.FormsEditMode,
 /** @scope Forms.FormRowView.prototype */ {
   classNames: ["sc-form-row-view"],
@@ -40,29 +40,29 @@ SC.FormRowView = SC.View.extend(SC.FlowedLayout, SC.CalculatesEmptiness, SC.Form
   */
   hasRowLabel: YES,
 
-  
+
   /**
     The text to display next to the row. If undefined, SproutCore will try
     to set it automatically to the key corresponding to this row in the FormView.
   */
   label: undefined,
-  
+
   /**
     The actual size for the label, as assigned by the parent FormView.
   */
   rowLabelSize: 0,
-  
+
   /**
     The measured size of the label. The parent FormView may use this to
     determine the proper rowLabelSize.
   */
   rowLabelMeasuredSize: 0,
-  
+
   /**
     If NO, the label will not automatically measure itself. The parent
     FormView normally manages this property for FormRowView.
 
-    Note that FormRowView never changes its own rowLabelSize: it only 
+    Note that FormRowView never changes its own rowLabelSize: it only
     measures it. The measurement is placed into rowLabelMeasuredSize.
 
     The FormView then sets the rowLabelSize, which is used to set the
@@ -82,7 +82,7 @@ SC.FormRowView = SC.View.extend(SC.FlowedLayout, SC.CalculatesEmptiness, SC.Form
   createChildViews: function() {
     // keep array of keys so we can pass on key to child.
     var cv = SC.clone(this.get('childViews'));
-    
+
     // add label
     if (this.labelView.isClass) {
       this.labelView = this.createChildView(this.labelView, {
@@ -93,17 +93,17 @@ SC.FormRowView = SC.View.extend(SC.FlowedLayout, SC.CalculatesEmptiness, SC.Form
       this.labelView.bind('shouldMeasureSize', this, 'shouldMeasureLabel');
       this.get('childViews').unshift(this.labelView);
     }
-    
+
     var content = this.get('content');
-    
+
     sc_super();
-    
-    
+
+
     // now, do the actual passing it
     var idx, len = cv.length, key, v;
     for (idx = 0; idx < len; idx++) {
       key = cv[idx];
-      
+
       // if the view was originally declared as a string, then we have something to give it
       if (SC.typeOf(key) === SC.T_STRING) {
         // try to get the actual view
@@ -133,20 +133,20 @@ SC.FormRowView = SC.View.extend(SC.FlowedLayout, SC.CalculatesEmptiness, SC.Form
 
     this.rowLabelSizeDidChange();
   },
-  
+
   labelDidChange: function() {
     this.get("labelView").set("value", this.get("label"));
   }.observes("label"),
-  
+
   labelSizeDidChange: function() {
     var size = this.get("labelView").get("measuredSize");
     this.set("rowLabelMeasuredSize", size.width);
-    
+
     // alert parent view if it is a row delegate
     var pv = this.get("parentView");
     if (pv && pv.get("isRowDelegate")) pv.rowLabelMeasuredSizeDidChange(this, size);
   },
-  
+
   rowLabelSizeDidChange: function() {
     this.get("labelView").adjust({
       "width": this.get("rowLabelSize")
@@ -173,7 +173,7 @@ SC.FormRowView.mixin({
     ext._singleField = fieldType;
     return ext;
   },
-  
+
   LabelView: SC.LabelView.extend(SC.AutoResize, SC.CalculatesEmptiness, {
     shouldAutoResize: NO, // only change the measuredSize so we can update.
     layout: { left:0, top:0, width: 0, height: 18 },