sproutcore 1.0.1003 → 1.0.1008

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

@@ -4,23 +4,23 @@
 
 module("credit_card validation - fieldValueForObject()");
 test("Expects a string of 16 digits.  Will split into groups of 4 for display.",function(){
-	obj=SC.Validator.CreditCard.create();
-	string = "1234567890123456";
-	grouped_string = obj.fieldValueForObject("1234567891234567");
+	var obj=SC.Validator.CreditCard.create();
+	var string = "1234567890123456";
+	var grouped_string = obj.fieldValueForObject("1234567891234567");
 	equals(grouped_string,"1234 5678 9123 4567");	
 });
 test("Removes all whitespace or dashes to make a single string",function(){
-	obj=SC.Validator.CreditCard.create();
-	string = "1234 5678-9012-3456";
-	clean_string = obj.objectForFieldValue(string);
+	var obj=SC.Validator.CreditCard.create();
+	var string = "1234 5678-9012-3456";
+	var clean_string = obj.objectForFieldValue(string);
 	equals(clean_string,"1234567890123456");	
 });
 
 test("Checks all valid card numbers or dashes to make a single string",function(){
-	obj=SC.Validator.CreditCard.create();
-	invalid_cc = "1234 5678-9012-3456";
+	var obj=SC.Validator.CreditCard.create();
+	var invalid_cc = "1234 5678-9012-3456";
 	equals(obj.checkNumber(invalid_cc),false);
-	valid_cc = "4111 1111 1111 1111";
+	var valid_cc = "4111 1111 1111 1111";
 	equals(obj.checkNumber(valid_cc),true);	
 });
 

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

