sproutcore 1.11.0.rc3 → 1.11.0

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

@@ -159,9 +159,7 @@ SC.View.LayoutStyleCalculator = {
 
   // handles the case where you do width:auto or height:auto and are not using "staticLayout"
   _invalidAutoValue: function (view, property) {
-    var error = SC.Error.desc("%@.layout() you cannot use %@:auto if staticLayout is disabled".fmt(view, property), "%@".fmt(view), -1);
-    SC.Logger.error(error.toString());
-    throw error;
+    SC.throw("%@.layout() you cannot use %@:auto if staticLayout is disabled".fmt(view, property), "%@".fmt(view), -1);
   },
 
   /** @private */

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

@@ -332,11 +332,12 @@ SC.CoreView.reopen(
   /** @private Adopt this view action. */
   _doAdopt: function (parentView, beforeView) {
     var curParentView = this.get('parentView'),
-      handled = true;
+      handled = true,
+      state = this.get('viewState');
 
     //@if (debug)
     if (SC.LOG_VIEW_STATES || this.SC_LOG_VIEW_STATE) {
-      SC.Logger.log('%c%@ — _doAdopt(%@, %@)'.fmt(this, parentView, beforeView), SC.LOG_VIEW_STATES_STYLE[this.get('viewState')]);
+      SC.Logger.log('%c%@ — _doAdopt(%@, %@): curParentView: %@'.fmt(this, parentView, beforeView, curParentView), SC.LOG_VIEW_STATES_STYLE[this.get('viewState')]);
     }
     //@endif
 
@@ -353,11 +354,11 @@ SC.CoreView.reopen(
 
     // You can adopt childViews that have you set as their parent (i.e. created
     // with createChildView()), but have not yet been fully adopted.
-    if (!curParentView || this.get('childViews').indexOf(this) < 0) {
+    var siblings = parentView.get('childViews');
+    if (!curParentView || siblings.indexOf(this) < 0) {
       var idx,
-        childViews = parentView.get('childViews'),
         parentViewState = parentView.get('viewState'),
-        parentNode, nextNode, nextView, siblings;
+        parentNode, nextNode, nextView;
 
       // Notify that the child view will be added to the parent view.
       if (parentView.willAddChild) { parentView.willAddChild(this, beforeView); }
@@ -367,10 +368,10 @@ SC.CoreView.reopen(
       this.set('parentView', parentView);
 
       // Add to the new parent's childViews array.
-      if (childViews.needsClone) { parentView.set(childViews = []); }
-      idx = (beforeView) ? childViews.indexOf(beforeView) : childViews.length;
-      if (idx < 0) { idx = childViews.length; }
-      childViews.insertAt(idx, this);
+      if (siblings.needsClone) { parentView.set('childViews', []); }
+      idx = (beforeView) ? siblings.indexOf(beforeView) : siblings.length;
+      if (idx < 0) { idx = siblings.length; }
+      siblings.insertAt(idx, this);
 
       // Pass the current designMode to the view (and its children).
       this.updateDesignMode(this.get('designMode'), parentView.get('designMode'));
@@ -379,7 +380,7 @@ SC.CoreView.reopen(
       this._adopted(beforeView);
 
       // When a view is adopted, it should go to the same state as its new parent.
-      switch (this.get('viewState')) {
+      switch (state) {
       case SC.CoreView.UNRENDERED:
         switch (parentViewState) {
         case SC.CoreView.UNRENDERED:
@@ -397,7 +398,6 @@ SC.CoreView.reopen(
           break;
         default:
           parentNode = parentView.get('containerLayer');
-          siblings = parentView.get('childViews');
           nextView = siblings.objectAt(siblings.indexOf(this) + 1);
           nextNode = (nextView) ? nextView.get('layer') : null;
 
@@ -412,13 +412,18 @@ SC.CoreView.reopen(
           break;
         default:
           parentNode = parentView.get('containerLayer');
-          siblings = parentView.get('childViews');
           nextView = siblings.objectAt(siblings.indexOf(this) + 1);
           nextNode = (nextView) ? nextView.get('layer') : null;
 
           this._doAttach(parentNode, nextNode);
         }
       }
+
+    // Adopting a view that is building out.
+    } else if (state === SC.CoreView.ATTACHED_BUILDING_OUT) {
+      this._doAttach();
+
+    // Can't do anything.
     } else {
       handled = false;
     }
@@ -481,7 +486,14 @@ SC.CoreView.reopen(
       // Note: We can be in ATTACHED_BUILDING_OUT state without a transition out while we wait for child views.
       if (this.get('transitionOut')) {
         // Cancel the building out transition (in place if we are going to switch to transitioning back in).
-        this.cancelAnimation(transitionIn ? SC.LayoutState.CURRENT : undefined);
+        // this.cancelAnimation(transitionIn ? SC.LayoutState.CURRENT : undefined);
+        this.cancelAnimation();
+
+        //@if (debug)
+        if (SC.LOG_VIEW_STATES || this.SC_LOG_VIEW_STATE) {
+          SC.Logger.log('%c       — cancelling build out outright'.fmt(this), SC.LOG_VIEW_STATES_STYLE[this.get('viewState')]);
+        }
+        //@endif
 
         // Set the proper state.
         this._gotoAttachedShownState();
@@ -635,15 +647,15 @@ SC.CoreView.reopen(
     // Result: If it has a build out transition, swap to it. Otherwise, cancel.
     case SC.CoreView.ATTACHED_BUILDING_IN:
       // Cancel the build in transition.
-      if (transitionOut) {
-        //@if (debug)
-        if (SC.LOG_VIEW_STATES || this.SC_LOG_VIEW_STATE) {
-          SC.Logger.log('%c       — cancelling build in in place'.fmt(this), SC.LOG_VIEW_STATES_STYLE[this.get('viewState')]);
-        }
-        //@endif
-
-        this.cancelAnimation(SC.LayoutState.CURRENT);
-      } else {
+      // if (transitionOut) {
+      //   //@if (debug)
+      //   if (SC.LOG_VIEW_STATES || this.SC_LOG_VIEW_STATE) {
+      //     SC.Logger.log('%c       — cancelling build in in place'.fmt(this), SC.LOG_VIEW_STATES_STYLE[this.get('viewState')]);
+      //   }
+      //   //@endif
+
+      //   this.cancelAnimation(SC.LayoutState.CURRENT);
+      // } else {
         //@if (debug)
         if (SC.LOG_VIEW_STATES || this.SC_LOG_VIEW_STATE) {
           SC.Logger.log('%c       — cancelling build in outright'.fmt(this), SC.LOG_VIEW_STATES_STYLE[this.get('viewState')]);
@@ -651,7 +663,7 @@ SC.CoreView.reopen(
         //@endif
 
         this.cancelAnimation();
-      }
+      // }
 
       // Set the proper state.
       this._gotoAttachedShownState();
@@ -1390,7 +1402,11 @@ SC.CoreView.reopen(
 
     // Update the state and children state. The children are updated top-down so that invalid state
     // children allow us to bail out early.
-    this._gotoUnattachedState();
+    // if (this.get('parentView')) {
+    //   this._gotoAttachedPartialState();
+      this._gotoUnattachedState();
+    // }
+
     this._callOnChildViews('_parentDidRender', true, notifyStack);
 
     this._sc_addRenderedStateObservers();

data/lib/frameworks/sproutcore/frameworks/datastore/data_sources/fixtures.js

@@ -67,11 +67,11 @@ SC.FixturesDataSource = SC.DataSource.extend(
 
     // can only handle local queries out of the box
     if (query.get('location') !== SC.Query.LOCAL) {
-      throw SC.$error('SC.Fixture data source can only fetch local queries');
+      SC.throw('SC.Fixture data source can only fetch local queries');
     }
 
     if (!query.get('recordType') && !query.get('recordTypes')) {
-      throw SC.$error('SC.Fixture data source can only fetch queries with one or more record types');
+      SC.throw('SC.Fixture data source can only fetch queries with one or more record types');
     }
 
     if (this.get('simulateRemoteResponse')) {

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

@@ -542,7 +542,7 @@ SC.Record = SC.Object.extend(
         attrs;
 
     attrs = store.readEditableDataHash(storeKey);
-    if (!attrs) throw SC.Record.BAD_STATE_ERROR;
+    if (!attrs) SC.Record.BAD_STATE_ERROR.throw();
 
     // if value is the same, do not flag record as dirty
     if (value !== attrs[key]) {
@@ -1346,7 +1346,7 @@ SC.Record.mixin( /** @scope SC.Record */ {
     @constant
     @type SC.Error
   */
-  BAD_STATE_ERROR:     SC.$error("Internal Inconsistency"),
+  BAD_STATE_ERROR: SC.$error("Internal Inconsistency"),
 
   /**
     Error for when you try to create a new record that already exists.
@@ -1364,7 +1364,7 @@ SC.Record.mixin( /** @scope SC.Record */ {
     @constant
     @type SC.Error
   */
-  NOT_FOUND_ERROR:     SC.$error("Not found "),
+  NOT_FOUND_ERROR: SC.$error("Not found "),
 
   /**
     Error for when you try to modify a record that is currently busy
@@ -1373,7 +1373,7 @@ SC.Record.mixin( /** @scope SC.Record */ {
     @constant
     @type SC.Error
   */
-  BUSY_ERROR:          SC.$error("Busy"),
+  BUSY_ERROR: SC.$error("Busy"),
 
   /**
     Generic unknown record error
@@ -1382,7 +1382,7 @@ SC.Record.mixin( /** @scope SC.Record */ {
     @constant
     @type SC.Error
   */
-  GENERIC_ERROR:       SC.$error("Generic Error"),
+  GENERIC_ERROR: SC.$error("Generic Error"),
 
   /**
     If true, then searches for records of this type will return subclass instances. For example:

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

@@ -278,7 +278,7 @@ SC.NestedStore = SC.Store.extend(
   reset: function() {
     // requires a pstore to reset
     var parentStore = this.get('parentStore');
-    if (!parentStore) throw SC.Store.NO_PARENT_STORE_ERROR;
+    if (!parentStore) SC.Store.NO_PARENT_STORE_ERROR.throw();
 
     // inherit data store from parent store.
     this.dataHashes = SC.beget(parentStore.dataHashes);
@@ -337,7 +337,7 @@ SC.NestedStore = SC.Store.extend(
 
   /** @private - adapt for nested store */
   chainAutonomousStore: function(attrs, newStoreClass) {
-    throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+    SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   // ..........................................................
@@ -616,7 +616,7 @@ SC.NestedStore = SC.Store.extend(
         // status hierarchy, so even though lower stores would complete the
         // retrieval, the upper layers would never inherit the new statuses.
         if (status & K.DIRTY) {
-          throw SC.Store.NESTED_STORE_RETRIEVE_DIRTY_ERROR;
+          SC.Store.NESTED_STORE_RETRIEVE_DIRTY_ERROR.throw();
         }
         else {
           // Not dirty?  Then abandon any status we had set (to re-establish
@@ -661,7 +661,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   /** @private - adapt for nested store */
@@ -669,7 +669,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   /** @private - adapt for nested store */
@@ -677,7 +677,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   /** @private - adapt for nested store */
@@ -685,7 +685,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   // ..........................................................
@@ -698,7 +698,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   /** @private - adapt for nested store */
@@ -706,7 +706,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   /** @private - adapt for nested store */
@@ -714,7 +714,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   /** @private - adapt for nested store */
@@ -722,7 +722,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   // ..........................................................
@@ -734,7 +734,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   /** @private - adapt for nested store */
@@ -742,7 +742,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   },
 
   /** @private - adapt for nested store */
@@ -750,7 +750,7 @@ SC.NestedStore = SC.Store.extend(
     if( this.get( "dataSource" ) )
       return sc_super();
     else
-      throw SC.Store.NESTED_STORE_UNSUPPORTED_ERROR;
+      SC.Store.NESTED_STORE_UNSUPPORTED_ERROR.throw();
   }
 
 }) ;

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

@@ -517,7 +517,7 @@ SC.Query = SC.Object.extend(SC.Copyable, SC.Freezable,
     this._order = this.buildOrder(this.get('orderBy'));
 
     this._isReady = !!tree && !tree.error;
-    if (tree && tree.error) throw tree.error;
+    if (tree && tree.error) SC.throw(tree.error);
     return this._isReady;
   },
 

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

@@ -272,7 +272,7 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
     if (!storeKeys) throw new Error("Unable to edit an SC.RecordArray that does not have its storeKeys property set.");
 
-    if (!this.get('isEditable')) throw SC.RecordArray.NOT_EDITABLE;
+    if (!this.get('isEditable')) SC.RecordArray.NOT_EDITABLE.throw();
 
     // map to store keys
     keys = [] ;
@@ -814,7 +814,7 @@ SC.RecordArray.mixin(/** @scope SC.RecordArray.prototype */{
 
     @type SC.Error
   */
-  NOT_EDITABLE: SC.Error.desc("SC.RecordArray is not editable"),
+  NOT_EDITABLE: SC.$error("SC.RecordArray is not editable"),
 
   /**
     Number of milliseconds to allow a query matching to run for. If this number

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

@@ -643,7 +643,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
 
       } else if (status & SC.Record.BUSY) {
         // make sure nested store does not have any changes before resetting
-        if(store.get('hasChanges')) throw K.CHAIN_CONFLICT_ERROR;
+        if(store.get('hasChanges')) K.CHAIN_CONFLICT_ERROR.throw();
         store.reset();
       }
     }
@@ -812,7 +812,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
   commitChangesFromNestedStore: function (nestedStore, changes, force) {
     // first, check for optimistic locking problems
     if (!force && nestedStore.get('conflictedStoreKeys')) {
-      throw SC.Store.CHAIN_CONFLICT_ERROR;
+      SC.Store.CHAIN_CONFLICT_ERROR.throw();
     }
 
     // OK, no locking issues.  So let's just copy them changes.
@@ -1230,11 +1230,11 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     if ((status & K.BUSY)  ||
         (status & K.READY) ||
         (status === K.DESTROYED_DIRTY)) {
-      throw id ? K.RECORD_EXISTS_ERROR : K.BAD_STATE_ERROR;
+      (id ? K.RECORD_EXISTS_ERROR : K.BAD_STATE_ERROR).throw();
 
     // allow error or destroyed state only with id
     } else if (!id && (status===SC.DESTROYED_CLEAN || status===SC.ERROR)) {
-      throw K.BAD_STATE_ERROR;
+      K.BAD_STATE_ERROR.throw();
     }
 
     // Store the dataHash and setup initial status.
@@ -1343,7 +1343,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
 
     // error out if empty
     } else if (status & K.BUSY) {
-      throw K.BUSY_ERROR ;
+      K.BUSY_ERROR.throw();
 
     // otherwise, destroy in dirty state
     } else status = newStatus ;
@@ -1384,8 +1384,8 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     unload records this way.
 
     @param {SC.Record|Array} recordTypes class or array of classes
-    @param {Array} ids (optional) ids to unload
-    @param {Array} storeKeys (optional) store keys to unload
+    @param {Array} [ids] ids to unload
+    @param {Array} [storeKeys] store keys to unload
     @returns {SC.Store} receiver
   */
   unloadRecords: function(recordTypes, ids, storeKeys, newStatus) {
@@ -1441,11 +1441,11 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
 
     // error out if empty
     } else if (status === K.EMPTY) {
-      throw K.NOT_FOUND_ERROR ;
+      K.NOT_FOUND_ERROR.throw();
 
     // error out if busy
     } else if (status & K.BUSY) {
-      throw K.BUSY_ERROR ;
+      K.BUSY_ERROR.throw();
 
     // if new status, destroy in clean state
     } else if (status === K.READY_NEW) {
@@ -1655,12 +1655,12 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     // BUSY_LOADING, BUSY_CREATING, BUSY_COMMITTING, BUSY_REFRESH_CLEAN
     // BUSY_REFRESH_DIRTY, BUSY_DESTROYING
     if (status & K.BUSY) {
-      throw K.BUSY_ERROR ;
+      K.BUSY_ERROR.throw();
 
     // if record is not in ready state, then it is not found.
     // ERROR, EMPTY, DESTROYED_CLEAN, DESTROYED_DIRTY
     } else if (!(status & K.READY)) {
-      throw K.NOT_FOUND_ERROR ;
+      K.NOT_FOUND_ERROR.throw();
 
     // otherwise, make new status READY_DIRTY unless new.
     // K.READY_CLEAN, K.READY_DIRTY, ignore K.READY_NEW
@@ -1790,11 +1790,11 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
           this._setCallbackForStoreKey(storeKey, callback, hasCallbackArray, storeKeys);
         // K.BUSY_DESTROYING, K.BUSY_COMMITTING, K.BUSY_CREATING
         } else if ((status === K.BUSY_DESTROYING) || (status === K.BUSY_CREATING) || (status === K.BUSY_COMMITTING)) {
-          throw K.BUSY_ERROR ;
+          K.BUSY_ERROR.throw();
 
         // K.DESTROY_DIRTY, bad state...
         } else if (status === K.DESTROYED_DIRTY) {
-          throw K.BAD_STATE_ERROR ;
+          K.BAD_STATE_ERROR.throw();
 
         // ignore K.BUSY_LOADING, K.BUSY_REFRESH_CLEAN, K.BUSY_REFRESH_DIRTY
         }
@@ -2007,7 +2007,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
       status = this.readStatus(storeKey);
 
       if (status === K.ERROR) {
-        throw K.NOT_FOUND_ERROR ;
+        K.NOT_FOUND_ERROR.throw();
       }
       else {
         if(status === K.READY_NEW) {
@@ -2117,7 +2117,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
         status = this.readStatus(storeKey);
 
         if ((status === K.EMPTY) || (status === K.ERROR)) {
-          throw K.NOT_FOUND_ERROR ;
+          K.NOT_FOUND_ERROR.throw();
         }
         ret.push(storeKey);
         this._cancelCallback(storeKey);
@@ -2225,35 +2225,38 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
 
     @param {SC.Record} recordTypes the record type or array of record types
     @param {Array} dataHashes array of data hashes to update
-    @param {Array} ids optional array of ids.  if not passed lookup on hashes
+    @param {Array} [ids] array of ids.  if not passed lookup on hashes
     @returns {Array} store keys assigned to these ids
   */
-  loadRecords: function(recordTypes, dataHashes, ids) {
+  // TODO: No reason for first argument to be an array. The developer can just call loadRecords multiple times with different record type each time. Would save us the need to check if recordTypes is an Array or not.
+  loadRecords: function (recordTypes, dataHashes, ids) {
     var isArray = SC.typeOf(recordTypes) === SC.T_ARRAY,
         len     = dataHashes.get('length'),
         ret     = [],
-        recordType, id, primaryKey, idx, dataHash;
+        recordType,
+        id, primaryKey, idx, dataHash;
 
     // save lookup info
     if (!isArray) {
       recordType = recordTypes || SC.Record;
-      primaryKey = recordType.prototype.primaryKey ;
+      primaryKey = recordType.prototype.primaryKey;
     }
 
     // push each record
-    for(idx=0;idx<len;idx++) {
+    for (idx = 0; idx < len; idx++) {
       dataHash = dataHashes.objectAt(idx);
       if (isArray) {
         recordType = recordTypes.objectAt(idx) || SC.Record;
         primaryKey = recordType.prototype.primaryKey ;
       }
+
       id = (ids) ? ids.objectAt(idx) : dataHash[primaryKey];
-      ret[idx] = this.loadRecord(recordType, dataHash, id);
 
+      ret[idx] = this.loadRecord(recordType, dataHash, id);
     }
 
     // return storeKeys
-    return ret ;
+    return ret;
   },
 
   /**
@@ -2299,7 +2302,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     // EMPTY, ERROR, READY_CLEAN, READY_NEW, READY_DIRTY, DESTROYED_CLEAN,
     // DESTROYED_DIRTY
     if (!(status & K.BUSY)) {
-      throw K.BAD_STATE_ERROR; // should never be called in this state
+      K.BAD_STATE_ERROR.throw(); // should never be called in this state
     }
 
     // otherwise, determine proper state transition
@@ -2329,7 +2332,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
         break;
 
       default:
-        throw K.BAD_STATE_ERROR ;
+        K.BAD_STATE_ERROR.throw() ;
     }
     this.writeStatus(storeKey, status) ;
     this.dataHashDidChange(storeKey, null, YES);
@@ -2354,12 +2357,12 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     // EMPTY, ERROR, READY_CLEAN, READY_NEW, READY_DIRTY, DESTROYED_CLEAN,
     // DESTROYED_DIRTY
     if (!(status & K.BUSY)) {
-      throw K.BAD_STATE_ERROR; // should never be called in this state
+      K.BAD_STATE_ERROR.throw(); // should never be called in this state
     }
 
     // otherwise, determine proper state transition
     if(status === K.BUSY_DESTROYING) {
-      throw K.BAD_STATE_ERROR ;
+      K.BAD_STATE_ERROR.throw();
     } else status = K.READY_CLEAN;
 
     this.writeStatus(storeKey, status);
@@ -2395,7 +2398,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     // EMPTY, ERROR, READY_CLEAN, READY_NEW, READY_DIRTY, DESTROYED_CLEAN,
     // DESTROYED_DIRTY
     if (!(status & K.BUSY)) {
-      throw K.BAD_STATE_ERROR; // should never be called in this state
+      K.BAD_STATE_ERROR.throw(); // should never be called in this state
     }
     // otherwise, determine proper state transition
     else{
@@ -2427,7 +2430,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
 
     // EMPTY, ERROR, READY_CLEAN, READY_NEW, READY_DIRTY, DESTROYED_CLEAN,
     // DESTROYED_DIRTY
-    if (!(status & K.BUSY)) { throw K.BAD_STATE_ERROR; }
+    if (!(status & K.BUSY)) { K.BAD_STATE_ERROR.throw(); }
 
     // otherwise, determine proper state transition
     else status = K.ERROR ;
@@ -2590,7 +2593,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
 
     For example,
 
-        storeKeys = store.loadRecords(body.contacts);
+        storeKeys = store.loadRecords(MyApp.SomeType, body.contacts);
         store.dataSourceDidFetchQuery(query, storeKeys);
 
     # Automatic updates
@@ -2853,7 +2856,7 @@ SC.Store.mixin(/** @scope SC.Store.prototype */{
 
     @type Error
   */
-  CHAIN_CONFLICT_ERROR: new Error("Nested Store Conflict"),
+  CHAIN_CONFLICT_ERROR: SC.$error("Nested Store Conflict"),
 
   /**
     Standard error if you try to perform an operation on a nested store
@@ -2861,7 +2864,7 @@ SC.Store.mixin(/** @scope SC.Store.prototype */{
 
     @type Error
   */
-  NO_PARENT_STORE_ERROR: new Error("Parent Store Required"),
+  NO_PARENT_STORE_ERROR: SC.$error("Parent Store Required"),
 
   /**
     Standard error if you try to perform an operation on a nested store that
@@ -2869,7 +2872,7 @@ SC.Store.mixin(/** @scope SC.Store.prototype */{
 
     @type Error
   */
-  NESTED_STORE_UNSUPPORTED_ERROR: new Error("Unsupported In Nested Store"),
+  NESTED_STORE_UNSUPPORTED_ERROR: SC.$error("Unsupported In Nested Store"),
 
   /**
     Standard error if you try to retrieve a record in a nested store that is
@@ -2877,7 +2880,7 @@ SC.Store.mixin(/** @scope SC.Store.prototype */{
 
     @type Error
   */
-  NESTED_STORE_RETRIEVE_DIRTY_ERROR: new Error("Cannot Retrieve Dirty Record in Nested Store"),
+  NESTED_STORE_RETRIEVE_DIRTY_ERROR: SC.$error("Cannot Retrieve Dirty Record in Nested Store"),
 
   /**
     Data hash state indicates the data hash is currently editable