sproutcore 1.11.0.rc1 → 1.11.0.rc2

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/render_context.js

@@ -952,7 +952,7 @@ SC.RenderContext = SC.Builder.create(
   /**
     Removes all styles from the context.
 
-    Be aware that setStyle() only effects the styles specified.  If there
+    Be aware that setStyle() only affects the styles specified.  If there
     are existing styles that are not modified by a call to setStyle(), they
     will remain on the context.  For example, if you call addStyle('margin-left', 10)
     and addStyle('margin-right', 10) followed by setClass({ 'margin-right': null }),

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

@@ -575,10 +575,14 @@ SC.RootResponder = SC.Object.extend(
   sendAction: function( action, target, sender, pane, context, firstResponder) {
     target = this.targetForAction(action, target, sender, pane, firstResponder) ;
 
-    // HACK: If the target is a ResponderContext, forward the action.
-    if (target && target.isResponderContext) {
-      return !!target.sendAction(action, sender, context, firstResponder);
-    } else return target && target.tryToPerform(action, sender);
+    if (target) {
+      // HACK: If the target is a ResponderContext, forward the action.
+      if (target.isResponderContext) {
+        return !!target.sendAction(action, sender, context, firstResponder);
+      } else {
+        return target.tryToPerform(action, sender, context);
+      }
+    }
   },
 
   _responderFor: function(target, methodName, firstResponder) {
@@ -634,11 +638,13 @@ SC.RootResponder = SC.Object.extend(
 
     // 2. an explicit target was passed...
     if (target) {
+      // Normalize String targets to Objects
       if (SC.typeOf(target) === SC.T_STRING) {
-        target =  SC.objectForPropertyPath(target) ||
-                  SC.objectForPropertyPath(target, sender);
+        target = SC.objectForPropertyPath(target) ||
+                 SC.objectForPropertyPath(target, sender);
       }
 
+      // Ensure that the target responds to the method.
       if (target && !target.isResponderContext) {
         if (target.respondsTo && !target.respondsTo(methodName)) {
           target = null ;
@@ -717,7 +723,7 @@ SC.RootResponder = SC.Object.extend(
   sendEvent: function(action, evt, target) {
     var pane, ret ;
 
-    SC.run(function() {
+    SC.run(function send_event() {
       // get the target pane
       if (target) pane = target.get('pane') ;
       else pane = this.get('menuPane') || this.get('keyPane') || this.get('mainPane') ;
@@ -848,7 +854,6 @@ SC.RootResponder = SC.Object.extend(
           var responder = this ;
 
           document.body['on' + keyName] = function(e) {
-            // return method.call(responder, SC.Event.normalizeEvent(e));
             return method.call(responder, SC.Event.normalizeEvent(event || window.event)); // this is IE :(
           };
 
@@ -1549,7 +1554,9 @@ SC.RootResponder = SC.Object.extend(
       //@endif
 
       // loop through changed touches, calling touchStart, etc.
-      var idx, touches = evt.changedTouches, len = touches.length,
+      var changedTouches = evt.changedTouches,
+          len = changedTouches.length,
+          idx,
           touch, touchEntry;
 
       // prepare event for touch mapping.
@@ -1557,7 +1564,7 @@ SC.RootResponder = SC.Object.extend(
 
       // Loop through each touch we received in this event
       for (idx = 0; idx < len; idx++) {
-        touch = touches[idx];
+        touch = changedTouches[idx];
 
         // Create an SC.Touch instance for every touch.
         touchEntry = SC.Touch.create(touch, this);
@@ -1587,6 +1594,8 @@ SC.RootResponder = SC.Object.extend(
         // Unset the reference to the original event so we can garbage collect.
         touchEntry.event = null;
       }
+
+      evt.touchContext = null;
     }, this);
 
     // hack for text fields
@@ -1716,6 +1725,8 @@ SC.RootResponder = SC.Object.extend(
         touchEntry = this._touches[touch.identifier];
         if (touchEntry) touchEntry.event = null;
       }
+      evt.touchContext = null;
+      evt.viewChangedTouches = null;
     }, this);
 
     return evt.hasCustomEventHandling;

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/action_support.js

@@ -24,13 +24,7 @@
       });
 
       view = SC.View.create(SC.ActionSupport, {
-        action: null,
-        zomgAction: null,
-        pane: pane,
-
-        someEvent: function() {
-          return this.fireAction(this.get('zomgAction'));
-        }
+        pane: pane
       });
     },
 
@@ -41,10 +35,10 @@
 
 
   // ..........................................................
-  // No Parameters
+  // No Arguments
   //
 
-  test("no paramaters - only action set", function() {
+  test("no arguments - only action set", function() {
     var expectedAction = 'someAction';
 
     view.set('action', expectedAction);
@@ -53,11 +47,11 @@
     ok(sendActionSpy.wasCalledWith(expectedAction, null, view, pane, null, view), 'triggers the action');
   });
 
-  test("no paramaters - action and target set", function() {
+  test("no arguments - action and target set", function() {
     var expectedAction = 'someAction';
 
-    view.set('target', target);
     view.set('action', expectedAction);
+    view.set('target', target);
     view.fireAction();
 
     ok(sendActionSpy.wasCalledWith(expectedAction, target, view, pane, null, view), 'triggers the action');
@@ -65,40 +59,50 @@
 
 
   // ..........................................................
-  // Actions Parameter
+  // Arguments
   //
 
-  test("action parameter - only action set", function() {
+  test("context argument", function() {
     var expectedAction = 'someAction';
+    var context = { zomg: "context" };
 
-    view.set('zomgAction', expectedAction);
-    view.someEvent();
+    view.set('action', expectedAction);
+    view.fireAction(context);
 
-    ok(sendActionSpy.wasCalledWith(expectedAction, null, view, pane, null, view), 'triggers the action');
+    ok(sendActionSpy.wasCalledWith(expectedAction, null, view, pane, context, view), 'triggers the action');
   });
 
-  test("action parameter - action and target set", function() {
+
+  // ..........................................................
+  // Backwards-compatibility
+  //
+
+  test("backwards-compatibility actionContext property", function() {
     var expectedAction = 'someAction';
+    var context = { zomg: "context" };
 
-    view.set('target', target);
-    view.set('zomgAction', expectedAction);
-    view.someEvent();
+    view.set('action', expectedAction);
+    view.set('actionContext', context);
+    view.fireAction();
 
-    ok(sendActionSpy.wasCalledWith(expectedAction, target, view, pane, null, view), 'triggers the action');
+    ok(sendActionSpy.wasCalledWith(expectedAction, null, view, pane, context, view), 'triggers the action');
   });
 
+  test("backwards-compatibility action argument", function() {
+    var expectedAction = 'someAction';
+    var context = { zomg: "context" };
 
-  // ..........................................................
-  // Action Context
-  //
+    view.fireAction(expectedAction);
 
-  test("context", function() {
+    ok(sendActionSpy.wasCalledWith(expectedAction, null, view, pane, null, view), 'triggers the action');
+  });
+
+  test("backwards-compatibility String context argument", function() {
     var expectedAction = 'someAction';
-    var context = {zomg: "context"};
+    var context = "context";
 
     view.set('action', expectedAction);
-    view.set('actionContext', context)
-    view.fireAction();
+    view.fireAction(context);
 
     ok(sendActionSpy.wasCalledWith(expectedAction, null, view, pane, context, view), 'triggers the action');
   });

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

@@ -7,64 +7,68 @@
 /*global module test equals context ok same Q$ htmlbody Dummy */
 
 var r, r2, sender, pane, pane2, barView, fooView, defaultResponder;
-var keyPane, mainPane, globalResponder, globalResponderContext, actionSender ;
+var keyPane, mainPane, globalResponder, globalResponderContext, actionSender, actionContext;
 
 var CommonSetup = {
-  setup: function() { 
-    
-    actionSender = null ; // use for sendAction tests
-    var action = function(sender) { actionSender = sender; } ;
-    
+  setup: function() {
+
+    actionSender = null; // use for sendAction tests
+    actionContext = null;
+    var action = function (sender, context) {
+      actionSender = sender;
+      actionContext = context;
+    };
+
     sender = SC.Object.create();
-    
+
     // default responder for each pane
-    defaultResponder = SC.Object.create({ 
-      defaultAction: action 
+    defaultResponder = SC.Object.create({
+      defaultAction: action
     });
 
     // global default responder set on RootResponder
-    globalResponder = SC.Object.create({ 
-      globalAction: action 
+    globalResponder = SC.Object.create({
+      globalAction: action
     });
-    
-    // global default responder as a responder context 
+
+    // global default responder as a responder context
     // set on RootResponder
     globalResponderContext = SC.Object.create(SC.ResponderContext, {
       globalAction: action
     });
-    
+
     // explicit pane
-    pane = SC.Pane.create({ 
+    pane = SC.Pane.create({
       acceptsKeyPane: YES,
       defaultResponder: defaultResponder,
       childViews: [SC.View.extend({
         bar: action,  // implement bar action
         childViews: [SC.View.extend({
           foo: action // implement foo action
-        })]    
+        })]
       })],
-      
+
       paneAction: action
-       
+
     });
-    
-    pane2 = SC.Pane.create({ 
+
+    pane2 = SC.Pane.create({
       acceptsKeyPane: YES,
       defaultResponder: defaultResponder,
       childViews: [SC.View.extend({
         bar: action,  // implement bar action
         childViews: [SC.View.extend({
           foo: action // implement foo action
-        })]    
+        })]
       })],
-      
+
       paneAction: action,
-      
+
       keyAction: action,
       mainAction: action,
       globalAction: action
     });
-    
+
     keyPane = SC.Pane.create({
       acceptsKeyPane: YES,
       keyAction: action
@@ -78,54 +82,54 @@ var CommonSetup = {
     mainPane.firstResponder = mainPane ;
 
     r = SC.RootResponder.create({
-      mainPane: mainPane, 
+      mainPane: mainPane,
       keyPane:  keyPane,
-      defaultResponder: globalResponder 
-    }); 
-    
+      defaultResponder: globalResponder
+    });
+
     r2 = SC.RootResponder.create({
       mainPane: mainPane,
       keyPane: keyPane,
       defaultResponder: globalResponderContext
     });
-    
+
     barView = pane.childViews[0];
     ok(barView.bar, 'barView should implement bar');
-    
+
     fooView = barView.childViews[0];
     ok(fooView.foo, 'fooView should implement foo');
-    
+
     // setup dummy namespace
-    window.Dummy = { 
+    window.Dummy = {
       object: SC.Object.create({ foo: action }),
-      hash: { foo: action } 
+      hash: { foo: action }
     };
-    
+
   },
 
   teardown: function() {
-    r = r2 = sender = pane = window.Dummy = barView = fooView = null; 
-    defaultResponder = keyPane = mainPane = globalResponder = null; 
-    globalResponderContext = null;    
+    r = r2 = sender = pane = window.Dummy = barView = fooView = null;
+    defaultResponder = keyPane = mainPane = globalResponder = null;
+    globalResponderContext = null;
   }
 };
 
 // ..........................................................
 // targetForAction()
-// 
+//
 module("SC.RootResponder#targetForAction", CommonSetup);
 
 
 test("pass property path string as target", function() {
   var result = r.targetForAction('foo', 'Dummy.object');
-  
+
   equals(result, Dummy.object, 'should find DummyNamespace.object if it implements the action');
 
   equals(r.targetForAction("foo", "Dummy.hash"), Dummy.hash, 'should return if object found at path and it has function, even if it does not use respondsTo');
-  
+
   equals(r.targetForAction('bar', 'Dummy.object'), null, 'should return null if found DummyNamepace.object but does not implement action');
-  
-  equals(r.targetForAction('foo', 'Dummy.imaginary.item'), null, 'should return null if property path could not resolve');  
+
+  equals(r.targetForAction('foo', 'Dummy.imaginary.item'), null, 'should return null if property path could not resolve');
 });
 
 test("pass real object as target", function() {
@@ -135,96 +139,96 @@ test("pass real object as target", function() {
 });
 
 test("no target, explicit pane, nested firstResponder", function() {
-  
+
   pane.set('firstResponder', fooView) ;
-  equals(r.targetForAction('foo', null, null, pane), fooView, 
+  equals(r.targetForAction('foo', null, null, pane), fooView,
     'should return firstResponder if implementation action');
-    
-  equals(r.targetForAction('bar', null, null, pane), barView, 
+
+  equals(r.targetForAction('bar', null, null, pane), barView,
     'should return parent of firstResponder');
 
-  equals(r.targetForAction('paneAction', null, null, pane), pane, 
+  equals(r.targetForAction('paneAction', null, null, pane), pane,
     'should return pane action');
-  
-  equals(r.targetForAction('defaultAction', null, null, pane), 
+
+  equals(r.targetForAction('defaultAction', null, null, pane),
     defaultResponder, 'should return defaultResponder');
 
-  equals(r.targetForAction('imaginaryAction', null, null, pane), null, 
+  equals(r.targetForAction('imaginaryAction', null, null, pane), null,
     'should return null for not-found action');
 });
 
 
 test("no target, explicit pane, top-level firstResponder", function() {
-  
+
   pane.set('firstResponder', barView) ; // fooView is child...
-  
-  equals(r.targetForAction('foo', null, null, pane), null, 
+
+  equals(r.targetForAction('foo', null, null, pane), null,
     'should NOT return child of firstResponder');
-    
-  equals(r.targetForAction('bar', null, null, pane), barView, 
+
+  equals(r.targetForAction('bar', null, null, pane), barView,
     'should return firstResponder');
 
-  equals(r.targetForAction('paneAction', null, null, pane), pane, 
+  equals(r.targetForAction('paneAction', null, null, pane), pane,
     'should return pane action');
-  
-  equals(r.targetForAction('defaultAction', null, null, pane), 
+
+  equals(r.targetForAction('defaultAction', null, null, pane),
     defaultResponder, 'should return defaultResponder');
 
-  equals(r.targetForAction('imaginaryAction', null, null, pane), null, 
+  equals(r.targetForAction('imaginaryAction', null, null, pane), null,
     'should return null for not-found action');
 });
 
 test("no target, explicit pane, pane is first responder", function() {
-  
-  pane.set('firstResponder', pane) ; 
-  
-  equals(r.targetForAction('foo', null, null, pane), null, 
+
+  pane.set('firstResponder', pane) ;
+
+  equals(r.targetForAction('foo', null, null, pane), null,
     'should NOT return child view');
-    
-  equals(r.targetForAction('bar', null, null, pane), null, 
+
+  equals(r.targetForAction('bar', null, null, pane), null,
     'should NOT return child view');
 
-  equals(r.targetForAction('paneAction', null, null, pane), pane, 
+  equals(r.targetForAction('paneAction', null, null, pane), pane,
     'should return pane action');
-  
-  equals(r.targetForAction('defaultAction', null, null, pane), 
+
+  equals(r.targetForAction('defaultAction', null, null, pane),
     defaultResponder, 'should return defaultResponder');
 
-  equals(r.targetForAction('imaginaryAction', null, null, pane), null, 
+  equals(r.targetForAction('imaginaryAction', null, null, pane), null,
     'should return null for not-found action');
 });
 
 test("no target, explicit pane, no first responder", function() {
-  
-  pane.set('firstResponder', null) ; 
-  
-  equals(r.targetForAction('foo', null, null, pane), null, 
+
+  pane.set('firstResponder', null) ;
+
+  equals(r.targetForAction('foo', null, null, pane), null,
     'should NOT return child view');
-    
-  equals(r.targetForAction('bar', null, null, pane), null, 
+
+  equals(r.targetForAction('bar', null, null, pane), null,
     'should NOT return child view');
 
-  equals(r.targetForAction('paneAction', null, null, pane), pane, 
+  equals(r.targetForAction('paneAction', null, null, pane), pane,
     'should return pane');
-  
-  equals(r.targetForAction('defaultAction', null, null, pane), 
+
+  equals(r.targetForAction('defaultAction', null, null, pane),
     defaultResponder, 'should return defaultResponder');
-    
-  equals(r.targetForAction('imaginaryAction', null, null, pane), null, 
+
+  equals(r.targetForAction('imaginaryAction', null, null, pane), null,
     'should return null for not-found action');
-  
+
 });
 
 test("no target, explicit pane, does not implement action", function() {
   equals(r.targetForAction('keyAction', null, null, pane), keyPane,
     'should return keyPane');
-    
+
   equals(r.targetForAction('mainAction', null, null, pane), mainPane,
     'should return mainPane');
 
   equals(r.targetForAction('globalAction', null, null, pane), globalResponder,
     'should return global defaultResponder');
-      
+
   equals(r2.targetForAction('globalAction', null, null, pane), globalResponderContext,
     'should return global defaultResponder');
 });
@@ -232,15 +236,15 @@ test("no target, explicit pane, does not implement action", function() {
 test("no target, explicit pane, does implement action", function() {
   equals(r.targetForAction('keyAction', null, null, pane2), pane2,
     'should return pane');
-    
+
   equals(r.targetForAction('mainAction', null, null, pane2), pane2,
     'should return pane');
 
   equals(r.targetForAction('globalAction', null, null, pane2), pane2,
     'should return pane');
-    
+
   equals(r2.targetForAction('globalAction', null, null, pane2), pane2,
-    'should return pane');  
+    'should return pane');
 });
 
 test("no target, no explicit pane", function() {
@@ -255,14 +259,27 @@ test("no target, no explicit pane", function() {
 
 // ..........................................................
 // sendAction()
-// 
+//
 module("SC.RootResponder#sendAction", CommonSetup) ;
 
+test("if context given, passes context to action + target", function() {
+  var context = {};
+
+  // pane.firstResponder = defaultResponder;
+  r.sendAction('defaultAction', defaultResponder, sender, pane, context);
+  equals(actionSender, sender, 'action did invoke');
+  equals(actionContext, context, 'context was passed');
+
+  actionSender = null;
+  r.sendAction('imaginaryAction', null, sender, pane);
+  equals(actionSender, null, 'action did not invoke');
+});
+
 test("if pane passed, invokes action on pane if found", function() {
   pane.firstResponder = pane;
   r.sendAction('paneAction', null, sender, pane);
   equals(actionSender, sender, 'action did invoke');
-  
+
   actionSender = null;
   r.sendAction('imaginaryAction', null, sender, pane);
   equals(actionSender, null, 'action did not invoke');
@@ -271,7 +288,7 @@ test("if pane passed, invokes action on pane if found", function() {
 test("searches panes if none passed, invokes action if found", function() {
   r.sendAction('keyAction', null, sender);
   equals(actionSender, sender, 'action did invoke');
-  
+
   actionSender = null;
   r.sendAction('imaginaryAction', null, sender);
   equals(actionSender, null, 'action did not invoke');
@@ -280,7 +297,7 @@ test("searches panes if none passed, invokes action if found", function() {
 test("searches target if passed, invokes action if found", function() {
   r.sendAction('foo', fooView, sender);
   equals(actionSender, sender, 'action did invoke');
-  
+
   actionSender = null;
   r.sendAction('imaginaryAction', fooView, sender);
   equals(actionSender, null, 'action did not invoke');