sproutcore 1.9.0 → 1.9.1

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/viewDidResize.js

@@ -82,69 +82,64 @@ test("making sure that the frame value is correct inside viewDidResize()", funct
 // 
 module("SC.View#parentViewDidResize");
 
-// view.callCount must increments whenever something interesting happens
-function testParentViewDidResizeWithAlignments(view) {
+test("Optimized notify on frame and optimized cascade call to child views.", function() {
+  var view = SC.View.create({
+    // instrument...
+    frameCallCount: 0,
+    frameDidChange: function() {
+      this.frameCallCount++;
+    }.observes('frame'),
+    viewDidResize: CoreTest.stub('viewDidResize', SC.View.prototype.viewDidResize)
+  });
+
   // try with fixed layout
   view.set('layout', { top: 10, left: 10, height: 10, width: 10 });
-  view.callCount = 0 ;
+  view.viewDidResize.reset(); view.frameCallCount = 0;
   view.parentViewDidResize();
-  equals(view.callCount, 0, 'should not notify frame changed');
+  view.viewDidResize.expect(0);
+  equals(view.frameCallCount, 0, 'should not notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 
   // try with flexible height
   view.set('layout', { top: 10, left: 10, bottom: 10, width: 10 });
-  view.callCount = 0 ;
+  view.viewDidResize.reset(); view.frameCallCount = 0;
   view.parentViewDidResize();
-  equals(view.callCount, 1, 'should notify frame changed');
+  view.viewDidResize.expect(1);
+  equals(view.frameCallCount, 1, 'should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 
   // try with flexible width
   view.set('layout', { top: 10, left: 10, height: 10, right: 10 });
-  view.callCount = 0 ;
+  view.viewDidResize.reset(); view.frameCallCount = 0;
   view.parentViewDidResize();
-  equals(view.callCount, 1, 'should notify frame changed');
+  view.viewDidResize.expect(1);
+  equals(view.frameCallCount, 1, 'should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 
   // try with right align
   view.set('layout', { top: 10, right: 10, height: 10, width: 10 });
-  view.callCount = 0 ;
+  view.viewDidResize.reset(); view.frameCallCount = 0;
   view.parentViewDidResize();
-  equals(view.callCount, 1, 'should notify frame changed');
+  view.viewDidResize.expect(0);
+  equals(view.frameCallCount, 1, 'should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 
   // try with bottom align
   view.set('layout', { top: 10, bottom: 10, height: 10, width: 10 });
-  view.callCount = 0 ;
+  view.viewDidResize.reset(); view.frameCallCount = 0;
   view.parentViewDidResize();
-  equals(view.callCount, 1, 'should notify frame changed');
+  view.viewDidResize.expect(0);
+  equals(view.frameCallCount, 1, 'should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 
   // try with center horizontal align
   view.set('layout', { centerX: 10, top: 10, height: 10, width: 10 });
-  view.callCount = 0 ;
+  view.viewDidResize.reset(); view.frameCallCount = 0;
   view.parentViewDidResize();
-  equals(view.callCount, 1, 'should notify frame changed');
+  view.viewDidResize.expect(0);
+  equals(view.frameCallCount, 1, 'should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 
   // try with center vertical align
   view.set('layout', { left: 10, centerY: 10, height: 10, width: 10 });
-  view.callCount = 0 ;
+  view.viewDidResize.reset(); view.frameCallCount = 0;
   view.parentViewDidResize();
-  equals(view.callCount, 1, 'should notify frame changed');
-}
-
-test("notifies 'frame' property change unless layout is fixed", function() {
-  var view = SC.View.create({
-    // instrument...
-    callCount: 0 ,
-    frameDidChange: function() { 
-      this.callCount++; 
-    }.observes('frame')
-  });
-  testParentViewDidResizeWithAlignments(view);
-});
-
-test("calls viewDidResize on self unless layout is fixed", function() {
-  var view = SC.View.create({
-    // instrument...
-    callCount: 0 ,
-    viewDidResize: function() { this.callCount++; }
-  });
-  testParentViewDidResizeWithAlignments(view);
+  view.viewDidResize.expect(0);
+  equals(view.frameCallCount, 1, 'should notify frame changed when isFixedPosition: %@ and isFixedSize: %@'.fmt(view.get('isFixedPosition'), view.get('isFixedSize')));
 });
 
 // ..........................................................

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js

@@ -156,7 +156,7 @@ SC.CoreView.reopen(
       if (!value) {
         var parent = this.get('parentView');
         if (parent) { parent = parent.get('layer'); }
-        if (parent) { this._view_layer = value = this.findLayerInParentLayer(parent); }
+        this._view_layer = value = this.findLayerInParentLayer(parent);
       }
     }
     return value ;
@@ -215,7 +215,7 @@ SC.CoreView.reopen(
   */
   findLayerInParentLayer: function(parentLayer) {
     var id = "#" + this.get('layerId');
-    return jQuery(id)[0] || jQuery(id, parentLayer)[0] ;
+    return jQuery(id, parentLayer)[0] || jQuery(id)[0];
   },
 
   /**
@@ -1314,17 +1314,11 @@ SC.CoreView.reopen(
 
     this._destroy(); // core destroy method
 
-    // remove from parent if found
-    if (this.get('parentView')) { this.removeFromParent(); }
-
     //Do generic destroy. It takes care of mixins and sets isDestroyed to YES.
-    sc_super();
-    return this; // done with cleanup
+    return sc_super();
   },
 
   _destroy: function() {
-    if (this.get('isDestroyed')) { return this ; } // nothing to do
-
     // destroy the layer -- this will avoid each child view destroying
     // the layer over and over again...
     this.destroyLayer() ;
@@ -1341,7 +1335,13 @@ SC.CoreView.reopen(
     delete this._CQ ;
     delete this.page ;
 
-    return this ;
+    // remove from parent if found.
+    if (this.get('parentView')) { this.removeFromParent(); }
+
+    // clear owner.
+    this.set('owner', null);
+
+    return this;
   },
 
   /**

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout.js

@@ -214,34 +214,64 @@ SC.View.reopen(
   layout: { top: 0, left: 0, bottom: 0, right: 0 },
 
   /**
-    Returns whether the layout is 'fixed' or not.  A fixed layout has a fixed
-    left & top position within its parent's frame as well as a fixed width and height.
-    Fixed layouts are therefore unaffected by changes to their parent view's
-    layout.
+    Returns whether the layout is 'fixed' or not.  A fixed layout means a
+    fixed left & top position and fixed width & height.  Fixed layouts are
+    therefore unaffected by changes to their parent view's layout.
 
     @returns {Boolean} YES if fixed, NO otherwise
     @test in layoutStyle
   */
   isFixedLayout: function() {
+    return this.get('isFixedPosition') && this.get('isFixedSize');
+  }.property('isFixedPosition', 'isFixedSize').cacheable(),
+
+  /**
+    Returns whether the position is 'fixed' or not.  A fixed position means a
+    fixed left & top position within its parent's frame.  Fixed positions are
+    therefore unaffected by changes to their parent view's size.
+
+    @returns {Boolean} YES if fixed, NO otherwise
+    @test in layoutStyle
+  */
+  isFixedPosition: function() {
     var layout = this.get('layout'),
         ret;
 
-    // Layout is fixed if it has width + height !== SC.LAYOUT_AUTO and left + top
+    // Position is fixed if it has left + top !== SC.LAYOUT_AUTO
     ret = (
-      ((layout.width !== undefined) && (layout.height !== undefined)) &&
-      ((layout.width !== SC.LAYOUT_AUTO) && (layout.height !== SC.LAYOUT_AUTO)) &&
       ((layout.left !== undefined) && (layout.top !== undefined)) &&
       ((layout.left !== SC.LAYOUT_AUTO) && (layout.top !== SC.LAYOUT_AUTO))
     );
 
-    // The layout may appear fixed, but only if none of the values are percentages
+    // The position may appear fixed, but only if none of the values are percentages.
     if (ret) {
-      ret = (
-        !SC.isPercentage(layout.top) &&
-        !SC.isPercentage(layout.left) &&
-        !SC.isPercentage(layout.width) &&
-        !SC.isPercentage(layout.height)
-      );
+      ret = ( !SC.isPercentage(layout.top) && !SC.isPercentage(layout.left) );
+    }
+
+    return ret;
+  }.property('layout').cacheable(),
+
+  /**
+    Returns whether the size is 'fixed' or not.  A fixed size means a fixed
+    width and height.  Fixed sizes are therefore unaffected by changes to their
+    parent view's size.
+
+    @returns {Boolean} YES if fixed, NO otherwise
+    @test in layoutStyle
+  */
+  isFixedSize: function () {
+    var layout = this.get('layout'),
+        ret;
+
+    // Size is fixed if it has width + height !== SC.LAYOUT_AUTO
+    ret = (
+      ((layout.width !== undefined) && (layout.height !== undefined)) &&
+      ((layout.width !== SC.LAYOUT_AUTO) && (layout.height !== SC.LAYOUT_AUTO))
+    );
+
+    // The size may appear fixed, but only if none of the values are percentages.
+    if (ret) {
+      ret = ( !SC.isPercentage(layout.width) && !SC.isPercentage(layout.height) );
     }
 
     return ret;
@@ -604,26 +634,28 @@ SC.View.reopen(
     This method may be called on your view whenever the parent view resizes.
 
     The default version of this method will reset the frame and then call
-    viewDidResize().  You will not usually override this method, but you may
-    override the viewDidResize() method.
+    viewDidResize() if its size may have changed.  You will not usually override
+    this method, but you may override the viewDidResize() method.
 
     @returns {void}
     @test in viewDidResize
   */
   parentViewDidResize: function() {
-    var frameMayHaveChanged;
+    var positionMayHaveChanged,
+      sizeMayHaveChanged;
 
     // If this view uses static layout, our "do we think the frame changed?"
     // result of isFixedLayout is not applicable and we simply have to assume
     // that the frame may have changed.
-    frameMayHaveChanged = this.useStaticLayout || !this.get('isFixedLayout');
+    sizeMayHaveChanged = this.useStaticLayout || !this.get('isFixedSize');
+    positionMayHaveChanged = !this.get('isFixedPosition');
 
-    // Do we think there's a chance our frame will have changed as a result?
-    if (frameMayHaveChanged) {
-      // There's a chance our frame changed.  Invoke viewDidResize(), which
-      // will notify about our change to 'frame' (if it actually changed) and
-      // appropriately notify our child views.
+    if (sizeMayHaveChanged) {
+      // If our size isn't fixed, our frame may have changed and it will effect our child views.
       this.viewDidResize();
+    } else if (positionMayHaveChanged) {
+      // If our size is fixed but our position isn't, our frame may have changed, but it won't effect our child views.
+      this._viewFrameDidChange();
     }
   },
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/manipulation.js

@@ -139,7 +139,7 @@ SC.View.reopen(
       }
     });
 
-    // Even though its layer has not necessarily been created, the child views 
+    // Even though its layer has not necessarily been created, the child views
     // are added immediately. Hence notify views immediately.
     if (this.didAddChild) { this.didAddChild(view, beforeView) ; }
     if (view.didAddToParent) { view.didAddToParent(this, beforeView) ; }

data/lib/frameworks/sproutcore/frameworks/datastore/models/record.js

@@ -454,7 +454,11 @@ SC.Record = SC.Object.extend(
         this.propertyDidChange('id'); // Reset computed value
       }
 
-      if(!ignoreDidChange) this.endEditing(key);
+      if(!ignoreDidChange) { this.endEditing(key); }
+      else {
+        // We must still inform the store of the change so that it can track the change across stores.
+        store.dataHashDidChange(storeKey, null, undefined, key);
+      }
     }
     return this ;
   },

data/lib/frameworks/sproutcore/frameworks/datastore/system/nested_store.js

@@ -14,11 +14,11 @@ sc_require('system/store');
   all at once.  You usually will use a `NestedStore` as part of store chaining
   to stage changes to your object graph before sharing them with the rest of
   the application.
-  
-  Normally you will not create a nested store directly.  Instead, you can 
+
+  Normally you will not create a nested store directly.  Instead, you can
   retrieve a nested store by using the `chain()` method.  When you are finished
   working with the nested store, `destroy()` will dispose of it.
-  
+
   @extends SC.Store
   @since SproutCore 1.0
 */
@@ -26,7 +26,7 @@ SC.NestedStore = SC.Store.extend(
 /** @scope SC.NestedStore.prototype */ {
 
   /**
-    This is set to YES when there are changes that have not been committed 
+    This is set to YES when there are changes that have not been committed
     yet.
 
     @type Boolean
@@ -36,31 +36,31 @@ SC.NestedStore = SC.Store.extend(
 
   /**
     The parent store this nested store is chained to.  Nested stores must have
-    a parent store in order to function properly.  Normally, you create a 
+    a parent store in order to function properly.  Normally, you create a
     nested store using the `SC.Store#chain()` method and this property will be
     set for you.
-    
+
     @type SC.Store
     @default null
   */
   parentStore: null,
 
   /**
-    `YES` if the view is nested. Walk like a duck
-    
+    `YES` if the store is nested. Walk like a duck
+
     @type Boolean
     @default YES
   */
   isNested: YES,
 
   /**
-    If YES, then the attribute hash state will be locked when you first 
+    If YES, then the attribute hash state will be locked when you first
     read the data hash or status.  This means that if you retrieve a record
-    then change the record in the parent store, the changes will not be 
+    then change the record in the parent store, the changes will not be
     visible to your nested store until you commit or discard changes.
-    
+
     If `NO`, then the attribute hash will lock only when you write data.
-    
+
     Normally you want to lock your attribute hash the first time you read it.
     This will make your nested store behave most consistently.  However, if
     you are using multiple sibling nested stores at one time, you may want
@@ -68,7 +68,7 @@ SC.NestedStore = SC.Store.extend(
     in the other one immediately.  In this case you will be responsible for
     ensuring that the sibling stores do not edit the same part of the object
     graph at the same time.
-    
+
     @type Boolean
     @default YES
   */
@@ -76,18 +76,18 @@ SC.NestedStore = SC.Store.extend(
 
   /** @private
     Array contains the base revision for an attribute hash when it was first
-    cloned from the parent store.  If the attribute hash is edited and 
-    committed, the commit will fail if the parent attributes hash has been 
+    cloned from the parent store.  If the attribute hash is edited and
+    committed, the commit will fail if the parent attributes hash has been
     edited since.
-    
+
     This is a form of optimistic locking, hence the name.
-    
+
     Each store gets its own array of locks, which are selectively populated
     as needed.
-    
-    Note that this is kept as an array because it will be stored as a dense 
+
+    Note that this is kept as an array because it will be stored as a dense
     array on some browsers, making it faster.
-    
+
     @type Array
     @default null
   */
@@ -98,21 +98,21 @@ SC.NestedStore = SC.Store.extend(
     was last committed.  This array is used to sync data hash changes between
     chained stores.  For a log changes that may actually be committed back to
     the server see the changelog property.
-    
+
     @type SC.Set
     @default YES
   */
   chainedChanges: null,
-    
+
   // ..........................................................
   // STORE CHAINING
-  // 
-  
+  //
+
   /**
     `find()` cannot accept REMOTE queries in a nested store.  This override will
     verify that condition for you.  See `SC.Store#find()` for info on using this
     method.
-    
+
     @param {SC.Query} query query object to use.
     @returns {SC.Record|SC.RecordArray}
   */
@@ -122,9 +122,9 @@ SC.NestedStore = SC.Store.extend(
     }
     return sc_super();
   },
-  
+
   /**
-    Propagate this store's changes to its parent.  If the store does not 
+    Propagate this store's changes to its parent.  If the store does not
     have a parent, this has no effect other than to clear the change set.
 
     @param {Boolean} force if YES, does not check for conflicts first
@@ -143,7 +143,7 @@ SC.NestedStore = SC.Store.extend(
 
   /**
     Discard the changes made to this store and reset the store.
-    
+
     @returns {SC.Store} receiver
   */
   discardChanges: function() {
@@ -162,26 +162,26 @@ SC.NestedStore = SC.Store.extend(
           this._notifyRecordPropertyChange(parseInt(storeKey, 10));
         }
       }
-    }   
-    
+    }
+
     this.reset();
     this.flush();
     return this ;
   },
-  
+
   /**
-    When you are finished working with a chained store, call this method to 
+    When you are finished working with a chained store, call this method to
     tear it down.  This will also discard any pending changes.
-    
+
     @returns {SC.Store} receiver
   */
   destroy: function() {
     this.discardChanges();
-    
+
     var parentStore = this.get('parentStore');
     if (parentStore) parentStore.willDestroyNestedStore(this);
-    
-    sc_super();  
+
+    sc_super();
     return this ;
   },
 
@@ -193,33 +193,33 @@ SC.NestedStore = SC.Store.extend(
     // requires a pstore to reset
     var parentStore = this.get('parentStore');
     if (!parentStore) throw SC.Store.NO_PARENT_STORE_ERROR;
-    
+
     // inherit data store from parent store.
     this.dataHashes = SC.beget(parentStore.dataHashes);
     this.revisions  = SC.beget(parentStore.revisions);
     this.statuses   = SC.beget(parentStore.statuses);
-    
+
     // beget nested records references
     this.childRecords = parentStore.childRecords ? SC.beget(parentStore.childRecords) : {};
     this.parentRecords = parentStore.parentRecords ? SC.beget(parentStore.parentRecords) : {};
-    
+
     // also, reset private temporary objects
     this.chainedChanges = this.locks = this.editables = null;
     this.changelog = null ;
 
     // TODO: Notify record instances
-    
+
     this.set('hasChanges', NO);
   },
-  
+
   /** @private
-  
+
     Chain to parentstore
   */
   refreshQuery: function(query) {
     var parentStore = this.get('parentStore');
     if (parentStore) parentStore.refreshQuery(query);
-    return this ;      
+    return this ;
   },
 
   /**
@@ -228,7 +228,7 @@ SC.NestedStore = SC.Store.extend(
     Delegates the call to the parent store.
 
     @param {Number} storeKey The store key of the record.
- 
+
     @returns {SC.Error} SC.Error or null if no error associated with the record.
   */
   readError: function(storeKey) {
@@ -242,25 +242,25 @@ SC.NestedStore = SC.Store.extend(
     Delegates the call to the parent store.
 
     @param {SC.Query} query The SC.Query with which the error is associated.
- 
+
     @returns {SC.Error} SC.Error or null if no error associated with the query.
   */
   readQueryError: function(query) {
     var parentStore = this.get('parentStore');
     return parentStore ? parentStore.readQueryError(query) : null;
   },
-  
+
   // ..........................................................
   // CORE ATTRIBUTE API
-  // 
+  //
   // The methods in this layer work on data hashes in the store.  They do not
-  // perform any changes that can impact records.  Usually you will not need 
+  // perform any changes that can impact records.  Usually you will not need
   // to use these methods.
-  
+
   /**
     Returns the current edit status of a storekey.  May be one of `INHERITED`,
     `EDITABLE`, and `LOCKED`.  Used mostly for unit testing.
-    
+
     @param {Number} storeKey the store key
     @returns {Number} edit status
   */
@@ -268,15 +268,15 @@ SC.NestedStore = SC.Store.extend(
     var editables = this.editables, locks = this.locks;
     return (editables && editables[storeKey]) ? SC.Store.EDITABLE : (locks && locks[storeKey]) ? SC.Store.LOCKED : SC.Store.INHERITED ;
   },
-   
+
   /**  @private
-    Locks the data hash so that it iterates independently from the parent 
+    Locks the data hash so that it iterates independently from the parent
     store.
   */
   _lock: function(storeKey) {
-    var locks = this.locks, rev, editables, 
+    var locks = this.locks, rev, editables,
         pk, pr, path, tup, obj, key;
-    
+
     // already locked -- nothing to do
     if (locks && locks[storeKey]) return this;
 
@@ -286,8 +286,8 @@ SC.NestedStore = SC.Store.extend(
     // fixup editables
     editables = this.editables;
     if (editables) editables[storeKey] = 0;
-    
-    
+
+
     // if the data hash in the parent store is editable, then clone the hash
     // for our own use.  Otherwise, just copy a reference to the data hash
     // in the parent store. -- find first non-inherited state
@@ -295,13 +295,13 @@ SC.NestedStore = SC.Store.extend(
     while(pstore && (editState=pstore.storeKeyEditState(storeKey)) === SC.Store.INHERITED) {
       pstore = pstore.get('parentStore');
     }
-    
+
     if (pstore && editState === SC.Store.EDITABLE) {
-      
+
       pk = this.childRecords[storeKey];
       if (pk){
         // Since this is a nested record we have to actually walk up the parent chain
-        // to get to the root parent and clone that hash. And then reconstruct the 
+        // to get to the root parent and clone that hash. And then reconstruct the
         // memory space linking.
         this._lock(pk);
         pr = this.parentRecords[pk];
@@ -317,37 +317,37 @@ SC.NestedStore = SC.Store.extend(
       }
       if (!editables) editables = this.editables = [];
       editables[storeKey] = 1 ; // mark as editable
-      
+
     } else this.dataHashes[storeKey] = pstore.dataHashes[storeKey];
-    
+
     // also copy the status + revision
     this.statuses[storeKey] = this.statuses[storeKey];
     rev = this.revisions[storeKey] = this.revisions[storeKey];
-    
+
     // save a lock and make it not editable
-    locks[storeKey] = rev || 1;    
-    
+    locks[storeKey] = rev || 1;
+
     return this ;
   },
-  
+
   /** @private - adds chaining support */
   readDataHash: function(storeKey) {
     if (this.get('lockOnRead')) this._lock(storeKey);
     return this.dataHashes[storeKey];
   },
-  
+
   /** @private - adds chaining support */
   readEditableDataHash: function(storeKey) {
 
     // lock the data hash if needed
     this._lock(storeKey);
-    
+
     return sc_super();
   },
-  
-  /** @private - adds chaining support - 
+
+  /** @private - adds chaining support -
     Does not call sc_super because the implementation of the method vary too
-    much. 
+    much.
   */
   writeDataHash: function(storeKey, hash, status) {
     var locks = this.locks, didLock = NO, rev ;
@@ -373,24 +373,24 @@ SC.NestedStore = SC.Store.extend(
 
     if (!didLock) {
       rev = this.revisions[storeKey] = this.revisions[storeKey]; // copy ref
-    
+
       // make sure we lock if needed.
       if (!locks) locks = this.locks = [];
       if (!locks[storeKey]) locks[storeKey] = rev || 1;
     }
-    
+
     // Also note that this hash is now editable.  (Even if we locked it,
     // above, it may not have been marked as editable.)
     var editables = this.editables;
     if (!editables) editables = this.editables = [];
     editables[storeKey] = 1 ; // use number for dense array support
-    
+
     return this ;
   },
 
   /** @private - adds chaining support */
   removeDataHash: function(storeKey, status) {
-    
+
     // record optimistic lock revision
     var locks = this.locks;
     if (!locks) locks = this.locks = [];
@@ -398,15 +398,15 @@ SC.NestedStore = SC.Store.extend(
 
     return sc_super();
   },
-  
+
   /** @private - bookkeeping for a single data hash. */
   dataHashDidChange: function(storeKeys, rev, statusOnly, key) {
     // update the revision for storeKey.  Use generateStoreKey() because that
-    // guarantees a universally (to this store hierarchy anyway) unique 
+    // guarantees a universally (to this store hierarchy anyway) unique
     // key value.
     if (!rev) rev = SC.Store.generateStoreKey();
     var isArray, len, idx, storeKey;
-    
+
     isArray = SC.typeOf(storeKeys) === SC.T_ARRAY;
     if (isArray) {
       len = storeKeys.length;
@@ -417,7 +417,7 @@ SC.NestedStore = SC.Store.extend(
 
     var changes = this.chainedChanges;
     if (!changes) changes = this.chainedChanges = SC.Set.create();
-    
+
     for(idx=0;idx<len;idx++) {
       if (isArray) storeKey = storeKeys[idx];
       this._lock(storeKey);
@@ -432,13 +432,13 @@ SC.NestedStore = SC.Store.extend(
 
   // ..........................................................
   // SYNCING CHANGES
-  // 
-  
+  //
+
   /** @private - adapt for nested store */
   commitChangesFromNestedStore: function(nestedStore, changes, force) {
 
     sc_super();
-    
+
     // save a lock for each store key if it does not have one already
     // also add each storeKey to my own changes set.
     var pstore = this.get('parentStore'), psRevisions = pstore.revisions, i;
@@ -452,38 +452,38 @@ SC.NestedStore = SC.Store.extend(
       if (!myLocks[storeKey]) myLocks[storeKey] = psRevisions[storeKey]||1;
       myChanges.add(storeKey);
     }
-    
+
     // Finally, mark store as dirty if we have changes
     this.setIfChanged('hasChanges', myChanges.get('length')>0);
     this.flush();
-    
+
     return this ;
   },
 
   // ..........................................................
   // HIGH-LEVEL RECORD API
-  // 
-  
-  
+  //
+
+
   /** @private - adapt for nested store */
   queryFor: function(recordType, conditions, params) {
     return this.get('parentStore').queryFor(recordType, conditions, params);
   },
-  
+
   /** @private - adapt for nested store */
-  findAll: function(recordType, conditions, params, recordArray, _store) { 
+  findAll: function(recordType, conditions, params, recordArray, _store) {
     if (!_store) _store = this;
     return this.get('parentStore').findAll(recordType, conditions, params, recordArray, _store);
   },
 
   // ..........................................................
   // CORE RECORDS API
-  // 
-  // The methods in this section can be used to manipulate records without 
+  //
+  // The methods in this section can be used to manipulate records without
   // actually creating record instances.
-  
+
   /** @private - adapt for nested store
-  
+
     Unlike for the main store, for nested stores if isRefresh=YES, we'll throw
     an error if the record is dirty.  We'll otherwise avoid setting our status
     because that can disconnect us from upper and/or lower stores.
@@ -498,7 +498,7 @@ SC.NestedStore = SC.Store.extend(
       for(idx=0;idx<len;idx++) {
         storeKey = !storeKeys ? pstore.storeKeyFor(recordTypes, ids[idx]) : storeKeys[idx];
         status   = this.peekStatus(storeKey);
-        
+
         // We won't allow calling retrieve on a dirty record in a nested store
         // (although we do allow it in the main store).  This is because doing
         // so would involve writing a unique status, and that would break the
@@ -519,7 +519,7 @@ SC.NestedStore = SC.Store.extend(
 
           var changed    = NO;
           var statusOnly = NO;
-  
+
           if (dataHashes  &&  dataHashes.hasOwnProperty(storeKey)) {
             delete dataHashes[storeKey];
             changed = YES;
@@ -536,12 +536,12 @@ SC.NestedStore = SC.Store.extend(
             if (!changed) statusOnly = YES;
             changed = YES;
           }
-          
+
           if (changed) this._notifyRecordPropertyChange(storeKey, statusOnly);
         }
       }
     }
-    
+
     return pstore.retrieveRecords(recordTypes, ids, storeKeys, isRefresh);
   },
 
@@ -554,7 +554,7 @@ SC.NestedStore = SC.Store.extend(
   commitRecord: function(recordType, id, storeKey) {
     throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
   },
-  
+
   /** @private - adapt for nested store */
   cancelRecords: function(recordTypes, ids, storeKeys) {
     throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
@@ -564,22 +564,22 @@ SC.NestedStore = SC.Store.extend(
   cancelRecord: function(recordType, id, storeKey) {
     throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
   },
-  
+
   // ..........................................................
   // DATA SOURCE CALLBACKS
-  // 
+  //
   // Mathods called by the data source on the store
 
   /** @private - adapt for nested store */
   dataSourceDidCancel: function(storeKey) {
     throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
   },
-  
+
   /** @private - adapt for nested store */
   dataSourceDidComplete: function(storeKey, dataHash, newId) {
     throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
   },
-  
+
   /** @private - adapt for nested store */
   dataSourceDidDestroy: function(storeKey) {
     throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
@@ -592,13 +592,13 @@ SC.NestedStore = SC.Store.extend(
 
   // ..........................................................
   // PUSH CHANGES FROM DATA SOURCE
-  // 
-  
+  //
+
   /** @private - adapt for nested store */
   pushRetrieve: function(recordType, id, dataHash, storeKey) {
     throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
   },
-  
+
   /** @private - adapt for nested store */
   pushDestroy: function(recordType, id, storeKey) {
     throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
@@ -608,6 +608,6 @@ SC.NestedStore = SC.Store.extend(
   pushError: function(recordType, id, error, storeKey) {
     throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
   }
-  
+
 }) ;