sproutcore 1.0.1049.pre.2 → 1.4.0.rc

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/ui.js

@@ -68,8 +68,8 @@ pane.verifyEmpty = function verifyEmpty(view, expectedHint) {
   var layer = view.$();
   
   ok(!layer.hasClass('not-empty'), 'layer should not have not-empty class');
-  equals(input.val(), '', 'input should have empty value');
-  
+  if(SC.browser.safari) equals(input.val(), '', 'input should have empty value');
+  else equals(input.val(), expectedHint, 'input should have empty value');
   if (expectedHint) {
     var hint = view.$('.sc-hint');
     if (hint.length===1) {

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/clippingFrame.js

@@ -112,7 +112,7 @@ test("notifies receiver and each child if parent clipping frame changes", functi
   // This should not happen.  If this is the case, fix the view code so that
   // it does not invalidate frame more than once before you change this 
   // number.
-  equals(callCount, 4, 'should invoke observer on child and nested child');
+  equals(callCount, 2, 'should invoke observer on child and nested child');
 });
 
 
@@ -128,6 +128,6 @@ test("does not notify child views of clippingFrame changes if child view hasStat
   // now, adjust layout of child so that clipping frame will change...
   a.adjust('top', -50);
   
-  equals(callCount, 2, 'should invoke observer on child only');
+  equals(callCount, 1, 'should invoke observer on child only');
 });
 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/createLayer.js

@@ -16,11 +16,11 @@ test("returns the receiver", function() {
   equals(v.createLayer(), v, 'returns receiver');
 });
 
-test("calls renderToContext() and sets layer to resulting element", function() {
+test("calls prepareContext() and sets layer to resulting element", function() {
   var v= SC.View.create({
     tagName: 'span',
     
-    renderToContext: function(context, firstTime) {
+    prepareContext: function(context, firstTime) {
       context.push("foo");
     }
   });

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/layoutStyle.js

@@ -26,9 +26,7 @@ var parent, child;
 function performLayoutTest(layout, no_f, no_s, with_f, with_s) {
   
   // make sure we add null properties and convert numbers to 'XXpx' to style layout.
-  var keys = 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight'.w();
-  if (SC.platform.supportsCSSTransforms) keys.push('transform');
-
+  var keys = 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight webkitTransform'.w();
   keys.forEach(function(key) {
     if (no_s[key]===undefined) no_s[key] = null;
     if (with_s[key]===undefined) with_s[key] = null;  
@@ -41,13 +39,10 @@ function performLayoutTest(layout, no_f, no_s, with_f, with_s) {
   child.set('layout', layout) ;
 
   console.log(child.get('layoutStyle'));
-
-  var testKey;
-
+  
   // test
   keys.forEach(function(key) {
-    testKey = key === 'transform' ? SC.platform.domCSSPrefix+'Transform' : key;
-    equals(child.get('layoutStyle')[testKey], no_s[key], "STYLE NO PARENT %@".fmt(key)) ;  
+    equals(child.get('layoutStyle')[key], no_s[key], "STYLE NO PARENT %@".fmt(key)) ;  
   });
   
   // add parent
@@ -57,8 +52,7 @@ function performLayoutTest(layout, no_f, no_s, with_f, with_s) {
   
   // test again
   keys.forEach(function(key) {
-    testKey = key === 'transform' ? SC.platform.domCSSPrefix+'Transform' : key;
-    equals(child.get('layoutStyle')[testKey], with_s[key], "STYLE W/ PARENT %@".fmt(key)) ;  
+    equals(child.get('layoutStyle')[key], with_s[key], "STYLE W/ PARENT %@".fmt(key)) ;  
   });
 }
 
@@ -243,139 +237,84 @@ test("layout {top, left, width: auto, height: auto}", function() {
 
 
 
+
+
+
+
 // ..........................................................
-// TEST CSS TRANSFORM LAYOUT VARIATIONS
+// TEST FRAME/STYLEFRAME WITH ACCELERATE LAYOUT VARIATIONS
 // 
 // NOTE:  Each test evaluates the frame before and after adding it to the 
 // parent.
 
-module('CSS TRANSFORM LAYOUT VARIATIONS', {
+module('ACCELERATED LAYOUT VARIATIONS', {
   setup: function(){
     commonSetup.setup();
-    child.createLayer();
-    document.body.appendChild(child.get('layer'));
+    
+    // Force support
+    child.hasAcceleratedLayer = YES;
+    SC.platform.supportsAcceleratedLayers = YES;
+    SC.platform.supportsCSS3DTransforms = YES;
   },
 
   teardown: commonSetup.teardown
 });
 
-function transformFor(view){
-  return view.get('layer').style[SC.platform.domCSSPrefix+'Transform'];
-}
-
-test("layout {rotate}", function() {
-  child.adjust('rotate', 45).updateLayout();
-  equals(transformFor(child), 'rotate(45deg)', 'transform attribute should be "rotate(45deg)"')
-});
-
-test("layout {rotate} with units", function() {
-  child.adjust('rotate', '1rad').updateLayout();
-  equals(transformFor(child), 'rotate(1rad)', 'transform attribute should be "rotate(1rad)"')
-});
-
-test("layout {scale}", function() {
-  child.adjust('scale', 2).updateLayout();
-  equals(transformFor(child), 'scale(2)', 'transform attribute should be "scale(2)"')
-});
-
-test("layout {scale} with multiple", function() {
-  child.adjust('scale', [2, 3]).updateLayout();
-  equals(transformFor(child), 'scale(2, 3)', 'transform attribute should be "scale(2, 3)"')
-});
-
-test("layout {rotate, scale}", function() {
-  child.adjust({ rotate: 45, scale: 2 }).updateLayout();
-  equals(transformFor(child), 'rotate(45deg) scale(2)', 'transform attribute should be "rotate(45deg) scale(2)"')
-});
+test("layout {top, left, width, height}", function() {
 
-test("layout {rotate} update", function() {
-  child.adjust('rotate', 45).updateLayout();
-  child.adjust('rotate', 90).updateLayout();
-  equals(transformFor(child), 'rotate(90deg)', 'transform attribute should be "rotate(90deg)"')
-});
+  var layout = { top: 10, left: 10, width: 50, height: 50 };
+  var s = { top: 0, left: 0, width: 50, height: 50, "-webkit-transform": 'translate3d(10px, 10px, 0)' } ;
+  var no_f = { x: 0, y: 0, width: 50, height: 50, "-webkit-transform": 'translate3d(10px, 10px, 0)' } ;
+  var with_f = { x: 0, y: 0, width: 50, height: 50, "-webkit-transform": 'translate3d(10px, 10px, 0)' } ;
 
+  performLayoutTest(layout, no_f, s, with_f, s) ;
+}) ;
 
-if (SC.platform.supportsCSSTransforms) {
+test("layout {top, left, bottom, right}", function() {
 
-  // ..........................................................
-  // TEST FRAME/STYLEFRAME WITH ACCELERATE LAYOUT VARIATIONS
-  // 
-  // NOTE:  Each test evaluates the frame before and after adding it to the 
-  // parent.
+  var layout = { top: 10, left: 10, bottom: 10, right: 10 };
+  var no_f = { x: 10, y: 10, width: 0, height: 0, "-webkit-transform": 'translateZ(0px)' } ;
+  var with_f = { x: 10, y: 10, width: 180, height: 180, "-webkit-transform": 'translateZ(0px)' } ;
+  var s = { top: 10, left: 10, bottom: 10, right: 10, "-webkit-transform": 'translateZ(0px)' } ;
 
-  module('ACCELERATED LAYOUT VARIATIONS', {
-    setup: function(){
-      commonSetup.setup();
-      // Force support
-      child.hasAcceleratedLayer = YES;
-    },
+  performLayoutTest(layout, no_f, s, with_f, s) ;
+}) ;
 
-    teardown: commonSetup.teardown
+test("layout {top, left, width: auto, height: auto}", function() {
+  child = SC.View.create({
+    hasAcceleratedLayer: YES, // Force this
+    useStaticLayout: YES,
+    render: function(context) {
+      // needed for auto
+      context.push('<div style="padding: 10px"></div>');
+    }
   });
 
-  test("layout {top, left, width, height}", function() {
-    var layout = { top: 10, left: 10, width: 50, height: 50 };
-    var expectedTransform = 'translateX(10px) translateY(10px)';
-    if (SC.platform.supportsCSS3DTransforms) expectedTransform += ' translateZ(0px)';
-    var s = { top: 0, left: 0, width: 50, height: 50, transform: expectedTransform } ;
-    var no_f = { x: 0, y: 0, width: 50, height: 50, transform: expectedTransform } ;
-    var with_f = { x: 0, y: 0, width: 50, height: 50, transform: expectedTransform } ;
-
-    performLayoutTest(layout, no_f, s, with_f, s) ;
-  }) ;
-
-  test("layout {top, left, bottom, right}", function() {
-
-    var layout = { top: 10, left: 10, bottom: 10, right: 10 };
-    var expectedTransform = 'translateX(0px) translateY(0px)';
-    if (SC.platform.supportsCSS3DTransforms) expectedTransform += ' translateZ(0px)';
-    var no_f = { x: 10, y: 10, width: 0, height: 0, transform: expectedTransform } ;
-    var with_f = { x: 10, y: 10, width: 180, height: 180, transform: expectedTransform } ;
-    var s = { top: 10, left: 10, bottom: 10, right: 10, transform: expectedTransform } ;
-
-    performLayoutTest(layout, no_f, s, with_f, s) ;
-  }) ;
-
-  test("layout {top, left, width: auto, height: auto}", function() {
-    child = SC.View.create({
-      hasAcceleratedLayer: YES, // Force this
-      useStaticLayout: YES,
-      render: function(context) {
-        // needed for auto
-        context.push('<div style="padding: 10px"></div>');
-      }
-    });
-
-    // parent MUST have a layer.
-    parent.createLayer();
-    var layer = parent.get('layer');
-    document.body.appendChild(layer);
+  // parent MUST have a layer.
+  parent.createLayer();
+  var layer = parent.get('layer');
+  document.body.appendChild(layer);
   
-    var layout = { top: 0, left: 0, width: 'auto', height: 'auto' };
-    var expectedTransform = 'translateX(0px) translateY(0px)';
-    if (SC.platform.supportsCSS3DTransforms) expectedTransform += ' translateZ(0px)';
-    var no_f = { x: 0, y: 0, width: 0, height: 0, transform: expectedTransform };
-    var with_f = { x: 0, y: 0, width: 20, height: 20, transform: expectedTransform };
-    var s = { top: 0, left: 0, width: 'auto', height: 'auto', transform: expectedTransform };
+  var layout = { top: 0, left: 0, width: 'auto', height: 'auto' };
+  var no_f = { x: 0, y: 0, width: 0, height: 0, "-webkit-transform": 'translateZ(0px)' };
+  var with_f = { x: 0, y: 0, width: 20, height: 20, "-webkit-transform": 'translateZ(0px)' };
+  var s = { top: 0, left: 0, width: 'auto', height: 'auto', "-webkit-transform": 'translateZ(0px)' };
   
-    performLayoutTest(layout, no_f, s, with_f, s);
+  performLayoutTest(layout, no_f, s, with_f, s);
   
-    layer.parentNode.removeChild(layer);
-  });
+  layer.parentNode.removeChild(layer);
+});
 
-  test("layout w/ percentage {top, left, width, height}", function() {
+test("layout w/ percentage {top, left, width, height}", function() {
 
-    var layout = { top: 0.1, left: 0.1, width: 0.5, height: 0.5 };
-    var expectedTransform = 'translateX(0px) translateY(0px)';
-    if (SC.platform.supportsCSS3DTransforms) expectedTransform += ' translateZ(0px)';
-    var s = { top: '10%', left: '10%', width: '50%', height: '50%', transform: expectedTransform } ;
-    var no_f = { top: '10%', left: '10%', width: '50%', height: '50%', transform: expectedTransform } ;
-    var with_f = { top: '10%', left: '10%', width: '50%', height: '50%', transform: expectedTransform } ;
+  var layout = { top: 0.1, left: 0.1, width: 0.5, height: 0.5 };
+  var s = { top: '10%', left: '10%', width: '50%', height: '50%', "-webkit-transform": 'translateZ(0px)' } ;
+  var no_f = { top: '10%', left: '10%', width: '50%', height: '50%', "-webkit-transform": 'translateZ(0px)' } ;
+  var with_f = { top: '10%', left: '10%', width: '50%', height: '50%', "-webkit-transform": 'translateZ(0px)' } ;
 
-    performLayoutTest(layout, no_f, s, with_f, s) ;
-  }) ;
+  performLayoutTest(layout, no_f, s, with_f, s) ;
+}) ;
 
-}
 
 
 
@@ -461,7 +400,7 @@ test("layout {bottom, right, centerX, centerY, height, width} - bottom/right tak
   var no_f = { x: 0, y: 0, width: 60, height: 60 } ;
   var with_f = { x: 130, y: 130, width: 60, height: 60 } ;
   var s = { width: '60%', height: '60%', bottom: '10%', right: '10%' } ;
-
+  
   performLayoutTest(layout, no_f, s, with_f, s) ;
   
 }) ;
@@ -481,7 +420,6 @@ test("layout {top, left, bottom, right, centerX, centerY, height, width} - top/l
 test("layout {centerX, centerY, width:auto, height:auto}", function() {
   var error=null;
   var layout = { centerX: 0.1, centerY: 0.1, width: 'auto', height: 'auto' };
-
   child.set('layout', layout) ;
   try{
     child.layoutStyle();

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/prepareContext.js

@@ -19,20 +19,12 @@ test("populates context with layerId & classNames from view if firstTime", funct
   view.prepareContext(context, YES);
   equals(context.id(), 'foo', 'did set id');
   ok(context.hasClass('bar'), 'did set class names');
-});
-
-test("check that testing without first time does not render to a context (no render needed)", function() {
-  var view = SC.View.create({
-    layerId: "foo", 
-    classNames: ["bar"] 
-  });
-  var context = view.renderContext();
-  view.prepareContext(context, NO);
   
-  // updating of view settings are now handled through CoreQuery, never
-  // touching rendercontext, in the function updateViewSettings.
+  // test w/o firstTime
+  context = view.renderContext();
+  view.prepareContext(context, NO);
   ok(context.id() !== 'foo', 'did not set id');
-  ok(!context.hasClass('bar'), 'did not set class name');
+  ok(context.hasClass('bar'), 'did set class name');
 });
 
 test("invokes renderLayout if first time", function() {

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

@@ -43,21 +43,18 @@ test("default implementation invokes renderChildViews if firstTime = YES", funct
   
 module("SC.View#renderChildViews");
 
-test("creates a context and then invokes renderToContext or updateLayer on each childView", function() {
+test("creates a context and then invokes prepareContext on each childView", function() {
 
 	var runCount = 0, curContext, curFirstTime ;
 	
 	var ChildView = SC.View.extend({
-	  renderToContext: function(context) {
+	  prepareContext: function(context, firstTime) {
 	  	equals(context.prevObject, curContext, 'passed child context of curContext');
+	  	equals(firstTime, curFirstTime, 'passed first time flag');
 	  	
 	  	equals(context.tagName(), this.get('tagName'), 'context setup with current tag name');
 	  	
 	  	runCount++; // record run
-	  },
-	  
-	  updateLayer: function() {
-	    runCount++;
 	  }
 	});
 	
@@ -73,7 +70,7 @@ test("creates a context and then invokes renderToContext or updateLayer on each
 	curContext = view.renderContext('div');
 	curFirstTime= YES ;
 	equals(view.renderChildViews(curContext, curFirstTime), curContext, 'returns context');
-	equals(runCount, 3, 'renderToContext() invoked for each child view');
+	equals(runCount, 3, 'prepareContext() invoked for each child view');
 	
 
 	// VERIFY: firstTime= NO 	
@@ -81,46 +78,6 @@ test("creates a context and then invokes renderToContext or updateLayer on each
 	curContext = view.renderContext('div');
 	curFirstTime= NO ;
 	equals(view.renderChildViews(curContext, curFirstTime), curContext, 'returns context');
-	equals(runCount, 3, 'updateLayer() invoked for each child view');
-
-});
-
-test("creates a context and then invokes renderContent and updateContent to call renderToContext or updateLayer on each childView", function() {
-
-	var runCount = 0, curContext ;
-	
-	var ChildView = SC.View.extend({
-	  renderToContext: function(context) {
-	  	equals(context.prevObject, curContext, 'passed child context of curContext');
-	  	
-	  	equals(context.tagName(), this.get('tagName'), 'context setup with current tag name');
-	  	
-	  	runCount++; // record run
-	  },
-	  
-	  updateLayer: function() {
-	    runCount++;
-	  }
-	});
-	
-	var view = SC.View.create({
-		childViews: [
-			ChildView.extend({ tagName: 'foo' }),
-			ChildView.extend({ tagName: 'bar' }),
-			ChildView.extend({ tagName: 'baz' })
-		]
-	});
-
-	// VERIFY: firstTime= YES 	
-	curContext = view.renderContext('div');
-	equals(view.renderContent(curContext), undefined, 'returns nothing');
-	equals(runCount, 3, 'renderToContext() invoked for each child view');
-	
-
-	// VERIFY: firstTime= NO 	
-	runCount = 0 ; //reset
-	curContext = view.renderContext('div');
-	equals(view.updateContent(curContext), undefined, 'returns nothing');
-	equals(runCount, 3, 'updateLayer() invoked for each child view');
+	equals(runCount, 3, 'prepareContext() invoked for each child view');
 
 });

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/updateLayer.js

@@ -14,12 +14,12 @@
 // 
 module("SC.View#updateLayer");
 
-test("invokes updateViewSettings() and then updates layer element", function() {
+test("invokes prepareContext() and then updates layer element", function() {
   var layer = document.createElement('div');
   var view = SC.View.create({
     layer: layer, // fake it...
-    updateViewSettings: function() {
-      this.$(this.get("layer")).addClass('did-update');
+    prepareContext: function(context) {
+      context.addClass('did-update');
     }
   });
   

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/updateLayerLocation.js

@@ -158,7 +158,7 @@ module("SC.View#updateLayerLocationIfNeeded",{
  setup: function() {
    view = SC.View.create({
      updateLayerLocation: function() { runCount++; }
-   })
+   });
    runCount = 0;
  },
  
@@ -184,7 +184,7 @@ test("does NOT invoke updateLayerLocation if layerLocationNeedsUpdate is NO", fu
 });
 
 test("sets layerLocationNeedsUpdate to NO when run", function() {
-  
+  var view = SC.View.create(); // this needs to _not_ override updateLayerLocation.
   view.set('layerLocationNeedsUpdate', YES);
   view.updateLayerLocationIfNeeded();
   equals(view.get('layerLocationNeedsUpdate'), NO, 'did reset');

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

@@ -11,7 +11,7 @@
 // 
 module("SC.View#viewDidResize");
 
-test("invokes parentViewDidResize on all child views - ignoring views that do not implement method", function() {
+test("invokes parentViewDidResize on all child views", function() {
   var callCount = 0 ;
   var ChildView = SC.View.extend({ 
     parentViewDidResize: function() { callCount++; } 
@@ -21,12 +21,9 @@ test("invokes parentViewDidResize on all child views - ignoring views that do no
     childViews: [ChildView, ChildView, ChildView]    
   });
   
-  // one of the childViews should NOT implement method
-  view.childViews[2].parentViewDidResize = null ;
-  
   // now test...
   SC.run(function() { view.viewDidResize(); });
-  equals(callCount, 2, 'should invoke parentViewDidResize() on two methods that support it');
+  equals(callCount, 3, 'should invoke parentViewDidResize() on all children');
 });
 
 test("triggers whenever layout property is changed", function() {
@@ -150,25 +147,6 @@ test("calls viewDidResize on self unless layout is fixed", function() {
   testParentViewDidResizeWithAlignments(view);
 });
 
-test("invoked whenever view is added to a new parentView but not when it is removed", function() {
-  var callCount = 0;
-  var view = SC.View.create({
-    parentViewDidResize: function() { callCount++; }
-  });
-  var parent = SC.Pane.create().append(); // must be visible in window...
-  SC.RunLoop.begin().end();
-
-  callCount = 0 ;
-  SC.run(function() { parent.appendChild(view); });
-  equals(callCount, 1, 'should call parentViewDidResize');
-  
-  callCount = 0;
-  SC.run(function() { parent.removeChild(view); });
-  equals(callCount, 0, 'should not call parentViewDidResize()');
-  
-  parent.remove();
-});
-
 // ..........................................................
 // beginLiveResize()
 //