sproutcore 1.5.0.rc.2 → 1.5.0

data/lib/frameworks/sproutcore/frameworks/foundation/tests/validators/date.js

@@ -8,19 +8,17 @@
 
 module("SC.Validator.Date");
 
-test("Converts into date if a value is given",function(){
-    var date = new Date(1234947136000),
-        utcDate = new Date(Number(date) + (date.getTimezoneOffset() * 60000)); // Adjust for timezone offset
+test("Converts into String if a number is given",function() {
+  var date = SC.DateTime.create({milliseconds: 1234947136000 + (new Date().getTimezoneOffset() * 60000)});
 
-    var c = SC.Validator.Date.fieldValueForObject(Number(utcDate),'','');
-    var expected = "Feb 18, 2009 8:52:16 AM";
-    ok(c === expected, "Number converted to date format. Expected: (%@) but got (%@)".fmt(expected, c));
+  var c = SC.Validator.Date.fieldValueForObject(date._ms, '', '');
+  var expected = "Feb 18, 2009 8:52:16 AM";
+  equals(c, expected, "Number converted to date format");
 });
 
-test("Converts into number when date string is given", function(){
-    var expected = 1234918336000;
-    var date = new Date(expected);
-    var d = SC.Validator.Date.objectForFieldValue(date.format('NNN d, yyyy h:mm:ss a'),'','');
-    ok(d === expected, "Date String compared with value in seconds. Expected: (%@) but got (%@)".fmt(expected, d));
-    ok(SC.typeOf(d) == "number", "Number is obtained");
+test("Converts into number when date string is given", function() {
+  var expected = 1234918336000;
+  var date = SC.DateTime.create(expected);
+  var d = SC.Validator.Date.objectForFieldValue(date.toFormattedString('%b %d, %Y %i:%M:%S %p'),'','');
+  equals(d, expected, "Number of milliseconds returned is correct");
 });

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/ui.js

@@ -13,21 +13,32 @@
   var pane = SC.ControlTestPane.design({ height: 100 });
   
   pane.add("basic", SC.ContainerView, {
-      isEnabled: YES
-    });
+    isEnabled: YES
+  });
     
   pane.add("disabled", SC.ContainerView, {
-      isEnabled: NO
-    });
+    isEnabled: NO
+  });
 
   pane.add("nowShowingDefault", SC.ContainerView, {
-      nowShowing: 'start',
+    nowShowing: 'start',
 
-      start: SC.LabelView.design({
-        value: 'Start'
-      })
+    start: SC.LabelView.design({
+      value: 'Start'
+    })
 
-    });
+  });
+
+  pane.add("has-templates", SC.ContainerView, {
+    nowShowing: 'template',
+
+    template: SC.TemplateView.design({
+      isTemplate1: YES
+    }),
+    template2: SC.TemplateView.design({
+      isTemplate2: YES
+    })
+  });
 
     // .add("disabled - single selection", SC.ListView, {
     //   isEnabled: NO,
@@ -142,4 +153,28 @@
 
   });
 
+  test("Works with TemplateViews", function() {
+    var view = pane.view("has-templates");
+    view.awake();
+
+    var contentView = view.get('contentView');
+
+    equals(view.get('nowShowing'), 'template', "precond - should have correct nowShowing");
+    ok(contentView, "precond - should have contentView");
+    ok(contentView.isTemplate1, "precond - should have correct contentView");
+
+    SC.run(function() { view.set('nowShowing', 'template2'); });
+
+    contentView = view.get('contentView');
+
+    ok(contentView, "should still have contentView");
+    ok(contentView.isTemplate2, "should have switched contentView");
+
+    SC.run(function() { view.set('nowShowing', null); });
+
+    contentView = view.get('contentView');
+
+    ok(!contentView, "should have removed contentView");
+  });
+
 })();

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/image/ui.js

