sproutcore 1.6.0.rc.2-java → 1.6.0.1-java

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/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/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,
   
@@ -114,7 +114,7 @@ SC.LabelView = SC.View.extend(SC.Control, SC.InlineEditable,
     
     @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
@@ -253,10 +253,16 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     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;
@@ -532,7 +539,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     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.
@@ -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{ 

data/lib/frameworks/sproutcore/frameworks/handlebars/handlebars.js

@@ -1389,7 +1389,7 @@ Handlebars.JavaScriptCompiler = function() {};
 
   var reservedWords = ("break case catch continue default delete do else finally " +
                        "for function if in instanceof new return switch this throw " + 
-                       "try typeof var void while with null true false").split(" ");
+                       "try typeof var void while with null true false extends").split(" ");
 
   compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
 

data/lib/frameworks/sproutcore/frameworks/runtime/core.js

@@ -39,7 +39,7 @@ window.SproutCore = window.SproutCore || SC ;
 // rest of the methods go into the mixin defined below.
 
 /**
-  @version 1.6.0.rc.2
+  @version 1.6.0
   @namespace
 
   All SproutCore methods and functions are defined
@@ -59,7 +59,7 @@ window.SproutCore = window.SproutCore || SC ;
 */
 SC = window.SC; // This is dumb but necessary for jsdoc to get it right
 
-SC.VERSION = '1.6.0.rc.2';
+SC.VERSION = '1.6.0';
 
 /**
   @private
@@ -189,7 +189,8 @@ SC.mixin(/** @scope window.SC.prototype */ {
             SC.T_ARRAY: An instance of Array,<br>
             SC.T_CLASS: A SproutCore class (created using SC.Object.extend()),<br>
             SC.T_OBJECT: A SproutCore object instance,<br>
-            SC.T_HASH: A JavaScript object not inheriting from SC.Object
+            SC.T_HASH: A JavaScript object not inheriting from SC.Object, <br>
+            SC.T_ERROR: A SproutCore SC.Error object <br>
   */
   typeOf: function(item) {
     if (item === undefined) return SC.T_UNDEFINED ;
@@ -200,16 +201,21 @@ SC.mixin(/** @scope window.SC.prototype */ {
     if (nativeType === "function") {
       return item.isClass ? SC.T_CLASS : SC.T_FUNCTION;
     } else if (nativeType === "object") {
-      if (item.isError) {
-        return SC.T_ERROR ;
-      } else if (item.isObject) {
-        return SC.T_OBJECT ;
+      
+      // Note: typeOf() may be called before SC.Error has had a chance to load
+      // so this code checks for the presence of SC.Error first just to make
+      // sure.  No error instance can exist before the class loads anyway so
+      // this is safe.
+      if (SC.Error && (item instanceof SC.Error)) {
+        return SC.T_ERROR;
+      } else if (item instanceof SC.Object) {
+        return SC.T_OBJECT;
       } else {
-        return SC.T_HASH ;
+        return SC.T_HASH;
       }
     }
 
-    return nativeType ;
+    return nativeType;
   },
 
   /**

data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/flatten.js

@@ -0,0 +1,24 @@
+// ==========================================================================
+// Project:   SproutCore Costello - Property Observing Library
+// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2010 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*globals module test ok equals same CoreTest */
+
+sc_require('debug/test_suites/array/base');
+
+SC.ArraySuite.define(function(T) {
+
+  T.module("flatten");
+
+  test("should return flattened arrays", function() {
+    var expected = [1,2,3,4,'a'],
+        obj      = T.newObject([1,2,[3,[4]],'a']);
+
+    expected.forEach(function(i,idx) {
+      equals(obj.flatten().objectAt(idx), i,'obj.flatten().objectAt(%@) should match %@'.fmt(idx,i));
+    });
+  });
+});

data/lib/frameworks/sproutcore/frameworks/runtime/ext/array.js

@@ -11,7 +11,8 @@ SC.supplement(Array.prototype, SC.CoreArray);
 
 // Because Arrays are dealt with so much, we add specialized functions.
 
-SC.mixin(Array.prototype, {
+SC.mixin(Array.prototype,
+  /** @lends Array.prototype */ {
 
   // primitive for array support.
   replace: function(idx, amt, objects) {

data/lib/frameworks/sproutcore/frameworks/runtime/ext/function.js

@@ -142,7 +142,7 @@ SC.mixin(Function.prototype,
     not cacheable.
 
     @param {Boolean} aFlag optionally indicate cacheable or no, default YES
-    @returns {Function} reciever, useful for chaining calls.
+    @returns {Function} receiver, useful for chaining calls.
   */
   cacheable: function(aFlag) {
     return SC.Function.cacheable(this, aFlag);
@@ -163,7 +163,7 @@ SC.mixin(Function.prototype,
     non-volatile.
 
     @param {Boolean} aFlag optionally indicate state, default to YES
-    @returns {Function} reciever, useful for chaining calls.
+    @returns {Function} receiver, useful for chaining calls.
   */
   idempotent: function(aFlag) {
     return SC.Function.idempotent(this, aFlag);
@@ -174,13 +174,13 @@ SC.mixin(Function.prototype,
   },
 
   /**
-    Declare that a function should observe an object or property at the named 
+    Declare that a function should observe an object or property at the named
     path.  Note that the path is used only to construct the observation one time.
 
     @param {String...} propertyPaths A list of strings which indicate the
       properties being observed
-      
-    @returns {Function} reciever, useful for chaining calls.
+
+    @returns {Function} receiver, useful for chaining calls.
   */
   observes: function(propertyPaths) {
     return SC.Function.observes(this, arguments);