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

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDg1MjQwYWRlZjUzZGFmNjFkMGUyYjFjYmFhN2NjNGM3MzM1M2IyZg==
+    ZmUxOTcxMGViYzE0OWVlYmJiMzlhNTUwMzk1M2I5ZDM1NzFiYWMzOA==
   data.tar.gz: !binary |-
-    NWEzMzgxNjhlYTJjOTBlMDQxNTgzYTYxOTNmYzE4MTU4ZmViOGQ2MA==
+    M2VkMDZmODFjODExNDE4ZDY1NzQzYzVlNTU3NzdlZmE0MTU3NmQzMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2VkY2E5ZTBkNTY3MTdjZTk0YmY1YmU4YjAyYzFkYzc5Nzg1YzQxN2ViZmEz
-    MDlkMDBkOTZmMWY1YzNkMTgwNWNiNTcyNjcyOGJmMjY5YzViYTkyYmRiY2Uz
-    Mzk3OWI0ZjZhMTI4YjYyZTZhNzRmZDkxYjIwMjZkZGYwN2NmOTI=
+    OWM1OGJhNDk5OWFiNmVlOWM4YjZjMzk3OWExYzU1NjliODUxMDZmZjYxMjUz
+    NDE2ODZiN2M5ZGQ3NzdmYTg1YWU5NjEwY2NkMWYzYjdkNDcyM2MyZGY5ODg3
+    NDEwZGFmMjMyMGQzMTNkMGFiNDMyYzBhNDBlNWQwYzAxZWFiZGY=
   data.tar.gz: !binary |-
-    OWVlMzRiOGMxNGRkMWVmYWRjMmU5MTRjYjFjYTExZTYyZjRmYmU5NDZmZDBj
-    ZjRiMTA4YmNlZWJjZjMwMzZlNjFjZDYwNjgzZmY2YWZjZTYzOGRiNzYyNjg1
-    NzFhNDQ1ZGY4NjU0N2I4MWE3OTJjMzRhMDNlNTM4ZTA1YzBlZTE=
+    NjYxYzdhZmYyMDI4N2FiN2UyZDJkNTlhNTBkMjJmYmM5MjI4ZmJkNDg3OTdh
+    ZjhhYzcwNzg0MzgzOGI4M2FjNGY4NzNhZTBiOTA2YTJkMjA0Y2YzOTMxOTE4
+    ZmQxMTU2ZDg0YzI3NjkyMTFjMDFkZGFkOGM0M2Q3NjU2NTMyOGQ=

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 10
-:patch: 0.rc.2
+:patch: 0.rc.3

data/lib/frameworks/sproutcore/CHANGELOG.md

@@ -7,6 +7,8 @@ CHANGE LOG
 ### CHANGES & FEATURES
 
 * Improves and adds hundreds of lines of documentation.
+* Removes a developer warning when animating with a duration of 0, which can be valid if the duration is calculated. In any case, animating a duration of 0 has always been supported by SC.View.prototype.animate.
+* Improves the regular expression used by SC.RenderContext to escape strings so that HTML entities like ' or à are preserved.
 * Set SC.DEFAULT_CURSOR to 'default' instead of 'auto'.
 * Improves the ability of the SC.browser experimental name testing to succeed by adding a test value that can be used.
 * Masks all debug statements from SC.Binding using @if(debug).
@@ -332,6 +334,18 @@ Also added better documentation for using dataSourceDidFetchQuery.
 
 ### BUG FIXES
 
