sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/root_responder.js

@@ -8,78 +8,28 @@
 // ========================================================================
 // RootResponder Tests
 // ========================================================================
-/*globals module test ok isObj equals expect */
-
-var sub, newPane, oldPane, lightPane, darkPane, myPane, responder;
+/*global module, test, ok, equals */
 
+var responder;
 
 module("SC.RootResponder", {
-	setup: function() {		
-		sub = SC.Object.create({
-			action: function() { var objectA = "hello"; }
-		});
-		
-		newPane = SC.Pane.create({ owner: this});
-		oldPane = SC.Pane.create({ owner: this});
-		lightPane = SC.Pane.create({ owner: this});
-		darkPane = SC.Pane.create({ owner: this});
-		myPane = SC.Pane.create();
-		responder = SC.RootResponder.create({});
+	setup: function() {
+		responder = SC.RootResponder.create();
 	},
 	
 	teardown: function() {
-		delete sub;
-	}
-	
-	// var objectA, submit = document.createElement('pane');
-	// 
-	//   triggerMe: function() {
-	//     SC.Event.trigger(submit, 'click');
-	//   }
-	//   
+    responder.destroy();
+  }
 });
 
 test("Basic requirements", function() {
-  expect(2);
   ok(SC.RootResponder, "SC.RootResponder");
-  ok(SC.RootResponder.responder, "SC.RootResponder.responder");
-});
-
-test("root_responder.makeMainPane() : Should change the new Pane to key view", function() {
-	responder.makeMainPane(newPane);
-	//Checking the mainPane property
-	equals(responder.get('mainPane'),newPane);
-	equals(responder.get('keyPane'), newPane);
-});
-
-test("root_responder.makeMainPane() : Should notify other panes about the changes", function() {
-	responder.makeMainPane(newPane);
-		
-	//Notify other panes about the changes
-	equals(newPane.get('isMainPane'),YES);
-	equals(oldPane.get('isMainPane'),NO);
-	
-});
-
-test("root_responder.makeKeyPane() : Should make the passed pane as the key pane", function() {
- responder.makeMainPane(oldPane);
- equals(responder.get('keyPane'), oldPane);
- 
- responder.makeKeyPane(lightPane);
- equals(responder.get('keyPane'),lightPane);
-}); 
-
-test("root_responder.makeKeyPane() : Should make the main pane as the key pane if null is passed", function() {
- responder.makeMainPane(lightPane);
- responder.makeKeyPane(oldPane);
- // newPane is set as the Main pane
- equals(responder.get('mainPane'),lightPane);
- // KeyPane is null as it is not set yet 
- equals(responder.get('keyPane'), oldPane);
- 
- responder.makeKeyPane();
- // KeyPane is set as the mainPane as null is passed 
- equals(responder.get('keyPane'),lightPane);
+  ok(SC.RootResponder.responder && SC.RootResponder.responder, "SC.RootResponder.responder");
+  equals(
+    SC.RootResponder.responder ? SC.RootResponder.responder.constructor : "no responder!",
+    SC.RootResponder,
+    "SC.RootResponder.responder is an instance of"
+  );
 });
 
 test("root_responder.ignoreTouchHandle() : Should ignore TEXTAREA, INPUT, A, and SELECT elements", function () {
@@ -90,7 +40,7 @@ test("root_responder.ignoreTouchHandle() : Should ignore TEXTAREA, INPUT, A, and
    ok(responder.ignoreTouchHandle({
      target: { tagName: tag },
      allowDefault: SC.K
-   }), "should pass touch events through to <" + tag + ">s");
+   }), "should pass touch events through to <" + tag + "> elements");
  });
 
  ["AUDIO", "B", "Q", "BR", "BODY", "BUTTON", "CANVAS", "FORM",
@@ -99,33 +49,8 @@ test("root_responder.ignoreTouchHandle() : Should ignore TEXTAREA, INPUT, A, and
    ok(!responder.ignoreTouchHandle({
      target: { tagName: tag },
      allowDefault: SC.K
-   }), "should NOT pass touch events through to <" + tag + ">s");
+   }), "should NOT pass touch events through to <" + tag + "> elements");
  });
 
  SC.browser.isMobileSafari = wasMobileSafari;
 });
