sproutcore 1.11.0.rc2 → 1.11.0.rc3

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/main_pane.js

@@ -33,12 +33,12 @@
   });
 
   test("should not be attached before calling append()", function() {
-    equals(pane.get('isPaneAttached'), NO) ;
+    equals(pane.get('isAttached'), NO) ;
   });
 
   test("should attach when calling append()", function() {
     pane.append() ;
-    equals(pane.get('isPaneAttached'), YES) ;
+    equals(pane.get('isAttached'), YES) ;
   });
 
   test("appending should make pane main & key", function() {

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/append_remove.js

@@ -234,7 +234,7 @@ test("updates frame and clippingFrame when loading MainPane", function() {
 
   // needs a fixed layout size to make sure the sizes stay constant
   var pane = SC.MainPane.create();
-  var w = SC.RootResponder.responder.computeWindowSize().width;
+  var windowWidth = SC.RootResponder.responder.computeWindowSize().width;
 
   // add the pane to the main window.  should resize the frames
   SC.run(function() {
@@ -242,8 +242,8 @@ test("updates frame and clippingFrame when loading MainPane", function() {
   });
 
   // should equal window size
-  equals(pane.get('frame').width, w, 'frame width should have changed');
-  equals(pane.get('clippingFrame').width, w, 'clippingFrame width should have changed');
+  equals(pane.get('frame').width, windowWidth, 'frame width should have changed');
+  equals(pane.get('clippingFrame').width, windowWidth, 'clippingFrame width should have changed');
 
   // Clean up.
   pane.destroy();

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

@@ -41,8 +41,10 @@ var commonSetup = {
   },
 
   teardown: function () {
-    pane.remove();
-    pane.destroy();
+    SC.run(function () {
+      pane.destroy();
+    });
+    pane = view = null;
   }
 };
 
@@ -51,7 +53,7 @@ if (SC.platform.supportsCSSTransitions) {
   module("ANIMATION", commonSetup);
 
   test("should work", function () {
-    stop(2000);
+    stop(4000);
     SC.RunLoop.begin();
     view.animate('left', 100, { duration: 1 });
     SC.RunLoop.end();
@@ -65,7 +67,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("animate + adjust: no conflict", function () {
-    stop(1000);
+    stop(4000);
 
     SC.run(function () {
       view.animate('left', 100, { duration: 0.1 });
@@ -97,7 +99,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("animate + adjust: conflict", function () {
-    stop(1000);
+    stop(4000);
 
     SC.run(function () {
       view.animate('left', 100, { duration: 0.1 });
@@ -122,7 +124,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("callbacks work in general", function () {
-    stop(2000);
+    stop(4000);
 
     SC.run(function () {
       view.animate('left', 100, { duration: 0.5 }, function () {
@@ -135,7 +137,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("callbacks work in general with target method", function () {
-    stop(2000);
+    stop(4000);
 
     var ob = SC.Object.create({
       callback: function () {
@@ -152,7 +154,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("callbacks should have appropriate data", function () {
-    stop(2000);
+    stop(4000);
 
     SC.RunLoop.begin();
     view.animate('left', 100, { duration: 0.5 }, function (data) {
@@ -167,7 +169,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("handles delay function string", function () {
-    stop(2000);
+    stop(4000);
 
     SC.RunLoop.begin();
     view.animate('left', 100, { duration: 1, delay: 1 });
@@ -181,7 +183,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("handles timing function string", function () {
-    stop(2000);
+    stop(4000);
 
     SC.RunLoop.begin();
     view.animate('left', 100, { duration: 1, timing: 'ease-in' });
@@ -195,7 +197,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("handles timing function array", function () {
-    stop(2000);
+    stop(4000);
 
     SC.RunLoop.begin();
     view.animate('left', 100, { duration: 1, timing: [0.1, 0.2, 0.3, 0.4] });
@@ -209,7 +211,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("should allow multiple keys to be set at once", function () {
-    stop(2000);
+    stop(4000);
 
     SC.RunLoop.begin();
     view.animate({ top: 100, left: 100 }, { duration: 1 });
@@ -225,7 +227,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("should not animate any keys that don't change", function () {
-    stop(2000);
+    stop(4000);
 
     SC.RunLoop.begin();
     view.animate({ top: 0, left: 100 }, { duration: 1 });
@@ -241,7 +243,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("animating height with a centerY layout should also animate margin-top", function () {
-    stop(2000);
+    stop(4000);
 
     SC.RunLoop.begin();
     view.adjust({ top: null, centerY: 0 });
@@ -258,7 +260,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("animating width with a centerX layout should also animate margin-left", function () {
-    stop(2000);
+    stop(4000);
 
     SC.RunLoop.begin();
     view.adjust({ left: null, centerX: 0 });
@@ -276,7 +278,7 @@ if (SC.platform.supportsCSSTransitions) {
 
   // Pretty sure this does the job
   test("callbacks should be called only once for a grouped animation", function () {
-    stop(2000);
+    stop(4000);
     var stopped = true;
 
     expect(1);
@@ -299,7 +301,7 @@ if (SC.platform.supportsCSSTransitions) {
   // This behavior should be up for debate.  Does the callback call immediately, or does it wait until the end of
   // the specified animation period?  Currently we're calling it immediately.
   test("callback should be called immediately when a property is animated to its current value.", function () {
-    stop(2000);
+    stop(4000);
 
     expect(1);
 
@@ -312,8 +314,30 @@ if (SC.platform.supportsCSSTransitions) {
     });
   });
 
+  // This behavior should be up for debate.  Does the callback call immediately, or does it wait until the end of
+  // the specified animation period?  Currently we're calling it immediately.
+  test("callback should be called immediately when a property is animated to its current value (even if the value is implied).", function () {
+    stop(4000);
+
+    expect(1);
+
+    var implicitView = SC.View.create({
+        backgroundColor: '#ABC',
+        layout: { left: 0 } // implicit layout: { top: 0, right: 0, bottom: 0 }
+      });
+    pane.appendChild(implicitView);
+
+    SC.run(function () {
+      implicitView.animate('top', 0, { duration: 0.5 }, function () {
+        ok(true, 'callback called back');
+
+        start();
+      });
+    });
+  });
+
   test("callback should be called when a property is animated with a duration of zero.", function () {
-    stop(2000);
+    stop(4000);
 
     expect(1);
 
@@ -326,7 +350,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("multiple animations should be able to run simultaneously", function () {
-    stop(2000);
+    stop(4000);
 
     expect(2);
 
@@ -343,7 +367,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("altering existing animation should call callback as cancelled", function () {
-    stop(2000);
+    stop(4000);
 
     var order = 0;
     expect(6);
@@ -379,7 +403,7 @@ if (SC.platform.supportsCSSTransitions) {
 
   test("should not cancel callback when value hasn't changed", function () {
     var callbacks = 0, wasCancelled = NO, check = 0;
-    stop(2000);
+    stop(4000);
 
     SC.run(function () {
       // this triggers the initial layoutStyle code
@@ -412,7 +436,7 @@ if (SC.platform.supportsCSSTransitions) {
   // and not expecting a null value.
   test("animating different attributes at different times should not throw an error", function () {
     // Run test.
-    stop(2000);
+    stop(4000);
 
     expect(0);
 
@@ -442,7 +466,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("should handle transform attributes", function () {
-    stop(2000);
+    stop(4000);
 
     SC.run(function () {
       view.animate('rotateX', 45, { duration: 1 });
@@ -459,7 +483,7 @@ if (SC.platform.supportsCSSTransitions) {
 
   test("should handle conflicting transform animations", function () {
     /*global console*/
-    stop(2000);
+    stop(4000);
 
     var originalConsoleWarn = console.warn;
     console.warn = function (warning) {
@@ -485,7 +509,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("removes animation property when done", function () {
-    stop(2000);
+    stop(4000);
 
     SC.RunLoop.begin();
     view.animate({ top: 100, scale: 2 }, { duration: 0.5 });
@@ -500,7 +524,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("Test that cancelAnimation() removes the animation style and fires the callback with isCancelled set.", function () {
-    stop(2000);
+    stop(4000);
 
     expect(7);
 
@@ -532,7 +556,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("Test that cancelAnimation(SC.LayoutState.CURRENT) removes the animation style, stops at the current position and fires the callback with isCancelled set.", function () {
-    stop(2000);
+    stop(4000);
 
     expect(9);
 
@@ -566,7 +590,7 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   test("Test that cancelAnimation(SC.LayoutState.START) removes the animation style, returns to the start position and fires the callback with isCancelled set.", function () {
-    stop(2000);
+    stop(4000);
 
     expect(9);
 
@@ -609,7 +633,7 @@ if (SC.platform.supportsCSSTransitions) {
     });
 
     test("handles acceleration when appropriate", function () {
-      stop(2000);
+      stop(4000);
 
       SC.RunLoop.begin();
       view.animate('top', 100, { duration: 1 });
@@ -623,7 +647,7 @@ if (SC.platform.supportsCSSTransitions) {
     });
 
     test("doesn't use acceleration when not appropriate", function () {
-      stop(1000);
+      stop(4000);
 
       SC.RunLoop.begin();
       view.adjust({ height: null, bottom: 0 });
@@ -638,7 +662,7 @@ if (SC.platform.supportsCSSTransitions) {
     });
 
     test("combines accelerated layer animation with compatible transform animations", function () {
-      stop(1000);
+      stop(4000);
 
       SC.RunLoop.begin();
       view.animate('top', 100, { duration: 1 }).animate('rotateX', 45, { duration: 1 });
@@ -656,7 +680,7 @@ if (SC.platform.supportsCSSTransitions) {
     });
 
     test("should not use accelerated layer if other transforms are being animated at different speeds", function () {
-      stop(1000);
+      stop(4000);
 
       SC.RunLoop.begin();
       view.animate('rotateX', 45, { duration: 2 }).animate('top', 100, { duration: 1 });
@@ -673,7 +697,7 @@ if (SC.platform.supportsCSSTransitions) {
     });
 
     test("callbacks should work properly with acceleration", function () {
-      stop(1000);
+      stop(4000);
 
       SC.run(function () {
         view.animate({ top: 100, left: 100, scale: 2 }, { duration: 0.25 }, function () {
@@ -694,7 +718,7 @@ if (SC.platform.supportsCSSTransitions) {
 
       ok(callbacks === 0, "precond - callback should not have been run yet");
 
-      stop(2000);
+      stop(4000);
 
       // we need to test changing the width at a later time
       setTimeout(function () {
@@ -711,7 +735,7 @@ if (SC.platform.supportsCSSTransitions) {
     });
 
     test("Test that cancelAnimation() removes the animation style and fires the callback with isCancelled set.", function () {
-      stop(2000);
+      stop(4000);
 
       SC.run(function () {
         view.animate({ left: 100, top: 100, width: 400 }, { duration: 0.5 }, function (data) {
@@ -756,7 +780,7 @@ if (SC.platform.supportsCSSTransitions) {
     });
 
     test("Test that cancelAnimation(SC.LayoutState.CURRENT) removes the animation style, stops at the current position and fires the callback with isCancelled set.", function () {
-      stop(2000);
+      stop(4000);
 
 
       SC.run(function () {
@@ -799,7 +823,7 @@ if (SC.platform.supportsCSSTransitions) {
     });
 
     test("Test that cancelAnimation(SC.LayoutState.START) removes the animation style, goes back to the start position and fires the callback with isCancelled set.", function () {
-      stop(2000);
+      stop(4000);
 
       // expect(12);
 
@@ -863,7 +887,7 @@ module("ANIMATION WITHOUT TRANSITIONS", {
 });
 
 test("should update layout", function () {
-  stop(2000);
+  stop(4000);
   SC.RunLoop.begin();
   view.animate('left', 100, { duration: 1 });
   SC.RunLoop.end();
@@ -875,7 +899,7 @@ test("should update layout", function () {
 });
 
 test("should still run callback", function () {
-  stop(2000);
+  stop(4000);
 
   expect(1);
 

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

@@ -29,8 +29,8 @@ test("The borderFrame property of the view should include the borders from the l
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 0, y: 0, width: 100, height: 100 }), "The frame without borders is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame without borders is");
+  same(frame, { x: 0, y: 0, width: 100, height: 100 }, "The frame without borders is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame without borders is");
 
   // Right 5px border.
   SC.run(function () {
@@ -40,8 +40,8 @@ test("The borderFrame property of the view should include the borders from the l
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 0, y: 0, width: 95, height: 100 }), "The frame with 5px right border is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with 5px right border is");
+  same(frame, { x: 0, y: 0, width: 95, height: 100 }, "The frame with 5px right border is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with 5px right border is");
 
   // Top 10px border.
   SC.run(function () {
@@ -51,8 +51,8 @@ test("The borderFrame property of the view should include the borders from the l
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 0, y: 10, width: 95, height: 90 }), "The frame with 5px right border & 10px top border is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with 5px right border & 10px top border is");
+  same(frame, { x: 0, y: 10, width: 95, height: 90 }, "The frame with 5px right border & 10px top border is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with 5px right border & 10px top border is");
 
   // Left 15px border.
   SC.run(function () {
@@ -62,8 +62,8 @@ test("The borderFrame property of the view should include the borders from the l
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 15, y: 10, width: 80, height: 90 }), "The frame with 5px right border & 10px top border & 15px left border is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with 5px right border & 10px top border & 15px left border is");
+  same(frame, { x: 15, y: 10, width: 80, height: 90 }, "The frame with 5px right border & 10px top border & 15px left border is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with 5px right border & 10px top border & 15px left border is");
 
   // Bottom 20px border.
   SC.run(function () {
@@ -73,8 +73,8 @@ test("The borderFrame property of the view should include the borders from the l
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 15, y: 10, width: 80, height: 70 }), "The frame with 5px right border & 10px top border & 15px left border & 20px bottom border is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with 5px right border & 10px top border & 15px left border & 20px bottom border is");
+  same(frame, { x: 15, y: 10, width: 80, height: 70 }, "The frame with 5px right border & 10px top border & 15px left border & 20px bottom border is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with 5px right border & 10px top border & 15px left border & 20px bottom border is");
 
   // 25px border.
   SC.run(function () {
@@ -84,8 +84,8 @@ test("The borderFrame property of the view should include the borders from the l
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 25, y: 25, width: 50, height: 50 }), "The frame with 25px border is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with 25px border is");
+  same(frame, { x: 25, y: 25, width: 50, height: 50 }, "The frame with 25px border is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with 25px border is");
 
 });
 
@@ -112,8 +112,8 @@ test("The borderFrame property of the view should be correct for view with useSt
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 0, y: 0, width: 100, height: 100 }), "The frame with useStaticLayout true after rendering is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with useStaticLayout true after rendering is");
+  same(frame, { x: 0, y: 0, width: 100, height: 100 }, "The frame with useStaticLayout true after rendering is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with useStaticLayout true after rendering is");
 
   // Right 5px border.
   SC.run(function () {
@@ -123,8 +123,8 @@ test("The borderFrame property of the view should be correct for view with useSt
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 0, y: 0, width: 95, height: 100 }), "The frame with 5px right border is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with 5px right border is");
+  same(frame, { x: 0, y: 0, width: 95, height: 100 }, "The frame with 5px right border is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with 5px right border is");
 
   // Top 10px border.
   SC.run(function () {
@@ -134,8 +134,8 @@ test("The borderFrame property of the view should be correct for view with useSt
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 0, y: 10, width: 95, height: 90 }), "The frame with 5px right border & 10px top border is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with 5px right border & 10px top border is");
+  same(frame, { x: 0, y: 10, width: 95, height: 90 }, "The frame with 5px right border & 10px top border is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with 5px right border & 10px top border is");
 
   // Left 15px border.
   SC.run(function () {
@@ -145,8 +145,8 @@ test("The borderFrame property of the view should be correct for view with useSt
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 15, y: 10, width: 80, height: 90 }), "The frame with 5px right border & 10px top border & 15px left border is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with 5px right border & 10px top border & 15px left border is");
+  same(frame, { x: 15, y: 10, width: 80, height: 90 }, "The frame with 5px right border & 10px top border & 15px left border is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with 5px right border & 10px top border & 15px left border is");
 
   // Bottom 20px border.
   SC.run(function () {
@@ -156,8 +156,8 @@ test("The borderFrame property of the view should be correct for view with useSt
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 15, y: 10, width: 80, height: 70 }), "The frame with 5px right border & 10px top border & 15px left border & 20px bottom border is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with 5px right border & 10px top border & 15px left border & 20px bottom border is");
+  same(frame, { x: 15, y: 10, width: 80, height: 70 }, "The frame with 5px right border & 10px top border & 15px left border & 20px bottom border is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with 5px right border & 10px top border & 15px left border & 20px bottom border is");
 
   // 25px border.
   SC.run(function () {
@@ -167,8 +167,8 @@ test("The borderFrame property of the view should be correct for view with useSt
   frame = view.get('frame');
   borderFrame = view.get('borderFrame');
 
-  ok(SC.rectsEqual(frame, { x: 25, y: 25, width: 50, height: 50 }), "The frame with 25px border is");
-  ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, width: 100, height: 100 }), "The borderFrame with 25px border is");
+  same(frame, { x: 25, y: 25, width: 50, height: 50 }, "The frame with 25px border is");
+  same(borderFrame, { x: 0, y: 0, width: 100, height: 100 }, "The borderFrame with 25px border is");
 
   pane.destroy();
 });
@@ -185,8 +185,8 @@ test("borderFrame on a view with a scale.", function() {
     frame = view.get('frame');
     borderFrame = view.get('borderFrame');
 
-    ok(SC.rectsEqual(frame, { x: 2, y: 2, height: 96, width: 96 }), "PRELIM: The unscaled frame with border: 2 is correct.");
-    ok(SC.rectsEqual(borderFrame, { x: 0, y: 0, height: 100, width: 100 }), "PRELIM: The unscaled borderFrame with border: 2 is correct.");
+    same(frame, { x: 2, y: 2, height: 96, width: 96 }, "PRELIM: The unscaled frame with border: 2 is correct.");
+    same(borderFrame, { x: 0, y: 0, height: 100, width: 100 }, "PRELIM: The unscaled borderFrame with border: 2 is correct.");
 
     SC.run(function() {
       view.adjust({ scale: 0.5 });
@@ -195,7 +195,7 @@ test("borderFrame on a view with a scale.", function() {
     frame = view.get('frame');
     borderFrame = view.get('borderFrame');
 
-    ok(SC.rectsEqual(frame, { x: 26, y: 26, height: 48, width: 48 }), "The scaled frame with border: 2 is correct.");
-    ok(SC.rectsEqual(borderFrame, { x: 25, y: 25, height: 50, width: 50 }), "The scaled borderFrame with border: 2 is correct.");
+    same(frame, { x: 26, y: 26, height: 48, width: 48, scale: 0.5 }, "The scaled frame with border: 2 is correct.");
+    same(borderFrame, { x: 25, y: 25, height: 50, width: 50, scale: 0.5 }, "The scaled borderFrame with border: 2 is correct.");
 
 });