sproutcore 1.10.0.rc.2 → 1.10.0.rc.3

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

@@ -4,149 +4,164 @@
 //            portions copyright ©2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
+/*global equals, module, test */
 
 /*
   Tests SplitView Child logic. This covers properties which are interpreted
   by the SplitChild mixin itself—not the properties used by the SplitView.
-  
+
   As such, we look at:
-  
+
   - layout
   - positionOffset
   - sizeOffset
   - splitChildLayoutDidChange
   - splitView calculation
   - splitViewLayoutDirection property
-  
+
   All tests are run twice: once in horizontal, once in vertical.
 */
 
 
-var splitView;
+var pane, splitView;
 
 function setupSuite(layoutDirection) {
-module("SplitView - SplitChild (" + (layoutDirection === SC.LAYOUT_HORIZONTAL ? "HORIZONTAL" : "VERTICAL") + ")", {
-  setup: function() {
-    SC.RunLoop.begin();
-    splitView = SC.SplitView.create({
-      childViews: [ 'left', 'middle', 'right' ],
-      
-      left:  SC.View.extend(SC.SplitChild, { name: 'left', size: 100 }),
-      middle: SC.View.extend(SC.SplitChild, { name: 'middle', size: 300, positionOffset: -10, sizeOffset: 20 }),
-      right: SC.SplitView.extend(SC.SplitChild, {
-        name: 'right',
-        size: 100,
-        splitDividerView: null,
-        childViews: ['top', 'bottom'],
-        top: SC.View.extend(SC.SplitChild, { name: 'top', size: 100 }),
-        bottom: SC.View.extend(SC.SplitChild, { name: 'bottom', size: 400 })
-      }),
-      
-      layout: { 
-        left: 0, top: 0, 
-        width: layoutDirection === SC.LAYOUT_HORIZONTAL ? 500 : 300, 
-        height: layoutDirection === SC.LAYOUT_HORIZONTAL ? 300 : 500 
-      },
-      
-      layoutDirection: layoutDirection,
-      
-      splitDividerView: null // in most of these tests, we are not checking the behavior of split dividers 
-    });
-    SC.RunLoop.end();
-  }
-});
-
-function verifyChildren(view) {
-  var pos = 0;
-  for (var i = 1; i < arguments.length; i++) {
-    var child = view.childViews[i - 1];
-    equals(child.get('position'), pos, "Correct position for view " + i);
-    equals(child.get('size'), arguments[i], "Correct size for view " + i);
-    
-    var cpos = pos + child.get('positionOffset');
-    var csize = arguments[i] + child.get('sizeOffset');
-    var layout = child.get('layout');
-    
-    // check layout, and consider offset
-    if (splitView.get('layoutDirection') === SC.LAYOUT_HORIZONTAL) {
-      equals(layout.left, cpos, "Correct left for view " + i);      
-      equals(layout.width, csize, "Correct width for view " + i);
-
-      equals(layout.top, 0, "Top is 0 in LAYOUT_HORIZONTAL");
-      equals(layout.bottom, 0, "Bottom is 0 in LAYOUT_HORIZONTAL");
-    } else {
-      equals(layout.top, cpos, "Correct top for view " + i);
-      equals(layout.height, csize, "Correct height for view " + i);
+  module("SplitView - SplitChild (" + (layoutDirection === SC.LAYOUT_HORIZONTAL ? "HORIZONTAL" : "VERTICAL") + ")", {
+
+    setup: function () {
+      SC.run(function () {
+        splitView = SC.SplitView.create({
+          childViews: [ 'left', 'middle', 'right' ],
+
+          left:  SC.View.extend(SC.SplitChild, { name: 'left', size: 100 }),
+
+          middle: SC.View.extend(SC.SplitChild, { name: 'middle', size: 300, positionOffset: -10, sizeOffset: 20 }),
+
+          right: SC.SplitView.extend(SC.SplitChild, {
+            name: 'right',
+            size: 100,
+            splitDividerView: null,
+            childViews: ['top', 'bottom'],
+            top: SC.View.extend(SC.SplitChild, { name: 'top', size: 100 }),
+            bottom: SC.View.extend(SC.SplitChild, { name: 'bottom', size: 400 })
+          }),
 
-      equals(layout.left, 0, "Left is 0 in LAYOUT_VERTICAL");
-      equals(layout.right, 0, "Right is 0 in LAYOUT_VERTICAL");
+          layout: {
+            left: 0,
+            top: 0,
+            width: layoutDirection === SC.LAYOUT_HORIZONTAL ? 500 : 300,
+            height: layoutDirection === SC.LAYOUT_HORIZONTAL ? 300 : 500
+          },
+
+          layoutDirection: layoutDirection,
+
+          splitDividerView: null // in most of these tests, we are not checking the behavior of split dividers
+
+        });
+
+        pane = SC.Pane.create({
+          childViews: [splitView]
+        });
+        pane.append();
+      });
+    },
+
+    teardown: function () {
+      pane.destroy();
+      pane = splitView = null;
     }
-    
-    pos += arguments[i];
-  }
-}
+  });
+
+  function verifyChildren(view) {
+    var pos = 0;
+
+    for (var i = 1; i < arguments.length; i++) {
+      var child = view.childViews[i - 1];
+
+      equals(child.get('position'), pos, "Correct position for view " + i);
+      equals(child.get('size'), arguments[i], "Correct size for view " + i);
+
+      var cpos = pos + child.get('positionOffset');
+      var csize = arguments[i] + child.get('sizeOffset');
+      var layout = child.get('layout');
+
+      // check layout, and consider offset
+      if (splitView.get('layoutDirection') === SC.LAYOUT_HORIZONTAL) {
+        equals(layout.left, cpos, "Correct left for view " + i);
+        equals(layout.width, csize, "Correct width for view " + i);
 
-test("Layout gets applied correctly for child views.", function() {
-  verifyChildren(splitView, 100, 300, 100);
-  
-  // double-check the position/sizeOffset
-  var cv = splitView.get('childViews');
-  equals(cv[1].get('positionOffset'), -10, "Middle child has proper position offset");
-  equals(cv[1].get('sizeOffset'), 20, "Middle child has proper size offset");
-  
-  if (layoutDirection === SC.LAYOUT_HORIZONTAL) {
-    equals(cv[1].get('layout').left, 90, "Middle child has proper (offsetted) position in layout");
-    equals(cv[1].get('layout').width, 320, "Middle child has proper (offsetted) size in layout");
-  } else {
-    equals(cv[1].get('layout').top, 90, "Middle child has proper (offsetted) position in layout");
-    equals(cv[1].get('layout').height, 320, "Middle child has proper (offsetted) size in layout");
+        equals(layout.top, 0, "Top is 0 in LAYOUT_HORIZONTAL");
+        equals(layout.bottom, 0, "Bottom is 0 in LAYOUT_HORIZONTAL");
+      } else {
+        equals(layout.top, cpos, "Correct top for view " + i);
+        equals(layout.height, csize, "Correct height for view " + i);
+
+        equals(layout.left, 0, "Left is 0 in LAYOUT_VERTICAL");
+        equals(layout.right, 0, "Right is 0 in LAYOUT_VERTICAL");
+      }
+
+      pos += arguments[i];
+    }
   }
-  
-});
-
-test("Check that layout adjusts after adjusting child view position", function() {
-  SC.RunLoop.begin();
-  splitView.adjustPositionForChild(splitView.childViews[1], 200);
-  SC.RunLoop.end();
-  
-  verifyChildren(splitView, 200, 200, 100);
-});
-
-test("Check that changing orientation changes layouts.", function() {
-  equals(splitView.get('layoutDirection'), layoutDirection);
-
-  var childLayoutDirection = splitView.childViews[0].get('splitViewLayoutDirection');
-  equals(childLayoutDirection, layoutDirection, "Child has correct layout direction before orientation change.");
-  
-  var newLayoutDirection = layoutDirection === SC.LAYOUT_HORIZONTAL ? SC.LAYOUT_VERTICAL : SC.LAYOUT_HORIZONTAL;
-  
-  SC.RunLoop.begin();
-  splitView.set(
-    'layoutDirection', 
-    newLayoutDirection
-  );
-  SC.RunLoop.end();
-  
-  equals(splitView.get('layoutDirection'), newLayoutDirection);
-
-  childLayoutDirection = splitView.childViews[0].get('splitViewLayoutDirection');
-  equals(childLayoutDirection, newLayoutDirection, "Child has correct layout direction after orientation change.");  
-  
-  // height is different, so layout should have changed to 100, 100, 100
-  verifyChildren(splitView, 100, 100, 100);
-});
-
-test("Check that the `splitView` computed is correct on SC.SplitChilds", function () {
-  equals(splitView, splitView.childViews[0].get('splitView'));
-  equals(splitView, splitView.childViews[1].get('splitView'));
-  equals(splitView, splitView.childViews[2].get('splitView'),
-         'the splitView should the closest parent splitView');
-
-  var nestedSplitView = splitView.childViews[2];
-
-  equals(nestedSplitView, nestedSplitView.childViews[0].get('splitView'));
-  equals(nestedSplitView, nestedSplitView.childViews[1].get('splitView'));
-});
+
+  test("Layout gets applied correctly for child views.", function () {
+    verifyChildren(splitView, 100, 300, 100);
+
+    // double-check the position/sizeOffset
+    var cv = splitView.get('childViews');
+    equals(cv[1].get('positionOffset'), -10, "Middle child has proper position offset");
+    equals(cv[1].get('sizeOffset'), 20, "Middle child has proper size offset");
+
+    if (layoutDirection === SC.LAYOUT_HORIZONTAL) {
+      equals(cv[1].get('layout').left, 90, "Middle child has proper (offsetted) position in layout");
+      equals(cv[1].get('layout').width, 320, "Middle child has proper (offsetted) size in layout");
+    } else {
+      equals(cv[1].get('layout').top, 90, "Middle child has proper (offsetted) position in layout");
+      equals(cv[1].get('layout').height, 320, "Middle child has proper (offsetted) size in layout");
+    }
+
+  });
+
+  test("Check that layout adjusts after adjusting child view position", function () {
+    SC.RunLoop.begin();
+    splitView.adjustPositionForChild(splitView.childViews[1], 200);
+    SC.RunLoop.end();
+
+    verifyChildren(splitView, 200, 200, 100);
+  });
+
+  test("Check that changing orientation changes layouts.", function () {
+    equals(splitView.get('layoutDirection'), layoutDirection);
+
+    var childLayoutDirection = splitView.childViews[0].get('splitViewLayoutDirection');
+    equals(childLayoutDirection, layoutDirection, "Child has correct layout direction before orientation change.");
+
+    var newLayoutDirection = layoutDirection === SC.LAYOUT_HORIZONTAL ? SC.LAYOUT_VERTICAL : SC.LAYOUT_HORIZONTAL;
+
+    SC.run(function () {
+      splitView.set('layoutDirection', newLayoutDirection);
+    });
+
+    equals(splitView.get('layoutDirection'), newLayoutDirection);
+
+    childLayoutDirection = splitView.childViews[0].get('splitViewLayoutDirection');
+    equals(childLayoutDirection, newLayoutDirection, "Child has correct layout direction after orientation change.");
+
+    // height is different, so layout should have changed to 100, 100, 100
+    verifyChildren(splitView, 100, 100, 100);
+  });
+
+  test("Check that the `splitView` computed is correct on SC.SplitChilds", function () {
+    equals(splitView, splitView.childViews[0].get('splitView'));
+    equals(splitView, splitView.childViews[1].get('splitView'));
+    equals(splitView, splitView.childViews[2].get('splitView'),
+           'the splitView should the closest parent splitView');
+
+    var nestedSplitView = splitView.childViews[2];
+
+    equals(nestedSplitView, nestedSplitView.childViews[0].get('splitView'));
+    equals(nestedSplitView, nestedSplitView.childViews[1].get('splitView'));
+  });
 
 }
 

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

@@ -825,7 +825,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
   contentLengthDidChange: function () {
     var content = this.get('content');
     this.set('length', content ? content.get('length') : 0);
-    this.invokeOnce('adjustLayout');
+    this.invokeOnce(this.adjustLayout);
   },
 
   /** @private

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

@@ -1509,9 +1509,9 @@ SC.ScrollView = SC.View.extend({
       y: touch.scrollVelocity.y * 10
     };
 
-      window.requestAnimationFrame(function(){
-          self.decelerateAnimation();
-      });
+    window.requestAnimationFrame(function () {
+      self.decelerateAnimation();
+    });
   },
 
   /** @private
@@ -1714,9 +1714,9 @@ SC.ScrollView = SC.View.extend({
     // (so we may calculate elapsed time) and the timeout we are creating, so we may cancel it in future.
     var self = this;
     touch.lastEventTime = Date.now();
-      window.requestAnimationFrame(function(){
-          SC.run(self.decelerateAnimation(), self);
-      });
+    window.requestAnimationFrame(function () {
+      SC.run(self.decelerateAnimation(), self);
+    });
   },
 
   // ..........................................................
@@ -1791,6 +1791,9 @@ SC.ScrollView = SC.View.extend({
     }
 
     if (this.get('isVisibleInWindow')) this._scsv_registerAutoscroll();
+
+    // Initialize cache values.
+    this._scroll_contentWidth = this._scroll_contentHeight = null;
   },
 
   /** @private
@@ -1862,7 +1865,7 @@ SC.ScrollView = SC.View.extend({
     size of the contentView changes.  We don't care about the origin since
     that is tracked separately from the offset values.
   */
-  contentViewFrameDidChange: function(force) {
+  contentViewFrameDidChange: function (force) {
     var view   = this.get('contentView'),
         f      = (view) ? view.get('frame') : null,
         scale  = this._scale,

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

@@ -43,7 +43,7 @@ SC.RESIZE_AUTOMATIC = 'sc-automatic-resize';
   You can set up a split view like any other view in SproutCore:
 
       SplitView.design({
-        childViews: 'leftPanel rightPanel'.w(),
+        childViews: ['leftPanel', 'rightPanel'],
 
         leftPanel: SC.View.design(SC.SplitChild, {
           minimumSize: 200
@@ -178,10 +178,11 @@ SC.SplitView = SC.View.extend({
     }
   }.property('frame', 'layoutDirection').cacheable(),
 
-  viewDidResize: function(orig) {
+  viewDidResize: function () {
     this.scheduleTiling();
-    orig();
-  }.enhance(),
+
+    sc_super();
+  },
 
   layoutDirectionDidChange: function() {
     this.scheduleTiling();

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

@@ -10,33 +10,33 @@
 
   The SC.ContentDisplay mixin makes it easy to automatically update your view
   display whenever relevant properties on a content object change.  To use
-  this mixin, include it in your view and then add the names of the 
-  properties on the content object you want to trigger a displayDidChange() 
-  method on your view. Your updateDisplay() method will then be called at the 
+  this mixin, include it in your view and then add the names of the
+  properties on the content object you want to trigger a displayDidChange()
+  method on your view. Your updateDisplay() method will then be called at the
   end of the run loop.
-  
+
   ## Example
-  
-      MyApp.MyViewClass = SC.View.extend(SC.ContentDisplay, { 
+
+      MyApp.MyViewClass = SC.View.extend(SC.ContentDisplay, {
         contentDisplayProperties: 'title isEnabled hasChildren'.w(),
         ...
       });
-  
+
   @since SproutCore 1.0
 */
 SC.ContentDisplay = {
-  
+
   /** @private */
   concatenatedProperties: 'contentDisplayProperties',
 
   /** @private */
   displayProperties: ['content'],
-  
-  /** 
+
+  /**
     Add an array with the names of any property on the content object that
     should trigger an update of the display for your view.  Changes to the
     content object will only invoke your display method once per runloop.
-    
+
     @type Array
     @default []
   */
@@ -97,8 +97,8 @@ SC.ContentDisplay = {
     if (content) this._display_beginObservingContent(content);
 
     this.displayDidChange();
-  }.observes('content', 'contentDisplayProperties'),
-  
+  }.observes('content'),
+
   /** @private Invoked when properties on the content object change. */
   _display_contentPropertyDidChange: function(target, key, value, propertyRevision) {
     if (key === '*') {
@@ -109,5 +109,5 @@ SC.ContentDisplay = {
       if (ary && ary.indexOf(key)>=0) this.displayDidChange();
     }
   }
-  
+
 } ;