+* Fixes a problem which kept firstObject and lastObject referenced from an array controller from updating on replace. Also fixes a problem updating lastObject on an enumerable when replacing the last items and shrinking the collection.
+* Fixes a problem when using an SC.SplitView as a split child.
+* Fixes a bug that updating the parent record data hash failed to update the nested record hashes as well.
+* Fixes a problem with SC.ScrollView that required an additional frame change notification to work previously.
+* Fixes a problem where childViews incorrectly called viewDidResize one extra time when appended to the DOM. The views will already have run viewDidResize once on being adopted by a parentView.
+* Fixes a miscalculation of isFixedPosition that resulted in incorrect values when short form layouts were used (ex. specifying { width: 10, height: 10 } only which implies top: 0 and left: 0). This would have caused such views to return false for hasAcceleratedLayer even though they had set wantsAcceleratedLayer to true.
+* Prevents needless view updates when displayDidChange is called on an unrendered view. Normally, the actual update code handles the check to see if the view is rendered and can be updated, but if displayDidChange comes before a render, we would end up rendering and then updating. Now it checks to see if the view is rendered before attempting to update it at all.
+* Fixes a potentially huge memory leak when views that mix in SC.ContentValueSupport (or via SC.Control) will not remove all the content value observers from the content object when the view is destroyed. One result is that every time you scrolled a list of SC.ListItemViews back and forth it was appending more and more observers to the content.
+* Gives SC.InlineTextFieldView a default layout size of 0x0 so that it doesn't alter the scrollTop/scrollLeft of a parent view layer that allows overflow.
+* Fixed position of picker panes when the anchor has a frame origin of 0,0.
+* Fixes the initialization of SC.ContainerView when the contentView is already set.
+* Fixes typo in SC.Binding.transform causing transforms to be added to parent.
 * Fixes inability to specify the window padding on a PickerPane to a value other than the default.
 * Fixes escaped overflowTitle of SC.SegmentedView that showed '»' and invalid text of overflowToolTip that showed 'More…'. Also removes unnecessary escaping of `title` attributes on buttons and labels, because the browser doesn't render HTML inside of a `title` and removes invalid `alt` attribute on button divs.
 * Fixes SC.ArrayController so that firstObject, firstSelectableObject and lastObject update properly when swapping out the content. This also ensures that when allowsEmptySelection is false, that the selection changes to the new first object when the content is swapped.

data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/array.js

