sproutcore 1.11.0.rc2 → 1.11.0.rc3

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

@@ -333,36 +333,40 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   init: function () {
     sc_super();
 
-    var title = this.get('overflowTitle'),
-        toolTip = this.get('overflowToolTip'),
-        icon = this.get('overflowIcon'),
-        overflowView;
-
-    overflowView = this.get('segmentViewClass').create({
-      controlSize: this.get('controlSize'),
-      escapeHTML: false,
-      localize: this.get('localize'),
-      title: title,
-      toolTip: toolTip,
-      icon: icon,
-      isLastSegment: YES,
-      isOverflowSegment: YES,
-      layoutDirection: this.get('layoutDirection'),
-      isVisible: this.get('shouldHandleOverflow')
-    });
-    this.set('overflowView', overflowView);
-
-    this.appendChild(overflowView);
-
+    // Initialize.
+    this.shouldHandleOverflowDidChange();
     this.itemsDidChange();
   },
 
   shouldHandleOverflowDidChange: function () {
+    var overflowView = this.get('overflowView');
+
     if (this.get('shouldHandleOverflow')) {
+      var title = this.get('overflowTitle'),
+          toolTip = this.get('overflowToolTip'),
+          icon = this.get('overflowIcon');
+
+      overflowView = this.get('segmentViewClass').create({
+        controlSize: this.get('controlSize'),
+        escapeHTML: false,
+        localize: this.get('localize'),
+        title: title,
+        toolTip: toolTip,
+        icon: icon,
+        isLastSegment: YES,
+        isOverflowSegment: YES,
+        layoutDirection: this.get('layoutDirection')
+      });
+      this.appendChild(overflowView);
+      this.set('overflowView', overflowView);
+
       // remeasure should show/hide it as needed
       this.invokeLast(this.remeasure);
     } else {
-      this.get('overflowView').set('isVisible', NO);
+      if (overflowView) { // There will not be an overflow view on initialization.
+        this.removeChildAndDestroy(overflowView);
+        this.set('overflowView', null);
+      }
     }
   }.observes('shouldHandleOverflow'),
 
