sproutcore 1.10.3.1 → 1.11.0.rc1

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

@@ -32,70 +32,100 @@ module("SC.View#clippingFrame", {
   }
 });
 
-test("clippingFrame === frame w/ 0 offset if not partially hidden", function() {
+test("clippingFrame === frame if view not occluded or scaled.", function() {
   var result = pane.get('clippingFrame'), expected = pane.get('frame');
   expected.x = expected.y = 0 ;
-  same(result, expected, 'pane');
+  ok(SC.rectsEqual(result, expected), 'pane');
 
   result = a.get('clippingFrame'); expected = a.get('frame');
   expected.x = expected.y = 0 ;
-  same(result, expected, 'child');
+  ok(SC.rectsEqual(result, expected), 'child');
 
   result = aa.get('clippingFrame'); expected = aa.get('frame');
   expected.x = expected.y = 0 ;
-  same(result, expected, 'nested child');
+  ok(SC.rectsEqual(result, expected), 'nested child');
 });
 
-test("cuts off top of frame", function() {
+test("clippingFrame clips off top of frame when moved above top of parent.", function() {
   var result, expected;
 
   a.adjust('top', -50);
   result = a.get('clippingFrame'); expected = a.get('frame');
   expected.x = 0 ; expected.y = 50 ; expected.height = 50 ;
-  same(result, expected, 'child');
+  ok(SC.rectsEqual(result, expected), 'child');
 
   result = aa.get('clippingFrame'); expected = aa.get('frame');
   expected.x = 0 ; expected.y = 30 ; expected.height = 10 ;
-  same(result, expected, 'nested child');
+  ok(SC.rectsEqual(result, expected), 'nested child');
 });
 
-test("cuts off bottom of frame", function() {
+test("clippingFrame clips off bottom of frame when moved below bottom of parent.", function() {
   var result, expected;
 
   a.adjust('top', 150);
   result = a.get('clippingFrame'); expected = a.get('frame');
   expected.x = 0 ; expected.y = 0 ; expected.height = 50 ;
-  same(result, expected, 'child');
+  ok(SC.rectsEqual(result, expected), 'child');
 
   result = aa.get('clippingFrame'); expected = aa.get('frame');
   expected.x = 0 ; expected.y = 0 ; expected.height = 30 ;
-  same(result, expected, 'nested child');
+  ok(SC.rectsEqual(result, expected), 'nested child');
 });
 
-test("cuts off left of frame", function() {
+test("clippingFrame clips off left of frame when moved left of parent's left.", function() {
   var result, expected;
 
   a.adjust('left', -50);
   result = a.get('clippingFrame'); expected = a.get('frame');
   expected.y = 0 ; expected.x = 50 ; expected.width = 50 ;
-  same(result, expected, 'child');
+  ok(SC.rectsEqual(result, expected), 'child');
 
   result = aa.get('clippingFrame'); expected = aa.get('frame');
   expected.y = 0 ; expected.x = 30 ; expected.width = 10 ;
-  same(result, expected, 'nested child');
+  ok(SC.rectsEqual(result, expected), 'nested child');
 });
 
-test("cuts off right of frame", function() {
+test("clippingFrame clips off right of frame when moved right of parent's right.", function() {
   var result, expected;
 
   a.adjust('left', 150);
   result = a.get('clippingFrame'); expected = a.get('frame');
   expected.y = 0 ; expected.x = 0 ; expected.width = 50 ;
-  same(result, expected, 'child');
+  ok(SC.rectsEqual(result, expected), 'child');
 
   result = aa.get('clippingFrame'); expected = aa.get('frame');
   expected.y = 0 ; expected.x = 0 ; expected.width = 30 ;
-  same(result, expected, 'nested child');
+  ok(SC.rectsEqual(result, expected), 'nested child');
+});
+
+test("clippingFrame accounts for scale when not occluded.", function() {
+  var frame, clippingFrame, expectedFrame, expectedClippingFrame;
+
+  a.adjust('scale', 2);
+
+  frame = a.get('frame');
+  clippingFrame = a.get('clippingFrame');
+  expectedFrame = { x: 0, y: 0, height: 200, width: 200 };
+  expectedClippingFrame = { x: 0, y: 0, height: 100, width: 100 };
+
+  ok(SC.rectsEqual(frame, expectedFrame), "PRELIM: childView's frame is scaled to the parentView's scale.");
+
+  ok(SC.rectsEqual(clippingFrame, expectedClippingFrame), "childView's clippingFrame is scaled correctly into its own scale.");
+});
+
+test("clippingFrame correctly scales clipped portion when scaled and occluded.", function() {
+  var frame, clippingFrame, expectedFrame, expectedClippingFrame;
+
+  a.adjust({ scale: 2, top: -50 });
+
+  frame = a.get('frame');
+  clippingFrame = a.get('clippingFrame');
+  expectedFrame = { x: 0, y: -100, height: 200, width: 200 };
+  expectedClippingFrame = { x: 0, y: 50, height: 50, width: 100 };
+
+  ok(SC.rectsEqual(frame, expectedFrame), "PRELIM: childView's frame is scaled to the parentView's scale.");
+
+  ok(SC.rectsEqual(clippingFrame, expectedClippingFrame), "childView's clippingFrame is scaled correctly into its own scale and correctly reflects the occluded portion in that scale.");
 });
 
 test("notifies receiver and each child if parent clipping frame changes", function() {

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

@@ -11,7 +11,7 @@
 // COMMON SETUP CODE
 //
 var pane, a, b, aa, aaa, bb, f ;
-var A_LEFT = 10, A_TOP = 10, B_LEFT = 100, B_TOP = 100;
+var A_LEFT = 10, A_TOP = 10, B_LEFT = 100, B_TOP = 100, A_SCALE = 2;
 
 function setupFrameViews() {
   htmlbody('<style> .sc-view { border: 1px blue solid; position: absolute; }</style>');
@@ -21,7 +21,7 @@ function setupFrameViews() {
     .childView(SC.View.design()
       .layout({ top: A_TOP, left: A_LEFT, width: 150, height: 150 })
       .childView(SC.View.design()
-        .layout({ top: A_TOP, left: A_LEFT, width: 50, height: 50 })
+        .layout({ top: A_TOP, left: A_LEFT, width: 50, height: 50, scale: A_SCALE, transformOriginX: 0, transformOriginY: 0 })
         .childView(SC.View.design()
           .layout({ top: A_TOP, left: A_LEFT, width: 10, height: 10 }))))
 
@@ -37,7 +37,7 @@ function setupFrameViews() {
   aaa = aa.childViews[0];
   bb = b.childViews[0];
 
-  f = { x: 10, y: 10, width: 10, height: 10 };
+  f = { x: 50, y: 50, width: 10, height: 10 };
   pane.append();
 }
 
@@ -63,13 +63,18 @@ test("convert a -> top level", function() {
 
 test("convert child -> top level", function() {
   var result = aa.convertFrameToView(f, null);
+  f.x *= A_SCALE; f.y *= A_SCALE;
+  f.width *= A_SCALE; f.height *= A_SCALE;
   f.x += A_LEFT*2; f.y += A_TOP*2 ;
   same(result, f, 'should convert frame');
 });
 
 test("convert nested child -> top level", function() {
   var result = aaa.convertFrameToView(f, null);
-  f.x += A_LEFT*3; f.y += A_TOP*3 ;
+  f.x += A_LEFT; f.y += A_TOP ;
+  f.x *= A_SCALE; f.y *= A_SCALE;
+  f.width *= A_SCALE; f.height *= A_SCALE;
+  f.x += A_LEFT*2; f.y += A_TOP*2 ;
   same(result, f, 'should convert frame');
 });
 
@@ -82,13 +87,18 @@ test("convert a -> sibling", function() {
 
 test("convert child -> parent sibling", function() {
   var result = aa.convertFrameToView(f, b);
+  f.x *= A_SCALE; f.y *= A_SCALE;
+  f.width *= A_SCALE; f.height *= A_SCALE;
   f.x += A_LEFT*2 - B_LEFT; f.y += A_TOP*2 - B_TOP ;
   same(result, f, 'should convert frame');
 });
 
 test("convert nested child -> parent sibling", function() {
   var result = aaa.convertFrameToView(f, b);
-  f.x += A_LEFT*3 - B_LEFT; f.y += A_TOP*3 - B_TOP ;
+  f.x += A_LEFT; f.y += A_TOP ;
+  f.x *= A_SCALE; f.y *= A_SCALE;
+  f.width *= A_SCALE; f.height *= A_SCALE;
+  f.x += A_LEFT*2 - B_LEFT; f.y += A_TOP*2 - B_TOP ;
   same(result, f, 'should convert frame');
 });
 
@@ -97,18 +107,25 @@ test("convert nested child -> parent sibling", function() {
 test("convert a -> child", function() {
   var result = a.convertFrameToView(f, aa);
   f.x -= A_LEFT; f.y -= A_TOP ;
+  f.x /= A_SCALE; f.y /= A_SCALE;
+  f.width /= A_SCALE; f.height /= A_SCALE;
   same(result, f, 'should convert frame');
 });
 
 test("convert child -> parent", function() {
   var result = aa.convertFrameToView(f, a);
+  f.x *= A_SCALE; f.y *= A_SCALE;
+  f.width *= A_SCALE; f.height *= A_SCALE;
   f.x += A_LEFT; f.y += A_TOP ;
   same(result, f, 'should convert frame');
 });
 
 test("convert nested child -> parent", function() {
   var result = aaa.convertFrameToView(f, a);
-  f.x += A_LEFT*2; f.y += A_TOP*2 ;
+  f.x += A_LEFT; f.y += A_TOP ;
+  f.x *= A_SCALE; f.y *= A_SCALE;
+  f.width *= A_SCALE; f.height *= A_SCALE;
+  f.x += A_LEFT; f.y += A_TOP ;
   same(result, f, 'should convert frame');
 });
 
@@ -116,7 +133,10 @@ test("convert nested child -> parent", function() {
 
 test("convert a -> nested child", function() {
   var result = a.convertFrameToView(f, aaa);
-  f.x -= (A_LEFT+A_LEFT); f.y -= (A_TOP+A_TOP) ;
+  f.x -= A_LEFT; f.y -= A_TOP ;
+  f.x /= A_SCALE; f.y /= A_SCALE;
+  f.width /= A_SCALE; f.height /= A_SCALE;
+  f.x -= A_LEFT; f.y -= A_TOP ;
   same(result, f, 'should convert frame');
 });
 
@@ -137,13 +157,18 @@ test("convert a -> child of sibling", function() {
 
 test("convert child -> child of sibling", function() {
   var result = aa.convertFrameToView(f, bb);
+  f.x *= A_SCALE; f.y *= A_SCALE;
+  f.width *= A_SCALE; f.height *= A_SCALE;
   f.x += A_LEFT*2 - (B_LEFT+B_LEFT); f.y += A_TOP*2 - (B_TOP+B_TOP) ;
   same(result, f, 'should convert frame');
 });
 
 test("convert nested child -> child of sibling", function() {
   var result = aaa.convertFrameToView(f, bb);
-  f.x += A_LEFT*3 - (B_LEFT+B_LEFT); f.y += A_TOP*3 - (B_TOP+B_TOP) ;
+  f.x += A_LEFT; f.y += (A_TOP) ;
+  f.x *= A_SCALE; f.y *= A_SCALE;
+  f.width *= A_SCALE; f.height *= A_SCALE;
+  f.x += A_LEFT*2 - (B_LEFT+B_LEFT); f.y += A_TOP*2 - (B_TOP+B_TOP) ;
   same(result, f, 'should convert frame');
 });
 
@@ -164,12 +189,17 @@ test("convert a <- top level", function() {
 test("convert child <- top level", function() {
   var result = aa.convertFrameFromView(f, null);
   f.x -= A_LEFT*2; f.y -= A_TOP*2 ;
+  f.x /= A_SCALE; f.y /= A_SCALE;
+  f.width /= A_SCALE; f.height /= A_SCALE;
   same(result, f, 'should convert frame');
 });
 
 test("convert nested child <- top level", function() {
   var result = aaa.convertFrameFromView(f, null);
-  f.x -= A_LEFT*3; f.y -= A_TOP*3 ;
+  f.x -= A_LEFT*2; f.y -= A_TOP*2 ;
+  f.x /= A_SCALE; f.y /= A_SCALE;
+  f.width /= A_SCALE; f.height /= A_SCALE;
+  f.x -= A_LEFT; f.y -= A_TOP ;
   same(result, f, 'should convert frame');
 });
 
@@ -182,13 +212,20 @@ test("convert a <- sibling", function() {
 
 test("convert child <- parent sibling", function() {
   var result = aa.convertFrameFromView(f, b);
-  f.x += B_LEFT - A_LEFT*2; f.y += B_TOP - A_TOP*2;
+  f.x += B_LEFT; f.y += B_TOP;
+  f.x -= A_LEFT*2; f.y -= A_TOP*2 ;
+  f.x /= A_SCALE; f.y /= A_SCALE;
+  f.width /= A_SCALE; f.height /= A_SCALE;
   same(result, f, 'should convert frame');
 });
 
 test("convert nested child <- parent sibling", function() {
   var result = aaa.convertFrameFromView(f, b);
-  f.x += B_LEFT - A_LEFT*3; f.y += B_TOP - A_TOP*3;
+  f.x += B_LEFT; f.y += B_TOP;
+  f.x -= A_LEFT*2; f.y -= A_TOP*2 ;
+  f.x /= A_SCALE; f.y /= A_SCALE;
+  f.width /= A_SCALE; f.height /= A_SCALE;
+  f.x -= A_LEFT; f.y -= A_TOP ;
   same(result, f, 'should convert frame');
 });
 
@@ -196,6 +233,8 @@ test("convert nested child <- parent sibling", function() {
 
 test("convert a <- child", function() {
   var result = a.convertFrameFromView(f, aa);
+  f.x *= A_SCALE; f.y *= A_SCALE;
+  f.width *= A_SCALE; f.height *= A_SCALE;
   f.x += A_LEFT; f.y += A_TOP ;
   same(result, f, 'should convert frame');
 });
@@ -203,12 +242,17 @@ test("convert a <- child", function() {
 test("convert child <- parent", function() {
   var result = aa.convertFrameFromView(f, a);
   f.x -= A_LEFT; f.y -= A_TOP ;
+  f.x /= A_SCALE; f.y /= A_SCALE;
+  f.width /= A_SCALE; f.height /= A_SCALE;
   same(result, f, 'should convert frame');
 });
 
 test("convert nested child <- parent", function() {
   var result = aaa.convertFrameFromView(f, a);
-  f.x -= A_LEFT*2; f.y -= A_TOP*2 ;
+  f.x -= A_LEFT; f.y -= A_TOP ;
+  f.x /= A_SCALE; f.y /= A_SCALE;
+  f.width /= A_SCALE; f.height /= A_SCALE;
+  f.x -= A_LEFT; f.y -= A_TOP ;
   same(result, f, 'should convert frame');
 });
 
@@ -216,7 +260,10 @@ test("convert nested child <- parent", function() {
 
 test("convert a <- nested child", function() {
   var result = a.convertFrameFromView(f, aaa);
-  f.x += (A_LEFT+A_LEFT); f.y += (A_TOP+A_TOP) ;
+  f.x += A_LEFT; f.y += A_TOP ;
+  f.x *= A_SCALE; f.y *= A_SCALE;
+  f.width *= A_SCALE; f.height *= A_SCALE;
+  f.x += A_LEFT; f.y += A_TOP ;
   same(result, f, 'should convert frame');
 });
 
@@ -237,13 +284,20 @@ test("convert a <- child of sibling", function() {
 
 test("convert child <- child of sibling", function() {
   var result = aa.convertFrameFromView(f, bb);
-  f.x += (B_LEFT+B_LEFT) - A_LEFT*2; f.y += (B_TOP+B_TOP) - A_TOP*2;
+  f.x += (B_LEFT+B_LEFT); f.y += (B_TOP+B_TOP);
+  f.x -= A_LEFT*2; f.y -= A_TOP*2 ;
+  f.x /= A_SCALE; f.y /= A_SCALE;
+  f.width /= A_SCALE; f.height /= A_SCALE;
   same(result, f, 'should convert frame');
 });
 
 test("convert nested child <- child of sibling", function() {
   var result = aaa.convertFrameFromView(f, bb);
-  f.x += (B_LEFT+B_LEFT) - A_LEFT*3; f.y += (B_TOP+B_TOP) - A_TOP*3 ;
+  f.x += (B_LEFT+B_LEFT); f.y += (B_TOP+B_TOP);
+  f.x -= A_LEFT*2; f.y -= A_TOP*2 ;
+  f.x /= A_SCALE; f.y /= A_SCALE;
+  f.width /= A_SCALE; f.height /= A_SCALE;
+  f.x -= A_LEFT; f.y -= A_TOP ;
   same(result, f, 'should convert frame');
 });
 

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

@@ -75,7 +75,7 @@ test("Check that childView is updated if the pane has a static layout and view d
   pane.set('useStaticLayout', YES);
 
   childFrame = view.get('frame');
-  same(childFrame, wrongFrame, 'getting frame before layer exists on non-fixed layout childView should return an empty frame');
+  ok(SC.rectsEqual(childFrame, wrongFrame), 'getting frame before layer exists on non-fixed layout childView should return an empty frame');
 
   SC.run(function () {
     pane.append(); // make sure there is a layer...
@@ -83,7 +83,7 @@ test("Check that childView is updated if the pane has a static layout and view d
   childFrame = view.get('frame');
   correctFrame = pane.get('frame');
 
-  same(childFrame, correctFrame, 'getting frame after layer exists on non-fixed layout childView should return actual frame');
+  ok(SC.rectsEqual(childFrame, correctFrame), 'getting frame after layer exists on non-fixed layout childView should return actual frame');
 });
 
 

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

@@ -25,16 +25,22 @@ module("SC.View.prototype.isFixedLayout", {
 
 });
 
-test("Test isFixedSize for various layouts.", function () {
+test("Test isFixedHeight, isFixedWidth and 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('isFixedWidth'), "A width alone gives a fixed width.");
+  ok(!view.get('isFixedHeight'), "A width alone doesn't give a fixed height.");
   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('isFixedWidth'), "A height alone doesn't give a fixed width.");
+  ok(view.get('isFixedHeight'), "A height alone gives a fixed height.");
   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('isFixedWidth'), "A width & height give a fixed width.");
+  ok(view.get('isFixedHeight'), "A width & height give a fixed height.");
   ok(view.get('isFixedSize'), "A width & height corresponds to a fixed size.");
 });
 

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

@@ -193,27 +193,47 @@ test("is invoked on parentView if no layoutView whenever layout property changes
   view.destroy();
 });
 
-test("sets rotateX when rotate is set", function () {
-  var view = SC.View.create({});
-
+test("proxies rotate to rotateZ when 3D transforms are supported", function () {
+  // Retain CSS support information so we can return to it.
+  var actualSupport = SC.platform.get('supportsCSS3DTransforms'),
+      view;
+
+  // YES SUPPORT
+  SC.platform.set('supportsCSS3DTransforms', YES);
+  view = SC.View.create();
   SC.run(function () {
     view.set('layout', { rotate: 45 });
   });
+  equals(view.get('layout').rotate, undefined, "should clear rotate");
+  equals(view.get('layout').rotateZ, 45, "should set rotateZ");
+  // Clean up.
+  view.destroy();
 
-  equals(view.get('layout').rotateX, 45, "should set rotateX");
-
+  // NO SUPPORT
+  SC.platform.set('supportsCSS3DTransforms', NO);
+  view = SC.View.create();
+  SC.run(function () {
+    view.set('layout', { rotate: 45 });
+  });
+  equals(view.get('layout').rotate, 45, "should retain rotate");
+  equals(view.get('layout').rotateZ, undefined, "should not set rotateZ");
   // Clean up.
   view.destroy();
+
+  // Clean up bigger picture.
+  SC.platform.set('supportsCSS3DTransforms', actualSupport);
 });
 
-test("rotateX overrides rotate", function () {
+test("rotateZ and rotate together", function () {
   var view = SC.View.create({});
 
   SC.run(function () {
-    view.set('layout', { rotate: 45, rotateX: 90 });
+    view.set('layout', { rotate: 45, rotateZ: 90 });
   });
 
-  equals(view.get('layout').rotate, undefined, "should clear rotate for rotateX");
+  equals(view.get('layout').rotate, 45, "if both rotate and rotateZ values are present, both should be retained; rotate is");
+
+  equals(view.get('layout').rotateZ, 90, "if both rotate and rotateZ values are present, both should be retained; rotateZ is");
 
   // Clean up.
   view.destroy();
@@ -228,7 +248,7 @@ test("Calling viewDidResize on a view notifies its child views", function () {
   var view = SC.View.create({
     childViews: ['regular', 'core'],
 
-    regular: SC.View.create({
+    regular: SC.View.extend({
       viewDidResize: function () {
         regularViewCounter++;
         // Make sure we call the default implementation to
@@ -237,7 +257,7 @@ test("Calling viewDidResize on a view notifies its child views", function () {
       }
     }),
 
-    core: SC.CoreView.create({
+    core: SC.CoreView.extend({
       viewDidResize: function () {
         coreViewCounter++;
         sc_super();