sproutcore 1.0.1046 → 1.0.1049.pre.1

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: �2006-2009 Apple Inc. and contributors.
-// License:   Licened under MIT license (see license.js)
+// Copyright: ©2006-2009 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test equals context ok same */

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

@@ -0,0 +1,41 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2009 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test equals context ok */
+
+module("SC.View#themes");
+
+var t1 = SC.Theme.register("sc-test-1", SC.BaseTheme.extend({classNames: ["test-1"]}));
+var t2 = SC.Theme.register("sc-test-2", SC.BaseTheme.extend({classNames: ["test-2"]}));
+
+test("changing themes propagates to child view.", function() {
+  var view = SC.View.create({
+    "childViews": "child".w(),
+    theme: "sc-test-1",
+    child: SC.View.extend({
+      
+    })
+  });
+  
+  ok(t1 === view.get("theme"), "view's theme should be sc-test-1");
+  ok(t1 === view.child.get("theme"), "view's child's theme should be sc-test-1");
+  view.set("theme", "sc-test-2");
+  ok(t2 === view.get("theme"), "view's theme should be sc-test-2");
+  ok(t2 === view.child.get("theme"), "view's child's theme should be sc-test-2");
+});
+
+test("adding child to parent propagates theme to child view.", function() {
+  var child = SC.View.create({});
+  var view = SC.View.create({
+    theme: "sc-test-1"
+  });
+  
+  ok(t1 === view.get("theme"), "view's theme should be sc-test-1");
+  ok(!child.get("theme"), "view's child's theme should be null");
+  view.appendChild(child);
+  ok(t1 === child.get("theme"), "view's child's theme should be sc-test-1");
+});

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Apple Inc. and contributors.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test equals context ok same */
@@ -14,12 +14,12 @@
 // 
 module("SC.View#updateLayer");
 
-test("invokes prepareContext() and then updates layer element", function() {
+test("invokes updateViewSettings() and then updates layer element", function() {
   var layer = document.createElement('div');
   var view = SC.View.create({
     layer: layer, // fake it...
-    prepareContext: function(context) {
-      context.addClass('did-update');
+    updateViewSettings: function() {
+      this.$(this.get("layer")).addClass('did-update');
     }
   });
   

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: �2006-2009 Apple Inc. and contributors.
-// License:   Licened under MIT license (see license.js)
+// Copyright: ©2006-2009 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test equals context ok same */

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Apple Inc. and contributors.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test equals context ok same Q$ htmlbody */
@@ -25,7 +25,7 @@ test("invokes parentViewDidResize on all child views - ignoring views that do no
   view.childViews[2].parentViewDidResize = null ;
   
   // now test...
-  view.viewDidResize();
+  SC.run(function() { view.viewDidResize(); });
   equals(callCount, 2, 'should invoke parentViewDidResize() on two methods that support it');
 });
 
@@ -38,7 +38,7 @@ test("triggers whenever layout property is changed", function() {
     })]
   });
   
-  view.set('layout', { top: 10, left: 20, height: 50, width: 40 });
+  SC.run(function() { view.set('layout', { top: 10, left: 20, height: 50, width: 40 }); });
   equals(callCount, 1, 'viewDidResize should invoke once');
 });
 
@@ -156,13 +156,14 @@ test("invoked whenever view is added to a new parentView but not when it is remo
     parentViewDidResize: function() { callCount++; }
   });
   var parent = SC.Pane.create().append(); // must be visible in window...
-  
+  SC.RunLoop.begin().end();
+
   callCount = 0 ;
-  parent.appendChild(view);
+  SC.run(function() { parent.appendChild(view); });
   equals(callCount, 1, 'should call parentViewDidResize');
   
   callCount = 0;
-  parent.removeChild(view);
+  SC.run(function() { parent.removeChild(view); });
   equals(callCount, 0, 'should not call parentViewDidResize()');
   
   parent.remove();

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('validators/validator') ;

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('validators/validator') ;

data/frameworks/sproutcore/frameworks/foundation/validators/date_time.js

@@ -0,0 +1,46 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2009 Apple Inc. All rights reserved.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+
+/**
+  This validates a SC.DateTime, used in SC.DateFieldView.
+  
+  @class
+  @extends SC.Validator
+  @author Juan Pablo Goldfinger
+  @version 1.0
+*/
+SC.Validator.DateTime = SC.Validator.extend({
+
+  /**
+    The standard format you want the validator to convert dates to.
+  */
+  format: '%d/%m/%Y',
+
+  /**
+    if we have a number, then convert to a date object.
+  */
+  fieldValueForObject: function(object, form, field) {
+    if (SC.kindOf(object, SC.DateTime)) {
+      object = object.toFormattedString(this.get('format'));
+    } else {
+      object = null;
+    }
+    return object;
+  },
+
+  /**
+    Try to pase value as a date. convert into a number, or return null if
+    it could not be parsed.
+  */
+  objectForFieldValue: function(value, form, field) {
+    if (value) {
+      value = SC.DateTime.parse(value, this.get('format'));
+    }
+    return value;
+  }
+
+});

