sproutcore 1.6.0.beta.3-java → 1.6.0-java

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

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 /**
-  @mixin
+  @namespace
   Child views of SplitViews should use this mixin to get their positioning
   logic and default settings.
   
@@ -14,7 +14,8 @@
   child views. This mixin observes the position and size properties and 
   calls adjust().
 */
-SC.SplitChild = {
+SC.SplitChild = 
+  /** @scope SC.SplitChild.prototype */{
   /**
    * Set to YES if your Split Child is a divider view.
    *
@@ -48,13 +49,15 @@ SC.SplitChild = {
    * The current size of the SC.SplitView child. Use this to set the default
    * size.
    *
-   * Note: if undefined, results are undefined.
+   * If you specify a size, autoResizeStyle will default to SC.RESIZE_MANUAL;
+   * if you don't, SplitView will assume you want it to fill the available space
+   * and use SC.RESIZE_AUTOMATIC.
    *
-   * @default 100
+   * @default undefined
    *
    * @type Number
   */
-  size: 100,
+  size: undefined,
   
   /**
    * [RO] The current position of the SC.SplitView. This is read-only, and is set
@@ -121,9 +124,14 @@ SC.SplitChild = {
    *   SC.RESIZE_AUTOMATIC views have already been resized as much as possible.
    * - SC.FIXED_SIZE: Never resize.
    *
+   * If you specify an autoResizeStyle, it will be used. If you leave it at `undefined`, 
+   * it will look at `size`: if a `size` is supplied, it will use `SC.RESIZE_MANUAL`; otherwise
+   * it will use `SC.RESIZE_AUTOMATIC`.
+   *
+   * @default based on size
    * @type {AutoResizeStyle}
   */
-  autoResizeStyle: SC.RESIZE_MANUAL,
+  autoResizeStyle: undefined,
 
   /**
    * If NO, moving the divider before this view will not resize the view, but

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

@@ -30,7 +30,7 @@ SC.MOVES_PREVIOUS_CHILD = 'moves-previous-child';
 SC.MOVES_NEXT_CHILD = 'moves-next-child';
 
 /**
-  @mixin
+  @namespace
   A SplitThumb may be placed inside any view in a SplitView, and can even
   be a direct child of the SplitView. It forwards its events to the SplitView
   to control the movement of a divider or another child of the SplitView.

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

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 SC.BaseTheme.splitRenderDelegate = SC.RenderDelegate.create({
-  name: 'split',
+  className: 'split',
 
   render: function(dataSource, context) {
     context.addClass(dataSource.get('layoutDirection'));

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/render_delegates/split_divider.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 SC.BaseTheme.splitDividerRenderDelegate = SC.RenderDelegate.create({
-  name: 'split-divider',
+  className: 'split-divider',
   dividerSize: 1,
 
   splitPositionOffset: -5,

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

@@ -291,6 +291,15 @@ SC.SplitView = SC.View.extend({
     // as we loop using the lastChild variable.
     for (idx = 0; idx < len; idx++) {
       child = children[idx];
+
+      // do initial setup of things like autoResizeStyle:
+      if (!child.get('autoResizeStyle')) {
+        if (child.get('size') !== undefined) {
+          child.set('autoResizeStyle', SC.RESIZE_MANUAL);
+        } else {
+          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

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

@@ -7,8 +7,9 @@
 
 /**
   @class
-  @deprecated
-  DEPRECATED. Kept to allow a modicum of backwards-compatibility. Please use 
+  @deprecated Use a normal view and mix-in SC.SplitThumb.
+
+  Kept to allow a modicum of backwards-compatibility. Please use
   a normal view and mix in SC.SplitThumb instead.
 
   @extends SC.View

data/lib/frameworks/sproutcore/frameworks/foundation/core.js

@@ -15,9 +15,9 @@ SC.FOCUS_ALL_CONTROLS = YES;
 SC.ready(function() {
   var focus = SC.SAFARI_FOCUS_BEHAVIOR;
   if (focus !== null && focus !== undefined) {
-    //@ if (debug)
+    // @if (debug)
     SC.Logger.warn("SC.SAFARI_FOCUS_BEHAVIOR is deprecated. Please use SC.FOCUS_ALL_CONTROLS instead");
-    //@ endif
+    // @endif
     SC.FOCUS_ALL_CONTROLS = SC.SAFARI_FOCUS_BEHAVIOR;
   }
 });

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_resize.js

@@ -8,7 +8,7 @@
 sc_require("system/utils/string_measurement");
 
 /**
-  @mixin
+  @class
   Use this mixin to make your view automatically resize based upon its value,
   title, or other string property. Only works for views that support automatic
   resizing.
@@ -134,6 +134,9 @@ SC.AutoResize = {
       // if so, cancel the old request and make a new one
       SC.AutoResizeManager.cancelMeasurementForView(this, requestedBatchResizeId);
       SC.AutoResizeManager.scheduleMeasurementForView(this, batchResizeId);
+
+      // update the requested batchResizeId to the new id
+      this._scar_requestedBatchResizeId = batchResizeId;
     }
   }.observes('batchResizeId'),
 
@@ -151,7 +154,7 @@ SC.AutoResize = {
 
     this._scar_measurementPending = YES;
     this._scar_requestedBatchResizeId = batchResizeId;
-  },
+  }.observes('isVisible'),
 
   /**
     Measures the size of the view.
@@ -160,7 +163,8 @@ SC.AutoResize = {
   */
   measureSize: function(batch) {
     var metrics, layer, value = this.get('autoResizeText'),
-        autoSizePadding, paddingHeight, paddingWidth;
+        autoSizePadding, paddingHeight, paddingWidth,
+        ignoreEscape = !this.get('escapeHTML');
 
     // There are two special cases.
     //   - empty: we should do nothing. The metrics are 0.
@@ -172,7 +176,7 @@ SC.AutoResize = {
     if (SC.none(value) || value === "") {
       metrics = { width: 0, height: 0 };
     } else if (batch) {
-      metrics = SC.measureString(value);
+      metrics = SC.measureString(value, ignoreEscape);
     } else {
       // Normal resize pattern: get our own layer, pass it as a template to SC.metricsForString.
       layer = this.get('autoResizeLayer');
@@ -181,7 +185,7 @@ SC.AutoResize = {
         return;
       }
 
-      metrics = SC.metricsForString(value, layer);
+      metrics = SC.metricsForString(value, layer, this.get('classNames'), ignoreEscape);
     }
 
     // metrics should include padding
@@ -310,7 +314,7 @@ SC.AutoResizeManager = {
       return SC.AutoResizeManager.doBatchResize();
     }
 
-    var tag, views, view, layer, batches;
+    var tag, views, view, layer, batches, prepared;
 
     // first measure all the batched views
     batches = this.viewsNeedingResize;
@@ -318,25 +322,18 @@ SC.AutoResizeManager = {
       if (batches.hasOwnProperty(tag)) {
         views = batches[tag];
 
-        // step through until you find one with a layer
+        // now measure the rest using the same settings
         while ((view = views.pop())) {
-          layer = view.get('autoResizeLayer');
+          if(view.get('isVisible') && (layer = view.get('autoResizeLayer'))) {
+            if(!prepared) SC.prepareStringMeasurement(layer);
 
-          // use the layer to prepare the measurement
-          if(layer) {
-            SC.prepareStringMeasurement(layer);
             view.measureSize(YES);
-            break;
           }
         }
 
-        // now measure the rest using the same settings
-        while ((view = views.pop())) {
-          view.measureSize(YES);
-        }
-
-        SC.teardownStringMeasurement();
-
+        // if they were all isVisible:NO, then prepare was never called
+        // so dont call teardown
+        if(prepared) SC.teardownStringMeasurement();
       }
     }
 

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/button.js

@@ -5,10 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-SC.Button = {
-  
-  initMixin: function(){
-    SC.Logger.warn("SC.Button is deprecated and does nothing. Subclass SC.ButtonView instead.");
-  }
-  
-} ;
+SC.Button.initMixin = function(){
+  throw "SC.Button is deprecated as a mixin and is now a subclass of SC.TemplateView. Subclass SC.ButtonView instead.";
+};
+

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_value_support.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 /**
-  @mixin
+  @namespace
 
   This mixin allows a view to get its value from a content object based
   on the value of its contentValueKey.

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/flowed_layout.js

@@ -150,7 +150,7 @@ SC.FlowedLayout = {
   /** @private */
   _scfl_layoutPropertyDidChange: function(){
     this.invokeOnce("_scfl_tile");
-  },
+  }.observes('layoutDirection', 'align', 'flowPadding', 'canWrap', 'defaultFlowSpacing'),
   
   /** @private
     Overriden to only update if it is a view we do not manage, or the width or height has changed
@@ -192,11 +192,15 @@ SC.FlowedLayout = {
   observeChildLayout: function(c) {
     if (c._scfl_isBeingObserved) return;
     c._scfl_isBeingObserved = YES;
+    c.addObserver('flowSpacing', this, '_scfl_layoutPropertyDidChange');
     c.addObserver('isVisible', this, '_scfl_layoutPropertyDidChange');
     c.addObserver('useAbsoluteLayout', this, '_scfl_layoutPropertyDidChange');
     c.addObserver('calculatedWidth', this, '_scfl_layoutPropertyDidChange');
     c.addObserver('calculatedHeight', this, '_scfl_layoutPropertyDidChange');
     c.addObserver('startsNewRow', this, '_scfl_layoutPropertyDidChange');
+    c.addObserver('isSpacer', this, '_scfl_layoutPropertyDidChange');
+    c.addObserver('fillWidth', this, '_scfl_layoutPropertyDidChange');
+    c.addObserver('fillHeight', this, '_scfl_layoutPropertyDidChange');
   },
   
   /** @private
@@ -204,11 +208,15 @@ SC.FlowedLayout = {
   */
   unobserveChildLayout: function(c) {
     c._scfl_isBeingObserved = NO;
+    c.removeObserver('flowSpacing', this, '_scfl_layoutPropertyDidChange');
     c.removeObserver('isVisible', this, '_scfl_layoutPropertyDidChange');
     c.removeObserver('useAbsoluteLayout', this, '_scfl_layoutPropertyDidChange');
     c.removeObserver('calculatedWidth', this, '_scfl_layoutPropertyDidChange');
     c.removeObserver('calculatedHeight', this, '_scfl_layoutPropertyDidChange');
     c.removeObserver('startsNewRow', this, '_scfl_layoutPropertyDidChange');
+    c.removeObserver('isSpacer', this, '_scfl_layoutPropertyDidChange');
+    c.removeObserver('fillWidth', this, '_scfl_layoutPropertyDidChange');
+    c.removeObserver('fillHeight', this, '_scfl_layoutPropertyDidChange');
   },
   
   /**
@@ -233,6 +241,7 @@ SC.FlowedLayout = {
   flowSpacingForChild: function(idx, view) {
     var spacing = view.get("flowSpacing");
     if (SC.none(spacing)) spacing = this.get("defaultFlowSpacing");
+    if (SC.none(spacing)) spacing = 0;
     
     if (SC.typeOf(spacing) === SC.T_NUMBER) {
       spacing = { left: spacing, right: spacing, bottom: spacing, top: spacing };
@@ -259,7 +268,7 @@ SC.FlowedLayout = {
   flowSizeForChild: function(idx, view) {
     var cw = view.get('calculatedWidth'), ch = view.get('calculatedHeight');
     
-    var calc = {}, f = view.get('frame');
+    var calc = {}, f = view.get('frame'), l = view.get('layout');
     view._scfl_lastFrame = f;
     
     // if there is a calculated width, use that. NOTE: if calculatedWidth === 0,
@@ -280,19 +289,31 @@ SC.FlowedLayout = {
     // if it is a spacer, we must set the dimension that it
     // expands in to 0.
     if (view.get('isSpacer')) {
-      if (this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL) calc.width = 0;
-      else calc.height = 0;
+      if (this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL) {
+        calc.width = l.minWidth || 0;
+      } else {
+        calc.height = l.minHeight || 0;
+      }
     }
     
     // if it has a fillWidth/Height, clear it for later
     if (
       this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL && view.get('fillHeight')
     ) {
-      calc.height = 0;
+      calc.height = l.minHeight || 0;
     } else if (
       this.get('layoutDirection') === SC.LAYOUT_VERTICAL && view.get('fillWidth')
     ) {
-      calc.width = 0;
+      calc.width = l.minWidth || 0;
+    }
+
+    // finally, RECREATE the view's layout if it is invalid (lacks a width or a height)
+    if (l.width == undefined) {
+      view.adjust('width', f.width);
+    }
+
+    if (l.height == undefined) {
+      view.adjust('height', f.height);
     }
     
     // return
@@ -305,12 +326,34 @@ SC.FlowedLayout = {
   }.property('calculatedWidth', 'calculatedHeight'),
   
   /** @private */
+
+  // the maximum row length when all flexible items are collapsed.
+  _scfl_maxCollapsedRowLength: 0,
+
+  // the total row size when all flexible rows are collapsed.
+  _scfl_totalCollapsedRowSize: 0,
+
+
   _scfl_calculatedSizeDidChange: function() {
     if(this.get('autoResize')) {
-      if(this.get('shouldResizeWidth')) this.adjust('minWidth', this.get('calculatedWidth'));
-      if(this.get('shouldResizeHeight')) this.adjust('minHeight', this.get('calculatedHeight'));
+      if (this.get('layoutDirection') == SC.LAYOUT_VERTICAL) {
+        if (this.get('shouldResizeHeight')) {
+          this.adjust('minHeight', this.get('_scfl_maximumCollapsedRowLength'));
+        }
+
+        if (this.get('shouldResizeWidth')) {
+          this.adjust('minWidth', this.get('_scfl_totalCollapsedRowSize'));
+        }
+      } else {
+        if (this.get('shouldResizeWidth')) {
+          this.adjust('minWidth', this.get('_scfl_maximumCollapsedRowLength'));
+        }
+        if (this.get('shouldResizeHeight')) {
+          this.adjust('minHeight', this.get('_scfl_totalCollapsedRowSize'));
+        }
+      }
     }
-  }.observes('autoResize', 'shouldResizeWidth', 'calculatedWidth', 'shouldResizeHeight', 'calculatedHeight'),
+  }.observes('autoResize', 'shouldResizeWidth', '_scfl_maximumCollapsedRowLength', '_scfl_totalCollapsedRowSize', 'shouldResizeHeight'),
   
   /**
     @private
@@ -344,6 +387,14 @@ SC.FlowedLayout = {
       // The rows array starts empty. It will get filled out by the method
       // _scfl_distributeChildrenIntoRows.
       rows: undefined,
+
+
+      // the maximum row length where all collapsible items are collapsed.
+      maximumCollapsedRowLength: 0,
+
+      // the total sizes of all rows when collapsed (With flex-height rows
+      // at minimum size)
+      totalCollapsedRowSize: 0,
       
       // These properties are calculated once here, but later used by
       // the various methods.
@@ -429,7 +480,8 @@ SC.FlowedLayout = {
         items = [], itemOffset = 0, isVertical = plan.isVertical, itemSize, itemLength,
         canWrap = this.get('canWrap'),
         newRowPending = NO;
-    
+
+    var maxItemLength = 0;
     var max = row.plan.maximumRowLength;
     
     for (idx = startingAt; idx < len; idx++) {
@@ -438,12 +490,13 @@ SC.FlowedLayout = {
       // this must be set before we check if the child is included because even
       // if it isn't included, we need to remember that there is a line break
       // for later
-      newRowPending = newRowPending || (idx !== startingAt && child.get('startsNewRow'));
+      newRowPending = newRowPending || (items.length > 0 && child.get('startsNewRow'));
 
       if (!this.shouldIncludeChildInFlow(idx, child)) continue;
       
       childSize = this.flowSizeForChild(idx, child);
       spacing = this.flowSpacingForChild(idx, child);
+
       childSpacedSize = {
         width: childSize.width + spacing.left + spacing.right,
         height: childSize.height + spacing.top + spacing.bottom
@@ -487,9 +540,18 @@ SC.FlowedLayout = {
       
       items.push(item);
       itemOffset += itemLength;
+      maxItemLength = Math.max(itemLength, maxItemLength);
     }
     
     row.rowLength = itemOffset;
+
+    // if the row cannot wrap, then the minimum size for the row (and therefore collapsed size)
+    // is the same as the current row length: it consists of the minimum size of all items.
+    //
+    // If the row can wrap, then the longest item will determine the size of a fully 
+    // collapsed (one item per row) layout.
+    var minRowLength = canWrap ? maxItemLength : row.rowLength;
+    row.plan.maximumCollapsedRowLength = Math.max(minRowLength, row.plan.maximumCollapsedRowLength);
     row.items = items;
     return idx;
   },
@@ -569,6 +631,8 @@ SC.FlowedLayout = {
     row.shouldExpand = shouldExpand;
     row.rowLength = position - row.plan.rowStartPadding; // row length does not include padding
     row.rowSize = rowSize;
+
+    row.plan.totalCollapsedRowSize += row.rowSize;
     
   },
 
@@ -658,8 +722,9 @@ SC.FlowedLayout = {
     this.beginPropertyChanges();
 
     this.set('calculatedHeight', isVertical ? longestRow : totalSize);
-
     this.set('calculatedWidth', isVertical ? totalSize : longestRow);
+    this.set('_scfl_maximumCollapsedRowLength', plan.maximumCollapsedRowLength);
+    this.set('_scfl_totalCollapsedRowSize', plan.totalCollapsedRowSize);
 
     this.endPropertyChanges();
   },
@@ -699,11 +764,15 @@ SC.FlowedLayout = {
   
   /** @private */
   _scfl_frameDidChange: function() {
-    var frame = this.get("frame"), lf = this._scfl_lastFrameSize;
-    this._scfl_lastFrameSize = frame;
+    if (this._scfl_isChangingSize) return;
+
+    var frame = this.get("frame"), lf = this._scfl_lastFrameSize || {};
+    this._scfl_lastFrameSize = SC.clone(frame);
+
+    if (lf.width == frame.width && lf.height == frame.height) {
+      return;
+    }
 
-    if (lf && lf.width == frame.width && lf.height == frame.height) return;
-    
     this.invokeOnce("_scfl_tile");
   }.observes("frame"),