sproutcore 1.0.1037 → 1.0.1042

data/frameworks/sproutcore/frameworks/foundation/system/routes.js

@@ -190,7 +190,7 @@ SC.routes = SC.Object.create(
   /** @private */
   init: function() {
     arguments.callee.base.call(this) ;
-    if (SC.browser.isSafari && !(SC.browser.safari >= 3)) {
+    if (SC.browser.isSafari && parseInt(SC.browser.version,0) < 417) {
       SC.mixin(this,this.browserFuncs.safari) ;  
     } else if (SC.browser.isIE) {
       SC.mixin(this,this.browserFuncs.ie) ;  

data/frameworks/sproutcore/frameworks/foundation/system/utils.js

@@ -138,7 +138,6 @@ SC.mixin( /** @scope SC */ {
    */
   rectsEqual: function(r1, r2, delta) {
     if (!r1 || !r2) return (r1 == r2) ;
-  
     if (!delta && delta !== 0) delta = 0.1;
     if ((r1.y != r2.y) && (Math.abs(r1.y - r2.y) > delta)) return NO ; 
     if ((r1.x != r2.x) && (Math.abs(r1.x - r2.x) > delta)) return NO ; 

data/frameworks/sproutcore/frameworks/foundation/tests/controllers/array/array_case.js

@@ -183,17 +183,36 @@ test("array orderBy using function", function(){
 // ADD SPECIAL CASES HERE
 // 
 
+test("verify rangeObserver fires when content is deleted", function() {
+  
+  content = "1 2 3 4 5".w().map(function(x) {
+    return TestObject.create({ title: x });
+  });
+  
+  controller = SC.ArrayController.create({ content: content });
+
+  var cnt = 0,
+      observer = SC.Object.create({ method: function() { cnt++; } });
+  controller.addRangeObserver(SC.IndexSet.create(0,2), observer, observer.method);
+      
+  SC.RunLoop.begin();
+  content.length = 0 ;
+  content.enumerableContentDidChange(); 
+  SC.RunLoop.end();
+
+  equals(cnt, 1, 'range observer should have fired once');
+});
 
 
 // ..........................................................
 // VERIFY SC.ARRAY COMPLIANCE
 // 
 
-SC.ArraySuite.generate("SC.ArrayController", {
-  newObject: function(amt) {
-    if (amt === undefined || typeof amt === SC.T_NUMBER) {
-      amt = this.expected(amt);
-    }
-    return SC.ArrayController.create({ content: amt });
-  }
-});
+// SC.ArraySuite.generate("SC.ArrayController", {
+//   newObject: function(amt) {
+//     if (amt === undefined || typeof amt === SC.T_NUMBER) {
+//       amt = this.expected(amt);
+//     }
+//     return SC.ArrayController.create({ content: amt });
+//   }
+// });

data/frameworks/sproutcore/frameworks/foundation/tests/system/core_query/jquery_core.js

@@ -1159,7 +1159,7 @@ test("prev([String])", function() {
 
 
 test("addClass(String)", function() {
- expect(2);
+ expect(1);
  var div = SC.$("div");
  div.addClass("test");
  var pass = true;
@@ -1168,11 +1168,11 @@ test("addClass(String)", function() {
  }
  ok( pass, "Add Class" );
 
- // using contents will get regular, text, and comment nodes
- var j = SC.$("#nonnodes").contents();
- j.addClass("asdf");
- ok( j.hasClass("asdf"), "Check node,textnode,comment for addClass" );
-});
+ // // using contents will get regular, text, and comment nodes
+ //  var j = SC.$("#nonnodes").contents();
+ //  j.addClass("asdf");
+ //  ok( j.hasClass("asdf"), "Check node,textnode,comment for addClass" );
+ });
 
 test("removeClass(String) - simple", function() {
  expect(4);

data/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/helpers_style.js

@@ -47,13 +47,13 @@ test("clone on next retrieval if styles(foo) set with cloneOnModify=YES", functi
 
 test("extracts styles from element on first retrieval", function() {
   var elem = document.createElement('div');
-  SC.$(elem).attr('style', 'color: black; height: 20px; ');
+  SC.$(elem).attr('style', 'color: black; height: 20px; border-top: 1px solid hotpink; ');
   context = SC.RenderContext(elem);
   
   var result = context.styles();
   
   
-  same(result, { color: 'black', height: '20px' }, 'extracted style. This is failing in IE8 because it return styles like cOLOR.');
+  same(result, { color: 'black', height: '20px', borderTop: '1px solid hotpink' }, 'extracted style. This is failing in IE8 because it return styles like cOLOR.');
   
   equals(context.styles(), result, "should reuse same instance thereafter");
 });

data/frameworks/sproutcore/frameworks/foundation/tests/system/request.js

@@ -27,11 +27,11 @@ test("Basic Requirements", function() {
 });
 
 test("Test Asynchronous GET Request", function() {
-
+  
   var response, timer;
 
   timer = setTimeout(function() {
-    ok(false, 'response did not invoke notify() withint 2sec');
+    ok(false, 'response did not invoke notify() within 2sec');
     window.start();
   }, 2000);
   
@@ -155,7 +155,69 @@ test("Test Multiple Asynchronous GET Request - two immediate, and two in serial"
   setTimeout( function(){
     equals(requestCount, 6, "requestCount should be 6");
     equals(responseCount, 6, "responseCount should be 6");
-    window.start() ; // starts the test runne
+    window.start() ; // starts the test runner
   }, 2000);
 });
 
+
+test("Test timeouts", function() {
+  var message;
+  
+  // Sanity check 1
+  try {
+    SC.Request.getUrl(url).set('timeout', 0).send();
+  }
+  catch (e) {
+    message = e;
+  }
+  ok(message && message.indexOf("The timeout value must either not be specified or must be greater than 0") !== -1, 'An error should be thrown when the timeout value is 0 ms');
+  
+  // Sanity check 2
+  try {
+    SC.Request.getUrl(url).set('isAsynchronous', NO).set('timeout', 10).send();
+  }
+  catch (e2) {
+    message = e2;
+  }
+  ok(message && message.indexOf("Timeout values cannot be used with synchronous requests") !== -1, 'An error should be thrown when trying to use a timeout with a synchronous request');
+
+
+  // Make sure timeouts actually fire, and fire when expected.
+  var changedBefore  = NO,
+      changedAfter   = NO,
+      timeoutRequest = SC.Request.getUrl("http://www.sproutcore.com"),
+      checkstop;
+
+  var now = Date.now();
+  
+  // make the timeout as short as possible so that it will always happen
+  timeoutRequest.set('timeout', 10);
+  timeoutRequest.set('didTimeout', function() { 
+    // at least timeout time must have elapsed
+    var elapsed = Date.now()-now;
+    ok(elapsed >= 10, 'timeout must not fire earlier than 10msec - actual %@'.fmt(elapsed));
+
+    // timeout did fire...just resume...
+    clearTimeout(checkstop);
+    window.start();
+  });
+  
+  timeoutRequest.set('didReceive', function() { 
+    ok(false, 'timeout did not fire before response was recieved.  should have fired after 10msec.  response time: %@msec'.fmt(Date.now() - now));
+    window.start(); // resume
+  });
+  
+  SC.RunLoop.begin();
+  timeoutRequest.send();
+  SC.RunLoop.end();
+  
+  stop() ; // stops the test runner
+
+  // in case nothing works
+  checkstop = setTimeout(function() {
+    ok(false, 'timeout did not fire at all');
+    window.start();
+  }, 500); 
+  
+});
+

data/frameworks/sproutcore/frameworks/foundation/tests/views/pane/append_remove.js

@@ -70,7 +70,7 @@ test("adding/remove/adding pane", function() {
   var layer = pane.get('layer');
   ok(layer, 'has layer');
   equals(layer.parentNode, elem1, 'layer belongs to parent');
-  
+  ok(pane.get('isVisibleInWindow'), 'isVisibleInWindow is YES before remove');
   pane.remove();
   ok(!pane.get('isVisibleInWindow'), 'isVisibleInWindow is NO');
   

data/frameworks/sproutcore/frameworks/foundation/tests/views/view/convertLayouts.js

@@ -0,0 +1,145 @@
+// ========================================================================
+// View Convertion Layout Unit Tests
+// ========================================================================
+
+/*globals module test ok same equals */
+
+/* These unit tests verify:  convertLayoutToAnchoredLayout(), convertLayoutToCustomLayout() */
+
+var parent, child;
+
+/**
+  Helper setup that creates a parent and child view so that you can do basic
+  tests.
+*/
+var commonSetup = {
+  setup: function() {
+    
+    // create basic parent view
+    parent = SC.View.create({
+      layout: { top: 0, left: 0, width: 500, height: 500 }
+    });
+    
+    // create child view to test against.
+    child = SC.View.create();
+  },
+  
+  teardown: function() {
+    parent = child = null ;
+  }
+};
+
+// ..........................................................
+// TEST LAYOUT WITH BASIC LAYOUT CONVERSION
+// 
+
+module('BASIC LAYOUT CONVERSION', commonSetup);
+
+test("layout {top, left, width, height}", function() {
+  var layout = { top: 10, left: 10, width: 50, height: 50 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  same(cl, layout, 'conversion is equal');
+}) ;
+
+test("layout {top, left, bottom, right}", function() {
+  var layout = { top: 10, left: 10, bottom: 10, right: 10 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  
+  var testLayout = { top: 10, left: 10, width: 480, height: 480 };
+  same(cl, testLayout, 'conversion is equal');
+}) ;
+
+test("layout {bottom, right, width, height}", function() {
+  var layout = { bottom: 10, right: 10, width: 50, height: 50 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  
+  var testLayout = { top: 440, left: 440, width: 50, height: 50 };
+  same(cl, testLayout, 'conversion is equal');
+}) ;
+
+test("layout {centerX, centerY, width, height}", function() {
+  var layout = { centerX: 10, centerY: 10, width: 50, height: 50 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  
+  var testLayout = { top: 235, left: 235, width: 50, height: 50 };
+  same(cl, testLayout, 'conversion is equal');
+}) ;
+
+
+// ..........................................................
+// TEST LAYOUT WITH INVALID LAYOUT VARIATIONS
+// 
+
+module('INVALID LAYOUT VARIATIONS', commonSetup);
+
+test("layout {top, left} - assume right/bottom=0", function() {
+  var layout = { top: 10, left: 10 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  
+  var testLayout = { top: 10, left: 10, width: 490, height: 490 };
+  same(cl, testLayout, 'conversion is equal');
+}) ;
+
+test("layout {height, width} - assume top/left=0", function() {
+  var layout = { height: 60, width: 60 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  
+  var testLayout = { top: 0, left: 0, width: 60, height: 60 };
+  same(cl, testLayout, 'conversion is equal');
+}) ;
+
+test("layout {right, bottom} - assume top/left=0", function() {
+  var layout = { right: 10, bottom: 10 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  
+  var testLayout = { top: 0, left: 0, width: 490, height: 490 };
+  same(cl, testLayout, 'conversion is equal');
+}) ;
+
+test("layout {centerX, centerY} - assume width/height=0", function() {
+  var layout = { centerX: 10, centerY: 10 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  
+  var testLayout = { top: 260, left: 260, width: 0, height: 0 };
+  same(cl, testLayout, 'conversion is equal');
+}) ;
+
+test("layout {top, left, centerX, centerY, height, width} - top/left take presidence", function() {
+  var layout = { top: 10, left: 10, centerX: 10, centerY: 10, height: 60, width: 60 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  
+  var testLayout = { top: 10, left: 10, width: 60, height: 60 };
+  same(cl, testLayout, 'conversion is equal');
+}) ;
+
+test("layout {bottom, right, centerX, centerY, height, width} - bottom/right take presidence", function() {
+  var layout = { bottom: 10, right: 10, centerX: 10, centerY: 10, height: 60, width: 60 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  
+  var testLayout = { top: 430, left: 430, width: 60, height: 60 };
+  same(cl, testLayout, 'conversion is equal');
+  
+}) ;
+
+test("layout {top, left, bottom, right, centerX, centerY, height, width} - top/left take presidence", function() {
+  var layout = { top: 10, left: 10, bottom: 10, right: 10, centerX: 10, centerY: 10, height: 60, width: 60 };
+  var cl = SC.View.convertLayoutToAnchoredLayout(layout, parent.get('frame'));
+  
+  var testLayout = { top: 10, left: 10, width: 60, height: 60 };
+  same(cl, testLayout, 'conversion is equal');
+}) ;
+
+
+test("layout {centerX, centerY, width:auto, height:auto}", function() {
+  // var error=null;
+  // var layout = { centerX: 10, centerY: 10, width: 'auto', height: 'auto' };
+  // child.set('layout', layout) ;
+  // try{
+  //   child.layoutStyle();
+  // }catch(e){
+  //   error=e;
+  // }
+  // equals(SC.T_ERROR,SC.typeOf(error),'Layout style functions should throw and '+
+  // 'error if centerx/y and width/height are set at the same time ' + error );
+  
+}) ;

data/frameworks/sproutcore/frameworks/foundation/tests/views/view/didAppendToDocument.js

@@ -0,0 +1,48 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            portions copyright @2009 Apple Inc.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test htmlbody ok equals same stop start Q$ */
+
+
+var pane, view;
+
+module("SC.View#didAppendToDocument");
+
+test("Check that didAppendToDocument gets called at the right moment", function() {
+   var counter=0;
+   pane = SC.MainPane.create({
+     childViews: [
+       SC.View.extend({
+         render: function (context, firstTime) {
+           context.push('new string');
+         },
+         didAppendToDocument: function(){
+           counter++;
+         }
+       })
+     ]
+   });
+   equals(counter, 0, "");
+   pane.append(); // make sure there is a layer...
+   equals(counter, 1, "");
+   view  = pane.childViews[0];
+   view.displayDidChange();
+   SC.RunLoop.begin().end();
+   equals(counter, 2, "");  
+ 
+   var additionalView = SC.View.extend({
+     didAppendToDocument: function(){
+       counter++;
+     }
+   });
+   additionalView = additionalView.create();
+   pane.appendChild(additionalView);
+ 
+   SC.RunLoop.begin().end();
+   equals(counter, 3, "");  
+   pane.remove();
+});

data/frameworks/sproutcore/frameworks/foundation/tests/views/view/nextValidKeyView.js

@@ -0,0 +1,91 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Apple Inc. and contributors.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test equals context ok same Q$ htmlbody */
+
+var pane, textfield_view1, textfield_view2, textfield_view3, view1, view2, view3, view4, view5;
+    
+module("SC.View#nextValidKeyView", {
+  setup: function() {
+    SC.RunLoop.begin();
+    
+    pane = SC.Pane.design()
+    .layout({ top: 0, left: 0, bottom:0, right: 0 })
+    .childView(SC.TextFieldView.design())
+    .childView(SC.View.design())
+    .childView(SC.View.design()
+      .childView(SC.View.design()
+        .childView(SC.View.design()
+          .childView(SC.View.design()
+            .childView(SC.TextFieldView.design())
+          )
+        )
+      )
+    )
+    .childView(SC.View.design())
+    .childView(SC.View.design())
+    .childView(SC.View.design())
+    .childView(SC.View.design()
+      .childView(SC.TextFieldView.design())
+    )
+    .childView(SC.View.design())
+    .create();
+    pane.append();
+    SC.RunLoop.end();
+    
+    textfield_view1 = pane.childViews[0];
+    textfield_view2 = pane.childViews[2].childViews[0].childViews[0].childViews[0].childViews[0];
+    textfield_view3 = pane.childViews[6].childViews[0];
+    view1 = pane.childViews[1];
+    view2 = pane.childViews[3]; 
+    view3 = pane.childViews[4];
+    view4 = pane.childViews[5];
+    view5 = pane.childViews[7];
+  },
+  
+
+  teardown: function() { 
+    SC.RunLoop.begin();
+    pane.remove();
+    pane = textfield_view1 = textfield_view2 = textfield_view3 = view1 = view2 = view3 = null;
+    SC.RunLoop.end();
+  }
+});
+
+test("Navigate between textfields- going forward", function() {
+  SC.SAFARI_FOCUS_BEHAVIOR = YES;
+  var v = view2.nextValidKeyView();
+  same(v, textfield_view3, "The next view should be " + textfield_view3.toString());
+  v = textfield_view3.nextValidKeyView();
+  same(v, null, "The next view should be null");
+});
+
+test("Navigate between textfields- going backwards", function() {
+  SC.SAFARI_FOCUS_BEHAVIOR = YES;
+  var v = view2.previousValidKeyView();
+  same(v, textfield_view2, "The previous key view should be " + textfield_view2.toString());
+
+});
+
+
+test("Navigate forward with view that have a nextKeyView set", function() {
+  SC.SAFARI_FOCUS_BEHAVIOR = YES;
+  var v = view2.nextValidKeyView();
+  same(v, textfield_view3, "The next view should be " + textfield_view3.toString());
+  view3.set('nextKeyView', textfield_view1);
+  v = view2.nextValidKeyView();
+  same(v, textfield_view1, "The next view should be " + textfield_view1.toString());
+});
+
+
+test("Navigate backwards with view that have a previousKeyView set", function() {
+  SC.SAFARI_FOCUS_BEHAVIOR = YES;
+  var v = view2.previousValidKeyView();
+  same(v, textfield_view2, "The next view should be " + textfield_view2.toString());
+  view4.set('previousKeyView', textfield_view1);
+  v = textfield_view3.previousValidKeyView();
+  same(v, textfield_view1, "The next view should be " + textfield_view1.toString());
+});