sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -9,11 +9,15 @@
 // .......................................................
 // removeChild()
 //
-  
+
 var parent, child;
 module("SC.View#removeChild", {
 	setup: function() {
-		parent = SC.View.create({ childViews: [SC.View] });
+		parent = SC.View.create({ childViews: [
+      SC.View.extend({
+        updateLayerLocationIfNeeded: CoreTest.stub('updateLayerLocationIfNeeded', SC.View.prototype.updateLayerLocationIfNeeded)
+      })
+    ] });
 		child = parent.childViews[0];
 	}
 });
@@ -35,11 +39,11 @@ test("sets parentView property to null", function() {
 });
 
 test("does nothing if passed null", function() {
-  
+
   // monkey patch callbacks to make sure nothing runs.
   var callCount = 0;
   parent.willRemoveChild = parent.didRemoveChild = function() { callCount++; };
-  
+
   parent.removeChild(null);
   equals(callCount, 0, 'did not invoke callbacks');
 });
@@ -53,7 +57,7 @@ test("invokes child.willRemoveFromParent before removing if defined", function()
     equals(child.get('parentView'), parent, 'still in parent');
     callCount++;
   };
-  
+
   parent.removeChild(child);
   equals(callCount, 1, 'invoked callback');
 });
@@ -64,12 +68,12 @@ test("invokes parent.willRemoveChild before removing if defined", function() {
   var callCount = 0;
   parent.willRemoveChild = function(view) {
     equals(view, child, 'passed child as param');
-    
+
     // verify invoked BEFORE removal
     equals(child.get('parentView'), parent, 'still in parent');
     callCount++;
   };
-  
+
   parent.removeChild(child);
   equals(callCount, 1, 'invoked callback');
 });
@@ -86,7 +90,7 @@ test("invokes child.didRemoveFromParent AFTER removing if defined", function() {
     ok(!child.get('parentView'), 'no longer in parent');
     callCount++;
   };
-  
+
   parent.removeChild(child);
   equals(callCount, 1, 'invoked callback');
 });
@@ -97,55 +101,46 @@ test("invokes parent.didRemoveChild before removing if defined", function() {
   var callCount = 0;
   parent.didRemoveChild = function(view) {
     equals(view, child, 'passed child as param');
-    
+
     // verify invoked BEFORE removal
     ok(!child.get('parentView'), 'no longer in parent');
     callCount++;
   };
-  
+
   parent.removeChild(child);
   equals(callCount, 1, 'invoked callback');
 });
 
-test("invokes parentViewDidChange() on child view.  this is used by the view internals to update layer loc", function() {
-
-	// monkey patch to test
-	var callCount = 0;
-	child.parentViewDidChange = function() { callCount++; };
-	
-	parent.removeChild(child);
-	equals(callCount, 1, 'invoked parentViewDidChange');
-});
-
 // VERIFY LAYER CHANGES ARE DEFERRED
-test("should not move layer immediately", function() {
+test("should not move layer immediately");
+// , function() {
 
-  parent.createLayer();
+//   parent.createLayer();
 
-	var parentLayer = parent.get('layer'), childLayer = child.get('layer');  
-  ok(parentLayer, 'precond - parent has layer');
-  ok(childLayer, 'precond - child has layer');
-  equals(childLayer.parentNode, parentLayer, 'child layer belong to parent');
-  
-  parent.removeChild(child);
-  equals(childLayer.parentNode, parentLayer, 'child layer belong to parent');
-});
+// 	var parentLayer = parent.get('layer'), childLayer = child.get('layer');
+//   ok(parentLayer, 'precond - parent has layer');
+//   ok(childLayer, 'precond - child has layer');
+//   equals(childLayer.parentNode, parentLayer, 'child layer belong to parent');
+
+//   parent.removeChild(child);
+//   equals(childLayer.parentNode, parentLayer, 'child layer belong to parent');
+// });
 
 // .......................................................
 // removeAllChildren()
 //
 var view;
 module("SC.View#removeAllChildren", {
- setup: function() { 
-  view = SC.View.create({
-    childViews: [SC.View, SC.View, SC.View]
-  });
- }
+  setup: function() {
+    view = SC.View.create({
+      childViews: [SC.View, SC.View, SC.View]
+    });
+  }
 });
 
 test("removes all child views", function() {
   equals(view.childViews.length, 3, 'precond - has child views');
-  
+
   view.removeAllChildren();
   equals(view.childViews.length, 0, 'removed all children');
 });
