sproutcore 1.8.2.1 → 1.9.0

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

@@ -38,4 +38,11 @@ test("Tests stolen from Prototype.js", function() {
     // some of these strings are REALLY LONG so we don't want to write them out
     ok(SC.RenderContext.escapeHTML(tests[idx++]) === tests[idx]);
   }
-});
+});
+
+test("Should accept number argument", function() {
+  var number = 12345.6789,
+      numStr = number.toString();
+  
+  equals(numStr, SC.RenderContext.escapeHTML(number), "Properly produces string when invoked with a number argument");
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/timer/invokeLater.js

@@ -19,7 +19,7 @@ test("should invoke method string after specified time", function() {
   });
   o.invokeLater('func', 200) ;
   SC.RunLoop.end() ;
-  
+
   var tries = 20 ;
   var f = function f() {
     if (!fired && --tries >= 0) {
@@ -29,7 +29,7 @@ test("should invoke method string after specified time", function() {
     equals(YES, fired, 'did not fire') ;
     window.start() ; // starts the test runner
   } ;
-  
+
   stop() ; // stops the test runner
   setTimeout(f, 300) ;
 });
@@ -42,7 +42,7 @@ test("should invoke method instance after specified time", function() {
   });
   o.invokeLater(o.func, 200) ;
   SC.RunLoop.end() ;
-  
+
   var tries = 20 ;
   var f = function f() {
     if (!fired && --tries >= 0) {
@@ -52,7 +52,7 @@ test("should invoke method instance after specified time", function() {
     equals(YES, fired, 'did not fire') ;
     window.start() ; // starts the test runner
   } ;
-  
+
   stop() ; // stops the test runner
   setTimeout(f, 300) ;
 });
@@ -65,7 +65,7 @@ test("should invoke method string immediately if no time passed", function() {
   });
   o.invokeLater('func') ;
   SC.RunLoop.end() ;
-  
+
   var tries = 20 ;
   var f = function f() {
     if (!fired && --tries >= 0) {
@@ -75,7 +75,7 @@ test("should invoke method string immediately if no time passed", function() {
     equals(YES, fired, 'did not fire') ;
     window.start() ; // starts the test runner
   } ;
-  
+
   stop() ; // stops the test runner
   setTimeout(f, 300) ;
 });
@@ -84,15 +84,15 @@ test("should automatically bind with arguments if passed", function() {
   SC.RunLoop.begin() ;
   var fired = NO ;
   var g1 = null, g2 = null ; target = null ;
-  
+
   var o = SC.Object.create({
-    func: function(arg1, arg2) { 
+    func: function(arg1, arg2) {
       g1 = arg1 ; g2 = arg2 ; fired = YES ; target = this ;
     }
   });
   o.invokeLater('func', 200, 'ARG1', 'ARG2') ;
   SC.RunLoop.end() ;
-  
+
   var tries = 20 ;
   var f = function f() {
     if (!fired && --tries >= 0) {
@@ -105,7 +105,7 @@ test("should automatically bind with arguments if passed", function() {
     equals(target, o, 'target') ;
     window.start() ; // starts the test runner
   } ;
-  
+
   stop() ; // stops the test runner
   setTimeout(f, 300) ;
 });
@@ -117,10 +117,10 @@ test("should invoke function with target after specified time", function() {
   var fired = NO ;
   var target = null;
   var o = SC.Object.create() ;
-  var func = function() { fired = YES; target = this; } ; 
+  var func = function() { fired = YES; target = this; } ;
   func.invokeLater(o, 200) ;
   SC.RunLoop.end() ;
-  
+
   var tries = 20 ;
   var f = function f() {
     if (!fired && --tries >= 0) {
@@ -131,7 +131,7 @@ test("should invoke function with target after specified time", function() {
     equals(target, o, 'target') ;
     window.start() ; // starts the test runner
   } ;
-  
+
   stop() ; // stops the test runner
   setTimeout(f, 300) ;
 });
@@ -139,10 +139,10 @@ test("should invoke function with target after specified time", function() {
 test("should invoke object with no target after specified time", function() {
   SC.RunLoop.begin() ;
   var fired = NO ;
-  var func = function() { fired = YES; } ; 
+  var func = function() { fired = YES; } ;
   func.invokeLater(null, 200) ;
   SC.RunLoop.end() ;
-  
+
   var tries = 20 ;
   var f = function f() {
     if (!fired && --tries >= 0) {
@@ -152,7 +152,7 @@ test("should invoke object with no target after specified time", function() {
     equals(YES, fired, 'did not fire') ;
     window.start() ; // starts the test runner
   } ;
-  
+
   stop() ; // stops the test runner
   setTimeout(f, 300) ;
 });
@@ -161,10 +161,10 @@ test("should invoke function immediately if no time passed", function() {
   SC.RunLoop.begin() ;
   var fired = NO ;
   var o = SC.Object.create() ;
-  var func = function() { fired = YES; } ; 
+  var func = function() { fired = YES; } ;
   func.invokeLater(o) ;
   SC.RunLoop.end() ;
-  
+
   var tries = 20 ;
   var f = function f() {
     if (!fired && --tries >= 0) {
@@ -174,7 +174,7 @@ test("should invoke function immediately if no time passed", function() {
     equals(YES, fired, 'did not fire') ;
     window.start() ; // starts the test runner
   } ;
-  
+
   stop() ; // stops the test runner
   setTimeout(f, 300) ;
 });
@@ -183,14 +183,14 @@ test("should automatically bind with arguments if passed", function() {
   SC.RunLoop.begin() ;
   var fired = NO ;
   var g1 = null, g2 = null ; target = null ;
-  
+
   var o = SC.Object.create() ;
-  var func = function(arg1, arg2) { 
+  var func = function(arg1, arg2) {
     g1 = arg1 ; g2 = arg2 ; fired = YES ; target = this ;
-  } ; 
+  } ;
   func.invokeLater(o, 200, 'ARG1', 'ARG2') ;
   SC.RunLoop.end() ;
-  
+
   var tries = 20 ;
   var f = function f() {
     if (!fired && --tries >= 0) {
@@ -203,7 +203,7 @@ test("should automatically bind with arguments if passed", function() {
     equals(target, o, 'target') ;
     window.start() ; // starts the test runner
   } ;
-  
+
   stop() ; // stops the test runner
   setTimeout(f, 300) ;
 });

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

@@ -26,7 +26,7 @@ module("SC.offset", {
     // the offset by viewport will always equal offset by document), we simulate an app that uses a
     // scrollable viewport to test the validity of the functions.
     var viewportEl;
-    if (SC.browser.mobileSafari) {
+    if (SC.browser.isMobileSafari) {
       viewportEl = $("[name='viewport']")[0];
 
       viewportEl.setAttribute('content','initial-scale=0.8, minimum-scale=0.5, maximum-scale=1.2, user-scalable=yes, width=device-height');
@@ -56,15 +56,15 @@ module("SC.offset", {
       // Useful for debugging in iOS
       // /** Allow default touch events */
       //  touchStart: function(touch) {
-      //    if (SC.browser.mobileSafari) touch.allowDefault();
+      //    if (SC.browser.isMobileSafari) touch.allowDefault();
       //  },
       //
       //  touchesDragged: function(evt, touches) {
-      //    if (SC.browser.mobileSafari) evt.allowDefault();
+      //    if (SC.browser.isMobileSafari) evt.allowDefault();
       //  },
       //
       //  touchEnd: function(touch) {
-      //    if (SC.browser.mobileSafari) touch.allowDefault();
+      //    if (SC.browser.isMobileSafari) touch.allowDefault();
       //  }
     });
     pane.append();
@@ -78,7 +78,7 @@ module("SC.offset", {
 
   teardown: function() {
     // Useful for debugging in iOS
-    // if (!SC.browser.mobileSafari) {
+    // if (!SC.browser.isMobileSafari) {
       pane.remove();
       pane = view1 = view2 = view3 = view4 = null;
     // }

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

@@ -88,7 +88,6 @@ if (SC.platform.supportsCSSTransitions) {
 
       // TODO: Test this better
       ok(data.event, "has event");
-      equals(data.propertyName, 'left', "propertyName is 'left'");
       equals(data.view, view, "view is correct");
       equals(data.isCancelled, false, "animation is not cancelled");
     });
@@ -119,33 +118,58 @@ if (SC.platform.supportsCSSTransitions) {
   });
 
   // Pretty sure this does the job
-  test("callbacks should be called for each property", function(){
+  test("callbacks should be called only once for a grouped animation", function(){
     stop(2000);
     var stopped = true;
 
-    expect(2);
-    var propertyNames = "top left".w();
+    expect(1);
 
     SC.RunLoop.begin();
-    // We shouldn't have to use invokeLater, but it's the only way to get this to work!
-    view.invokeLater('animate', 1, { top: 100, left: 100 }, 0.500, function(data) {
+    view.invokeLater('animate', 1, { top: 100, left: 100 }, 0.250, function(data) {
       if (stopped) {
-        start();
         stopped = false;
+        // Continue on in a short moment.  Before the test times out, but after
+        // enough time for a second callback to possibly come in.
+        setTimeout(function() {
+          start();
+        }, 100);
       }
 
-      var hasProperty = false;
-      if (propertyNames.contains(data.propertyName)) {
-        propertyNames.removeObject(data.propertyName);
-        hasProperty = true;
-      }
+      ok(true, 'callback called back');
+    });
+    SC.RunLoop.end();
+  });
+
+  // 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);
+
+    expect(1);
+
+    SC.RunLoop.begin();
+    view.invokeLater('animate', 1, 'top', view.getPath('layout.top'), 0.250, function(){
+      ok(true, 'callback called back');
+      start();
+    });
+    SC.RunLoop.end();
+  });
+
+  test("callback should be called when a property is animated with a duration of zero.", function() {
+    stop(2000);
+
+    expect(1);
 
-      ok(hasProperty, "has property: "+data.propertyName);
+    SC.RunLoop.begin();
+    view.invokeLater('animate', 1, 'top', 20, 0, function(){
+      ok(true, 'callback called back');
+      start();
     });
     SC.RunLoop.end();
   });
 
-  test("multiple animations should be able to run simultaneously", function(){
+  test("multiple animations should be able to run simultaneously", function() {
     stop(2000);
 
     expect(2);
@@ -180,7 +204,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);
-    
+
     SC.RunLoop.begin();
     view.invokeLater(function() {
       // this triggers the initial layoutStyle code
@@ -192,12 +216,12 @@ if (SC.platform.supportsCSSTransitions) {
       view.displayDidChange();
     }, 1);
     SC.RunLoop.end();
-    
+
     setTimeout(function() {
       // capture the callbacks value
       check = callbacks;
     }, 250);
-    
+
     setTimeout(function() {
       start();
       equals(check, 0, "the callback should not have been cancelled initially");
@@ -206,6 +230,46 @@ if (SC.platform.supportsCSSTransitions) {
     }, 1000);
   });
 
+  /**
+    There was a bug in animation that once one property was animated, a null
+    version of it existed in _activeAnimations, such that when another property
+    was animated it would throw an exception iterating through _activeAnimations
+    and not expecting a null value.
+    */
+  test("animating different attributes at different times should not throw an error" , function(){
+    // Run test.
+    stop(2000);
+
+    expect(0);
+
+    // Override and wrap the problematic method to capture the error.
+    view.layoutStyleCalculator.transitionDidEnd = function() {
+      try {
+        SC.View.LayoutStyleCalculator.prototype.transitionDidEnd.apply(this, arguments);
+        ok(true);
+      } catch (ex) {
+        ok(false);
+      }
+    };
+
+    SC.RunLoop.begin();
+    // We shouldn't have to use invokeLater, but it's the only way to get this to work!
+    view.invokeLater(function() {
+      view.animate('left', 75, 0.2);
+    }, 1);
+    SC.RunLoop.end();
+
+    setTimeout(function() {
+      SC.RunLoop.begin();
+      view.animate('top', 50, 0.2);
+      SC.RunLoop.end();
+    }, 400);
+
+    setTimeout(function() {
+      start();
+    }, 1000);
+  });
+
   test("should handle transform attributes", function(){
     SC.RunLoop.begin();
     view.animate('rotateX', 45, { duration: 1 });
@@ -302,8 +366,7 @@ if (SC.platform.supportsCSSTransitions) {
     stop(2000);
     var stopped = true;
 
-    expect(3);
-    var propertyNames = "top left scale".w();
+    expect(1);
 
     SC.RunLoop.begin();
     // We shouldn't have to use invokeLater, but it's the only way to get this to work!
@@ -313,13 +376,7 @@ if (SC.platform.supportsCSSTransitions) {
         stopped = false;
       }
 
-      var hasProperty = false;
-      if (propertyNames.contains(data.propertyName)) {
-        propertyNames.removeObject(data.propertyName);
-        hasProperty = true;
-      }
-
-      ok(hasProperty, "has property: "+data.propertyName);
+      ok(true);
     });
     SC.RunLoop.end();
   });
@@ -372,11 +429,14 @@ test("should update layout", function(){
 });
 
 test("should still run callback", function(){
-  var ranCallback = false;
+  stop(2000);
+
+  expect(1);
 
   SC.RunLoop.begin();
-  view.animate('left', 100, 1, function() { ranCallback = true; });
+  view.animate({ top: 200, left: 100 }, 1, function() {
+    ok(true, "callback called");
+    start();
+  });
   SC.RunLoop.end();
-
-  ok(ranCallback, "should run callback");
 });

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

@@ -26,10 +26,11 @@ test("should apply bound class names to the element", function() {
 
 test("should add, remove, or change class names if changed after element is created", function() {
   var view = SC.View.create({
-    classNameBindings: ['priority', 'isUrgent', 'canIgnore'],
+    classNameBindings: ['priority', 'isUrgent', 'isClassified:classified', 'canIgnore'],
 
     priority: 'high',
     isUrgent: true,
+    isClassified: true,
     canIgnore: false
   });
 
@@ -37,26 +38,33 @@ test("should add, remove, or change class names if changed after element is crea
 
   view.set('priority', 'orange');
   view.set('isUrgent', false);
+  view.set('isClassified', false);
   view.set('canIgnore', true);
 
   ok(view.$().hasClass('orange'), "updates string values");
   ok(!view.$().hasClass('high'), "removes old string value");
 
-  ok(!view.$().hasClass('is-urgent', "removes dasherized class when changed from true to false"));
+  ok(!view.$().hasClass('is-urgent'), "removes dasherized class when changed from true to false");
+  ok(!view.$().hasClass('classified'), "removes customized class name when changed from true to false");
   ok(view.$().hasClass('can-ignore'), "adds dasherized class when changed from false to true");
 });
 
 test("should preserve class names applied via classNameBindings when view layer is updated",
 function(){
   var view = SC.View.create({
-    classNameBindings: ['isUrgent'],
+    classNameBindings: ['isUrgent', 'isClassified:classified'],
+    isClassified: true,
     isUrgent: false
   });
   view.createLayer();
-  ok(!view.$().hasClass('is-urgent', "removes dasherized class when changed from true to false"));
+  ok(!view.$().hasClass('can-ignore'), "does not add false Boolean values as class");
+  ok(view.$().hasClass('classified'), "supports customizing class name for Boolean values");
+  view.set('isClassified', false);
   view.set('isUrgent', true);
-  ok(view.$().hasClass('is-urgent', "adds dasherized class when changed from true to false"));
+  ok(view.$().hasClass('is-urgent'), "adds dasherized class when changed from false to true");
+  ok(!view.$().hasClass('classified'), "removes customized class name when changed from true to false");
   view.set('layerNeedsUpdate', YES);
   view.updateLayer();
-  ok(view.$().hasClass('is-urgent', "still has class when view display property is updated"));
+  ok(view.$().hasClass('is-urgent'), "still has class when view display property is updated");
+  ok(!view.$().hasClass('classified'), "still does not have customized class when view display property is updated");
 });