sproutcore 1.6.0.beta.3-java → 1.6.0-java

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

@@ -39,6 +39,12 @@
       isTemplate2: YES
     })
   });
+  
+  pane.add("cleans-up-views", SC.ContainerView, {
+    nowShowing: 'uninstantiatedView',
+    
+    uninstantiatedView: SC.View.design({})
+  });
 
     // .add("disabled - single selection", SC.ListView, {
     //   isEnabled: NO,
@@ -176,5 +182,22 @@
 
     ok(!contentView, "should have removed contentView");
   });
+  
+  test("Cleans up instantiated views", function() {
+    var view = pane.view("cleans-up-views");
+    view.awake();
+    
+    var contentView = view.get('contentView');
+    SC.run(function() { view.set('nowShowing', SC.View.create()); });
+    equals(contentView.isDestroyed, YES, "should have destroyed the view it instantiated (from path)");
+    
+    contentView = view.get('contentView');
+    SC.run(function() { view.set('nowShowing', SC.View.design()); });
+    equals(contentView.isDestroyed, NO, "should not have destroyed the view because it was already instantiated");
+    
+    contentView = view.get('contentView');
+    SC.run(function() { view.set('nowShowing', null); });
+    equals(contentView.isDestroyed, YES, "should have destroyed the view it instantiated (from class)");
+  });
 
 })();

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

@@ -69,6 +69,42 @@ test("isEnabled=NO should add disabled class", function() {
   ok(view.$().hasClass('disabled'), 'should have disabled class');
 });
 
+test("isEnabled=NO isEditable=NO should add disabled attribute", function() {
+  SC.RunLoop.begin();
+  view.set('isEnabled', NO);
+  view.set('isEditable', NO);
+  SC.RunLoop.end();  
+  ok(view.$input().attr('disabled'), 'should have disabled attribute');
+  ok(!view.$input().attr('readOnly'), 'should not have readOnly attribute');
+});
+
+test("isEnabled=NO isEditable=YES should add disabled attribute", function() {
+  SC.RunLoop.begin();
+  view.set('isEnabled', NO);
+  view.set('isEditable', YES);
+  SC.RunLoop.end();  
+  ok(view.$input().attr('disabled'), 'should have disabled attribute');
+  ok(!view.$input().attr('readOnly'), 'should not have readOnly attribute');
+});
+
+test("isEnabled=YES isEditable=NO should add readOnly attribute", function() {
+  SC.RunLoop.begin();
+  view.set('isEnabled', YES);
+  view.set('isEditable', NO);
+  SC.RunLoop.end();  
+  ok(!view.$input().attr('disabled'), 'should not have disabled attribute');
+  ok(view.$input().attr('readOnly'), 'should have readOnly attribute');
+});
+
+test("isEnabled=YES isEditable=YES should not add disable or readOnly attribute", function() {
+  SC.RunLoop.begin();
+  view.set('isEnabled', YES);
+  view.set('isEditable', YES);
+  SC.RunLoop.end();  
+  ok(!view.$input().attr('disabled'), 'should not have disabled attribute');
+  ok(!view.$input().attr('readOnly'), 'should not have readOnly attribute');
+});
+
 // test("isEnabled=NO should add disabled attr to input", function() {
 //   SC.RunLoop.begin();
 //   view1.set('isEnabled', NO);