@@ -385,10 +389,11 @@ SC.SegmentedView = SC.View.extend(SC.Control,
         i, j;
 
     // Update childViews
-    if (childViews.get('length') - 1 > items.get('length')) {   // We've lost segments (ie. childViews)
+    var childViewsLength = this.get('shouldHandleOverflow') ? childViews.get('length') - 1 : childViews.get('length');
+    if (childViewsLength > items.get('length')) {   // We've lost segments (ie. childViews)
 
       // Remove unneeded segments from the end back
-      for (i = childViews.get('length') - 2; i >= items.get('length'); i--) {
+      for (i = childViewsLength - 1; i >= items.get('length'); i--) {
         childView = childViews.objectAt(i);
         localItem = childView.get('localItem');
 
@@ -417,10 +422,10 @@ SC.SegmentedView = SC.View.extend(SC.Control,
       // Update our value which may have changed
       this.set('value', value);
 
-    } else if (childViews.get('length') - 1 < items.get('length')) {  // We've gained segments
+    } else if (childViewsLength < items.get('length')) {  // We've gained segments
 
       // Create the new segments
-      for (i = childViews.get('length') - 1; i < items.get('length'); i++) {
+      for (i = childViewsLength; i < items.get('length'); i++) {
 
         // We create a default SC.ButtonView-like object for each segment
         childView = segmentViewClass.create({
@@ -592,12 +597,12 @@ SC.SegmentedView = SC.View.extend(SC.Control,
         value = this.get('value'),
         overflowView = this.get('overflowView'),
         isHorizontal = this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL,
-        layoutProperty = isHorizontal ? 'width' : 'height',
         visibleDim = isHorizontal ? this.$().width() : this.$().height(),  // The inner width/height of the div
         curElementsDim = 0,
         dimToFit, length, i,
         isOverflowing = NO,
         wantsAutoResize = this.get('shouldAutoResize'),
+        layoutProperty = isHorizontal ? 'width' : 'height',
         canAutoResize = !SC.none(this.getPath('layout.%@'.fmt(layoutProperty))),
         willAutoResize = wantsAutoResize && canAutoResize;
 
@@ -851,7 +856,6 @@ SC.SegmentedView = SC.View.extend(SC.Control,
 
     var childViews = this.get('childViews'),
         childView,
-        overflowIndex = childViews.get('length') - 1,
         index;
 
     if (!this.get('isEnabledInPane')) return YES; // nothing to do // TODO: return NO?
@@ -863,6 +867,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
       this.activeChildView = childView;
 
       // if mouse was pressed on the overflow segment, popup the menu
+      var overflowIndex = this.get('shouldHandleOverflow') ? childViews.get('length') - 1 : null;
       if (index === overflowIndex) this.showOverflowMenu();
       else this._isMouseDown = YES;
 
@@ -899,7 +904,6 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   /** @private */
   mouseMoved: function (evt) {
     var childViews = this.get('childViews'),
-        overflowIndex = childViews.get('length') - 1,
         activeChildView,
         childView,
         index;
@@ -917,6 +921,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
         if (childView.get('isEnabled')) childView.set('isActive', YES);
         this.activeChildView = childView;
 
+        var overflowIndex = this.get('shouldHandleOverflow') ? childViews.get('length') - 1 : null;
         if (index === overflowIndex) {
           this.showOverflowMenu();
           this._isMouseDown = NO;
@@ -930,7 +935,6 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   mouseEntered: function (evt) {
     var childViews = this.get('childViews'),
         childView,
-        overflowIndex = childViews.get('length') - 1,
         index;
 
     // if mouse was pressed down initially, start detection again
@@ -938,6 +942,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
       index = this.displayItemIndexForEvent(evt);
 
       // if mouse was pressed on the overflow segment, popup the menu
+      var overflowIndex = this.get('shouldHandleOverflow') ? childViews.get('length') - 1 : null;
       if (index === overflowIndex) {
         this.showOverflowMenu();
         this._isMouseDown = NO;
@@ -970,7 +975,6 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   touchStart: function (touch) {
     var childViews = this.get('childViews'),
         childView,
-        overflowIndex = childViews.get('length') - 1,
         index;
 
     if (!this.get('isEnabledInPane')) return YES; // nothing to do
@@ -983,6 +987,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
       this.activeChildView = childView;
 
       // if touch was on the overflow segment, popup the menu
+      var overflowIndex = this.get('shouldHandleOverflow') ? childViews.get('length') - 1 : null;
       if (index === overflowIndex) this.showOverflowMenu();
       else this._isTouching = YES;
     }
@@ -1015,7 +1020,6 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   touchesDragged: function (evt, touches) {
     var isTouching = this.touchIsInBoundary(evt),
         childViews = this.get('childViews'),
-        overflowIndex = childViews.get('length') - 1,
         activeChildView,
         childView,
         index;
@@ -1036,6 +1040,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
 
         this.activeChildView = childView;
 
+        var overflowIndex = this.get('shouldHandleOverflow') ? childViews.get('length') - 1 : null;
         if (index === overflowIndex) {
           this.showOverflowMenu();
           this._isMouseDown = NO;
@@ -1067,11 +1072,11 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   _touchDidEnter: function (evt) {
     var childViews = this.get('childViews'),
         childView,
-        overflowIndex = childViews.get('length') - 1,
         index;
 
     index = this.displayItemIndexForEvent(evt);
 
+    var overflowIndex = this.get('shouldHandleOverflow') ? childViews.get('length') - 1 : null;
     if (index === overflowIndex) {
       this.showOverflowMenu();
       this._isTouching = NO;
@@ -1258,6 +1263,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     var value = this.get('value'),
         overflowItemsLength,
         childViews = this.get('childViews'),
+        childViewsLength = this.get('shouldHandleOverflow') ? childViews.get('length') - 1 : childViews.get('length'),
         overflowIndex = Infinity,
         overflowView = this.get('overflowView'),
         childView;
@@ -1265,13 +1271,13 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     // The index where childViews are all overflowed
     if (this.overflowItems) {
       overflowItemsLength = this.overflowItems.get('length');
-      overflowIndex = childViews.get('length') - 1 - overflowItemsLength;
+      overflowIndex = childViewsLength - overflowItemsLength;
 
       // Clear out the selected value of the overflowView (if it's set)
       overflowView.set('isSelected', NO);
     }
 
-    for (var i = childViews.get('length') - 2; i >= 0; i--) {
+    for (var i = childViewsLength - 1; i >= 0; i--) {
       childView = childViews.objectAt(i);
       if (SC.isArray(value) ? value.indexOf(childView.get('value')) >= 0 : value === childView.get('value')) {
         childView.set('isSelected', YES);

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

@@ -40,7 +40,7 @@ SC.SliderView = SC.View.extend(SC.Control,
   /**
     The minimum value of the slider.
 
-    @type {Number}
+    @type Number
     @default 0
   */
   minimum: 0,
@@ -58,7 +58,7 @@ SC.SliderView = SC.View.extend(SC.Control,
   /**
     The maximum value of the slider bar.
 
-    @type {Number}
+    @type Number
     @default 1
   */
   maximum: 1,
@@ -78,7 +78,7 @@ SC.SliderView = SC.View.extend(SC.Control,
 
     All values will be rounded to this step size when displayed.
 
-    @type {Number}
+    @type Number
     @default 0.1
   */
   step: 0.1,
@@ -87,8 +87,8 @@ SC.SliderView = SC.View.extend(SC.Control,
     When set to true, this draws and positions an element for each step, giving
     your theme the opportunity to show a mark at each step.
 
-    @type {Boolean}
-    @default {false}
+    @type Boolean
+    @default false
   */
   markSteps: false,
 
@@ -97,8 +97,8 @@ SC.SliderView = SC.View.extend(SC.Control,
     value. Set to false to prevent a slider in a scroll view from hijacking scroll
     events mid-scroll, for example.
 
-    @type {Boolean}
-    @default {true}
+    @type Boolean
+    @default true
   */
   updateOnScroll: true,
 
@@ -110,7 +110,7 @@ SC.SliderView = SC.View.extend(SC.Control,
   displayProperties: ['displayValue', 'markSteps'],
 
   /** @private
-   @property
+   @type Number
    The raw, unchanged value to be provided to screen readers and the like.
   */
   ariaValue: function() {
@@ -126,7 +126,7 @@ SC.SliderView = SC.View.extend(SC.Control,
   /*
     The value, converted to a percent out of 100 between maximum and minimum.
 
-    @property
+    @type Number
     @readonly
   */
   displayValue: function() {
@@ -137,9 +137,9 @@ SC.SliderView = SC.View.extend(SC.Control,
     If a nonzero step is specified, this property contains an array of each step's value between
     min and max (inclusive).
 
-    @property
+    @type Array
+    @default null
     @readonly
-    @type {Array|null}
   */
   steps: function() {
     var step = this.get('step');
@@ -163,9 +163,9 @@ SC.SliderView = SC.View.extend(SC.Control,
     expressed as a fraction between 0 and 1 (inclusive). You can use these values to generate
     and position labels for each step, for example.
 
-    @property
+    @type Array
+    @default null
     @readonly
-    @type {Array|null}
   */
   stepPositions: function() {
     var steps = this.get('steps');
@@ -181,7 +181,7 @@ SC.SliderView = SC.View.extend(SC.Control,
     return ret;
   }.property('steps').cacheable(),
 
-  // Given a particular value, returns the percentage value.
+  /** @private Given a particular value, returns the percentage value. */
   _displayValueForValue: function(value) {
     var min = this.get('minimum'),
         max = this.get('maximum'),

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

@@ -87,34 +87,51 @@ SC.RESIZE_AUTOMATIC = 'sc-automatic-resize';
 SC.SplitView = SC.View.extend({
   /**@scope SC.SplitView.prototype*/
 
-  /** @private */
+  /**
+    @type Array
+    @default ['topLeftView', 'bottomRightView']
+    @readonly
+    @see SC.View#childViews
+  */
+  childViews: ['topLeftView', 'bottomRightView'],
+
+  /**
+    @type Array
+    @default ['sc-split-view']
+    @readonly
+    @see SC.View#classNames
+   */
   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.
+    @type Boolean
+    @default true
+    @readonly
+   */
   isSplitView: YES,
 
   /**
-   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}
+   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,
 
   /**
-   * Determines whether the SplitView should lay out its children
-   * horizontally or vertically.
-   *
-   * Possible values:
-   *
-   * - SC.LAYOUT_HORIZONTAL: side-by-side
-   * - SC.LAYOUT_VERTICAL: on top of each other
-   *
-   * @type LayoutDirection
+   Determines whether the SplitView should lay out its children
+   horizontally or vertically.
+
+   Possible values:
+
+     - SC.LAYOUT_HORIZONTAL: side-by-side
+     - SC.LAYOUT_VERTICAL: on top of each other
+
+   @type LayoutDirection
+   @default SC.LAYOUT_HORIZONTAL
   */
   layoutDirection: SC.LAYOUT_HORIZONTAL,
 
@@ -125,7 +142,7 @@ SC.SplitView = SC.View.extend({
    * If NO, the SplitView will decide its own size based on its children.
    *
    * @type Boolean
-   * @default YES
+   * @default true
   */
   shouldResizeChildrenToFit: YES,
 
@@ -134,7 +151,8 @@ SC.SplitView = SC.View.extend({
    * This allows the cursor to be used even if the user drags "too far",
    * past the child's own boundaries.
    *
-   * @type {String}
+   * @type String
+   * @default null
   */
   splitChildCursorStyle: null,
 
@@ -338,12 +356,9 @@ SC.SplitView = SC.View.extend({
       if (lastNonDividerChild && !child.isSplitDivider) {
         dividerId = SC.guidFor(lastNonDividerChild) + "-" + SC.guidFor(child);
 
+        // Try to re-use an existing divider.
         divider = oldDividers[dividerId];
-
-        // if the previous view is a divider, but is not in our set of dividers,
-        // then it is manually created. If it is manually created, we should not
-        // create a new one.
-        if (!divider && !lastChild.isSplitDivider) {
+        if (!divider) {
           divider = this.invokeDelegateMethod(del, 'splitViewDividerBetween', this, lastNonDividerChild, child);
         }
 
@@ -545,7 +560,7 @@ SC.SplitView = SC.View.extend({
       var isResizable = this.invokeDelegateMethod(del, 'splitViewShouldResizeChildToFit', this, child);
       if (isResizable === useResizable) {
         // if outOfSize === -1 then we are aggressively resizing (not resizing proportionally)
-        if (outOfSize === -1) size += diff
+        if (outOfSize === -1) size += diff;
         else size += (size / outOfSize) * diff;
 
         size = Math.round(size);
@@ -597,7 +612,7 @@ SC.SplitView = SC.View.extend({
    * @returns {Number} The final position of the child.
   */
   splitViewAdjustPositionForChild: function(splitView, child, position) {
-    var del = this.get('delegate');
+    // var del = this.get('delegate');
     // Unlike tiling, the process of moving a child view is much more sophisticated.
     //
     // The basic sequence of events is simple:

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

@@ -103,24 +103,14 @@ SC.StaticContentView = SC.View.extend(
         x: 0,
         y: 0,
         width: rect.width,
-        originalWidth: rect.width,
-        height: rect.height,
-        originalHeight: rect.height,
-        scale: 1,
-        transformOriginX: 0.5,
-        transformOriginY: 0.5
+        height: rect.height
       };
     } else {
       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
+        height: layer.clientHeight
       };
     }
   }.property('content').cacheable(),