@@ -14,7 +14,7 @@ test("validate() a number", function() {
 });
 
 test("Checking fieldValueForObject" ,function(){
- obj = {};
+ var obj = {};
  var value;
  value = SC.Validator.Number.fieldValueForObject(obj,'','');
  equals(SC.T_HASH,SC.typeOf(value),'Returns an object');
@@ -27,7 +27,7 @@ test("Checking fieldValueForObject" ,function(){
 });
 
 test("Checking objectForFieldValue" ,function(){
- obj = {};
+ var obj = {};
  var value = '';
  value = SC.Validator.Number.objectForFieldValue('','','');
  equals(null,value,'Returns null for an empty string parameter');

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

@@ -10,15 +10,15 @@
 // htmlbody('<style> .sc-control-test-pane .wrapper { overflow: none; } </style>');
 
 (function() {
-  var pane = SC.ControlTestPane.design({ height: 100 })
+  var pane = SC.ControlTestPane.design({ height: 100 });
   
   pane.add("basic", SC.ContainerView, {
       isEnabled: YES
-    })
+    });
     
   pane.add("disabled", SC.ContainerView, {
       isEnabled: NO
-    })
+    });
     
     // .add("disabled - single selection", SC.ListView, {
     //   isEnabled: NO,

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

@@ -13,7 +13,7 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 
   var pane = SC.ControlTestPane.design()
     .add("image_not_loaded", SC.ImageView, { 
-      value: appleURL, layout : {width: 200, height: 300}
+      value: null, layout : {width: 200, height: 300}
     })
     .add("image_loaded", SC.ImageView, { 
       value: appleURL, status:'loaded', layout : {width: 200, height: 300}
@@ -26,8 +26,15 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
   
   
     test("Verify that all the rendering properties of an image that is being loaded are correct", function() {
-      ok(pane.view('image_not_loaded').get('isVisibleInWindow'), 'image_not_loaded is visible in window');
-      ok((pane.view('image_not_loaded').$().attr('src').indexOf('blank.gif')!=-1), "The src should be set to the blank URL.");    
+      var view = pane.view('image_not_loaded');
+
+      ok(view.get('isVisibleInWindow'), 'image_not_loaded is visible in window');
+
+      view.set('value', appleURL);
+      ok(view.get('status') !== 'loaded', 'PRECOND - status should not be loaded (status=%@)'.fmt(view.get('status')));
+     
+      var url = view.$().attr('src')
+  ok((url.indexOf('blank.gif')!=-1), "The src should be blank URL. url = %@".fmt(url));    
     });
     
     test("Verify that all the rendering properties of an image that is loaded are correct", function() {

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

@@ -140,8 +140,8 @@ test("Check that the title is set or not and if it is in the appropriate element
   var viewElem=pane.view('basic').$();
   equals(viewElem.text(), 'hello', 'has a value set');
 
-  var viewElem=pane.view('centered,icon').$('img');
-  ok((viewElem!=null), 'should have an image corresponding to an icon');
+  viewElem=pane.view('centered,icon').$('img');
+  ok((viewElem!==null), 'should have an image corresponding to an icon');
 
 });
 

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

@@ -31,6 +31,20 @@ test("adding to document for first time", function() {
   
 });
 
+test("adding a pane twice should have no effect", function() {
+  var cnt = 0;
+  var pane = SC.Pane.create();
+  pane._tmp_paneDidAttach = pane.paneDidAttach;
+  pane.paneDidAttach = function() {
+    cnt++;
+    return this._tmp_paneDidAttach.apply(this, arguments);
+  };
+  
+  pane.append();
+  pane.append();
+  equals(cnt, 1, 'should only append once');
+});
+
 test("readding pane", function() {
   var pane = SC.Pane.create();
   var elem1 = Q$('body').get(0), elem2 = Q$('#appendtest').get(0);

data/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/methods.js

@@ -5,13 +5,13 @@
 // License:   Licened under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test htmlbody ok equals same stop start */
+/*global module test htmlbody ok equals same stop start Q$ */
 
 
 // note: need to test interaction with Validators here
 // possibly move Validator support to TextFieldView specifically.
 
-var pane, view ;
+var pane, view, view1;
 module("SC.TextFieldView",{
 	setup: function() {
 	    SC.RunLoop.begin();
@@ -68,9 +68,9 @@ test("isEnabled=NO should add disabled class", function() {
 //   });
 
 test("isEnabled and isEditable mapping", function() {
-  	obj= SC.TextFieldView.create();
-	obj.set('isEnabled',false)
+  var obj= SC.TextFieldView.create();
+	obj.set('isEnabled',false);
 	equals(obj.get('isEditable'),false);
-	obj.set('isEnabled',true)
+	obj.set('isEnabled',true);
 	equals(obj.get('isEditable'),true);
 });

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

@@ -247,6 +247,7 @@ test("Setting the selection to a non-SC.TextSelection value should fail", functi
 test("Setting and then getting back the selection", function() {  
   var view = pane.view('with value');
   var fieldElement = view.$input()[0];
+  fieldElement.focus();
   fieldElement.size = 10;     // Avoid Firefox 3.5 issue
   
   var newSelection = SC.TextSelection.create({start:2, end:5});
@@ -281,9 +282,7 @@ test("Adding left accessory view", function() {
   // The hint and padding elements should automatically have their 'left'
   // values set to the accessory view's offset + width
   // (18 = 2 left offset + 16 width)
-  var hintElement  = view.$('.sc-hint')[0];
   var paddingElement = view.$('.padding')[0];
-  ok(hintElement.style.left  === '18px', 'hint element should get 18px left');
   ok(paddingElement.style.left === '18px', 'padding element should get 18px left');
   
   // Test removing the accessory view.
@@ -291,7 +290,6 @@ test("Adding left accessory view", function() {
   view.set('leftAccessoryView', null);
   SC.RunLoop.end();
   ok(view.get('childViews').length === 0, 'after removing the left accessory view there should be no child views left');
-  ok(!hintElement.style.left, 'after removing the left accessory view the hint element should have no left style');
   ok(!paddingElement.style.left, 'after removing the left accessory view the padding element should have no left style');
 });
 
@@ -314,9 +312,7 @@ test("Adding right accessory view", function() {
   // The hint and padding elements should automatically have their 'right'
   // values set to the accessory view's offset + width
   // (20 = 3 right offset + 17 width)
-  var hintElement  = view.$('.sc-hint')[0];
   var paddingElement = view.$('.padding')[0];
-  ok(hintElement.style.right  === '20px', 'hint element should get 20px right');
   ok(paddingElement.style.right === '20px', 'padding element should get 20px right');
   
   
@@ -339,7 +335,6 @@ test("Adding right accessory view", function() {
   view.set('rightAccessoryView', null);
   SC.RunLoop.end();
   ok(view.get('childViews').length === 0, 'after removing the right accessory view there should be no child views left');
-  ok(!hintElement.style.right, 'after removing the right accessory view the hint element should have no right style');
   ok(!paddingElement.style.right, 'after removing the right accessory view the padding element should have no right style');
 });
 
@@ -365,11 +360,8 @@ test("Adding both left and right accessory views", function() {
   // 'right' values set to the accessory views' offset + width
   //   *  left:   18 = 2 left offset + 16 width)
   //   *  right:  20 = 3 left offset + 17 width)
-  var hintElement  = view.$('.sc-hint')[0];
   var paddingElement = view.$('.padding')[0];
-  ok(hintElement.style.left  === '18px', 'hint element should get 18px left');
   ok(paddingElement.style.left === '18px', 'padding element should get 18px left');
-  ok(hintElement.style.right  === '20px', 'hint element should get 20px right');
   ok(paddingElement.style.right === '20px', 'padding element should get 20px right');
   
   
@@ -378,13 +370,11 @@ test("Adding both left and right accessory views", function() {
   view.set('rightAccessoryView', null);
   SC.RunLoop.end();
   ok(view.get('childViews').length === 1, 'after removing the right accessory view there should be one child view left (the left accessory view)');
-  ok(!hintElement.style.right, 'after removing the right accessory view the hint element should have no right style');
   ok(!paddingElement.style.right, 'after removing the right accessory view the padding element should have no right style');
   SC.RunLoop.begin();
   view.set('leftAccessoryView', null);
   SC.RunLoop.end();
   ok(view.get('childViews').length === 0, 'after removing both accessory views there should be no child views left');
-  ok(!hintElement.style.left, 'after removing the left accessory view the hint element should have no left style');
   ok(!paddingElement.style.left, 'after removing the left accessory view the padding element should have no left style');
 });
 

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

@@ -112,7 +112,7 @@ test("notifies receiver and each child if parent clipping frame changes", functi
   // This should not happen.  If this is the case, fix the view code so that
   // it does not invalidate frame more than once before you change this 
   // number.
-  equals(callCount, 2, 'should invoke observer on child and nested child');
+  equals(callCount, 4, 'should invoke observer on child and nested child');
 });
 
 
@@ -128,6 +128,6 @@ test("does not notify child views of clippingFrame changes if child view hasStat
   // now, adjust layout of child so that clipping frame will change...
   a.adjust('top', -50);
   
-  equals(callCount, 1, 'should invoke observer on child only');
+  equals(callCount, 2, 'should invoke observer on child only');
 });
 

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

@@ -75,10 +75,8 @@ test("removes layer from parentNode if in DOM", function() {
   
   view.destroyLayer();
 
-  if(layer.parentNode)
-    equals(layer.parentNode.nodeType, 11, 'layer no longer in parent node');
-  else
-    equals(layer.parentNode, null, 'layer no longer in parent node');
+  if(layer.parentNode) equals(layer.parentNode.nodeType, 11, 'layer no longer in parent node');
+  else equals(layer.parentNode, null, 'layer no longer in parent node');
   layer = null; // cleanup
 });
 

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

@@ -43,10 +43,8 @@ test("discovers layer by finding element with matching layerId - when DOM is in
 });
 
 test("discovers layer by finding element with matching layerId - when parent DOM is NOT in document", function() {
-  if(parentDom.parentNode)
-      equals(parentDom.parentNode.nodeType, 11, 'precond - NOT in parent doc');
-  else    
-    equals(parentDom.parentNode, null, 'precond - NOT in parent doc');
+  if(parentDom.parentNode) equals(parentDom.parentNode.nodeType, 11, 'precond - NOT in parent doc');
+  else equals(parentDom.parentNode, null, 'precond - NOT in parent doc');
   equals(view.findLayerInParentLayer(parentDom), childDom, 'found childDom');
 });
 

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

@@ -42,7 +42,7 @@ test("insertBefore(child, null) appends child to end of parent.childView's array
 test("insertBefore(child, otherChild) inserts child before other child view", function() {
   
   var otherChild = parent.childViews[0]; // get current first child
-  ok(otherChild, 'precond - otherChild is not null')
+  ok(otherChild, 'precond - otherChild is not null');
   parent.insertBefore(child, otherChild);
   equals(parent.childViews[0], child, 'child inserted before other child');
 });

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

@@ -39,7 +39,6 @@ function performLayoutTest(layout, no_f, no_s, with_f, with_s) {
   child.set('layout', layout) ;
 
   // test
-  same(child.get('frame'), no_f, "FRAME NO PARENT".fmt(SC.inspect(child.get('frame')), SC.inspect(no_f))) ;  
   keys.forEach(function(key) {
     equals(child.get('layoutStyle')[key], no_s[key], "STYLE NO PARENT %@".fmt(key)) ;  
   });
@@ -50,7 +49,6 @@ function performLayoutTest(layout, no_f, no_s, with_f, with_s) {
   SC.RunLoop.end();
   
   // test again
-  same(child.get('frame'), with_f, "FRAME WITH PARENT".fmt(SC.inspect(child.get('frame')), SC.inspect(with_f))) ;  
   keys.forEach(function(key) {
     equals(child.get('layoutStyle')[key], with_s[key], "STYLE NO PARENT %@".fmt(key)) ;  
   });

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

@@ -26,7 +26,7 @@ SC.Validator.Password = SC.Validator.extend(
   },
 
   validate: function(force) {
-    if (!this.fields || this.fields.length == 0) return true ;
+    if (!this.fields || this.fields.length === 0) return true ;
     
     var empty = false ;
     var notEmpty = false ;
@@ -35,22 +35,22 @@ SC.Validator.Password = SC.Validator.extend(
     this.fields.forEach(function(field) {
       var curValue = field.get('fieldValue') ;
       if (curValue != value) ret= false ;
-      if (!curValue || curValue.length == 0) empty = true ;
+      if (!curValue || curValue.length === 0) empty = true ;
       if (curValue && curValue.length > 0) notEmpty = true ;
     }) ;
 
     // if forces, valid OK if there was an empty.  If not forced, valid OK 
     // only if all fields match AND they are not all empty.
     if (force) {
-      return (notEmpty == false) ? false : ret ;
+      return (notEmpty === false) ? false : ret ;
     } else {
-      return (empty == true) ? true : ret ;
+      return (empty === true) ? true : ret ;
     }
   },
   
   // update field states
   updateFields: function(form,valid) {
-    if (!this.fields || this.fields.length == 0) return true ;
+    if (!this.fields || this.fields.length === 0) return true ;
     var err = "Invalid.Password".loc();
     var topField = this._field ;
     this.fields.forEach(function(f) {

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

@@ -296,8 +296,9 @@ SC.Validator.mixin(/** @scope SC.Validator */ {
     method you define in your subclass.
   */
   fieldValueForObject: function(object, form, field) {
-    if (this.prototype && this.prototype.fieldValueForObject)
+    if (this.prototype && this.prototype.fieldValueForObject) {
       return this.prototype.fieldValueForObject(object,form,field) ;
+    }
     else return null ;
   },
   
@@ -306,8 +307,9 @@ SC.Validator.mixin(/** @scope SC.Validator */ {
     method you define in your subclass.
   */
   objectForFieldValue: function(value, form, field) {
-    if (this.prototype && this.prototype.objectForFieldValue)
+    if (this.prototype && this.prototype.objectForFieldValue) {
       return this.prototype.objectForFieldValue(value,form,field) ;
+    }
     else return null ;
   }
   

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

@@ -42,6 +42,9 @@ SC.FieldView = SC.View.extend(SC.Control, SC.Validatable,
   */
   followSafariTabFocusBehavior: NO,
 
+
+  _field_isMouseDown: NO,
+  
   /**
     The raw value of the field itself.  This is computed from the 'value'
     property by passing it through any validator you might have set.  This is 
@@ -225,11 +228,7 @@ SC.FieldView = SC.View.extend(SC.Control, SC.Validatable,
     event.  But first, set isActive to YES.
   */
   mouseDown: function(evt) {  
-    if (this.get('isEnabled')) {
-              this.set('isActive', YES); 
-              this.becomeFirstResponder();
-              this._field_isMouseDown = YES;
-            }
+    this._field_isMouseDown = YES;
     evt.allowDefault(); 
     return YES; 
   },
@@ -252,8 +251,6 @@ SC.FieldView = SC.View.extend(SC.Control, SC.Validatable,
     return YES;
   },
   
-  _field_isMouseDown: NO,
-  
   /** @private
     on mouse up, remove the isActive class and then allow the browser to do
     its normal thing.
@@ -261,7 +258,7 @@ SC.FieldView = SC.View.extend(SC.Control, SC.Validatable,
   mouseUp: function(evt) {
     // track independently in case isEnabled has changed
     if (this._field_isMouseDown) this.set('isActive', NO); 
-    this._field_isMouseDown = false;
+    this._field_isMouseDown = NO;
     evt.allowDefault();
     return YES ;
   },

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

@@ -74,6 +74,11 @@ SC.LabelView = SC.View.extend(SC.Control,
   */
   value: '',
   
+  /**
+    The hint to display if no value is set.  Should be used only if isEditable
+    is set to YES.
+  */
+  hint: null,
 
   /**
     The exampleInlineTextFieldView property is by default a 
@@ -97,6 +102,11 @@ SC.LabelView = SC.View.extend(SC.Control,
   */
   textAlign: SC.ALIGN_LEFT,
   
+  /**
+    If you want the inline editor to be multiline set this property to YES.
+  */
+  isInlineEditorMultiline: NO,
+  
   /**
     [RO] The value that will actually be displayed.
     
@@ -192,7 +202,7 @@ SC.LabelView = SC.View.extend(SC.Control,
       delegate: this,
       exampleElement: el,
       value: value, 
-      multiline: NO, 
+      multiline: this.get('isInlineEditorMultiline'), 
       isCollection: NO,
       validator: this.get('validator'),
       exampleInlineTextFieldView: this.get('exampleInlineTextFieldView')
@@ -256,8 +266,9 @@ SC.LabelView = SC.View.extend(SC.Control,
   _TEMPORARY_CLASS_HASH: {},
   
   render: function(context, firstTime) {
-    var value = this.get('displayValue');
-    var icon = this.get('icon') ;
+    var value = this.get('displayValue'),
+        icon = this.get('icon'),
+        hint = this.get('hint');
     
     // add icon if needed
     if (icon) {
@@ -267,8 +278,13 @@ SC.LabelView = SC.View.extend(SC.Control,
       context.push(icon);
     }
     
-    // add display value
-    context.push(value);
+    // if there is a hint set and no value, render the hint
+    // otherwise, render the value
+    if (hint && (!value || value === '')) {
+      context.push('<span class="sc-hint">', hint, '</span>');
+    } else { 
+      context.push(value);
+    }
     
     // and setup alignment and font-weight on styles
     context.addStyle('text-align',  this.get('textAlign'))