@@ -78,10 +114,3 @@ test("isEnabled=NO should add disabled class", function() {
 //   ok(view1.get('value') === 'SproutCore', 'value cannot be changed');
 //   });
 
-test("isEnabled and isEditable mapping", function() {
-  var obj= SC.TextFieldView.create();
-  obj.set('isEnabled',false);
-  equals(obj.get('isEditable'),false);
-  obj.set('isEnabled',true);
-  equals(obj.get('isEditable'),true);
-});

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

@@ -32,13 +32,22 @@
   .add("disabled - empty", SC.TextFieldView, { 
     hint: "Full Name", 
     value: null,
-    isEnabled: NO
+    isEnabled: NO,
+    isEditable: NO
   })
   
   .add("disabled - with value", SC.TextFieldView, { 
     hint: "Full Name", 
     value: 'John Doe',
-    isEnabled: NO
+    isEnabled: NO,
+    isEditable: NO
+  })
+
+  .add("enabled - not editable - with value", SC.TextFieldView, { 
+    hint: "Full Name", 
+    value: 'John Doe',
+    isEnabled: YES,
+    isEditable: NO
   })
   
   .add("textarea - empty", SC.TextFieldView, { 
@@ -81,13 +90,21 @@
     isEnabled: YES
   })
   
-  .add("aria-disabled",SC.TextFieldView, {
+  .add("aria-disabled", SC.TextFieldView, {
     hint: "Full Name", 
     value: 'John Doe',
     isTextArea: YES,
     isEnabled: NO
   })
 
+  .add("aria-readonly", SC.TextFieldView, {
+    hint: "Full Name", 
+    value: 'John Doe',
+    isTextArea: YES,
+    isEnabled: YES,
+    isEditable: NO
+  })
+  
   .add("aria-invalid", SC.TextFieldView, {
       value: SC.Error.create({errorValue:'Error Message'}),
       isEnabled: YES
@@ -104,7 +121,7 @@ pane.verifyEmpty = function verifyEmpty(view, expectedHint) {
   
   ok(!layer.hasClass('not-empty'), 'layer should not have not-empty class');
   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');
+  else equals(input.val(), expectedHint, 'input should have expected hint as value');
   if (expectedHint) {
     var hint = view.$('.sc-hint');
     if (hint.length===1) {
@@ -149,6 +166,15 @@ pane.verifyDisabled = function verifyDisabled(view, isDisabled) {
   }
 };
 
+pane.verifyReadOnly = function verifyReadonly(view, isReadOnly) {
+  var input = view.$('input');
+  
+  if(isReadOnly) {
+    ok(input.attr('readOnly'), 'input should have readOnly attr');
+  } else {
+    ok(!input.attr('readOnly'), 'input should not have readOnly attr');
+  }
+};
 
 // ..........................................................
 // TEST INITIAL STATES
@@ -192,6 +218,12 @@ test("disabled - with value", function() {
   pane.verifyDisabled(view, YES);
 });
 
+test("enabled - not editable - with value", function() {
+  var view = pane.view('enabled - not editable - with value');
+  pane.verifyNotEmpty(view, 'John Doe', 'Full Name');
+  pane.verifyReadOnly(view, YES);
+});
+
 test("textarea - empty", function() {
    var view = pane.view('empty');
    pane.verifyEmpty(view, 'Full Name');
@@ -261,6 +293,22 @@ test("enabling disabled view", function() {
   pane.verifyDisabled(view, NO);
 });
 
+test("changing isEditable", function() {
+  var view = pane.view('enabled - not editable - with value');
+
+  // test changing isEditable state updates like it should
+  SC.RunLoop.begin();
+  view.set('isEditable', YES);
+  SC.RunLoop.end();
+  pane.verifyReadOnly(view, NO);
+
+  // test changing isEditable state updates like it should
+  SC.RunLoop.begin();
+  view.set('isEditable', NO);
+  SC.RunLoop.end();
+  pane.verifyReadOnly(view, YES);
+});
+
 if (!SC.browser.isIE && !SC.platform.input.placeholder) {
   test("Changing value to null -- password field", function() {
     var view = pane.view('password-hint'),
@@ -606,6 +654,12 @@ test("should have aria-disabled as YES", function() {
   equals(label.attr('aria-disabled'), 'true', 'aria-disabled should be true');
 });
 
+test("should have aria-readonly as YES", function() {
+  var view = pane.view('aria-readonly');
+  var label = view.$();  
+  equals(label.attr('aria-readonly'), 'true', 'aria-readonly should be true');
+});
+
 test("should have aria-invalid as YES", function() {
   var view = pane.view('aria-invalid');
   var label = view.$();

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

@@ -33,12 +33,12 @@ SC.Validator.Date = SC.Validator.extend(
     /*
       TODO [CC] deprecated warning, we should remove this in a future release
     */
-    //@ if (debug)
+    // @if (debug)
     if (format.indexOf('%') === -1) {
       SC.Logger.warn("You're using a Date validator with a format (%@) for time.js, which has been deprecated. Please change your format to something compatible with SC.DateTime".fmt(format));
       format = this.constructor.prototype.format;
     }
-    //@ endif
+    // @endif
 
     if (SC.typeOf(object) === SC.T_NUMBER) {
       dateTime = SC.DateTime.create(object);
@@ -62,12 +62,12 @@ SC.Validator.Date = SC.Validator.extend(
     /*
       TODO [CC] deprecated warning, we should remove this in a future release
     */
-    //@ if (debug)
+    // @if (debug)
     if (format.indexOf('%') === -1) {
       SC.Logger.warn("You're using a Date validator with a format (%@) for time.js, which has been deprecated. Please change your format to something compatible with SC.DateTime".fmt(format));
       format = this.constructor.prototype.format;
     }
-    //@ endif
+    // @endif
 
     if (value) {
       dateTime = SC.DateTime.parse(value, format);

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

@@ -18,7 +18,7 @@ SC.VALIDATE_NO_CHANGE = NO;
   "validate" attribute in your text field.  For example, if you want to
   validate a field using the PhoneNumberValidator use this:
 
-  <input value="1234567890" validate="phone-number" />
+      <input value="1234567890" validate="phone-number" />
 
   Validators get notified at three points.  You can implement one or all
   of these methods to support validation.  All of the validate methods except
@@ -28,10 +28,8 @@ SC.VALIDATE_NO_CHANGE = NO;
   following:
 
   1. You can simply validate the field value and return OK or an error str
-  
   2. You can modify the field value (for example, you could format the
      string to match some predefined format).
-     
   3. If you need to roundtrip the server first to perform validation, you can
      return Validator.OK, then save the form and field info until after the
      roundtrip.  On return, if there is a problem, first verify the field

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

@@ -63,7 +63,8 @@ SC.ContainerView = SC.View.extend(
     @param {SC.View} newContent the new content view or null.
   */
   replaceContent: function(newContent) {
-    this.replaceAllChildren(newContent ? [newContent] : []);
+    this.removeAllChildren() ;
+    if (newContent) this.appendChild(newContent) ;
   },
 
   /** @private */
@@ -83,9 +84,7 @@ SC.ContainerView = SC.View.extend(
   awake: function() {
     sc_super();
     var nowShowing = this.get('nowShowing') ;
-    if (nowShowing && nowShowing.length>0) {
-      this.nowShowingDidChange();
-    }
+    if (nowShowing && nowShowing.length>0) this.nowShowingDidChange();
   },
   
   /**
@@ -103,7 +102,13 @@ SC.ContainerView = SC.View.extend(
     
     // If nowShowing was changed because the content was set directly, then do nothing.
     if (content === SC.CONTENT_SET_DIRECTLY) return ;
-    
+
+    // Take note now if we need to destroy the current contentView
+    var viewToDestroy = (this._instantiatedLastView === YES) ? this.get('contentView') : null;
+
+    // Reset for next time
+    this._instantiatedLastView = NO;
+
     // 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) {
@@ -117,7 +122,10 @@ SC.ContainerView = SC.View.extend(
     // 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.CoreView)) content = content.create();
+      if (content.kindOf(SC.CoreView)) {
+        content = this.createChildView(content);
+        this._instantiatedLastView = YES;
+      } 
       else content = null;
     } 
     
@@ -126,6 +134,9 @@ SC.ContainerView = SC.View.extend(
     
     // Sets the content.
     this.set('contentView', content) ;
+
+    // If we need to cleanup the previous view, do so
+    if(viewToDestroy) viewToDestroy.destroy();
     
   }.observes('nowShowing'),
   

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

@@ -288,21 +288,6 @@ SC.FieldView = SC.View.extend(SC.Control, SC.Validatable,
     if (SC.FOCUS_ALL_CONTROLS) { return this.get('isEnabled'); }
     return NO;
   }.property('isEnabled'),
-  
-  willBecomeKeyResponderFrom: function(keyView) {
-    // focus the text field.
-    if (!this._isFocused) {
-      this._isFocused = YES ;
-      this.becomeFirstResponder();
-      if (this.get('isVisibleInWindow')) {
-        this.$input()[0].focus();
-      }
-    }
-  },
-  
-  willLoseKeyResponderTo: function(responder) {
-    if (this._isFocused) this._isFocused = NO ;
-  },
     
   // these methods use the validator to convert the raw field value returned
   // by your subclass into an object and visa versa.

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

@@ -59,7 +59,7 @@ SC.LabelView = SC.View.extend(SC.Control, SC.InlineEditable,
     
     @property {String} SC.REGULAR_WEIGHT|SC.BOLD_WEIGHT
     @default null
-    @deprecated
+    @deprecated Use CSS instead.
   */
   fontWeight: null,
   
@@ -112,9 +112,9 @@ SC.LabelView = SC.View.extend(SC.Control, SC.InlineEditable,
   /**
     Set the alignment of the label view.
     
-    @property {String} SC.ALIGN_LEFT|SC.ALIGN_MIDDLE|SC.ALIGN_RIGHT
+    @property {String} SC.ALIGN_LEFT|SC.ALIGN_CENTER|SC.ALIGN_RIGHT
     @default null
-    @deprecated
+    @deprecated Use CSS instead.
   */
   textAlign: null,
 

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

@@ -122,8 +122,8 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
   isContextMenuEnabled: YES,
 
   /**
-    @deprecated
-    
+    @deprecated Use #applyImmediately instead.
+
     If true, every change to the text in the text field updates 'value'.
     If false, 'value' is only updated when commitEditing() is called (this
     is called automatically when the text field loses focus), or whenever
@@ -245,18 +245,24 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     if (continuouslyUpdatesValue !== null && continuouslyUpdatesValue !== undefined) {
       this.set('applyImmediately',  continuouslyUpdatesValue);
 
-      //@ if (debug)
+      // @if (debug)
       SC.Logger.warn("SC.TextFieldView#continuouslyUpdatesValue is deprecated. Please use #applyImmediately instead.");
-      //@ endif
+      // @endif
     }
     
     return sc_super();
   },
 
-  /** isEditable maps to isEnabled with a TextField. */
-  isEditable: function() {
-    return this.get('isEnabled') ;
-  }.property('isEnabled').cacheable(),
+  /** 
+    This property indicates if the value in the text field can be changed.
+    If set to NO, a readOnly attribute will be added to the DOM Element.
+    
+    Note if isEnabled is NO this property will have no effect.
+  
+    @property
+    @type Boolean
+  */
+  isEditable: YES,
 
   /**
     The current selection of the text field, returned as an SC.TextSelection
@@ -369,7 +375,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
   // INTERNAL SUPPORT
   //
 
-  displayProperties: ['formattedHint', 'fieldValue', 'isEditing', 'leftAccessoryView', 'rightAccessoryView', 'isTextArea'],
+  displayProperties: ['formattedHint', 'fieldValue', 'isEditing', 'isEditable', 'leftAccessoryView', 'rightAccessoryView', 'isTextArea'],
 
   createChildViews: function() {
     sc_super();
@@ -478,6 +484,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     if(firstTime) {
       context.attr('aria-multiline', this.get('isTextArea'));
       context.attr('aria-disabled', !this.get('isEnabled'));
+      context.attr('aria-readonly', this.get('isEnabled') && !this.get('isEditable'));
     }
     if(!SC.ok(this.get('value'))) {
       context.attr('aria-invalid', YES);
@@ -517,7 +524,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     //        here, but currently SC.RenderContext will render sibling
     //        contexts as parent/child.
 
-    var hint = this.get('formattedHint'), disabled, name, adjustmentStyle, type, 
+    var hint = this.get('formattedHint'), activeState, name, adjustmentStyle, type, 
         hintElements, element, paddingElementStyle, fieldClassNames,
         spellCheckEnabled=this.get('spellCheckEnabled'), spellCheckString,
         maxLength = this.get('maxLength'), isOldSafari;
@@ -526,13 +533,13 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     
     //Adding this to differentiate between older and newer versions of safari
     //since the internal default field padding changed 
-    isOldSafari= (parseInt(SC.browser.webkit,0)<532);
+    isOldSafari= SC.browser.isWebkit && (parseInt(SC.browser.webkit,0)<532);
     context.setClass('oldWebKitFieldPadding', isOldSafari);
     
     spellCheckString = spellCheckEnabled ? ' spellcheck="true"' : ' spellcheck="false"';
     if (firstTime || this._forceRenderFirstTime) {
       this._forceRenderFirstTime = NO;
-      disabled = this.get('isEnabled') ? '' : 'disabled="disabled"' ;
+      activeState = this.get('isEnabled') ? (this.get('isEditable') ? '' : 'readonly="readonly"') : 'disabled="disabled"' ;
       name = this.get('layerId');
       
       if(this.get('shouldRenderBorder')) context.push('<span class="border"></span>');
@@ -564,7 +571,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
       // Render the input/textarea field itself, and close off the padding.
       if (this.get('isTextArea')) {
         context.push('<textarea class="',fieldClassNames,'" name="', name, 
-                      '" ', disabled, ' placeholder="',hint, '"',
+                      '" ', activeState, ' placeholder="',hint, '"',
                       spellCheckString,' maxlength="', maxLength, '">', 
                       value, '</textarea></span>') ;
       }
@@ -576,7 +583,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
         if (this.get('isPassword') && (value !== hint || SC.browser.isIE || SC.platform.input.placeholder)) { type = 'password'; }
         
         context.push('<input class="',fieldClassNames,'" type="', type,
-                      '" name="', name, '" ', disabled, ' value="', value,
+                      '" name="', name, '" ', activeState, ' value="', value,
                       '" placeholder="',hint,'"', spellCheckString, 
                       ' maxlength="', maxLength, '" /></span>') ;
       }
@@ -615,9 +622,13 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
       if (element) {
         if (!this.get('isEnabled')) {
           element.disabled = 'true' ;
-        }
-        else {
+          element.readOnly = null ;
+        } else if(!this.get('isEditable')) {
           element.disabled = null ;
+          element.readOnly = 'true' ;
+        } else {
+          element.disabled = null ;
+          element.readOnly = null ;
         }
 
         // Adjust the padding element to accommodate any accessory views.
@@ -775,14 +786,14 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
       // passing the original event here instead that was potentially set from
       // loosing the responder on the inline text editor so that we can
       // use it for the delegate to end editing
-      this.fieldDidBlur(this._origEvent);
+      this.fieldDidBlur(this._origEvent || evt);
       var val = this.get('value');
       if(!SC.platform.input.placeholder && ((!val) || (val && val.length===0))) {
         this._hintON = YES;
       }
     }, this);
   },
-  
+
   fieldDidFocus: function(evt) {
     this.becomeFirstResponder();
 
@@ -920,7 +931,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     When we become first responder, focus the text field if needed and
     hide the hint text.
   */
-  willBecomeKeyResponderFrom: function(keyView) {
+  didBecomeKeyResponderFrom: function(keyView) {
     if(this.get('isVisibleInWindow')) {
       var inp = this.$input()[0];
       try{