@@ -8,7 +8,7 @@
 /*global module test htmlbody ok equals same */
 
 (function() {
-  var logoURL = "http://www.sproutcore.com/assets/images/logo.png";
+  var logoURL = sc_static('images/sproutcore.png');
   var sampleURLs = [ "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/canyon-public-domain-images-pictures/zion-hiker-the-sweetie-hiking-in-zion-narrows_w725_h544.jpg",
 "http://www.public-domain-image.com/cache/people-public-domain-images-pictures/children-kids-public-domain-images-pictures/children-playing_w562_h725.jpg",
 "http://www.public-domain-image.com/cache/architecture-public-domain-images-pictures/fountain-public-domain-images-pictures/water-fountain-in-park_w725_h544.jpg", "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/canyon-public-domain-images-pictures/winter-at-bryce-canyon_w725_h544.jpg", "http://www.public-domain-image.com/cache/fauna-animals-public-domain-images-pictures/prairie-dog-public-domain-images-pictures/prairie-dog-pups_w725_h483.jpg", "http://www.public-domain-image.com/cache/fauna-animals-public-domain-images-pictures/prairie-dog-public-domain-images-pictures/prairie-rattlesnake-crotalus-viridis_w725_h484.jpg", "http://www.public-domain-image.com/cache/fauna-animals-public-domain-images-pictures/tigers-public-domain-images-pictures/bengal-tiger_w725_h486.jpg", "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/field-public-domain-images-pictures/wooden-logs-in-field_w725_h483.jpg", "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/field-public-domain-images-pictures/wheat-yellow-in-field_w725_h544.jpg", "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/field-public-domain-images-pictures/vineyards_w725_h544.jpg", "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/autumn-public-domain-images-pictures/old-trees-with-leaves-on-ground-in-autumn_w725_h484.jpg", "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/canyon-public-domain-images-pictures/yaki-point-at-the-grand-canyon_w725_h547.jpg", "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/canyon-public-domain-images-pictures/grand-canyons-overlook-railings-pointing_w725_h544.jpg", "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/coast-public-domain-images-pictures/sand-ocean-tidepools-sea-swimming-swimmers-waves_w725_h544.jpg", "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/coast-public-domain-images-pictures/waves-breaking-rocks_w725_h544.jpg", "http://www.public-domain-image.com/cache/nature-landscapes-public-domain-images-pictures/sand-public-domain-images-pictures/sand-footstep_w725_h482.jpg"];
@@ -67,7 +67,7 @@
       // Status has changed, but the observer fires immediately, so pause in order to have the DOM updated
       setTimeout(function() {
         imgEl = imageView.$('img');
-        equals(logoURL, imgEl.attr('src'), "img src should be set to logoURL");
+        ok(imgEl.attr('src').indexOf(logoURL) !== 0, "img src should be set to logoURL");
 
         window.start(); // continue the tests
         }, 100);
@@ -176,10 +176,10 @@
         SC.RunLoop.end();
 
         innerFrame = imageView.get('innerFrame');
-        equals(innerFrame.width, 294, "SC.SCALE_NONE width");
+        equals(innerFrame.width, 271, "SC.SCALE_NONE width");
         equals(innerFrame.height, 60, "SC.SCALE_NONE height");
         if (testImg) {
-          equals(imgEl.css('width'), "294px", "SC.SCALE_NONE width");
+          equals(imgEl.css('width'), "271px", "SC.SCALE_NONE width");
           equals(imgEl.css('height'), "60px", "SC.SCALE_NONE height");
         }
 
@@ -189,10 +189,10 @@
 
         innerFrame = imageView.get('innerFrame');
         equals(innerFrame.width, 588, "SC.FILL_PROPORTIONALLY width");
-        equals(innerFrame.height, 120, "SC.FILL_PROPORTIONALLY height");
+        equals(innerFrame.height, 130, "SC.FILL_PROPORTIONALLY height");
         if (testImg) {
           equals(imgEl.css('width'), "588px", "SC.FILL_PROPORTIONALLY width");
-          equals(imgEl.css('height'), "120px", "SC.FILL_PROPORTIONALLY height");
+          equals(imgEl.css('height'), "130px", "SC.FILL_PROPORTIONALLY height");
         }
 
         SC.RunLoop.begin();
@@ -200,10 +200,10 @@
         SC.RunLoop.end();
 
         innerFrame = imageView.get('innerFrame');
-        equals(innerFrame.width, 441, "SC.BEST_FIT width");
+        equals(innerFrame.width, 407, "SC.BEST_FIT width");
         equals(innerFrame.height, 90, "SC.BEST_FIT height");
         if (testImg) {
-          equals(imgEl.css('width'), "441px", "SC.BEST_FIT width");
+          equals(imgEl.css('width'), "407px", "SC.BEST_FIT width");
           equals(imgEl.css('height'), "90px", "SC.BEST_FIT height");
         }
 
@@ -212,10 +212,10 @@
         SC.RunLoop.end();
 
         innerFrame = imageView.get('innerFrame');
-        equals(innerFrame.width, 294, "SC.BEST_FIT_DOWN_ONLY width (larger frame)");
+        equals(innerFrame.width, 271, "SC.BEST_FIT_DOWN_ONLY width (larger frame)");
         equals(innerFrame.height, 60, "SC.BEST_FIT_DOWN_ONLY height (larger frame)");
         if (testImg) {
-          equals(imgEl.css('width'), "294px", "SC.BEST_FIT_DOWN_ONLY width (larger frame)");
+          equals(imgEl.css('width'), "271px", "SC.BEST_FIT_DOWN_ONLY width (larger frame)");
           equals(imgEl.css('height'), "60px", "SC.BEST_FIT_DOWN_ONLY height (larger frame)");
         }
 
@@ -225,10 +225,10 @@
 
         innerFrame = imageView.get('innerFrame');
         equals(innerFrame.width, 147, "SC.BEST_FIT_DOWN_ONLY width (smaller size frame)");
-        equals(innerFrame.height, 30, "SC.BEST_FIT_DOWN_ONLY height (smaller size frame)");
+        equals(innerFrame.height, 33, "SC.BEST_FIT_DOWN_ONLY height (smaller size frame)");
         if (testImg) {
           equals(imgEl.css('width'), "147px", "SC.BEST_FIT_DOWN_ONLY width (smaller size frame)");
-          equals(imgEl.css('height'), "30px", "SC.BEST_FIT_DOWN_ONLY height (smaller size frame)");
+          equals(imgEl.css('height'), "33px", "SC.BEST_FIT_DOWN_ONLY height (smaller size frame)");
         }
 
         window.start(); // starts the test runner
@@ -240,7 +240,7 @@
     var imageHolder = pane.view('image_holder'),
         imageView;
 
-    // The logo is 294x60
+    // The logo is 271x60
     imageView = SC.ImageView.create({
       value: logoURL + "?lastmod=" + Math.round(Math.random() * 100000),
       layout: { top: 0, left: 0, width: 588, height: 90 },
@@ -314,11 +314,11 @@
         // Default is SC.ALIGN_CENTER
         innerFrame = imageView.get('innerFrame');
         equals(innerFrame.y, 30, "SC.ALIGN_CENTER top");
-        equals(innerFrame.x, 147, "SC.ALIGN_CENTER left");
+        equals(innerFrame.x, 158.5, "SC.ALIGN_CENTER left");
         if (testImg) {
           imgEl = imageView.$('img');
           equals(imgEl.css('top'), "30px", "SC.ALIGN_CENTER top");
-          equals(imgEl.css('left'), "147px", "SC.ALIGN_CENTER left");
+          equals(imgEl.css('left'), "159px", "SC.ALIGN_CENTER left");
         }
 
         SC.RunLoop.begin();
@@ -339,10 +339,10 @@
 
         innerFrame = imageView.get('innerFrame');
         equals(innerFrame.y, 0, "SC.ALIGN_TOP top");
-        equals(innerFrame.x, 147, "SC.ALIGN_TOP left");
+        equals(innerFrame.x, 158.5, "SC.ALIGN_TOP left");
         if (testImg) {
           equals(imgEl.css('top'), "0px", "SC.ALIGN_TOP top");
-          equals(imgEl.css('left'), "147px", "SC.ALIGN_TOP left");
+          equals(imgEl.css('left'), "159px", "SC.ALIGN_TOP left");
         }
 
         SC.RunLoop.begin();
@@ -351,10 +351,10 @@
 
         innerFrame = imageView.get('innerFrame');
         equals(innerFrame.y, 0, "SC.ALIGN_TOP_RIGHT top");
-        equals(innerFrame.x, 294, "SC.ALIGN_TOP_RIGHT left");
+        equals(innerFrame.x, 317, "SC.ALIGN_TOP_RIGHT left");
         if (testImg) {
           equals(imgEl.css('top'), "0px", "SC.ALIGN_TOP_RIGHT top");
-          equals(imgEl.css('left'), "294px", "SC.ALIGN_TOP_RIGHT left");
+          equals(imgEl.css('left'), "317px", "SC.ALIGN_TOP_RIGHT left");
         }
         SC.RunLoop.begin();
         imageView.set('align', SC.ALIGN_RIGHT);
@@ -362,10 +362,10 @@
 
         innerFrame = imageView.get('innerFrame');
         equals(innerFrame.y, 30, "SC.ALIGN_RIGHT top");
-        equals(innerFrame.x, 294, "SC.ALIGN_RIGHT left");
+        equals(innerFrame.x, 317, "SC.ALIGN_RIGHT left");
         if (testImg) {
           equals(imgEl.css('top'), "30px", "SC.ALIGN_RIGHT top");
-          equals(imgEl.css('left'), "294px", "SC.ALIGN_RIGHT left");
+          equals(imgEl.css('left'), "317px", "SC.ALIGN_RIGHT left");
         }
 
         SC.RunLoop.begin();
@@ -374,10 +374,10 @@
 
         innerFrame = imageView.get('innerFrame');
         equals(innerFrame.y, 60, "SC.ALIGN_BOTTOM_RIGHT top");
-        equals(innerFrame.x, 294, "SC.ALIGN_BOTTOM_RIGHT left");
+        equals(innerFrame.x, 317, "SC.ALIGN_BOTTOM_RIGHT left");
         if (testImg) {
           equals(imgEl.css('top'), "60px", "SC.ALIGN_BOTTOM_RIGHT top");
-          equals(imgEl.css('left'), "294px", "SC.ALIGN_BOTTOM_RIGHT left");
+          equals(imgEl.css('left'), "317px", "SC.ALIGN_BOTTOM_RIGHT left");
         }
 
         SC.RunLoop.begin();
@@ -386,10 +386,10 @@
 
         innerFrame = imageView.get('innerFrame');
         equals(innerFrame.y, 60, "SC.ALIGN_BOTTOM top");
-        equals(innerFrame.x, 147, "SC.ALIGN_BOTTOM left");
+        equals(innerFrame.x, 158.5, "SC.ALIGN_BOTTOM left");
         if (testImg) {
           equals(imgEl.css('top'), "60px", "SC.ALIGN_BOTTOM top");
-          equals(imgEl.css('left'), "147px", "SC.ALIGN_BOTTOM left");
+          equals(imgEl.css('left'), "159px", "SC.ALIGN_BOTTOM left");
         }
 
         SC.RunLoop.begin();
@@ -488,5 +488,25 @@
 
     imageHolder.appendChild(imageView);
   });
+
+  test("CSS class is applied for ImageView using a sprite for value", function() {
+    var view = pane.view('sprite_image'),
+        viewElem = view.$('img');
+
+    ok(viewElem.hasClass('sprite-class'), "element given correct class");
+
+    SC.run(function() {
+      view.set('value', 'another-sprite');
+    });
+
+    ok(!viewElem.hasClass('sprite-class'), "When value changed, element has old class removed");
+    ok(viewElem.hasClass('another-sprite'), "When value changed, element has new class added");
+
+    SC.run(function() {
+      view.set('value', null);
+    });
+
+    ok(!viewElem.hasClass('another-sprite'), "When value removed, element has old class removed");
+  });
 })();
 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/label/ui.js