@@ -153,17 +148,17 @@ test("removes all child views", function() {
 test("returns receiver", function() {
 	equals(view.removeAllChildren(), view, 'receiver');
 });
-  
+
 // .......................................................
 // removeFromParent()
 //
 module("SC.View#removeFromParent");
 
 test("removes view from parent view", function() {
-  var parent = SC.View.create({ childViews: [SC.View] });
-  var child = parent.childViews[0];
+  parent = SC.View.create({ childViews: [SC.View] });
+  child = parent.childViews[0];
   ok(child.get('parentView'), 'precond - has parentView');
-  
+
   child.removeFromParent();
   ok(!child.get('parentView'), 'no longer has parentView');
   ok(parent.childViews.indexOf(child)<0, 'no longer in parent childViews');
@@ -175,15 +170,14 @@ test("returns receiver", function() {
 
 test("does nothing if not in parentView", function() {
   var callCount = 0;
-  var child = SC.View.create();
+  child = SC.View.create();
 
 	// monkey patch for testing...
-	child.willRemoveFromParent = function() { callCount++; };  
+	child.willRemoveFromParent = function() { callCount++; };
 	ok(!child.get('parentView'), 'precond - has no parent');
-	
+
 	child.removeFromParent();
 	equals(callCount, 0, 'did not invoke callback');
 });
 
 
-

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

@@ -41,12 +41,14 @@ test("default implementation invokes renderChildViews if firstTime = YES", funct
   equals(rendered, 1, 'rendered the child');
   equals(parentRendered, 1);
 
-  view.updateLayer();
+  view.updateLayer(true);
   equals(rendered, 1, 'didn\'t call render again');
   equals(parentRendered, 1, 'didn\'t call the parent\'s render again');
-  equals(parentUpdated, 1, 'called the parent\'t update');
+  equals(parentUpdated, 1, 'called the parent\'s update');
   equals(updated, 0, 'didn\'t call the child\'s update');
 
+  // Clean up.
+  view.destroy();
 });
 
 test("default implementation does not invoke renderChildViews if explicitly rendered in render method", function() {
@@ -81,12 +83,14 @@ test("default implementation does not invoke renderChildViews if explicitly rend
   equals(parentRendered, 1);
   equals(view.$('div').length, 1);
 
-  view.updateLayer();
+  view.updateLayer(true);
   equals(rendered, 1, 'didn\'t call render again');
   equals(parentRendered, 1, 'didn\'t call the parent\'s render again');
-  equals(parentUpdated, 1, 'called the parent\'t update');
+  equals(parentUpdated, 1, 'called the parent\'s update');
   equals(updated, 0, 'didn\'t call the child\'s update');
 
+  // Clean up.
+  view.destroy();
 });
 
 test("should invoke renderChildViews if layer is destroyed then re-rendered", function() {
@@ -126,6 +130,8 @@ test("should invoke renderChildViews if layer is destroyed then re-rendered", fu
   equals(parentRendered, 2);
   equals(view.$('div').length, 1);
 
+  // Clean up.
+  view.destroy();
 });
 // .......................................................
 // renderChildViews()
@@ -173,6 +179,8 @@ test("creates a context and then invokes renderToContext or updateLayer on each
   equals(view.renderChildViews(curContext, curFirstTime), curContext, 'returns context');
   equals(runCount, 3, 'updateLayer() invoked for each child view');
 
+  // Clean up.
+  view.destroy();
 });
 
 test("creates a context and then invokes renderChildViews to call renderToContext on each childView", function() {
@@ -200,4 +208,6 @@ test("creates a context and then invokes renderChildViews to call renderToContex
   view.renderChildViews(curContext);
   equals(runCount, 3, 'renderToContext() invoked for each child view');
 
+  // Clean up.
+  view.destroy();
 });

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

@@ -7,7 +7,7 @@
 /*global module test equals context ok same */
 
 // .......................................................
-//  render() 
+//  render()
 //
 module("SC.View#render");
 
@@ -22,16 +22,19 @@ test("Supports backwards-compatible render method", function() {
   });
 
   view.createLayer();
-  
+
   view.render = function(context, firstTime) {
     renderCallCount++;
     ok(context._STYLE_REGEX, 'passes RenderContext');
     equals(firstTime, NO, 'passes NO for firstTime');
   };
-  
+
   view.updateLayer();
-  
+
   equals(renderCallCount, 2, 'render should have been called twice');
+
+  // Clean up.
+  view.destroy();
 });
 
 test("Treats a view as its own render delegate", function() {
@@ -47,21 +50,24 @@ test("Treats a view as its own render delegate", function() {
     },
 
     update: function(elem) {
-     ok(elem.jquery, 'passes a jQuery object as first parameter'); 
+     ok(elem.jquery, 'passes a jQuery object as first parameter');
      updateCallCount++;
     }
   });
-  
+
   view.createLayer();
   view.updateLayer();
   equals(renderCallCount, 1, "calls render once");
   equals(updateCallCount, 1, "calls update once");
+
+  // Clean up.
+  view.destroy();
 });
 
 test("Passes data source as first parameter if render delegate is not the view", function() {
   var renderCallCount = 0,
       updateCallCount = 0;
-      
+
   var view;
 
   var renderDelegate = SC.Object.create({
@@ -74,9 +80,9 @@ test("Passes data source as first parameter if render delegate is not the view",
 
     update: function(dataSource, elem) {
       equals(dataSource, view.get('renderDelegateProxy'), "passes view's render delegate proxy as data source");
-      ok(elem.jquery, "passes a jQuery object as first parameter"); 
+      ok(elem.jquery, "passes a jQuery object as first parameter");
       updateCallCount++;
-    }  
+    }
   });
 
   view = SC.View.create({
@@ -87,6 +93,9 @@ test("Passes data source as first parameter if render delegate is not the view",
   view.updateLayer();
   equals(renderCallCount, 1, "calls render once");
   equals(updateCallCount, 1, "calls update once");
+
+  // Clean up.
+  view.destroy();
 });
 
 test("Extending view with render delegate by implementing old render method", function() {
@@ -108,10 +117,10 @@ test("Extending view with render delegate by implementing old render method", fu
       sc_super();
     }
   });
-  
+
   childView.createLayer();
   childView.updateLayer();
-  
+
   equals(renderCalls, 1, "calls render on render delegate once");
   equals(updateCalls, 1, "calls update on render delegates once");
 });
@@ -121,43 +130,43 @@ test("Views that do not override render should render their child views", functi
 
   var parentView = SC.View.design({
     childViews: 'newStyle oldStyle renderDelegateView'.w(),
-    
+
     newStyle: SC.View.design({
       render: function(context) {
         newStyleCount++;
       },
-      
+
       update: function() {
         // no op
       }
     }),
-    
+
     oldStyle: SC.View.design({
       render: function(context, firstTime) {
         oldStyleCount++;
       }
     }),
-    
+
     renderDelegateView: SC.View.design({
       renderDelegate: SC.Object.create({
         render: function(dataSource, context) {
           ok(dataSource.isViewRenderDelegateProxy, "Render delegate should get passed a view's proxy for its data source");
           renderDelegateCount++;
         },
-        
+
         update: function() {
           // no op
         }
       })
     })
   });
-  
+
   parentView = parentView.create();
-  
+
   parentView.createLayer();
   parentView.updateLayer();
-  
+
   equals(newStyleCount, 1, "calls render on new style view once");
   equals(oldStyleCount, 1, "calls render on old style view once");
   equals(renderDelegateCount, 1, "calls render on render delegate once");
-});
+});

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

@@ -0,0 +1,229 @@
+// ==========================================================================
+// 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 parentView;
+
+/*
+ * SC.CoreView.UNRENDERED
+ * SC.CoreView.UNATTACHED
+ * SC.CoreView.UNATTACHED_BY_PARENT
+ * SC.CoreView.ATTACHED_SHOWING
+ * SC.CoreView.ATTACHED_SHOWN
+ * SC.CoreView.ATTACHED_HIDING
+ * SC.CoreView.ATTACHED_HIDDEN
+ * SC.CoreView.ATTACHED_HIDDEN_BY_PARENT
+ * SC.CoreView.ATTACHED_BUILDING_IN
+ * SC.CoreView.ATTACHED_BUILDING_OUT
+ * SC.CoreView.ATTACHED_BUILDING_OUT_BY_PARENT
+ */
+
+
+module("SC.View.prototype.replaceAllChildren", {
+
+  setup: function () {
+    parentView = SC.View.create({
+      childViews: ['a', 'b', SC.View],
+
+      a: SC.View,
+      b: SC.View
+    });
+  },
+
+  teardown: function () {
+    parentView.destroy();
+    parentView = null;
+  }
+
+});
+
+test("Replaces all children. UNRENDERED parent view.", function () {
+  var childViews = parentView.get('childViews'),
+    newChildViews = [SC.View.create(), SC.View.create()];
+
+  equals(childViews.get('length'), 3, "There are this many child views originally");
+
+  // Replace all children.
+  parentView.replaceAllChildren(newChildViews);
+
+  childViews = parentView.get('childViews');
+  equals(childViews.get('length'), 2, "There are this many child views after replaceAllChildren");
+});
+
+
+test("Replaces all children.  UNATTACHED parent view.", function () {
+  var childViews = parentView.get('childViews'),
+    newChildViews = [SC.View.create(), SC.View.create()],
+    childView, jq;
+
+  // Render the parent view.
+  parentView.createLayer();
+
+  equals(childViews.get('length'), 3, "There are this many child views originally");
+
+  jq = parentView.$();
+  for (var i = 0, len = childViews.get('length'); i < len; i++) {
+    childView = childViews.objectAt(i);
+
+    ok(jq.find('#' + childView.get('layerId')).get('length') === 1, "The child view with layer id %@ exists in the parent view's layer".fmt(childView.get('layerId')));
+  }
+
+  // Replace all children.
+  parentView.replaceAllChildren(newChildViews);
+
+  childViews = parentView.get('childViews');
+  equals(childViews.get('length'), 2, "There are this many child views after replaceAllChildren");
+
+  jq = parentView.$();
+  for (i = 0, len = childViews.get('length'); i < len; i++) {
+    childView = childViews.objectAt(i);
+
+    ok(jq.find('#' + childView.get('layerId')).get('length') === 1, "The new child view with layer id %@ exists in the parent view's layer".fmt(childView.get('layerId')));
+  }
+});
+
+
+test("Replaces all children.  ATTACHED_SHOWN parent view.", function () {
+  var childViews = parentView.get('childViews'),
+    newChildViews = [SC.View.create(), SC.View.create()],
+    childView, jq;
+
+  // Render the parent view and attach.
+  parentView.createLayer();
+  parentView._doAttach(document.body);
+
+  equals(childViews.get('length'), 3, "There are this many child views originally");
+
+  jq = parentView.$();
+  for (var i = 0, len = childViews.get('length'); i < len; i++) {
+    childView = childViews.objectAt(i);
+
+    ok(jq.find('#' + childView.get('layerId')).get('length') === 1, "The child view with layer id %@ exists in the parent view's layer".fmt(childView.get('layerId')));
+  }
+
+  // Replace all children.
+  parentView.replaceAllChildren(newChildViews);
+
+  childViews = parentView.get('childViews');
+  equals(childViews.get('length'), 2, "There are this many child views after replaceAllChildren");
+
+  jq = parentView.$();
+  for (i = 0, len = childViews.get('length'); i < len; i++) {
+    childView = childViews.objectAt(i);
+
+    ok(jq.find('#' + childView.get('layerId')).get('length') === 1, "The new child view with layer id %@ exists in the parent view's layer".fmt(childView.get('layerId')));
+  }
+});
+
+
+module("SC.View.prototype.replaceAllChildren", {
+
+  setup: function () {
+    parentView = SC.View.create({
+      childViews: ['a', 'b', SC.View],
+
+      containerLayer: function () {
+        return this.$('._wrapper')[0];
+      }.property('layer').cacheable(),
+
+      a: SC.View,
+      b: SC.View,
+
+      render: function (context) {
+        context = context.begin().addClass('_wrapper');
+        this.renderChildViews(context);
+        context = context.end();
+      }
+    });
+  },
+
+  teardown: function () {
+    parentView.destroy();
+    parentView = null;
+  }
+
+});
+
+
+test("Replaces all children. UNRENDERED parent view.", function () {
+  var childViews = parentView.get('childViews'),
+    newChildViews = [SC.View.create(), SC.View.create()];
+
+  equals(childViews.get('length'), 3, "There are this many child views originally");
+
+  // Replace all children.
+  parentView.replaceAllChildren(newChildViews);
+
+  childViews = parentView.get('childViews');
+  equals(childViews.get('length'), 2, "There are this many child views after replaceAllChildren");
+});
+
+
+test("Replaces all children.  UNATTACHED parent view.", function () {
+  var childViews = parentView.get('childViews'),
+    newChildViews = [SC.View.create(), SC.View.create()],
+    childView, jq;
+
+  // Render the parent view.
+  parentView.createLayer();
+
+  equals(childViews.get('length'), 3, "There are this many child views originally");
+
+  jq = parentView.$('._wrapper');
+  for (var i = 0, len = childViews.get('length'); i < len; i++) {
+    childView = childViews.objectAt(i);
+
+    ok(jq.find('#' + childView.get('layerId')).get('length') === 1, "The child view with layer id %@ exists in the parent view's layer".fmt(childView.get('layerId')));
+  }
+
+  // Replace all children.
+  parentView.replaceAllChildren(newChildViews);
+
+  childViews = parentView.get('childViews');
+  equals(childViews.get('length'), 2, "There are this many child views after replaceAllChildren");
+
+  jq = parentView.$('._wrapper');
+  for (i = 0, len = childViews.get('length'); i < len; i++) {
+    childView = childViews.objectAt(i);
+
+    ok(jq.find('#' + childView.get('layerId')).get('length') === 1, "The new child view with layer id %@ exists in the parent view's layer".fmt(childView.get('layerId')));
+  }
+});
+
+
+test("Replaces all children using containerLayer.  ATTACHED_SHOWN parent view.", function () {
+  var childViews = parentView.get('childViews'),
+    newChildViews = [SC.View.create(), SC.View.create()],
+    childView, jq;
+
+  // Render the parent view and attach.
+  parentView.createLayer();
+  parentView._doAttach(document.body);
+
+  equals(childViews.get('length'), 3, "There are this many child views originally");
+
+  jq = parentView.$('._wrapper');
+  for (var i = 0, len = childViews.get('length'); i < len; i++) {
+    childView = childViews.objectAt(i);
+
+    ok(jq.find('#' + childView.get('layerId')).get('length') === 1, "The child view with layer id %@ exists in the parent view's layer".fmt(childView.get('layerId')));
+  }
+
+  // Replace all children.
+  parentView.replaceAllChildren(newChildViews);
+
+  childViews = parentView.get('childViews');
+  equals(childViews.get('length'), 2, "There are this many child views after replaceAllChildren");
+
+  jq = parentView.$('._wrapper');
+  for (i = 0, len = childViews.get('length'); i < len; i++) {
+    childView = childViews.objectAt(i);
+
+    ok(jq.find('#' + childView.get('layerId')).get('length') === 1, "The new child view with layer id %@ exists in the parent view's layer".fmt(childView.get('layerId')));
+  }
+});