sproutcore 1.11.0.rc2 → 1.11.0.rc3

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/ui.js

@@ -314,13 +314,13 @@
     SC.run(function() {
       newContent = SC.View.create({ backgroundColor: 'blue' });
     });
-    equals(newContent.get('viewState'), SC.View.UNRENDERED, 'PRELIM: New view is unrendered');
+    equals(newContent.get('viewState'), SC.CoreView.UNRENDERED, 'PRELIM: New view is unrendered');
 
     SC.run(function() {
       view.set('contentView', newContent);
     });
     ok(view.getPath('containerView.contentView') === newContent, 'New content has been successfully loaded into the container view.');
-    equals(newContent.get('viewState'), SC.View.ATTACHED_SHOWN, 'New content has been rendered and attached.');
+    equals(newContent.get('viewState'), SC.CoreView.ATTACHED_SHOWN, 'New content has been rendered and attached.');
 
     // Replacing the content view on an unrendered view.
     SC.run(function() {
@@ -333,7 +333,7 @@
     SC.run(function() {
       view._doRender();
     });
-    equals(newContent.get('viewState'), SC.View.UNATTACHED_BY_PARENT, 'New content renders along with the rest of the view');
+    equals(newContent.get('viewState'), SC.CoreView.ATTACHED_PARTIAL, 'New content renders along with the rest of the view');
   });
 
 })();

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

@@ -157,6 +157,7 @@ var pane;
       itemTitleKey: 'value',
       itemValueKey: 'value',
       itemWidthKey: 'width',
+      shouldHandleOverflow: true,
       layout: { height: 25 }
     })
     .add("5_items,1_sel,widths,overflow", SC.SegmentedView, {
@@ -170,6 +171,7 @@ var pane;
       itemTitleKey: 'value',
       itemValueKey: 'value',
       itemWidthKey: 'width',
+      shouldHandleOverflow: true,
       value: "E",
       layout: { height: 25 }
     })
@@ -185,6 +187,7 @@ var pane;
       itemValueKey: 'value',
       itemWidthKey: 'width',
       itemLayerIdKey: 'layerId',
+      shouldHandleOverflow: true,
       value: "E",
       layout: { height: 25 }
     })
@@ -210,12 +213,14 @@ var pane;
       items: "Item1 Item2 Item3".w(),
       value: "Item2",
       layout: { height: 25, width: 0 },
+      shouldHandleOverflow: true,
       shouldAutoResize: YES
     })
     .add("3_items,1_sel,shouldAutoResize,flexible_layout", SC.SegmentedView, {
       items: "Item1 Item2 Item3".w(),
       value: "Item2",
       layout: { height: 25, left: 0, right: 0 },
+      shouldHandleOverflow: true,
       shouldAutoResize: YES
     });
 

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/split/{dividers.js → dividers_test.js}

@@ -8,17 +8,17 @@
 /*
   Tests SplitView logic responsible for automatically creating divider views.
   There are a few different parts to this:
-  
+
   - The automatic creation of dividers.
   - The splitDividerView property.
   - The splitViewDividerBetween method.
 
   We don't have to worry about orientation; the code being tested creates
   child views, but does nothing related to laying them out.
-  
+
   Note: We do NOT test the properties added to the split children (nextView, etc.);
   Those are tested in children.js.
-  
+
 */
 var createSplitView;
 
@@ -31,13 +31,13 @@ module("SplitView Dividers", {
         'left',
         'right'
       ],
-      
+
       left:  SC.View.extend(SC.SplitChild, { name: 'left', canCollapse: YES, collapseAtSize: 50 }),
       right: SC.View.extend(SC.SplitChild, { name: 'right', canCollapse: YES, collapseAtSize: 50 }),
-      
+
       layout: { left: 0, top: 0, width: 500, height: 500 }
     });
-    
+
     createSplitView = function(opts) {
       opts = opts || {};
       SC.RunLoop.begin();
@@ -46,9 +46,9 @@ module("SplitView Dividers", {
       return ret;
     };
   },
-  
+
   teardown: function() {
-    
+
   }
 });
 