@@ -104,8 +104,6 @@ test("Check that all labels have the right classes and styles set", function() {
   ok(viewElem.hasClass('sc-label-view'), 'basic.hasClass(sc-label-view) should be YES');
   ok(!viewElem.hasClass('icon'), 'basic.hasClass(icon) should be NO');
   ok(!viewElem.hasClass('disabled'), 'basic.hasClass(disabled) should be YES');
-  ok(viewElem.css('fontWeight') === 'normal', 'basic should have normal fontWeight');
-  ok(viewElem.css('textAlign') === 'left', 'basic should have left textAlign');
   
   viewElem=pane.view('disabled').$();
   ok(viewElem.hasClass('sc-view'), 'title.hasClass(sc-view) should be YES');
@@ -150,10 +148,19 @@ test("Check that all labels have the right classes and styles set", function() {
   ok(viewElem.hasClass('sc-label-view'), 'title,icon,selected.hasClass(sc-label-view) should be YES');
   ok(!viewElem.hasClass('icon'), 'title,icon,selected.hasClass(icon) should be YES');
   ok(!viewElem.hasClass('disabled'), 'title,icon,selected.hasClass(disabled) should be NO');
-  ok(viewElem.css('fontWeight') === 'bold', 'bold view should have bold fontWeight');
+  ok(viewElem[0].style.fontWeight === 'bold', 'bold view should have bold fontWeight');
    
 });
 
+test("Default styles are set correctly in CSS"
+//, function() {
+  // document.defaultView.getComputedStyle fails when we're running framework-level tests
+  // var viewElem=pane.view('basic').$();
+  // ok(viewElem.css('textAlign') === 'left', 'centered should have center textAlign');
+  // ok(viewElem.css('fontWeight') === 'normal', 'bold view should have bold fontWeight');
+//}
+);
+
 test("Check that the title is set or not and if it is in the appropriate element", function() {
   var viewElem=pane.view('basic').$();
   equals(viewElem.text(), 'hello', 'has a value set');

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/nextValidKeyView.js

@@ -48,11 +48,11 @@ module("SC.View#nextValidKeyView", {
     view5 = pane.childViews[7];
     
     OLD = {
-      SAFARI_FOCUS_BEHAVIOR: SC.SAFARI_FOCUS_BEHAVIOR,
+      FOCUS_ALL_CONTROLS: SC.FOCUS_ALL_CONTROLS,
       TABBING_ONLY_INSIDE_DOCUMENT: SC.TABBING_ONLY_INSIDE_DOCUMENT
     };
 
-    SC.SAFARI_FOCUS_BEHAVIOR = YES;
+    SC.FOCUS_ALL_CONTROLS = SC.FOCUS_ALL_CONTROLS;
     SC.TABBING_ONLY_INSIDE_DOCUMENT = NO;
     
   },
@@ -61,7 +61,7 @@ module("SC.View#nextValidKeyView", {
   teardown: function() { 
     
     // restore old settings
-    SC.SAFARI_FOCUS_BEHAVIOR = OLD.SAFARI_FOCUS_BEHAVIOR;
+    SC.FOCUS_ALL_CONTROLS = OLD.FOCUS_ALL_CONTROLS;
     SC.TABBING_ONLY_INSIDE_DOCUMENT = OLD.TABBING_ONLY_INSIDE_DOCUMENT;
 
     SC.RunLoop.begin();
@@ -72,7 +72,7 @@ module("SC.View#nextValidKeyView", {
 });
 
 test("Navigate between textfields- going forward", function() {
-  SC.SAFARI_FOCUS_BEHAVIOR = YES;
+  SC.FOCUS_ALL_CONTROLS = YES;
   SC.TABBING_ONLY_INSIDE_DOCUMENT = NO;
   
   var v = view2.nextValidKeyView();
@@ -83,7 +83,7 @@ test("Navigate between textfields- going forward", function() {
 });
 
 test("Navigate between textfields- going backwards", function() {
-  SC.SAFARI_FOCUS_BEHAVIOR = YES;
+  SC.FOCUS_ALL_CONTROLS = YES;
   var v = view2.previousValidKeyView();
   same(v, textfield_view2, "The previous key view should be " + textfield_view2.toString());
 
@@ -91,7 +91,7 @@ test("Navigate between textfields- going backwards", function() {
 
 
 test("Navigate forward with view that have a nextKeyView set", function() {
-  SC.SAFARI_FOCUS_BEHAVIOR = YES;
+  SC.FOCUS_ALL_CONTROLS = YES;
   var v = view2.nextValidKeyView();
   same(v, textfield_view3, "The next view should be " + textfield_view3.toString());
   view3.set('nextKeyView', textfield_view1);
@@ -101,7 +101,7 @@ test("Navigate forward with view that have a nextKeyView set", function() {
 
 
 test("Navigate backwards with view that have a previousKeyView set", function() {
-  SC.SAFARI_FOCUS_BEHAVIOR = YES;
+  SC.FOCUS_ALL_CONTROLS = YES;
   var v = view2.previousValidKeyView();
   same(v, textfield_view2, "The next view should be " + textfield_view2.toString());
   view4.set('previousKeyView', textfield_view1);

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/ui.js

@@ -18,6 +18,17 @@
     value: 'John Doe'
   })
   
+  .add("password", SC.TextFieldView, {
+    isPassword: YES,
+    value: "I'm so secret"
+  })
+  
+  .add("password-hint", SC.TextFieldView, {
+    hint: "Passwerd",
+    isPassword: YES,
+    value: "I'm so secret"
+  })
+  
   .add("disabled - empty", SC.TextFieldView, { 
     hint: "Full Name", 
     value: null,
@@ -92,7 +103,7 @@ pane.verifyEmpty = function verifyEmpty(view, expectedHint) {
   var layer = view.$();
   
   ok(!layer.hasClass('not-empty'), 'layer should not have not-empty class');
-  if(SC.browser.webkit) equals(input.val(), '', 'input should have empty value');
+  if(SC.browser.webkit || parseInt(SC.browser.mozilla) >= 2.0) equals(input.val(), '', 'input should have empty value');
   else equals(input.val(), expectedHint, 'input should have empty value');
   if (expectedHint) {
     var hint = view.$('.sc-hint');
@@ -157,6 +168,18 @@ test("with value", function() {
   pane.verifyDisabled(view, NO);
 });
 
+test("password", function() {
+  var view = pane.view('password');
+  pane.verifyNotEmpty(view, 'I\'m so secret');
+  pane.verifyDisabled(view, NO);
+});
+
+test("password with hint", function() {
+  var view = pane.view('password-hint');
+  pane.verifyNotEmpty(view, 'I\'m so secret', 'Passwerd');
+  pane.verifyDisabled(view, NO);
+});
+
 test("disabled - empty", function() {
   var view = pane.view('disabled - empty');
   pane.verifyEmpty(view, 'Full Name');
@@ -238,6 +261,20 @@ test("enabling disabled view", function() {
   pane.verifyDisabled(view, NO);
 });
 
+if (!SC.browser.isIE && !SC.platform.input.placeholder) {
+  test("Changing value to null -- password field", function() {
+    var view = pane.view('password-hint'),
+        input = view.$('input');
+
+    SC.run(function() {
+      view.set('value', null);
+    });
+
+    equals(input.attr('type'), 'text', "When nulled out, field was converted to type text");
+    equals(input.val(), view.get('hint'), "When nulled out, field was given value equal to hint");
+  });
+}
+
 // ..........................................................
 // TEST SELECTION SUPPORT
 // 

data/lib/frameworks/sproutcore/frameworks/foundation/validators/credit_card.js

@@ -48,7 +48,7 @@ SC.Validator.CreditCard = SC.Validator.extend(
   
   validateError: function(form, field) {
     var label = field.get('errorLabel') || 'Field' ;
-    return SC.$error("Invalid.CreditCard(%@)".loc(label), label);
+    return SC.$error(SC.String.loc("Invalid.CreditCard(%@)", label), label);
   },
   
   /**