sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -8,30 +8,31 @@
 
 // ..........................................................
 // createChildViews()
-// 
+//
 var view, parentDom, childDom, layerId ;
 module("SC.View#findLayerInParentLayer", {
   setup: function() {
-    
+
     layerId = 'foo-123';
-    
+
     // manually construct a test layer.  next childDom a few layers deep
     childDom = document.createElement('div');
     SC.$(childDom).attr('id', layerId);
-    
+
     var intermediate = document.createElement('div');
     intermediate.appendChild(childDom);
-    
+
     parentDom = document.createElement('div');
     parentDom.appendChild(intermediate);
     intermediate = null;
-    
-    
+
+
     // setup view w/ layerId
     view = SC.View.create({ layerId: layerId });
   },
-  
+
   teardown: function() {
+    view.destroy();
     view = parentDom = childDom = layerId = null;
   }
 });

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

@@ -8,43 +8,53 @@
 
 module("SC.View#init");
 
-test("registers view in the global views hash using layerId for event targeted", function() {
+test("registers view in the global views hash using layerId for event targeted", function () {
   var v = SC.View.create();
   equals(SC.View.views[v.get('layerId')], v, 'registers view');
 });
 
-test("adds displayDidChange observer on all display properties", function() {
-  var didChange = NO ;
+test("adds displayDidChange observer on all display properties (when rendered)", function () {
+  var didChange = NO;
   var v = SC.View.create({
     // override just to make sure the registration works...
-    displayDidChange: function() { didChange = YES ; },
-    
+    displayDidChange: function () { didChange = YES; },
+
     displayProperties: 'foo bar'.w(),
-    
+
     foo: 'foo',
     bar: 'bar'
   });
-  
+
   v.set('foo', 'baz');
-  ok(didChange, 'didChange on set(foo)');
-  didChange = NO ;
-  
+  ok(!didChange, '!didChange on set(foo) before view is rendered');
+  didChange = NO;
+
   v.set('bar', 'baz');
-  ok(didChange, 'didChange on set(bar)');
+  ok(!didChange, '!didChange on set(bar) before view is rendered');
+
+  // Render the view.
+  v._doRender();
+
+  v.set('foo', 'buz');
+  ok(didChange, 'didChange on set(foo) after view is rendered');
+  didChange = NO;
+
+  v.set('bar', 'buz');
+  ok(didChange, 'didChange on set(bar) after view is rendered');
 });
 
-test("invokes createChildViews()", function() {
-  var didInvoke = NO ;
+test("invokes createChildViews()", function () {
+  var didInvoke = NO;
   var v = SC.View.create({
     // override just for test
-    createChildViews: function() { didInvoke = YES; }
+    createChildViews: function () { didInvoke = YES; }
   });
   ok(didInvoke, 'did invoke createChildViews()');
 });
 
-test("does NOT create layer", function() {
+test("does NOT create layer", function () {
   var v = SC.View.create();
-  equals(v.get('layer'), null, 'did not create layer');  
+  equals(v.get('layer'), null, 'did not create layer');
 });
 
 

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

@@ -12,7 +12,7 @@ module("SC.View#insertBefore", {
 	  child = SC.View.create();
 	  parent = SC.View.create({
 	    childViews: [SC.View]
-	  });		
+	  });
 	}
 });
 
@@ -22,13 +22,13 @@ test("returns receiver", function() {
 
 test("makes set child.parentView = to new parent view", function() {
 	ok(child.get('parentView')!==parent, 'precond - parent is not child.parentView yet');
-	
-	// add observer to make sure property change triggers 
+
+	// add observer to make sure property change triggers
 	var callCount = 0;
 	child.addObserver('parentView', function() {
 	  callCount++;
 	});
-	
+
 	parent.insertBefore(child, null);
 	equals(child.get('parentView'), parent, 'parent is child.parentView');
 	equals(callCount, 1, 'observer did fire');
@@ -40,45 +40,31 @@ test("insertBefore(child, null) appends child to end of parent.childView's array
 });
 
 test("insertBefore(child, otherChild) inserts child before other child view", function() {
-  
+
   var otherChild = parent.childViews[0]; // get current first child
   ok(otherChild, 'precond - otherChild is not null');
   parent.insertBefore(child, otherChild);
   equals(parent.childViews[0], child, 'child inserted before other child');
 });
 
-test("if child belongs to another parent view, child will be removed from other parent when added to new parent", function() {
-
-	// create child view that belongs to a parent already
-  var oldParent = SC.View.create({ childViews:[SC.View] });
-  child = oldParent.childViews[0];
-  
-	ok(child, 'precond - got child');
-  ok(child.get('parentView'), 'precond - child has a parent view');  
-  
-  parent.insertBefore(child, null);
-  ok(oldParent.childViews.indexOf(child)<0, 'oldParent no longer has childView');
-  equals(child.get('parentView'), parent, 'child has new parent view');
-});
-
 test("invokes willAddChild() on receiver if defined before adding child" ,function() {
 
   // monkey patch to test
   var callCount = 0;
   var otherChild = parent.childViews[0];
   parent.willAddChild = function(newChild, beforeView) {
-  
+
   	// verify params
   	equals(newChild, child, 'passed newChild');
   	equals(beforeView, otherChild, 'passed beforeView');
-  	
+
   	// verify this is called BEFORE the view is added
   	ok(parent.childViews.indexOf(child)<0, 'should not have child yet');
   	ok(child.get('parentView')!==parent, 'childView not changed yet either');
   	callCount++;
   };
 
-	  
+
   parent.insertBefore(child, otherChild);
   equals(callCount, 1, 'invoked');
 });
@@ -89,18 +75,18 @@ test("invokes willAddToParent() on child view if defined before adding child" ,f
   var callCount = 0;
   var otherChild = parent.childViews[0];
   child.willAddToParent = function(parentView, beforeView) {
-  
+
   	// verify params
   	equals(parentView, parent, 'passed parent');
   	equals(beforeView, otherChild, 'passed beforeView');
-  	
+
   	// verify this is called BEFORE the view is added
   	ok(parent.childViews.indexOf(child)<0, 'should not have child yet');
   	ok(child.get('parentView')!==parent, 'childView not changed yet either');
   	callCount++;
   };
 
-	  
+
   parent.insertBefore(child, otherChild);
   equals(callCount, 1, 'invoked');
 });
@@ -111,11 +97,11 @@ test("invokes didAddChild() on receiver if defined after adding child" ,function
   var callCount = 0;
   var otherChild = parent.childViews[0];
   parent.didAddChild = function(newChild, beforeView) {
-  
+
   	// verify params
   	equals(newChild, child, 'passed newChild');
   	equals(beforeView, otherChild, 'passed beforeView');
-  	
+
   	// verify this is called AFTER the view is added
   	ok(parent.childViews.indexOf(child)>=0, 'should have child');
   	ok(child.get('parentView')===parent, 'childView should have new parentView');
@@ -135,11 +121,11 @@ test("invokes didAddToParent() on child view if defined after adding child" ,fun
   var callCount = 0;
   var otherChild = parent.childViews[0];
   child.didAddToParent = function(parentView, beforeView) {
-  
+
   	// verify params
   	equals(parentView, parent, 'passed parent');
   	equals(beforeView, otherChild, 'passed beforeView');
-  	
+
   	// verify this is called AFTER the view is added
   	ok(parent.childViews.indexOf(child)>=0, 'should have child');
   	ok(child.get('parentView')===parent, 'childView should have new parentView');
@@ -153,46 +139,20 @@ test("invokes didAddToParent() on child view if defined after adding child" ,fun
   equals(callCount, 1, 'invoked');
 });
 
-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.insertBefore(child, null);
-	equals(callCount, 1, 'invoked parentViewDidChange');
-
-  var coreView = SC.CoreView.create();
-  parent.insertBefore(coreView, null);
-  equals(parent.get('childViews').lastObject(), coreView, "inserts SC.CoreView");
-});
+// VERIFY LAYER CHANGES ARE DEFERRED
+test("should not move layer immediately");
+// , function() {
 
-test("invokes layoutDidChange() on child view", function() {
+//   parent.createLayer();
+//   child.createLayer();
 
-	// monkey patch to test
-	var callCount = 0;
-	child.layoutDidChange = function() { callCount++; };
+//   ok(parent.get('layer'), 'precond - parent has layer');
+//   ok(child.get('layer'), 'precond - child has layer');
 
-	parent.insertBefore(child, null);
-	equals(callCount, 1, 'invoked layoutDidChange');
+//   parent.insertBefore(child, null);
+//   ok(child.get('layer').parentNode !== parent.get('layer'), 'did not move layer');
 
-  var coreView = SC.CoreView.create();
-  parent.insertBefore(coreView, null);
-  equals(parent.get('childViews').lastObject(), coreView, "inserts SC.CoreView");
-});
-// VERIFY LAYER CHANGES ARE DEFERRED
-test("should not move layer immediately", function() {
-
-  parent.createLayer();
-  child.createLayer();
-  
-  ok(parent.get('layer'), 'precond - parent has layer');
-  ok(child.get('layer'), 'precond - child has layer');
-  
-  parent.insertBefore(child, null);
-  ok(child.get('layer').parentNode !== parent.get('layer'), 'did not move layer');
-  
-});
+// });
 
 // .......................................................
 // appendChild()
@@ -201,9 +161,9 @@ test("should not move layer immediately", function() {
 module('SC.View#appendChild', {
   setup: function() {
     parent = SC.View.create({
-      childViews: [SC.View, SC.View] 
+      childViews: [SC.View, SC.View]
     });
-    
+
     child = SC.View.create();
   }
 });
@@ -212,7 +172,7 @@ test("returns receiver", function() {
   equals(parent.appendChild(child, null), parent, 'receiver');
 });
 
-  
+
 test("should add child to end of childViews", function() {
   parent.appendChild(child);
   equals(parent.childViews[parent.childViews.length-1], child, 'child is last child view');

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

@@ -16,44 +16,56 @@
 
 // ..........................................................
 // BASE TESTS
-// 
-// These tests exercise the API.  See below for tests that cover edge 
-// conditions.  If you find a bug, we recommend that you add a test in the 
+//
+// These tests exercise the API.  See below for tests that cover edge
+// conditions.  If you find a bug, we recommend that you add a test in the
 // edge case section.
 
-var FRAME = { x: 10, y: 10, width: 30, height: 30 } ;
+var FRAME = { x: 10, y: 10, width: 30, height: 30 };
 
-var pane, view ; // test globals
+var pane, view; // test globals
+
+module("isVisible", {
 
-module("isVisibleInWindow", {
-  
   setup: function() {
-    pane = SC.MainPane.create() ;
-    view = SC.View.create() ; 
+    pane = SC.MainPane.create();
+    view = SC.View.create();
   },
-  
+
   teardown: function() {
-    view = null ;
-    pane.remove() ;
-    pane = null ;
+    view.destroy();
+    pane.remove().destroy();
+    pane = view = null;
   }
-  
+
 });
 
 test("a new view should not be visible initially", function() {
-  ok(view.get('isVisible'), "view.get('isVisible') === NO") ;
+  ok(view.get('isVisible'), "view.get('isVisible') === NO");
+});
+
+test("initializing with isVisible: false, should still add the proper class on append", function() {
+  var newView = SC.View.create({
+    isVisible: false
+  });
+
+  SC.RunLoop.begin();
+  pane.append();
+  pane.appendChild(newView);
+  SC.RunLoop.end();
+  ok(newView.$().hasClass('sc-hidden'), "newView.$().hasClass('sc-hidden') should be true");
 });
 
 test("adding a new view to a visible pane should make it visible", function() {
-  ok(view.get('isVisible'), "view.get('isVisible') === YES") ;
-  ok(pane.get('isVisible'), "pane.get('isVisible') === YES") ;
+  ok(view.get('isVisible'), "view.get('isVisible') === YES");
+  ok(pane.get('isVisible'), "pane.get('isVisible') === YES");
   SC.RunLoop.begin();
-  pane.appendChild(view) ;
-  pane.append() ;
+  pane.appendChild(view);
+  pane.append();
   view.set('isVisible', NO);
   SC.RunLoop.end();
-  ok(!view.get('isVisible'), "after pane.appendChild(view), view.get('isVisible') === YES") ;
-  ok(view.$().hasClass('sc-hidden'), "after view.set('isVisible', NO), view.$().hasClass('sc-hidden') should be true") ;
+  ok(!view.get('isVisible'), "after pane.appendChild(view), view.get('isVisible') === YES");
+  ok(view.$().hasClass('sc-hidden'), "after view.set('isVisible', NO), view.$().hasClass('sc-hidden') should be true");
 });
 
 test("a view with visibility can have a child view without visibility", function() {
@@ -70,12 +82,12 @@ test("a view with visibility can have a child view without visibility", function
 
   try {
     pane.append();
-    pane.remove();
+    pane.remove().destroy();
   } catch(e) {
     errored = true;
   } finally {
     try {
-      pane.remove();
+      pane.remove().destroy();
     } catch(e2) {
       errored = true;
     }

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

@@ -7,7 +7,7 @@
 // ========================================================================
 // View metrics Unit Tests
 // ========================================================================
-/*globals module test ok isObj equals expects */
+/*global module, test, ok, equals */
 
 /**
   These tests verify that all view metrics -- frame, clippingFrame,
@@ -16,107 +16,122 @@
 
 // ..........................................................
 // BASE TESTS
-// 
-// These tests exercise the API.  See below for tests that cover edge 
-// conditions.  If you find a bug, we recommend that you add a test in the 
+//
+// These tests exercise the API.  See below for tests that cover edge
+// conditions.  If you find a bug, we recommend that you add a test in the
 // edge case section.
 
-var FRAME = { x: 10, y: 10, width: 30, height: 30 } ;
-
-var pane, view ; // test globals
+var pane, view; // test globals
 
 module("isVisibleInWindow", {
-  
-  setup: function() {
-    pane = SC.MainPane.create() ;
-    pane.append() ;
-    view = SC.View.create() ; 
+
+  setup: function () {
+    pane = SC.MainPane.create();
+    pane.append();
+    view = SC.View.create();
   },
-  
-  teardown: function() {
-    view = null ;
-    pane.remove().destroy() ;
-    pane = null ;
+
+  teardown: function () {
+    view.destroy();
+    pane.remove().destroy();
+    pane = null;
   }
-  
+
 });
 
-test("a new view should not be visible initially", function() {
-  ok(!view.get('isVisibleInWindow'), "view.get('isVisibleInWindow') === NO") ;
+test("a new view should not be visible initially", function () {
+  ok(!view.get('isVisibleInWindow'), "view.get('isVisibleInWindow') === NO");
 });
 
-test("adding a new view to a visible pane should make it visible", function() {
-  ok(!view.get('isVisibleInWindow'), "view.get('isVisibleInWindow') === NO") ;
-  ok(pane.get('isVisibleInWindow'), "pane.get('isVisibleInWindow') === YES") ;
-  
-  pane.appendChild(view) ;
-  ok(view.get('isVisibleInWindow'), "after pane.appendChild(view), view.get('isVisibleInWindow') === YES") ;
+test("adding a new view to a visible pane should make it visible", function () {
+  ok(!view.get('isVisibleInWindow'), "view.get('isVisibleInWindow') === NO");
+  ok(pane.get('isVisibleInWindow'), "pane.get('isVisibleInWindow') === YES");
+
+  pane.appendChild(view);
+  ok(view.get('isVisibleInWindow'), "after pane.appendChild(view), view.get('isVisibleInWindow') === YES");
 });
 
-test("removing a view from a visible pane should make it invisible again", function() {
-  ok(!view.get('isVisibleInWindow'), "view.get('isVisibleInWindow') === NO") ;
-  ok(pane.get('isVisibleInWindow'), "pane.get('isVisibleInWindow') === YES") ;
-  pane.appendChild(view) ;
-  ok(view.get('isVisibleInWindow'), "after pane.appendChild(view), view.get('isVisibleInWindow') === YES") ;
-  
-  view.removeFromParent() ;
-  ok(!view.get('isVisibleInWindow'), "after view.removeFromParent(), view.get('isVisibleInWindow') === NO") ;
+test("removing a view from a visible pane should make it invisible again", function () {
+  ok(!view.get('isVisibleInWindow'), "view.get('isVisibleInWindow') === NO");
+  ok(pane.get('isVisibleInWindow'), "pane.get('isVisibleInWindow') === YES");
+  pane.appendChild(view);
+  ok(view.get('isVisibleInWindow'), "after pane.appendChild(view), view.get('isVisibleInWindow') === YES");
+
+  view.removeFromParent();
+  ok(!view.get('isVisibleInWindow'), "after view.removeFromParent(), view.get('isVisibleInWindow') === NO");
 });
 
 // .......................................................
-// integration with updateLayer and layoutChildViews 
+// integration with updateLayer and layoutChildViews
 //
-test("updateLayer should not be invoked even if layer becomes dirty until isVisibleInWindow changes, then it should invoke", function() {
-
-	var callCount = 0 ;
-	view.createLayer = function() {
-	  SC.View.prototype.createLayer.apply(this, arguments);
-	  callCount++;
-	};
-	ok(!view.get('isVisibleInWindow'), 'precond - view should not be visible to start');
-	
-	SC.RunLoop.begin();
-	view.displayDidChange();
-	SC.RunLoop.end();
-	equals(callCount, 0, 'createLayer should not run b/c its not visible');
-	
-	SC.RunLoop.begin();
-	pane.appendChild(view); // make visible in window...
-	ok(view.get('isVisibleInWindow'), 'view should now be visible in window');
-	SC.RunLoop.end();
-	equals(callCount, 1, 'createLayer should exec now b/c isVisibleInWindow is YES');
+test("_executeDoUpdateContent should not be invoked even if layer becomes dirty until isVisibleInWindow changes, then it should invoke", function () {
+
+  var callCount = 0;
+  view._executeDoUpdateContent = function () {
+    SC.View.prototype._executeDoUpdateContent.apply(this, arguments);
+    callCount++;
+  };
+  ok(!view.get('isVisibleInWindow'), 'precond - view should not be visible to start');
+
+  SC.run(function () {
+    view.displayDidChange();
+  });
+  equals(callCount, 0, '_executeDoUpdateContent should not run b/c it\'s not visible');
+
+  view.set('isVisible', false);
+
+  SC.run(function () {
+    pane.appendChild(view); // Attach the view.
+    view.displayDidChange();
+  });
+  equals(callCount, 0, '_executeDoUpdateContent should not run b/c it\'s not visible');
+
+  SC.run(function () {
+    view.set('isVisible', true);
+    ok(view.get('isVisibleInWindow'), 'view should now be visible in window');
+  });
+  equals(callCount, 1, '_executeDoUpdateContent should exec now b/c the view is visible');
 });
 
-test("layoutChildViewsIfNeeded should not be invoked even if layer needs layout until isVisibleInWindow changes, then it should invoke", function() {
-
-	var child = SC.View.create();
-	view.appendChild(child);
-	
-	var callCount = 0 ;
-	view.layoutChildViews = function() { callCount++; };
-	ok(!view.get('isVisibleInWindow'), 'precond - view should not be visible to start');
-	
-	SC.RunLoop.begin();
-	view.layoutDidChangeFor(child);
-	SC.RunLoop.end();
-	equals(callCount, 0, 'layoutChildViews should not run b/c its not visible');
-	
-	SC.RunLoop.begin();
-	pane.appendChild(view); // make visible in window...
-	ok(view.get('isVisibleInWindow'), 'view should now be visible in window');
-	SC.RunLoop.end();
-	equals(callCount, 1, 'layoutChildViews should exec now b/c isVisibleInWindow is YES');
+test("_doUpdateLayoutStyle should not be invoked even if layer needs layout until isVisibleInWindow changes, then it should invoke", function () {
+
+  var child = SC.View.create();
+  view.appendChild(child);
+
+  var callCount = 0;
+  child._doUpdateLayoutStyle = function () { callCount++; };
+  ok(!view.get('isVisibleInWindow'), 'precond - view should not be visible to start');
+
+  SC.run(function () {
+    child.layoutDidChange();
+  });
+
+  equals(callCount, 0, '_doUpdateLayoutStyle should not run b/c its not shown');
+
+  view.set('isVisible', false);
+
+  SC.run(function () {
+    pane.appendChild(view); // Attach the view.
+    child.layoutDidChange();
+  });
+  equals(callCount, 0, '_doUpdateLayoutStyle should not run b/c its not shown');
+
+  SC.run(function () {
+    view.set('isVisible', true);
+    ok(view.get('isVisibleInWindow'), 'view should now be visible in window');
+  });
+  equals(callCount, 1, '_doUpdateLayoutStyle should exec now b/c the child was appended to a shown parent');
 });
 
-test("setting isVisible to NO should trigger a layer update to hide the view", function() {
-  
+test("setting isVisible to NO should trigger a layer update to hide the view", function () {
+
   SC.RunLoop.begin();
   pane.appendChild(view);
   SC.RunLoop.end();
-  
+
   SC.RunLoop.begin();
   view.set('isVisible', NO);
   SC.RunLoop.end();
-  
-  ok(view.renderContext(view.get('layer')).classNames().indexOf('sc-hidden') >= 0, "layer should have the 'sc-hidden' class");
+
+  ok(view.renderContext(view.get('layer')).classes().indexOf('sc-hidden') >= 0, "layer should have the 'sc-hidden' class");
 });