data/frameworks/sproutcore/frameworks/foundation/validators/email.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('validators/validator') ;

data/frameworks/sproutcore/frameworks/foundation/validators/not_empty.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('validators/validator') ;

data/frameworks/sproutcore/frameworks/foundation/validators/number.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('validators/validator') ;
@@ -40,8 +40,8 @@ SC.Validator.Number = SC.Validator.extend(
   },
 
   objectForFieldValue: function(value, form, field) {
-    
     // strip out commas
+    var result;
     value = value.replace(/,/g,'');
     switch(SC.typeOf(value)) {
       case SC.T_STRING:
@@ -51,7 +51,14 @@ SC.Validator.Number = SC.Validator.extend(
           value = parseFloat(value) ;
         } else {
           if(value.length==1 && value.match(/-/)) value = null;
-          else value = parseInt(value,0) ;
+          else {
+            result = parseInt(value,0) ;
+            if(isNaN(result)){
+              value = SC.uniJapaneseConvert(value);
+              value = parseInt(value,0) ;
+              if(isNaN(value)) value='';
+            }else value = result;
+          }
         }
         break ;
       case SC.T_NULL:
@@ -76,10 +83,15 @@ SC.Validator.Number = SC.Validator.extend(
     Allow only numbers, dashes, period, and commas
   */
   validateKeyDown: function(form, field, charStr) {
+    var text = field.$input().val();
+    if (!text) text='';
+    text+=charStr;
     if(this.get('places')===0){
-      return (charStr.match(/^[\-+]?[0-9,\0]*/)[0]===charStr) || charStr.length === 0;
+      if(charStr.length===0) return true;
+      else return text.match(/^[\-{0,1}]?[0-9,\0]*/)[0]===text;
     }else {
-      return (charStr.match(/^[\-+]?[0-9,\0]*\.?[0-9\0]+/)===charStr) || charStr.length === 0;
+      if(charStr.length===0) return true;
+      else return text.match(/^[\-{0,1}]?[0-9,\0]*\.?[0-9\0]+/)===text;
     }
   }
     

data/frameworks/sproutcore/frameworks/foundation/validators/password.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('validators/validator') ;

data/frameworks/sproutcore/frameworks/foundation/validators/positive_integer.js

@@ -0,0 +1,84 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2009 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+sc_require('validators/validator') ;
+
+/**
+  Handles parsing and validating of positive integers.
+  
+  @extends SC.Validator
+  @author Nirumal Thomas
+  @version 1.0
+  @class
+*/
+SC.Validator.PositiveInteger = SC.Validator.extend(
+/** @scope SC.Validator.PositiveInteger.prototype */ {
+
+  /**
+    Default Value to be displayed. If the value in the text field is null,
+    undefined or an empty string, it will be replaced by this value.
+
+    @property
+    @type Number
+    @default null
+  */
+  defaultValue: null,
+
+  fieldValueForObject: function(object, form, field) {
+    switch(SC.typeOf(object)) {
+      case SC.T_NUMBER:
+        object = object.toFixed(0) ;
+        break ;
+      case SC.T_NULL:
+      case SC.T_UNDEFINED:
+        object = this.get('defaultValue') ;
+        break ;
+    }
+    return object ;
+  },
+
+  objectForFieldValue: function(value, form, field) {
+    // strip out commas
+    value = value.replace(/,/g,'');
+    switch(SC.typeOf(value)) {
+      case SC.T_STRING:
+        if (value.length === 0) {
+          value = this.get('defaultValue') ;
+        } else {
+          value = parseInt(value, 0) ;
+        }
+        break ;
+      case SC.T_NULL:
+      case SC.T_UNDEFINED:
+        value = this.get('defaultValue') ;
+        break ;
+    }
+    return value ;
+  },
+
+  validate: function(form, field) {
+    var value = field.get('fieldValue') ;
+    return (value === '') || !isNaN(value) ;
+  },
+  
+  validateError: function(form, field) {
+    var label = field.get('errorLabel') || 'Field' ;
+    return SC.$error("Invalid.Number(%@)".loc(label), label) ;
+  },
+  
+  /** 
+    Allow only numbers
+  */
+  validateKeyDown: function(form, field, charStr) {
+    var text = field.$input().val();
+    if (!text) text='';
+    text+=charStr;
+    if(charStr.length===0) return true ;
+    else return text.match(/^[0-9\0]*/)[0]===text;
+  }
+    
+}) ;

data/frameworks/sproutcore/frameworks/foundation/validators/validator.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 SC.VALIDATE_OK = YES;
@@ -88,7 +88,10 @@ SC.Validator = SC.Object.extend(
   /**
     Validate the field value.  
     
-    You can implement standard behavior for your validator by using the validate() and validateError() methods.  validate() should return NO if the field is not valid, YES otherwise.  If you return NO from this method, then the validateError() method will be called so you can generate an error object describing the specific problem.
+    You can implement standard behavior for your validator by using the validate()
+    and validateError() methods.  validate() should return NO if the field is not
+    valid, YES otherwise.  If you return NO from this method, then the validateError()
+    method will be called so you can generate an error object describing the specific problem.
 
     @param {SC.FormView} form the form this view belongs to
     @param {SC.View} field the field to validate.  Responds to fieldValue.
@@ -99,9 +102,13 @@ SC.Validator = SC.Object.extend(
   /**
     Returns an error object if the field is invalid.
   
-    This is the other standard validator method that can be used to impement basic validation.  Return an error object explaining why the field is not valid.  It will only be called if validate() returned NO.
+    This is the other standard validator method that can be used to impement basic validation.
+    Return an error object explaining why the field is not valid.  It will only be called if
+    validate() returned NO.
     
-    The default implementation of htis method returns a generic error message with the loc string "Invalid.Generate({fieldValue})".  You can simply define this loc string in strings.js if you prefer or you can override this method to provide a more specific error message.
+    The default implementation of htis method returns a generic error message with the loc
+    string "Invalid.Generate({fieldValue})".  You can simply define this loc string in
+    strings.js if you prefer or you can override this method to provide a more specific error message.
   
     @param {SC.FormView} form the form this view belongs to
     @param {SC.View} field the field to validate.  Responds to fieldValue.
@@ -120,9 +127,12 @@ SC.Validator = SC.Object.extend(
   /**
     Invoked just before the user ends editing of the field.
 
-    This is a primitive validation method.  You can implement the two higher-level methods (validate() and validateError()) if you prefer.
+    This is a primitive validation method.  You can implement the two higher-level
+    methods (validate() and validateError()) if you prefer.
     
-    The default implementation calls your validate() method and then validateError() if valiate() returns NO.  This method should return SC.VALIDATE_OK if validation succeeded or an error object if it fails.
+    The default implementation calls your validate() method and then validateError()
+    if valiate() returns NO.  This method should return SC.VALIDATE_OK if validation
+    succeeded or an error object if it fails.
   
     @param {SC.FormView} form the form for the field
     @param {SC.View} field the field to validate

data/frameworks/sproutcore/frameworks/foundation/views/container.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('views/view') ;
@@ -96,32 +96,35 @@ SC.ContainerView = SC.View.extend(
     SC.CONTENT_SET_DIRECTLY
   */
   nowShowingDidChange: function() {
-    var nowShowing = this.get('nowShowing') ;
-    var content = null;
-    //its a property path
-    if(SC.typeOf(nowShowing) === SC.T_STRING){
-      // if nowShowing was set because the content was set directly, then 
-      // do nothing.
-      if (nowShowing === SC.CONTENT_SET_DIRECTLY) return ;
-
-      // otherwise, if nowShowing is a non-empty string, try to find it...
-      if (nowShowing && nowShowing.length>0) {
-        if (nowShowing.indexOf('.')>0) {
-          content = SC.objectForPropertyPath(nowShowing, null);
-        } else {
-          content = SC.objectForPropertyPath(nowShowing, this.get('page'));
-        }
+    // This code turns this.nowShowing into a view object by any means necessary.
+    
+    var content = this.get('nowShowing') ;
+    
+    // If nowShowing was changed because the content was set directly, then do nothing.
+    if (content === SC.CONTENT_SET_DIRECTLY) return ;
+    
+    // If it's a string, try to turn it into the object it references...
+    if (SC.typeOf(content) === SC.T_STRING && content.length > 0) {
+      if (content.indexOf('.') > 0) {
+        content = SC.objectForPropertyPath(content);
+      } else {
+        content = SC.objectForPropertyPath(content, this.get('page'));
       }
-    }else{ //its a view
-      content = nowShowing;
     }
-
     
-    // only allow views
+    // If it's an uninstantiated view, then attempt to instantiate it.
+    // (Uninstantiated views have a create() method; instantiated ones do not.)
+    if (SC.typeOf(content) === SC.T_CLASS) {
+      if (content.kindOf(SC.View)) content = content.create();
+      else content = null;
+    } 
+    
+    // If content has not been turned into a view by now, it's hopeless.
     if (content && !(content instanceof SC.View)) content = null;
     
-    // set content
+    // Sets the content.
     this.set('contentView', content) ;
+    
   }.observes('nowShowing'),
   
   /**
@@ -133,4 +136,4 @@ SC.ContainerView = SC.View.extend(
     this.replaceContent(this.get('contentView'));
   }.observes('contentView')
   
-}) ;
+}) ;