@@ -428,6 +428,15 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
   _scac_arrayContentDidChange: function (start, removed, added) {
     this._scac_cached = NO;
     this.arrayContentDidChange(start, removed, added);
+
+    // If the start & length are provided, we can also indicate if the firstObject
+    // or lastObject properties changed, thus making them independently observable.
+    if (!SC.none(start)) {
+      if (start === 0) this.notifyPropertyChange('firstObject');
+      var length = added + removed;
+      if (!SC.none(length) && start + length >= this.get('length') - 1) this.notifyPropertyChange('lastObject');
+    }
+
     if (this._kvo_enumerable_property_chains) {
       var addedObjects = this.slice(start, start + added);
       this.setupEnumerablePropertyChains(addedObjects);
@@ -441,7 +450,6 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
   */
   _scac_contentDidChange: function () {
     this._scac_cached = NO; // invalidate observable content
-
     var content     = this.get('content'),
         lastContent = this._scac_content,
         didChange   = this._scac_arrayContentDidChange,

data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane_statechart.js

@@ -28,6 +28,13 @@ SC.Pane.reopen({
     // handle intercept if needed
     this._addIntercept();
 
+    // If the layout is flexible (dependent on the window size), then the view
+    // will resize when appended.
+    if (!this.get('isFixedSize')) {
+      // We call viewDidResize so that it calls parentViewDidResize on all child views.
+      this.viewDidResize();
+    }
+
     sc_super();
   },
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/array_case.js

@@ -183,6 +183,20 @@ test("The computed properties firstObject, firstSelectableObject & lastObject sh
   equals(controller.get('lastObject'), newObject, 'lastObject should be the new last object in content');
 });
 
+test("The computed properties firstObject, firstSelectableObject & lastObject should update when content items change.", function(){
+  equals(controller.get('firstObject'), content[0], 'first object should be the first object in content');
+  equals(controller.get('firstSelectableObject'), content[0], 'first selectable object should be the first object in content');
+  equals(controller.get('lastObject'), content[4], 'lastObject should be the last object in content');
+
+  // Change the items.
+  var newObject = TestObject.create({ title: "BLAH" });
+  controller.replace(0, 5, [newObject]);
+
+  equals(controller.get('firstObject'), newObject, 'first object should be the new first object in content');
+  equals(controller.get('firstSelectableObject'), newObject, 'first selectable object should be the new first object in content');
+  equals(controller.get('lastObject'), newObject, 'lastObject should be the new last object in content');
+});
+
 test("array orderBy using String", function(){
   var testController = SC.ArrayController.create({
     content: content,

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layout.js

@@ -0,0 +1,103 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module, test, equals, ok */
+
+var view;
+
+/** Test isFixedLayout via isFixedSize and isFixedPosition properties. */
+module("SC.View.prototype.isFixedLayout", {
+
+  setup: function () {
+    // Create a basic view.
+    view = SC.View.create({});
+  },
+
+  teardown: function () {
+    // Clean up.
+    view.destroy();
+    view = null;
+  }
+
+});
+
+test("Test isFixedSize for various layouts.", function () {
+  ok(!view.get('isFixedSize'), "The default layout doesn't correspond to a fixed size.");
+
+  SC.run(function () { view.set('layout', { width: 100 }); });
+  ok(!view.get('isFixedSize'), "A width alone doesn't correspond to a fixed size.");
+
+  SC.run(function () { view.set('layout', { height: 100 }); });
+  ok(!view.get('isFixedSize'), "A height alone doesn't correspond to a fixed size.");
+
+  SC.run(function () { view.set('layout', { width: 100, height: 100 }); });
+  ok(view.get('isFixedSize'), "A width & height corresponds to a fixed size.");
+});
+
+test("Test isFixedPosition for various layouts.", function () {
+  ok(view.get('isFixedPosition'), "The default layout corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { left: 0 }); });
+  ok(view.get('isFixedPosition'), "A left: 0 (implied top, bottom, right) corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { top: 0 }); });
+  ok(view.get('isFixedPosition'), "A top: 0 (implied left, bottom, right) corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { left: 0, top: 0 }); });
+  ok(view.get('isFixedPosition'), "A left: 0, top: 0 corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { left: 50 }); });
+  ok(view.get('isFixedPosition'), "A left: 50 corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { top: 50 }); });
+  ok(view.get('isFixedPosition'), "A top: 50 corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { left: 50, top: 50 }); });
+  ok(view.get('isFixedPosition'), "A left: 50, top: 50 corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { right: 0 }); });
+  ok(view.get('isFixedPosition'), "A right: 0 (implied left) corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { bottom: 0 }); });
+  ok(view.get('isFixedPosition'), "A bottom: 0 (implied top) corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { right: 50 }); });
+  ok(view.get('isFixedPosition'), "A right: 50 (implied left) corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { bottom: 50 }); });
+  ok(view.get('isFixedPosition'), "A bottom: 50 (implied top) corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { width: 100 }); });
+  ok(view.get('isFixedPosition'), "A width: 100 (implied left) corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { height: 100 }); });
+  ok(view.get('isFixedPosition'), "A height: 100 (implied top) corresponds to a fixed position.");
+
+  SC.run(function () { view.set('layout', { right: 0, width: 100 }); });
+  ok(!view.get('isFixedPosition'), "A right: 0, width: 100 (overridden left) doesn't correspond to a fixed position.");
+
+  SC.run(function () { view.set('layout', { bottom: 0, height: 100 }); });
+  ok(!view.get('isFixedPosition'), "A bottom: 0, height: 100 (overridden top) doesn't correspond to a fixed position.");
+
+  SC.run(function () { view.set('layout', { centerX: 0, width: 100 }); });
+  ok(!view.get('isFixedPosition'), "A centerX: 0, width: 100 (overridden left) doesn't correspond to a fixed position.");
+
+  SC.run(function () { view.set('layout', { centerY: 0, height: 100 }); });
+  ok(!view.get('isFixedPosition'), "A centerY: 0, height: 100 (overridden top) doesn't correspond to a fixed position.");
+
+  SC.run(function () { view.set('layout', { left: 0.2 }); });
+  ok(!view.get('isFixedPosition'), "A left: 0.2 (percentage left) doesn't correspond to a fixed position.");
+
+  SC.run(function () { view.set('layout', { top: 0.2 }); });
+  ok(!view.get('isFixedPosition'), "A top: 0.2 (percentage top) doesn't correspond to a fixed position.");
+
+  SC.run(function () { view.set('layout', { left: SC.LAYOUT_AUTO }); });
+  ok(!view.get('isFixedPosition'), "A left: SC.LAYOUT_AUTO (auto left) doesn't correspond to a fixed position.");
+
+  SC.run(function () { view.set('layout', { top: SC.LAYOUT_AUTO }); });
+  ok(!view.get('isFixedPosition'), "A top: SC.LAYOUT_AUTO (auto top) doesn't correspond to a fixed position.");
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutChildViews.js

@@ -41,7 +41,7 @@ test("calls renderLayout() on child views on views that need layout if they have
 //
 module("SC.View#updateLayout");
 
-test("if view has layout, calls _executeDoUpdateLayout", function() {
+test("if view has layout, calls _doUpdateLayoutStyle", function() {
 
 	// NOTE: renderLayout() is also called when a view's
 	// layer is first created.  We use isTesting below to
@@ -49,7 +49,7 @@ test("if view has layout, calls _executeDoUpdateLayout", function() {
 	// are actually doing layout.
 	var callCount = 0, isTesting = NO ;
 	var view = SC.View.create({
-		_executeDoUpdateLayout: function() {
+		_doUpdateLayoutStyle: function() {
 			callCount++;
 		}
 	});
@@ -58,10 +58,10 @@ test("if view has layout, calls _executeDoUpdateLayout", function() {
 	ok(view.get('layer'), 'precond - should have a layer');
 
 	view.updateLayout();
-	equals(callCount, 0, 'should not call _executeDoUpdateLayout() because the view isn\'t shown');
+	equals(callCount, 0, 'should not call _doUpdateLayoutStyle() because the view isn\'t shown');
 
 	view.updateLayout(true);
-	equals(callCount, 1, 'should call _executeDoUpdateLayout() because we force it');
+	equals(callCount, 1, 'should call _doUpdateLayoutStyle() because we force it');
 
 	// Clean up.
 	view.destroy();

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutDidChange.js

@@ -25,7 +25,9 @@ test("notifies layoutStyle & frame change", function () {
   equals(layoutStyleCallCount, 0, 'should not trigger observers for layoutStyle');
 
   // Attach to the document.
-  view.createLayer()._doAttach(document.body);
+  var parent = SC.Pane.create();
+  parent.append();
+  parent.appendChild(view);
 
   equals(frameCallCount, 2, 'should trigger observers for frame when attached to the document');
   equals(layoutStyleCallCount, 0, 'should still not trigger observers for layoutStyle');
@@ -39,6 +41,7 @@ test("notifies layoutStyle & frame change", function () {
 
   // Clean up.
   view.destroy();
+  parent.destroy();
 });
 
 test("invokes layoutDidChangeFor() on layoutView each time it is called", function () {

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/viewDidResize.js

@@ -166,28 +166,28 @@ test("When parentViewDidResize is called on a view, it should only notify on fra
   view.viewDidResize.reset(); view.frameCallCount = 0;
   parentView.adjust({ width: 60, height: 60 });
   view.viewDidResize.expect(0);
-  equals(view.frameCallCount, 1, 'should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
+  equals(view.frameCallCount, 1, 'right align: should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 
   // try with bottom align
-  view.set('layout', { top: 10, bottom: 10, height: 10, width: 10 });
+  view.set('layout', { left: 10, bottom: 10, height: 10, width: 10 });
   view.viewDidResize.reset(); view.frameCallCount = 0;
   parentView.adjust({ width: 50, height: 50 });
   view.viewDidResize.expect(0);
-  equals(view.frameCallCount, 1, 'should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
+  equals(view.frameCallCount, 1, 'bottom align: should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 
   // try with center horizontal align
   view.set('layout', { centerX: 10, top: 10, height: 10, width: 10 });
   view.viewDidResize.reset(); view.frameCallCount = 0;
   parentView.adjust({ width: 40, height: 40 });
   view.viewDidResize.expect(0);
-  equals(view.frameCallCount, 1, 'should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
+  equals(view.frameCallCount, 1, 'centerX: should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 
   // try with center vertical align
   view.set('layout', { left: 10, centerY: 10, height: 10, width: 10 });
   view.viewDidResize.reset(); view.frameCallCount = 0;
   parentView.adjust({ width: 30, height: 30 });
   view.viewDidResize.expect(0);
-  equals(view.frameCallCount, 1, 'should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
+  equals(view.frameCallCount, 1, 'centerY: should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 });
 
 // ..........................................................

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout.js

@@ -276,13 +276,24 @@ SC.View.reopen(
   */
   isFixedPosition: function () {
     var layout = this.get('layout'),
-        ret;
+      hasLeft,
+      hasTop,
+      ret;
 
     // Position is fixed if it has left + top !== SC.LAYOUT_AUTO
-    ret = (
-      ((layout.left !== undefined) && (layout.top !== undefined)) &&
-      ((layout.left !== SC.LAYOUT_AUTO) && (layout.top !== SC.LAYOUT_AUTO))
-    );
+    hasLeft = layout.left !== undefined;
+    if (!hasLeft) {
+      // Check for implied left. If there is a width, then there can't be a right or centerX.
+      hasLeft =  layout.width === undefined || (layout.width !== undefined && layout.right === undefined && layout.centerX === undefined);
+    }
+
+    hasTop = layout.top !== undefined;
+    if (!hasTop) {
+      // Check for implied top. If there is a height, then there can't be a bottom or centerY.
+      hasTop = layout.height === undefined || (layout.height !== undefined && layout.bottom === undefined && layout.centerY === undefined);
+    }
+
+    ret = (hasLeft && hasTop && layout.left !== SC.LAYOUT_AUTO && layout.top !== SC.LAYOUT_AUTO);
 
     // The position may appear fixed, but only if none of the values are percentages.
     if (ret) {
@@ -1220,7 +1231,7 @@ SC.View.reopen(
   /** @private Override: Notify on attached (avoids notify of frame changed). */
   _notifyAttached: function () {
     // If we are using static layout then we don't know the frame until appended to the document.
-    if (this.get('useStaticLayout') || !this.get('isFixedLayout')) {
+    if (this.get('useStaticLayout')) {
       // We call viewDidResize so that it calls parentViewDidResize on all child views.
       this.viewDidResize();
     }

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/statechart.js

@@ -1,5 +1,10 @@
 sc_require("views/view/base");
 
+// When in debug mode, core developers can log the view state.
+//@if (debug)
+SC.LOG_VIEW_STATES = false;
+//@endif
+
 
 SC.CoreView.mixin(
   /** @scope SC.CoreView */ {
@@ -260,6 +265,12 @@ SC.CoreView.reopen(
     var curParentView = this.get('parentView'),
       handled = true;
 
+    //@if (debug)
+    if (SC.LOG_VIEW_STATES) {
+      SC.Logger.log('%@:%@ — _doAdopt(%@, %@)'.fmt(this, this.get('viewState'), parentView, beforeView));
+    }
+    //@endif
+
     if (curParentView && curParentView !== parentView) {
       //@if(debug)
       // This should be avoided, because using the same view instance without explicitly orphaning it first is a dangerous practice.
@@ -295,7 +306,6 @@ SC.CoreView.reopen(
       // Notify adopted (on self and all child views).
       this._adopted();
 
-
       switch (this.get('viewState')) {
       case SC.CoreView.UNRENDERED:
         switch (parentViewState) {
@@ -353,6 +363,12 @@ SC.CoreView.reopen(
       transitionIn = this.get('transitionIn'),
       parentView;
 
+    //@if (debug)
+    if (SC.LOG_VIEW_STATES) {
+      SC.Logger.log('%@:%@ — _doAttach(%@, %@)'.fmt(this, state, parentNode, nextNode));
+    }
+    //@endif
+
     switch (state) {
     case SC.CoreView.ATTACHED_HIDING: // FAST PATH!
     case SC.CoreView.ATTACHED_HIDDEN: // FAST PATH!
@@ -434,6 +450,12 @@ SC.CoreView.reopen(
   _doDestroyLayer: function () {
     var handled = true;
 
+    //@if (debug)
+    if (SC.LOG_VIEW_STATES) {
+      SC.Logger.log('%@:%@ — _doDestroyLayer()'.fmt(this, this.get('viewState')));
+    }
+    //@endif
+
     if (this.get('_isRendered') && !this.get('isAttached')) {
       // Remove our reference to the layer (our self and all our child views).
       this._executeDoDestroyLayer();
@@ -450,6 +472,12 @@ SC.CoreView.reopen(
     var state = this.get('viewState'),
       transitionOut = this.get('transitionOut');
 
+    //@if (debug)
+    if (SC.LOG_VIEW_STATES) {
+      SC.Logger.log('%@:%@ — _doDetach()'.fmt(this, state));
+    }
+    //@endif
+
     switch (state) {
     case SC.CoreView.UNRENDERED: // FAST PATH!
     case SC.CoreView.UNATTACHED: // FAST PATH!
@@ -540,6 +568,12 @@ SC.CoreView.reopen(
     var state = this.get('viewState'),
       transitionHide = this.get('transitionHide');
 
+    //@if (debug)
+    if (SC.LOG_VIEW_STATES) {
+      SC.Logger.log('%@:%@ — _doHide()'.fmt(this, state));
+    }
+    //@endif
+
     switch (state) {
     case SC.CoreView.UNRENDERED: // FAST PATH!
     case SC.CoreView.ATTACHED_HIDDEN: // FAST PATH!
@@ -603,6 +637,12 @@ SC.CoreView.reopen(
     var parentView = this.get('parentView'),
       handled = true;
 
+    //@if (debug)
+    if (SC.LOG_VIEW_STATES) {
+      SC.Logger.log('%@:%@ — _doOrphan()'.fmt(this, this.get('viewState')));
+    }
+    //@endif
+
     if (parentView) {
       var childViews = parentView.get('childViews'),
         idx = childViews.indexOf(this);
@@ -623,10 +663,15 @@ SC.CoreView.reopen(
   },
 
   /** @private Render this view action. */
-
   _doRender: function () {
     var state = this.get('viewState');
 
+    //@if (debug)
+    if (SC.LOG_VIEW_STATES) {
+      SC.Logger.log('%@:%@ — _doRender()'.fmt(this, state));
+    }
+    //@endif
+
     switch (state) {
     case SC.CoreView.ATTACHED_SHOWING: // FAST PATHS!
     case SC.CoreView.ATTACHED_SHOWN:
@@ -646,7 +691,7 @@ SC.CoreView.reopen(
       this.renderToContext(context);
       this.set('layer', context.element());
 
-      // Route.
+      // Route first.
       this._gotoUnattachedState();
 
       // Notify rendered (on self and all child views).
@@ -679,6 +724,12 @@ SC.CoreView.reopen(
       isParentShown = parentView ? parentView.get('viewState') & SC.CoreView.IS_SHOWN : true,
       transitionShow = this.get('transitionShow');
 
+    //@if (debug)
+    if (SC.LOG_VIEW_STATES) {
+      SC.Logger.log('%@:%@ — _doShow()'.fmt(this, state));
+    }
+    //@endif
+
     switch (state) {
     case SC.CoreView.ATTACHED_SHOWN: // FAST PATH!
     case SC.CoreView.ATTACHED_SHOWING: // FAST PATH!
@@ -744,8 +795,11 @@ SC.CoreView.reopen(
     var isVisibleInWindow = this.get('isVisibleInWindow'),
       handled = true;
 
-    // Legacy.
-    this.set('layerNeedsUpdate', true);
+    //@if (debug)
+    if (SC.LOG_VIEW_STATES) {
+      SC.Logger.log('%@:%@ — _doUpdateContent(%@)'.fmt(this, this.get('viewState'), force));
+    }
+    //@endif
 
     if (this.get('_isRendered')) {
       if (isVisibleInWindow || force) {
@@ -1188,11 +1242,11 @@ SC.CoreView.reopen(
 
   /** @private Updates according to parent did render. */
   _parentDidRender: function () {
+    // Route first.
+    this._gotoUnattachedByParentState();
+
     // Notify rendered.
     this._rendered();
-
-    // Route
-    this._gotoUnattachedByParentState();
   },
 
   /** @private Starts building out view if appropriate. */

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js

@@ -281,8 +281,20 @@ SC.CoreView.reopen(
     @returns {SC.View} receiver
   */
   displayDidChange: function () {
-    // Filter the input channel.
-    this.invokeOnce(this._doUpdateContent);
+    //@if (debug)
+    if (SC.LOG_VIEW_STATES) {
+      SC.Logger.log('%@:%@ — displayDidChange()'.fmt(this, this.get('viewState')));
+    }
+    //@endif
+
+    // Don't run _doUpdateContent needlessly, because the view may render
+    // before it is invoked, which would result in a needless update.
+    if (this.get('_isRendered')) {
+      // Legacy.
+      this.set('layerNeedsUpdate', true);
+
+      this.invokeOnce(this._doUpdateContent);
+    }
 
     return this;
   },

data/lib/frameworks/sproutcore/frameworks/datastore/system/store.js

@@ -393,12 +393,33 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     if (!editables) editables = this.editables = [];
     editables[storeKey] = 1 ; // use number for dense array support
 
-    var that = this;
-    this._propagateToChildren(storeKey, function(storeKey){
-      that.writeDataHash(storeKey, null, status);
-    });
+    // Update the child record hashes in place.
+    if (!SC.none(this.parentRecords) ) {
+      var children = this.parentRecords[storeKey] || {},
+        childHash;
+
+      for (var key in children) {
+
+        if (children.hasOwnProperty(key)) {
+
+          if (hash) {
+            var childPath = children[key];
+            childPath = childPath.split('.');
+            if (childPath.length > 1) {
+              childHash = hash[childPath[0]][childPath[1]];
+            } else {
+              childHash = hash[childPath[0]];
+            }
 
-    return this ;
+            this.writeDataHash(key, childHash, status);
+          } else {
+            this.writeDataHash(key, null, status);
+          }
+        }
+      }
+    }
+
+    return this;
   },
 
   /**

data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/many_array.js

@@ -41,7 +41,14 @@ module("SC.Record.toMany array with data source", {
   }
 });
 
-test("when retrieving records with toMany association, it should call retrieveRecords once instead of calling retrieveRecord multiple times", function() {
+test("when retrieving records with toMany association, it should call retrieveRecords once instead of calling retrieveRecord multiple times");
+/** WON'T FIX AT THIS TIME.
+
+Yes, iterating a toMany attribute will call retrieveRecord for each individual index, but we cannot change this. If we tried to buffer all calls to retrieveRecord then we will break the existing contract that retrieveRecord and retrieveRecords will return immediately with storeKeys if the data source is going to handle it. Plus there are alternatives. The custom datasource could use invokeOnce and a temporary cache to buffer all calls to retrieveRecord in order to build a single request out of multiple ids. This is the most feasible, because it's highly dependent on the datasource/backend configuration. The other alternative is that the backend should return the related records when the main record is requested in a single request (again, highly dependent on the datasource/backend configuration).
+
+To do it within SproutCore itself would mean a big change along the lines of how every app works with the store and so it will certainly have to wait until a major version.
+
+, function() {
   var store = SC.Store.create().from("MyDataSource");
   SC.RunLoop.begin();
   store.loadRecords(MyApp.Project, [
@@ -61,3 +68,4 @@ test("when retrieving records with toMany association, it should call retrieveRe
   // retrieveRecords should be called only once
   same(store.get('dataSource').get('retrieveRecordsArguments').length, 1);
 });
+*/

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/data_store.js

@@ -181,8 +181,7 @@ test("Use in Nested Store", function () {
 });
 
 test("Store#pushRetrieve for parent updates the child records", function () {
-  var parent = store.materializeRecord(storeKeys[0]),
-    nr = parent.get('contents').firstObject(),
+  var parent, nr,
     newDataHash = {
       type: 'Directory',
       name: 'Dir 1 Changed',
@@ -208,6 +207,11 @@ test("Store#pushRetrieve for parent updates the child records", function () {
       ]
     };
 
+  SC.run(function () {
+    parent = store.materializeRecord(storeKeys[0]);
+    nr = parent.get('contents').firstObject();
+  });
+
   ok(nr, "Got nested record");
   equals(nr.get('name'), 'Dir 2', "Dir id:2 has correct name");
 

data/lib/frameworks/sproutcore/frameworks/desktop/mixins/split_child.js

@@ -20,7 +20,7 @@ SC.NeedsSplitParent = {
    * @property SC.SplitView
   */
   splitView: function () {
-    var view = this;
+    var view = this.get('parentView');
     while (view && !view.isSplitView) view = view.get('parentView');
     return view;
   }.property('parentView').cacheable(),

data/lib/frameworks/sproutcore/frameworks/desktop/panes/picker.js

@@ -460,8 +460,6 @@ SC.PickerPane = SC.PalettePane.extend(
         this.set('anchorCached', anchor);
       }
 
-      if (anchor.x === 0 && anchor.y === 0) { return; }
-
       origin = SC.cloneRect(anchor);
 
       if (preferType) {