sproutcore 1.6.0.rc.2-x86-mingw32 → 1.6.0.1-x86-mingw32

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/mixins/auto_resize.js

@@ -314,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;
@@ -322,28 +322,18 @@ SC.AutoResizeManager = {
       if (batches.hasOwnProperty(tag)) {
         views = batches[tag];
 
-        // step through until you find one with a layer and also visible
+        // now measure the rest using the same settings
         while ((view = views.pop())) {
+          if(view.get('isVisible') && (layer = view.get('autoResizeLayer'))) {
+            if(!prepared) SC.prepareStringMeasurement(layer);
 
-          if(!view.get('isVisible')) continue;
-
-          layer = view.get('autoResizeLayer');
-
-          // use the layer to prepare the measurement
-          if(layer) {
-            SC.prepareStringMeasurement(layer, view.get('classNames'));
             view.measureSize(YES);
-            break;
           }
         }
 
-        // now measure the rest using the same settings
-        while ((view = views.pop())) {
-          if(view.get('isVisible')) 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/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,
@@ -281,9 +290,9 @@ SC.FlowedLayout = {
     // expands in to 0.
     if (view.get('isSpacer')) {
       if (this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL) {
-        calc.width = view.get('layout').minWidth || 0;
+        calc.width = l.minWidth || 0;
       } else {
-        calc.height = view.get('layout').minHeight || 0;
+        calc.height = l.minHeight || 0;
       }
     }
     
@@ -291,11 +300,20 @@ SC.FlowedLayout = {
     if (
       this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL && view.get('fillHeight')
     ) {
-      calc.height = view.get('layout').minHeight || 0;
+      calc.height = l.minHeight || 0;
     } else if (
       this.get('layoutDirection') === SC.LAYOUT_VERTICAL && view.get('fillWidth')
     ) {
-      calc.width = view.get('layout').minWidth || 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
@@ -462,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++) {
@@ -521,10 +540,18 @@ SC.FlowedLayout = {
       
       items.push(item);
       itemOffset += itemLength;
+      maxItemLength = Math.max(itemLength, maxItemLength);
     }
     
     row.rowLength = itemOffset;
-    row.plan.maximumCollapsedRowLength = Math.max(row.rowLength, row.plan.maximumCollapsedRowLength);
+
+    // 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;
   },

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

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 /**
-  @mixin
+  @namespace
 
   This mixin is used for views that show a seperate editor view to edit.
   For example, the default behavior of SC.LabelView if isEditable is set

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

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 /**
-  @mixin
+  @namespace
 
   This mixin is for a view that is editable but is acting as a proxy to
   edit another view. For example, a calendar picker that pops up over

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

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 /**
-  @mixin
+  @namespace
   
   This delegate is consulted by view implementing SC.InlineEditable and
   SC.InlineEditor and controls the lifecycle of the editor as well as begin

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

@@ -49,7 +49,7 @@ SC.BEST_FIT = "fitBest";
 SC.BEST_FIT_DOWN_ONLY = "fitBestDown";
 
 /**
-  @mixin
+  @namespace
 
   InnerFrame provides the innerFrameForSize function, which will return a frame for the given size adjusted
   to fit within the given outer size, according to the align and scale properties.

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/canvas_image.js

@@ -51,7 +51,7 @@ sc_require('render_delegates/render_delegate');
 */
 
 SC.BaseTheme.canvasImageRenderDelegate = SC.RenderDelegate.create({
-  name: 'canvasImage',
+  className: 'canvasImage',
 
   /** @private
     We don't have an element yet, so we do the minimal necessary setup

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/helpers/sizing.js

@@ -5,6 +5,8 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
+sc_require('render_delegates/render_delegate');
+
 SC.RenderDelegate.reopen({
   /**
     A list of size names to look for when automatically determining

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/image.js

@@ -34,7 +34,7 @@ sc_require('render_delegates/render_delegate');
 */
 
 SC.BaseTheme.imageRenderDelegate = SC.RenderDelegate.create({
-  name: 'image',
+  className: 'image',
 
   render: function(dataSource, context) {
     var image = dataSource.get('image'),

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/label.js

@@ -35,7 +35,7 @@ sc_require('render_delegates/render_delegate');
 */
 
 SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
-  name: 'label',
+  className: 'label',
   
   render: function(dataSource, context) {
     this.addSizeClassName(dataSource, context);

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/render_delegate.js

@@ -126,7 +126,7 @@
   directive. For example:
 
       MyTheme.buttonRenderDelegate = SC.RenderDelegate.create({
-        name: 'button',
+        className: 'button',
         render: function(dataSource, context) {
           this.includeSlices(dataSource, context, SC.THREE_SLICE);
         }
@@ -199,7 +199,7 @@
   You can then use the helpers from your render delegates:
 
       MyTheme.someRenderDelegate = SC.RenderDelegate.create({
-        name: 'some-thingy',
+        className: 'some-thingy',
         render: function(dataSource, context) {
           this.myHelperMethod(dataSource);
         }
@@ -270,7 +270,7 @@ SC.RenderDelegate = /** @scope SC.RenderDelegate.prototype */{
     create a render delegate, you call this:
    
         MyTheme.myRenderDelegate = SC.RenderDelegate.create({
-          name: 'my-render-delegate',
+          className: 'my-render-delegate',
           render: function(dataSource, context) {
             // your code here...
           }
@@ -310,7 +310,7 @@ SC.RenderDelegate = /** @scope SC.RenderDelegate.prototype */{
       }
 
       if (v && v.isEnhancement && v !== this[i]) {
-        v = SC._enhance(this[i] || K, v);
+        v = SC._enhance(this[i] || SC.K, v);
       }
 
       this[i] = v;
@@ -343,11 +343,11 @@ SC.RenderDelegate = /** @scope SC.RenderDelegate.prototype */{
   },
 
   /**
-    All render delegates should have a name. Any time a render delegate is
+    All render delegates should have a class name. Any time a render delegate is
     used, this name should be added as a class name (`SC.View`s do this
     automatically).
   */
-  name: undefined,
+  className: undefined,
 
   /**
     Writes the DOM representation of this render delegate to the

data/lib/frameworks/sproutcore/frameworks/foundation/resources/text_field.css

@@ -19,9 +19,6 @@
     right: 3px;
     position: absolute;
   }
-  &.text-area .padding {
-    right: 0px;
-  }
   &.sc-text-field-accessory-view {
   	z-index: 2;
   }
@@ -30,8 +27,6 @@
   	top: 0px;
   	left: 0px;
   	width: 100%;
-  	height: 100%;
-  	line-height: 100%;
     bottom: 0px;
   	right: 0px;
   	display: block;

data/lib/frameworks/sproutcore/frameworks/foundation/system/exception_handler.js

@@ -36,9 +36,11 @@ SC.ExceptionHandler = {
     @param {Exception} exception the exception thrown during execution
   */
   handleException: function(exception) {
-    if (this.isShowingErrorDialog) return;
-
+    if (this.isShowingErrorDialog) return NO;
+    
     this._displayErrorDialog(exception);
+    
+    return NO;
   },
 
   /** @private