@@ -75,16 +75,16 @@ test("SC.SplitDividerView uses splitViewDividerBetween method", function(){
 test("splitViewDividerBetween works properly", function(){
   var MyDividerType1 = SC.SplitDividerView.extend({ dividerType: 1 });
   var MyDividerType2 = SC.SplitDividerView.extend({ dividerType: 2 });
-  
+
   var view = createSplitView({
     childViews: 'left middle right'.w(),
     middle: SC.View.design(SC.SplitChild, { name: 'middle' }),
-    splitViewDividerBetween: function(split, view1, view2) { 
+    splitViewDividerBetween: function(split, view1, view2) {
       if (view1 === split.left) return MyDividerType1.create();
       if (view1 === split.middle) return MyDividerType2.create();
-    } 
+    }
   });
-  
+
   equals(view.childViews.length, 5, "Should have created 5 views: left, divider, middle, divider, and right.");
   ok(view.childViews[1].kindOf(MyDividerType1), "2nd view is a MyDividerType1");
   ok(view.childViews[3].kindOf(MyDividerType2), "4th view is a MyDividerType2");
@@ -92,12 +92,12 @@ test("splitViewDividerBetween works properly", function(){
 
 function checkDividers(view, number) {
   var shouldBeDivider = NO;
-  
+
   equals(view.childViews.length, number * 2 - 1, "There should be " + (number * 2 - 1) + " children");
-  
+
   for (var i = 1; i < number; i++) {
     equals(
-      view.childViews[i - 1].isSplitDivider, shouldBeDivider, 
+      view.childViews[i - 1].isSplitDivider, shouldBeDivider,
       "View " + i + (shouldBeDivider ? " SHOULD " : " SHOULD NOT ") + "be a divider"
     );
     shouldBeDivider = !shouldBeDivider;
@@ -109,26 +109,26 @@ test("Adding/removing from end adds/removes dividers appropriately", function()
     childViews: 'left middle right'.w(),
     middle: SC.View.design(SC.SplitChild, { name: 'middle' })
   });
-  
+
   // do an initial check: should be three views with dividers.
   checkDividers(view, 3);
-  
+
   // add one, and check again.
   var add = SC.View.create(SC.SplitChild, { name: 'add' });
-  
+
   SC.RunLoop.begin();
   view.appendChild(add);
   SC.RunLoop.end();
-  
+
   checkDividers(view, 4);
-  
+
   // remove the one we added, and check again
   SC.RunLoop.begin();
   view.removeChild(add);
   SC.RunLoop.end();
-  
+
   checkDividers(view, 3);
-  
+
 });
 
 test("Adding/removing from beginning adds/removes dividers appropriately", function() {
@@ -136,26 +136,26 @@ test("Adding/removing from beginning adds/removes dividers appropriately", funct
     childViews: 'left middle right'.w(),
     middle: SC.View.design(SC.SplitChild, { name: 'middle' })
   });
-  
+
   // do an initial check: should be three views with dividers.
   checkDividers(view, 3);
-  
+
   // add one, and check again.
   var add = SC.View.create(SC.SplitChild, { name: 'add' });
-  
+
   SC.RunLoop.begin();
   view.insertBefore(add, view.childViews[0]);
   SC.RunLoop.end();
-  
+
   checkDividers(view, 4);
-  
+
   // remove the one we added, and check again
   SC.RunLoop.begin();
   view.removeChild(add);
   SC.RunLoop.end();
-  
+
   checkDividers(view, 3);
-  
+
 });
 
 test("Adding/removing in middle adds/removes dividers appropriately", function() {
@@ -163,26 +163,26 @@ test("Adding/removing in middle adds/removes dividers appropriately", function()
     childViews: 'left middle right'.w(),
     middle: SC.View.design(SC.SplitChild, { name: 'middle' })
   });
-  
+
   // do an initial check: should be three views with dividers.
   checkDividers(view, 3);
-  
+
   // add one, and check again.
   var add = SC.View.create(SC.SplitChild, { name: 'add' });
-  
+
   SC.RunLoop.begin();
   view.insertBefore(add, view.childViews[2]); // note: 2 is the middle view
   SC.RunLoop.end();
-  
+
   checkDividers(view, 4);
-  
+
   // remove the one we added, and check again
   SC.RunLoop.begin();
   view.removeChild(add);
   SC.RunLoop.end();
-  
+
   checkDividers(view, 3);
-  
+
 });
 
 test("Adding and removing before a divider doesn't screw things majorly", function() {
@@ -231,14 +231,14 @@ test("Adding and removing several views doesn't screw things up", function() {
   SC.RunLoop.begin();
   view.removeChild(view.childViews[2]);
   view.removeChild(view.childViews[3]);
-  
+
   // semi-random (I just picked 4 numbers):
   view.insertBefore(add1, view.childViews[0]);
   view.insertBefore(add2, view.childViews[0]);
   view.insertBefore(add3, view.childViews[4]);
   view.insertBefore(add4, view.childViews[3]);
   SC.RunLoop.end();
-  
+
   checkDividers(view, 5);
 });
 

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

@@ -2081,6 +2081,24 @@ SC.CollectionView = SC.View.extend(SC.ActionSupport, SC.CollectionViewDelegate,
   // MOUSE EVENTS
   //
 
+  doubleClick: function (ev) {
+    var isEnabledInPane = this.get('isEnabledInPane'),
+        handled = false;
+
+    if (isEnabledInPane) {
+      var action = this.get('action');
+
+      if (action) {
+        var itemView = this.itemViewForEvent(ev);
+
+        this._cv_performSelectAction(itemView, ev, 0, ev.clickCount);
+        handled = true;
+      }
+    }
+
+    return handled;
+  },
+
   /** @private
     Handles mouse down events on the collection view or on any of its
     children.
@@ -2259,21 +2277,18 @@ SC.CollectionView = SC.View.extend(SC.ActionSupport, SC.CollectionViewDelegate,
         } else if (info) {
           var idx = info.contentIndex;
 
-          // this will be set if the user simply clicked on an unselected item and
-          // selectOnMouseDown was NO.
+          // This will be set if the user simply clicked on an unselected item and selectOnMouseDown was NO.
           if (info.shouldSelect) {
             this.select(idx, info.modifierKeyPressed);
             didSelect = true;
           }
 
-          // This is true if the user clicked on a selected item with a modifier
-          // key pressed.
+          // This is true if the user clicked on a selected item with a modifier key pressed.
           if (info.shouldDeselect) this.deselect(idx);
 
-          // This is true if the user clicked on a selected item without a
-          // modifier-key pressed.  When this happens we try to begin editing
-          // on the content.  If that is not allowed, then simply clear the
-          // selection and reselect the clicked on item.
+          // This is true if the user clicked on a selected item without a modifier-key pressed.
+          // When this happens we try to begin editing on the content.  If that is not allowed, then
+          // simply clear the selection and reselect the clicked on item.
           if (info.shouldReselect) {
 
             // - contentValueIsEditable is true
@@ -2322,7 +2337,7 @@ SC.CollectionView = SC.View.extend(SC.ActionSupport, SC.CollectionViewDelegate,
     // Track that mouse is up no matter what (e.g. mouse went down and then view was disabled before mouse up).
     this._sc_isMouseDown = false;
 
-    return false;  // Bubble event to allow didDoubleClick to be called...
+    return false;  // Bubble event to allow doubleClick to be called.
   },
 
   /** @private */
@@ -2753,7 +2768,7 @@ SC.CollectionView = SC.View.extend(SC.ActionSupport, SC.CollectionViewDelegate,
   },
 
   /**
-    Implements the SC.DropTarget interface.  The default implementation will
+    Implements the SC.DropTargetProtocol interface.  The default implementation will
     consult the collection view delegate, if you implement those methods.
 
     This method is called once when the drag enters the view area.  It's
@@ -2899,7 +2914,7 @@ SC.CollectionView = SC.View.extend(SC.ActionSupport, SC.CollectionViewDelegate,
   },
 
   /**
-    Implements the SC.DropTarget interface.  The default implementation will
+    Implements the SC.DropTargetProtocol interface.  The default implementation will
     determine the drop location and then consult the collection view delegate
     if you implement those methods.  Otherwise it will handle reordering
     content on its own.
@@ -2933,7 +2948,7 @@ SC.CollectionView = SC.View.extend(SC.ActionSupport, SC.CollectionViewDelegate,
   },
 
   /**
-    Implements the SC.DropTarget protocol.  Hides any visible insertion
+    Implements the SC.DropTargetProtocol protocol.  Hides any visible insertion
     point and clears some cached values.
   */
   dragEnded: function () {
@@ -2942,7 +2957,7 @@ SC.CollectionView = SC.View.extend(SC.ActionSupport, SC.CollectionViewDelegate,
   },
 
   /**
-    Implements the SC.DropTarget protocol.
+    Implements the SC.DropTargetProtocol protocol.
 
     @returns {Boolean} YES
   */
@@ -2951,7 +2966,7 @@ SC.CollectionView = SC.View.extend(SC.ActionSupport, SC.CollectionViewDelegate,
   },
 
   /**
-    Implements the SC.DropTarget protocol. Consults the collection view
+    Implements the SC.DropTargetProtocol protocol. Consults the collection view
     delegate to actually perform the operation unless the operation is
     reordering content.
 

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

@@ -211,6 +211,7 @@ SC.MenuScrollView = SC.ScrollView.extend(
         controlSize: controlSize,
         scrollDown: false,
         isVisible: !autohidesVerticalScroller,
+        layout: { height: 0 },
 
         value: this.get('verticalScrollOffset'),
         valueBinding: '.owner.verticalScrollOffset', // Bind the value of the scroller to our vertical offset.
@@ -238,7 +239,7 @@ SC.MenuScrollView = SC.ScrollView.extend(
         controlSize: controlSize,
         scrollDown: true,
         isVisible: !autohidesVerticalScroller,
-        layout: { bottom: 0 },
+        layout: { bottom: 0, height: 0 },
 
         value: this.get('verticalScrollOffset'),
         valueBinding: '.owner.verticalScrollOffset', // Bind the value of the scroller to our vertical offset.

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

@@ -109,7 +109,7 @@ SC.ScrollView = SC.View.extend({
   _sc_contentHeightDidChange: false,
 
   /** @private The cached scale of the content. */
-  _sc_contentScale: 1,
+  _sc_contentScale: undefined,
 
   /** @private Flag used to react accordingly when the content's scale changes. */
   _sc_contentScaleDidChange: false,
@@ -184,7 +184,7 @@ SC.ScrollView = SC.View.extend({
   _sc_passTouchToContentTimer: null,
 
   /** @private The actual scale. */
-  _sc_scale: null,
+  _sc_scale: 1,
 
   /** @private Flag used to indicate when we should resize the content width manually. */
   // _sc_shouldResizeContentWidth: false,
@@ -645,11 +645,6 @@ SC.ScrollView = SC.View.extend({
       }
     } else {
       value = this._sc_scale;
-
-      // Default value.
-      if (value == null) {
-        value = 1;
-      }
     }
 
     // Update the actual value.
@@ -875,7 +870,7 @@ SC.ScrollView = SC.View.extend({
       contentViewLayout = contentView.get('layout'),
       leftStart = contentViewLayout.left,
       leftDelta = contentAdjustMap.left - leftStart,
-      scaleStart = contentViewLayout.scale,
+      scaleStart = contentViewLayout.scale == null ? 1 : contentViewLayout.scale,
       scaleDelta = contentAdjustMap.scale - scaleStart,
       topStart = contentViewLayout.top,
       topDelta = contentAdjustMap.top - topStart,
@@ -990,7 +985,7 @@ SC.ScrollView = SC.View.extend({
     // this._sc_shouldResizeContentHeight = false;
     this._sc_contentHeight = 0;
     this._sc_contentWidth = 0;
-    this._sc_contentScale = 1;
+    this._sc_contentScale = undefined;
 
     // Assign the content view to our container view. This ensures that it is instantiated.
     containerView.set('contentView', newView);
@@ -1003,12 +998,6 @@ SC.ScrollView = SC.View.extend({
       // newView.addObserver('layer', this, layerChangeFunc);
 
       if (!newView.useStaticLayout) {
-        // Ensure that scale transforms occur from the top-left corner (per our math).
-        newView.adjust({
-          transformOriginX: 0,
-          transformOriginY: 0
-        });
-
         // When a view wants an accelerated layer and isn't a fixed size, we convert it to a fixed
         // size and resize it when our container resizes.
         // if (newView.get('wantsAcceleratedLayer') && !newView.get('isFixedSize')) {
@@ -1126,7 +1115,7 @@ SC.ScrollView = SC.View.extend({
           if (this._sc_gestureAnchorHOffset != null) {
             this._sc_gestureAnchorHOffset = value;
           }
-        } else {
+        } else if (this.get('canScrollHorizontal')) {
           // Take alignment into account.
           var horizontalAlign = this.get('horizontalAlign'),
               horizontalScrollOffset = this._sc_horizontalScrollOffset,
@@ -1185,7 +1174,7 @@ SC.ScrollView = SC.View.extend({
           if (this._sc_gestureAnchorVOffset != null) {
             this._sc_gestureAnchorVOffset = value;
           }
-        } else {
+        } else if (this.get('canScrollVertical')) {
           var verticalAlign = this.get('verticalAlign'),
               verticalScrollOffset = this._sc_verticalScrollOffset,
               minimumVerticalScrollOffset = this.get('minimumVerticalScrollOffset');
@@ -1439,7 +1428,13 @@ SC.ScrollView = SC.View.extend({
       var contentAdjustMap = SC.ScrollView._SC_CONTENT_ADJUST_MAP; // Shared object used to avoid continually initializing/destroying objects.
 
       // Create the content adjust map once. Note: This is a shared object, all properties must be overwritten each time.
-      if (!contentAdjustMap) { contentAdjustMap = SC.ScrollView._SC_CONTENT_ADJUST_MAP = {}; }
+      if (!contentAdjustMap) {
+        contentAdjustMap = SC.ScrollView._SC_CONTENT_ADJUST_MAP = {
+          // Ensure that scale transforms occur from the top-left corner (per our math).
+          transformOriginX: 0,
+          transformOriginY: 0
+        };
+      }
 
       contentAdjustMap.left = left;
       contentAdjustMap.top = top;