sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/array.js

@@ -46,7 +46,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     ArrayController will wrap the item in an array in an attempt to normalize
     the result.
 
-    @property {SC.Array}
+    @type SC.Array
   */
   content: null,
 
@@ -54,7 +54,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     Makes the array editable or not.  If this is set to NO, then any attempts
     at changing the array content itself will throw an exception.
 
-    @property {Boolean}
+    @type Boolean
   */
   isEditable: YES,
 
@@ -90,7 +90,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
 
     If you pass a function, it should be suitable for use in compare().
 
-    @property {String|Array|Function}
+    @type String|Array|Function
   */
   orderBy: null,
 
@@ -99,7 +99,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     in an array and publish it.  Otherwise, it will treat single content like
     null content.
 
-    @property {Boolean}
+    @type Boolean
   */
   allowsSingleContent: YES,
 
@@ -112,7 +112,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     removeObject() will still destroy the object in question as well as
     removing it from the parent array.
 
-    @property {Boolean}
+    @type Boolean
   */
   destroyOnRemoval: NO,
 
@@ -121,9 +121,9 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     Depending on how you have your ArrayController configured, this property
     may be one of several different values.
 
-    @property {SC.Array}
+    @type SC.Array
   */
-  arrangedObjects: function() {
+  arrangedObjects: function () {
     return this;
   }.property().cacheable(),
 
@@ -132,15 +132,15 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     remove content.  You can delete content only if the content is not single
     content and isEditable is YES.
 
-    @property {Boolean}
+    @type Boolean
   */
-  canRemoveContent: function() {
+  canRemoveContent: function () {
     var content = this.get('content'), ret;
     ret = !!content && this.get('isEditable') && this.get('hasContent');
     if (ret) {
       return !content.isEnumerable ||
              (SC.typeOf(content.removeObject) === SC.T_FUNCTION);
-    } else return NO ;
+    } else return NO;
   }.property('content', 'isEditable', 'hasContent'),
 
   /**
@@ -149,9 +149,9 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     real SC.Array-like object.  You cannot reorder content when orderBy is
     non-null.
 
-    @property {Boolean}
+    @type Boolean
   */
-  canReorderContent: function() {
+  canReorderContent: function () {
     var content = this.get('content'), ret;
     ret = !!content && this.get('isEditable') && !this.get('orderBy');
     return ret && !!content.isSCArray;
@@ -166,15 +166,15 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     use the addObject() or pushObject() methods.  All other methods imply
     reordering and will fail.
 
-    @property {Boolean}
+    @type Boolean
   */
-  canAddContent: function() {
-    var content = this.get('content'), ret ;
+  canAddContent: function () {
+    var content = this.get('content'), ret;
     ret = content && this.get('isEditable') && content.isEnumerable;
     if (ret) {
       return (SC.typeOf(content.addObject) === SC.T_FUNCTION) ||
              (SC.typeOf(content.pushObject) === SC.T_FUNCTION);
-    } else return NO ;
+    } else return NO;
   }.property('content', 'isEditable'),
 
   /**
@@ -182,9 +182,9 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     even an empty array.  Returns NO if the content is null or not enumerable
     and allowsSingleContent is NO.
 
-    @property {Boolean}
+    @type Boolean
   */
-  hasContent: function() {
+  hasContent: function () {
     var content = this.get('content');
     return !!content &&
            (!!content.isEnumerable || !!this.get('allowsSingleContent'));
@@ -194,9 +194,9 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     Returns the current status property for the content.  If the content does
     not have a status property, returns SC.Record.READY.
 
-    @property {Number}
+    @type Number
   */
-  status: function() {
+  status: function () {
     var content = this.get('content'),
         ret = content ? content.get('status') : null;
     return ret ? ret : SC.Record.READY;
@@ -214,16 +214,16 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     If the source content does not support adding an object, then this method
     will throw an exception.
 
-    @param {Object} object the object to add
-    @returns {SC.ArrayController} receiver
+    @param {Object} object The object to add to the array.
+    @returns {SC.ArrayController} The receiver.
   */
-  addObject: function(object) {
-    if (!this.get('canAddContent')) { throw "%@ cannot add content".fmt(this); }
+  addObject: function (object) {
+    if (!this.get('canAddContent')) { throw new Error("%@ cannot add content".fmt(this)); }
 
     var content = this.get('content');
     if (content.isSCArray) { content.pushObject(object); }
     else if (content.addObject) { content.addObject(object); }
-    else { throw "%@.content does not support addObject".fmt(this); }
+    else { throw new Error("%@.content does not support addObject".fmt(this)); }
 
     return this;
   },
@@ -238,9 +238,9 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     @param {Object} object the object to remove
     @returns {SC.ArrayController} receiver
   */
-  removeObject: function(object) {
+  removeObject: function (object) {
     if (!this.get('canRemoveContent')) {
-      throw "%@ cannot remove content".fmt(this);
+      throw new Error("%@ cannot remove content".fmt(this));
     }
 
     var content = this.get('content');
@@ -261,9 +261,9 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
   /**
     Compute the length of the array based on the observable content
 
-    @property {Number}
+    @type Number
   */
-  length: function() {
+  length: function () {
     var content = this._scac_observableContent();
     return content ? content.get('length') : 0;
   }.property().cacheable(),
@@ -271,37 +271,38 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
   /** @private
     Returns the object at the specified index based on the observable content
   */
-  objectAt: function(idx) {
+  objectAt: function (idx) {
     var content = this._scac_observableContent();
-    return content ? content.objectAt(idx) : undefined ;
+    return content ? content.objectAt(idx) : undefined;
   },
 
   /** @private
     Forwards a replace on to the content, but only if reordering is allowed.
   */
-  replace: function(start, amt, objects) {
+  replace: function (start, amt, objects) {
     // check for various conditions before a replace is allowed
-    if (!objects || objects.get('length')===0) {
+    if (!objects || objects.get('length') === 0) {
       if (!this.get('canRemoveContent')) {
-        throw "%@ cannot remove objects from the current content".fmt(this);
+        throw new Error("%@ cannot remove objects from the current content".fmt(this));
       }
     } else if (!this.get('canReorderContent')) {
-      throw "%@ cannot add or reorder the current content".fmt(this);
+      throw new Error("%@ cannot add or reorder the current content".fmt(this));
     }
 
     // if we can do this, then just forward the change.  This should fire
     // updates back up the stack, updating rangeObservers, etc.
     var content = this.get('content'); // note: use content, not observable
     var objsToDestroy = [], i, objsLen;
-    if (this.get('destroyOnRemoval')){
-      for(i=0; i<amt; i++){
-        objsToDestroy.push(content.objectAt(i+start));
+
+    if (this.get('destroyOnRemoval')) {
+      for (i = 0; i < amt; i++) {
+        objsToDestroy.push(content.objectAt(i + start));
       }
     }
 
     if (content) { content.replace(start, amt, objects); }
 
-    for(i=0, objsLen = objsToDestroy.length; i<objsLen; i++){
+    for (i = 0, objsLen = objsToDestroy.length; i < objsLen; i++) {
 
       objsToDestroy[i].destroy();
     }
@@ -310,7 +311,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     return this;
   },
 
-  indexOf: function(object, startAt) {
+  indexOf: function (object, startAt) {
     var content = this._scac_observableContent();
     return content ? content.indexOf(object, startAt) : -1;
   },
@@ -320,7 +321,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
   //
 
   /** @private */
-  init: function() {
+  init: function () {
     sc_super();
     this._scac_contentDidChange();
   },
@@ -342,11 +343,11 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
 
     @returns {SC.Array} observable or null
   */
-  _scac_observableContent: function() {
+  _scac_observableContent: function () {
     var ret = this._scac_cached;
     if (ret) { return ret; }
 
-    var content = this.get('content'), func, len, order;
+    var content = this.get('content'), func, order;
 
     // empty content
     if (SC.none(content)) { return (this._scac_cached = []); }
@@ -360,8 +361,8 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     // no-wrap
     var orderBy = this.get('orderBy');
     if (!orderBy) {
-      if (content.isSCArray) { return (this._scac_cached = content) ; }
-      else { throw "%@.orderBy is required for unordered content".fmt(this); }
+      if (content.isSCArray) { return (this._scac_cached = content); }
+      else { throw new Error("%@.orderBy is required for unordered content".fmt(this)); }
     }
 
     // all remaining enumerables must be sorted.
@@ -369,19 +370,19 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     // build array - then sort it
     var type = SC.typeOf(orderBy);
 
-    if(type === SC.T_STRING) {
+    if (type === SC.T_STRING) {
       orderBy = [orderBy];
-    } else if(type === SC.T_FUNCTION) {
+    } else if (type === SC.T_FUNCTION) {
       func = orderBy;
-    } else if(type !== SC.T_ARRAY) {
-      throw "%@.orderBy must be Array, String, or Function".fmt(this);
+    } else if (type !== SC.T_ARRAY) {
+      throw new Error("%@.orderBy must be Array, String, or Function".fmt(this));
     }
 
     // generate comparison function if needed - use orderBy
-    func = func || function(a,b) {
+    func = func || function (a, b) {
       var status, key, match, valueA, valueB;
 
-      for(var i=0, l=orderBy.get('length'); i<l && !status; i++) {
+      for (var i = 0, l = orderBy.get('length'); i < l && !status; i++) {
         key = orderBy.objectAt(i);
 
         if (key.search(/(ASC|DESC)/) === 0) {
@@ -402,13 +403,13 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
         status = SC.compare(valueA, valueB) * order;
       }
 
-      return status ;
+      return status;
     };
 
-    return (this._scac_cached = content.toArray().sort(func)) ;
+    return (this._scac_cached = content.toArray().sort(func));
   },
 
-  propertyWillChange: function(key) {
+  propertyWillChange: function (key) {
     if (key === 'content') {
       this.arrayContentWillChange(0, this.get('length'), 0);
     } else {
@@ -416,19 +417,19 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     }
   },
 
-  _scac_arrayContentWillChange: function(start, removed, added) {
+  _scac_arrayContentWillChange: function (start, removed, added) {
     this.arrayContentWillChange(start, removed, added);
     if (this._kvo_enumerable_property_chains) {
-      var removedObjects = this.slice(start, start+removed);
+      var removedObjects = this.slice(start, start + removed);
       this.teardownEnumerablePropertyChains(removedObjects);
     }
   },
 
-  _scac_arrayContentDidChange: function(start, removed, added) {
+  _scac_arrayContentDidChange: function (start, removed, added) {
     this._scac_cached = NO;
     this.arrayContentDidChange(start, removed, added);
     if (this._kvo_enumerable_property_chains) {
-      var addedObjects = this.slice(start, start+added);
+      var addedObjects = this.slice(start, start + added);
       this.setupEnumerablePropertyChains(addedObjects);
     }
     this.updateSelectionAfterContentChange();
@@ -438,14 +439,11 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     Whenever content changes, setup and teardown observers on the content
     as needed.
   */
-  _scac_contentDidChange: function() {
-
+  _scac_contentDidChange: function () {
     this._scac_cached = NO; // invalidate observable content
 
     var content     = this.get('content'),
-        orders      = !!this.get('orderBy'),
         lastContent = this._scac_content,
-        oldlen      = this._scac_length || 0,
         didChange   = this._scac_arrayContentDidChange,
         willChange  = this._scac_arrayContentWillChange,
         sfunc       = this._scac_contentStatusDidChange,
@@ -473,7 +471,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
 
     // save new cached values
     this._scac_cached = NO;
-    this._scac_content = content ;
+    this._scac_content = content;
 
     // setup new observer
     // also, calculate new length.  do it manually instead of using
@@ -512,6 +510,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     this._scac_contentStatusDidChange();
 
     this.arrayContentDidChange(0, 0, newlen);
+    this.enumerableContentDidChange(0, newlen - 1);
     this.updateSelectionAfterContentChange();
   }.observes('content'),
 
@@ -522,7 +521,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     This is called whenever the content enumerable changes or whenever orderBy
     changes.
   */
-  _scac_enumerableDidChange: function() {
+  _scac_enumerableDidChange: function () {
     var content = this.get('content'), // use content directly
         newlen  = content ? content.get('length') : 0,
         oldlen  = this._scac_length;
@@ -542,7 +541,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
   /** @private
     Whenever the content "status" property changes, relay out.
   */
-  _scac_contentStatusDidChange: function() {
+  _scac_contentStatusDidChange: function () {
     this.notifyPropertyChange('status');
   }
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/controller.js

@@ -7,40 +7,40 @@
 
 /**
   @class
-  
+
   The controller base class provides some common functions you will need
   for controllers in your applications, especially related to maintaining
   an editing context.
-  
+
   In general you will not use this class, but you can use a subclass such
   as ObjectController, TreeController, or ArrayController.
-  
+
   ## EDITING CONTEXTS
-  
+
   One major function of a controller is to mediate between changes in the
-  UI and changes in the model.  In particular, you usually do not want 
-  changes you make in the UI to be applied to a model object directly.  
+  UI and changes in the model.  In particular, you usually do not want
+  changes you make in the UI to be applied to a model object directly.
   Instead, you often will want to collect changes to an object and then
   apply them only when the user is ready to commit their changes.
-  
+
   The editing contact support in the controller class will help you
   provide this capability.
-  
+
   @extends SC.Object
   @since SproutCore 1.0
 */
 SC.Controller = SC.Object.extend(
 /** @scope SC.Controller.prototype */ {
-  
+
   /**
-    Makes a controller editable or not editable.  The SC.Controller class 
-    itself does not do anything with this property but subclasses will 
+    Makes a controller editable or not editable.  The SC.Controller class
+    itself does not do anything with this property but subclasses will
     respect it when modifying content.
-    
-    @property {Boolean}
+
+    @type Boolean
   */
   isEditable: YES,
-  
+
   /**
    * Set this to YES if you are setting the controller content to a recordArray
    * or other content that needs to be cleaned up (with `.destroy()`) when

data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/object.js

@@ -65,7 +65,7 @@ SC.ObjectController = SC.Controller.extend(
     Usually your content object should implement the SC.Observable mixin, but
     this is not required.  All SC.Object-based objects support SC.Observable
 
-    @property {Object}
+    @type Object
   */
   content: null,
 
@@ -79,7 +79,7 @@ SC.ObjectController = SC.Controller.extend(
     If NO, then setting content to an enumerable with multiple items will be
     treated like setting a null value.  hasContent will be NO.
 
-    @property {Boolean}
+    @type Boolean
   */
   allowsMultipleContent: NO,
 
@@ -89,7 +89,7 @@ SC.ObjectController = SC.Controller.extend(
     with a single item.  Array's or enumerables with multiple items will
     normally make this property NO unless allowsMultipleContent is YES.
 
-    @property {Boolean}
+    @type Boolean
   */
   hasContent: function() {
     return !SC.none(this.get('observableContent'));
@@ -100,7 +100,7 @@ SC.ObjectController = SC.Controller.extend(
     itself does not do anything with this property but subclasses will
     respect it when modifying content.
 
-    @property {Boolean}
+    @type Boolean
   */
   isEditable: YES,
 
@@ -115,7 +115,7 @@ SC.ObjectController = SC.Controller.extend(
     Note that if you set the content to an enumerable which itself contains
     enumerables and allowsMultipleContent is NO, this will become null.
 
-    @property {Object}
+    @type Object
   */
   observableContent: function() {
     var content = this.get('content'),
@@ -190,8 +190,8 @@ SC.ObjectController = SC.Controller.extend(
     you can override this method to do some other kind of processing if
     needed.
 
-    @property {String} key key being retrieved
-    @property {Object} value value to set or undefined if reading only
+    @param {String} key key being retrieved
+    @param {Object} value value to set or undefined if reading only
     @returns {Object} property value
   */
   unknownProperty: function(key,value) {
@@ -229,7 +229,7 @@ SC.ObjectController = SC.Controller.extend(
     // setter
     } else {
       if (!this.get('isEditable')) {
-        throw "%@.%@ is not editable".fmt(this,key);
+        throw new Error("%@.%@ is not editable".fmt(this,key));
       }
 
       if (content.isEnumerable) content.setEach(key, value);