-
-//// CLEANUP
-/// Commenting out this two functions as the methods don't exist
-//// confirm with Charles 
-
-
-
-
-/*
-test("root_responder.removePane() : Should be able to remove panes to set", function() {
-	responder.removePane(darkPane);
-		
-	//Notify other panes about the changes
-	equals(responder.get('mainPane'),null);
-});
-
-test("root_responder.addPane() : Should be able to add panes to set", function() {
-	responder.addPane(darkPane);
-		
-	//Notify other panes about the changes
-	equals(responder.get('mainPane'),lightPane);
-});
-
-*/
-

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/touch.js

@@ -0,0 +1,106 @@
+// ==========================================================================
+// 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)
+// ==========================================================================
+
+// ========================================================================
+// RootResponder Tests: Touch
+// ========================================================================
+/*global module, test, ok, equals */
+
+var pane, view, layer, evt, evt2;
+
+module("SC.RootResponder", {
+  setup: function() {
+    // Create our pane.
+    pane = SC.Pane.extend({
+      childViews: ['contentView'],
+      contentView: SC.View.extend({
+        acceptsMultitouch: YES,
+        touchStart: function() {},
+        touchesDragged: function() {},
+        touchEnd: function() {}
+      })
+    });
+    // (Actually create it, in a run loop.)
+    SC.run(function() {
+      pane = pane.create().append();
+    });
+
+    // Get our view and layer.
+    view = pane.contentView;
+    layer = view.get('layer');
+    // Create and fill in our events.
+    evt = SC.Event.simulateEvent(layer, 'touchstart', { touches: [], identifier: 4, changedTouches: [], pageX: 100, pageY: 100 });
+    evt2 = SC.Event.simulateEvent(layer, 'touchstart', { touches: [], identifier: 5, changedTouches: [], pageX: 200, pageY: 200 });
+    evt.changedTouches.push(evt);
+    evt.changedTouches.push(evt2);
+    evt2.changedTouches.push(evt);
+    evt2.changedTouches.push(evt2);
+  },
+  
+  teardown: function() {
+    pane.destroy();
+  }
+});
+
+// With v1.11, SC.Touch now provides its own velocity along each axis.
+test("SC.Touch velocity", function() {
+  // Get a layer
+  var touch;
+
+  // Trigger touchstart
+  SC.run(function() {
+    SC.Event.trigger(layer, 'touchstart', [evt]);
+  });
+
+  touch = SC.RootResponder.responder._touches[evt.identifier];
+
+  equals(touch.velocityX, 0, "Horizontal velocity begin at zero");
+  equals(touch.velocityY, 0, "Vertical velocity begin at zero");
+
+  evt.type = 'touchmove';
+  evt.timeStamp += 100;
+  evt.pageX += 100;
+  evt.pageY += 100;
+  
+  SC.run(function() {
+    SC.Event.trigger(layer, 'touchmove', [evt]);
+  });
+
+  equals(touch.velocityX, 1, 'VelocityX for 100 pixels in 100 ms is 1.');
+  equals(touch.velocityY, 1, 'VelocityY for 100 pixels in 100 ms is 1.');
+
+});
+
+test("averagedTouchesForView", function() {
+  // Start touch.
+  SC.run(function() {
+    SC.Event.trigger(layer, 'touchstart', [evt, evt2]);
+  });
+
+  // Get our starting average.
+  var expectedAverageX = (evt.pageX + evt2.pageX) / 2,
+    expectedAverageY = (evt.pageY + evt2.pageY) / 2,
+    startAverage = SC.clone(SC.RootResponder.responder.averagedTouchesForView(view));
+
+  equals(startAverage.x, expectedAverageX, "averagedTouchesForView correctly returns touch location averages (x)");
+  equals(startAverage.y, expectedAverageY, "averagedTouchesForView correctly returns touch location averages (y)");
+  ok(startAverage.d, "averagedTouchesForView's distance measurement should ... be a nonzero number. (Pythagoras doesn't play nice with integers.)");
+
+  // Pinch out by 50 pixels in every direction.
+  evt.pageX = 50;
+  evt.pageY = 50;
+  evt2.pageX = 250;
+  evt2.pageY = 250;
+  SC.run(function() {
+    SC.Event.trigger(layer, 'touchmove', [evt, evt2]);
+  });
+  // Get our post-pinch average.
+  var endAverage = SC.RootResponder.responder.averagedTouchesForView(view);
+
+  ok(startAverage.x === endAverage.x && startAverage.y === endAverage.y, 'Touches moved symmetrically, so gesture center should not have moved.');
+  equals(endAverage.d, startAverage.d * 2, "Touches moved apart by 2x; gesture distance should have doubled");
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/sparse_array.js

@@ -307,9 +307,9 @@ test("test updating SparseArray length via delegate", function() {
 
     var arr = SC.SparseArray.create({delegate: delegate});
     delegate.arrlen = 5;
-    equals(arr.get('length'), 5)
-    arr.provideLength(null);
+    equals(arr.get('length'), 5);
     delegate.arrlen = 50;
+    arr.provideLength(null);
     equals(arr.get('length'), 50)
 });
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/touch.js

@@ -0,0 +1,136 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2014 Strobe Inc. and contributors.
+//            portions copyright @2011 Apple Inc.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+/*global module, test, ok, equals */
+
+var pane,
+    // TODO: This custom event counting could/should be replaced with CoreTest.stub.
+    outerCapture = 0,
+    outerStart = 0,
+    outerDragged = 0,
+    outerCancel = 0,
+    outerEnd = 0,
+    innerStart = 0,
+    innerDragged = 0,
+    innerCancel = 0,
+    innerEnd = 0;
+
+module("SC.View#captureTouch", {
+  setup: function() {
+    SC.run(function() {
+      pane = SC.Pane.create({
+        layout: { width: 200, height: 200, left: 0, top: 0 },
+        childViews: ['outerView'],
+
+        outerView: SC.View.extend({
+          captureTouch: function() { outerCapture++; return YES; },
+          touchStart: function() { outerStart++; return YES; },
+          // When touch is dragged, this passes control of the touch to the inner view.
+          touchesDragged: function(evt, viewTouches) {
+            outerDragged++;
+            viewTouches.forEach(function(touch) {
+              touch.stackNextTouchResponder(this.innerView);
+            }, this);
+          },
+          touchCancelled: function() { outerCancel++; },
+          touchEnd: function() { outerEnd++; },
+
+          childViews: ['innerView'],
+          innerView: SC.View.extend({
+            layout: { width: 50, height: 50, left: 100, top: 100 },
+            touchStart: function() { innerStart++; },
+            // When touch is dragged, this passes control of the touch BACK to the outer view.
+            touchesDragged: function(evt, viewTouches) {
+              innerDragged++;
+              viewTouches.invoke('restoreLastTouchResponder');
+            },
+            touchCancelled: function() { innerCancel++; },
+            touchEnd: function() { innerEnd++; }
+          })
+        })
+      }).append();
+    });
+  },
+
+  teardown: function() {
+    pane.remove();
+    pane = null;
+  }
+});
+
+test("Touch event handling and juggling.", function() {
+  var outer = pane.outerView,
+      inner = outer.innerView,
+      layer = inner.get('layer'),
+      event = SC.Event.simulateEvent(layer, 'touchstart');
+
+  event.touches = [];
+  event.identifier = 4;
+  event.changedTouches = [event];
+
+  // Trigger touchstart: outerView.captureTouch > outerView.touchStart
+  SC.run(function() {
+    SC.Event.trigger(layer, 'touchstart', [event]);
+  });
+
+  equals(outerCapture, 1, "To capture the initial touch, outerView.captureTouch should have run:");
+  equals(outerStart, 1, "Having captured the initial touch, outerView.touchStart should have run:");
+  if (innerStart) ok(false, "outerView.innerStart should not have been called yet!");
+  if (outerDragged) ok(false, "outerView.touchesDragged should not have been called yet!");
+  if (innerDragged) ok(false, "innerView.touchesDragged should not have been called yet!");
+  if (outerCancel) ok(false, "outerView.touchCancelled should not have been called yet!");
+  if (innerCancel) ok(false, "innerView.touchCancelled should not have been called yet!");
+  if (innerEnd) ok(false, "innerView.touchEnd should not have been called yet!");
+  if (outerEnd) ok(false, "outerView.touchEnd should not have been called yet!");
+
+  // Trigger touchmoved: outerView.touchesDragged > [passes touch to innerView] > innerView.touchStart
+  event.type = 'touchmove';
+  SC.run(function() {
+    SC.Event.trigger(layer, 'touchmove', [event]);
+  });
+
+  if (outerCapture !== 1) ok(false, "outerView.captureTouch should only have been called once!");
+  if (outerStart !== 1) ok(false, "outerView.touchStart should only have been called once!");
+  equals(outerDragged, 1, "Having captured the initial touch, outerView.touchesDragged should have been called:");
+  equals(outerCancel, 0, "Having given up ownership but not removed itself from the stack, outerView.touchCancelled should not have been called:");
+  equals(innerStart, 1, "Having been passed touch ownership by outerView, innerView.touchesStart should have been called:");
+  if (innerDragged) ok(false, "innerView.touchesDragged should not have been called yet!");
+  if (innerCancel) ok(false, "innerView.touchCancelled should not have been called yet!");
+  if (innerEnd) ok(false, "innerView.touchEnd should not have been called yet!");
+  if (outerEnd) ok(false, "outerView.touchEnd should not have been called yet!");
+
+  // Trigger touchmoved x2: innerView.touchesDragged > [passes touch back to outerView] > outerView.touchStart > innerView.touchCancelled
+  SC.run(function() {
+    SC.Event.trigger(layer, 'touchmove', [event]);
+  });
+
+  if (outerCapture !== 1) ok(false, "outerView.captureTouch should only have been called once!");
+  equals(outerDragged, 1, "Having passed ownership to innerView, outerView.touchesDragged should not have been called again:");
+  if (outerStart !== 1) ok(false, "Even having retaken ownership of the touch, outerView.touchStart should only have been called once!");
+  if (innerStart !== 1) ok(false, "innerView.touchStart should only have been called once!");
+  equals(innerDragged, 1, "Now having ownership of the touch, innerView.touchesDragged should have been called:");
+  if (outerCancel) ok(false, "Having never been removed from the touch responder stack, outerView.touchCancelled should not have been called!");
+  equals(innerCancel, 1, "Having passed ownership permanently back to outerView, innerView.touchCancelled should have been called:");
+  if (innerEnd) ok(false, "innerView.touchEnd should not have been called yet!");
+  if (outerEnd) ok(false, "outerView.touchEnd should not have been called yet!");
+
+  // Trigger touchend: outerView.touchEnd
+  event.type = 'touchend';
+  SC.run(function() {
+    SC.Event.trigger(layer, 'touchend', [event]);
+  });
+
+  if (outerCapture !== 1) ok(false, "outerView.captureTouch should only have been called once!");
+  if (outerStart !== 1) ok(false, "outerView.touchStart should only have been called once!");
+  if (innerStart !== 1) ok(false, "innerView.touchStart should only have been called once!");
+  if (outerDragged !== 1) ok(false, "outerView.touchesDragged should only have been called once!");
+  if (innerDragged !== 1) ok(false, "innerView.touchesDragged should only have been called once!");
+  if (innerCancel !== 1) ok(false, "innerView.touchCancelled should only have been called once!");
+  equals(outerCancel, 0, "Having never been removed from the touch's responder stack, outerView.touchCancelled should never have been called.");
+  equals(innerEnd, 0, "Having previously given up control of the touch, innerView.touchEnd should never have been called:");
+  equals(outerEnd, 1, "outerView.touchEnd should have been called:");
+
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/utils/rect.js

@@ -102,4 +102,45 @@ test("rectsEqual() tests equality with delta of 0", function() {
   equals(SC.rectsEqual(frame, { x: 50, y: 51, width: 100, height: 100 }, 0), NO, "Frame.y not equal");
   equals(SC.rectsEqual(frame, { x: 50, y: 50, width: 99, height: 100 }, 0), NO, "Frame.width not equal");
   equals(SC.rectsEqual(frame, { x: 50, y: 50, width: 100, height: 102 }, 0), NO, "Frame.height not equal");
-});
+});
+
+test("scaleRect scales rects.", function() {
+  var rect = { x: 0, y: 0, width: 100, height: 100 },
+      scaledRect, expectedRect;
+
+  // Identity
+  scaledRect = SC.scaleRect(rect, 1);
+  ok(SC.rectsEqual(rect, scaledRect), "Identity: scaling by a factor of 1 changes nothing (got %@, expected %@).".fmt(SC.inspect(scaledRect), SC.inspect(rect)));
+
+  // Scaled by 0.5, top-left
+  scaledRect = SC.scaleRect(rect, 0.5, 0, 0);
+  expectedRect = { x: 0, y: 0, width: 50, height: 50 };
+  ok(SC.rectsEqual(scaledRect, expectedRect), "Scaling by a factor of 0.5, top left (got %@, expected %@).".fmt(SC.inspect(scaledRect), SC.inspect(expectedRect)));
+
+  // Scale by 0.5, centered
+  scaledRect = SC.scaleRect(rect, 0.5);
+  expectedRect = { x: 25, y: 25, width: 50, height: 50 };
+  ok(SC.rectsEqual(scaledRect, expectedRect), "Scaling by a factor of 0.5, centered (got %@, expected %@).".fmt(SC.inspect(scaledRect), SC.inspect(expectedRect)));
+
+  // Scaled by 0.5, bottom-right
+  scaledRect = SC.scaleRect(rect, 0.5, 1, 1);
+  expectedRect = { x: 50, y: 50, width: 50, height: 50 };
+  ok(SC.rectsEqual(scaledRect, expectedRect), "Scaling by a factor of 0.5, bottom right (got %@, expected %@).".fmt(SC.inspect(scaledRect), SC.inspect(expectedRect)));
+
+  // Scale by 2, top-left
+  scaledRect = SC.scaleRect(rect, 2, 0, 0);
+  expectedRect = { x: 0, y: 0, width: 200, height: 200 };
+  ok(SC.rectsEqual(scaledRect, expectedRect), "Scaling by a factor of 2 top-left (got %@, expected %@).".fmt(SC.inspect(scaledRect), SC.inspect(expectedRect)));
+
+  // Scale by 2, centered
+  scaledRect = SC.scaleRect(rect, 2);
+  expectedRect = { x: -50, y: -50, width: 200, height: 200 };
+  ok(SC.rectsEqual(scaledRect, expectedRect), "Scaling by a factor of 2 centered (got %@, expected %@).".fmt(SC.inspect(scaledRect), SC.inspect(expectedRect)));
+
+  // Scale by 2, bottom-right
+  scaledRect = SC.scaleRect(rect, 2, 1, 1);
+  expectedRect = { x: -100, y: -100, width: 200, height: 200 };
+  ok(SC.rectsEqual(scaledRect, expectedRect), "Scaling by a factor of 2 bottom-right (got %@, expected %@).".fmt(SC.inspect(scaledRect), SC.inspect(expectedRect)));
+
+
+});

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

@@ -150,6 +150,17 @@ test("adding a pane twice should have no effect", function() {
   pane.destroy();
 });
 
+test("SC.Pane#append correctly returns the receiver.", function() {
+  var pane = SC.Pane.create(),
+    ret = pane.append();
+
+  equals(pane, ret, 'SC.Pane#append returns the receiver');
+
+  // Clean up.
+  pane.destroy();
+});
+
+
 test("adding/remove/adding pane", function() {
   var pane = SC.Pane.create();
   var elem1 = Q$('body').get(0), elem2 = Q$('#appendtest').get(0);