sproutcore 1.10.1 → 1.10.2

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

@@ -29,12 +29,21 @@ SC.CoreView.mixin(
 
   /**
     The view is enabled itself, but is effectively disabled in the pane due to
-    a disabled parent view.
+    a disabled ancestor.
 
     @static
     @constant
   */
-  DISABLED_BY_PARENT: 0x12 // 18
+  DISABLED_BY_PARENT: 0x12, // 18
+
+  /**
+    The view is disabled itself and is also disabled in the pane due to
+    a disabled ancestor.
+
+    @static
+    @constant
+  */
+  DISABLED_AND_BY_PARENT: 0x13 // 19
 
 });
 
@@ -112,11 +121,16 @@ SC.View.reopen(
 
   /** @private */
   _doEnable: function () {
-    var handled = true;
+    var handled = true,
+      enabledState = this.get('enabledState');
 
-    if (this.get('enabledState') & SC.CoreView.IS_DISABLED) {
+    if (enabledState === SC.CoreView.DISABLED) {
+      // If the view itself is disabled, then we can enable it.
       this._callOnChildViews('_parentDidEnableInPane');
       this._gotoEnabledState();
+    } else if (enabledState === SC.CoreView.DISABLED_AND_BY_PARENT) {
+      // The view is no longer disabled itself, but still disabled by an ancestor.
+      this._gotoDisabledByParentState();
     } else {
       handled = false;
     }
@@ -126,15 +140,20 @@ SC.View.reopen(
 
   /** @private */
   _doDisable: function () {
-    var handled = true;
+    var handled = true,
+      enabledState = this.get('enabledState');
 
-    if (this.get('enabledState') !== SC.CoreView.DISABLED) {
+    // If the view is not itself disabled, then we can disable it.
+    if (enabledState === SC.CoreView.ENABLED) {
       if (this.get('isFirstResponder')) {
         this.resignFirstResponder();
       }
 
       this._callOnChildViews('_parentDidDisableInPane');
       this._gotoDisabledState();
+    } else if (enabledState === SC.CoreView.DISABLED_BY_PARENT) {
+      // The view is now disabled itself and disabled by an ancestor.
+      this._gotoDisabledAndByParentState();
     } else {
       handled = false;
     }
@@ -146,6 +165,14 @@ SC.View.reopen(
   // Methods
   //
 
+  /** @private */
+  init: function (original) {
+    original();
+
+    // If the view is pre-configured as disabled, then go to the proper initial state.
+    if (!this.get('isEnabled')) { this._doDisable(); }
+  }.enhance(),
+
   /** @private
     Observes the isEnabled property and resigns first responder if set to NO.
     This will avoid cases where, for example, a disabled text field retains
@@ -206,10 +233,18 @@ SC.View.reopen(
 
   /** @private */
   _parentDidEnableInPane: function () {
-    var isEnabled = this.get('isEnabled');
+    var enabledState = this.get('enabledState');
 
-    if (isEnabled) {
-      this._gotoEnabledState();
+    if (this.get('shouldInheritEnabled')) {
+
+      if (enabledState === SC.CoreView.DISABLED_BY_PARENT) { // Was enabled before.
+        this._gotoEnabledState();
+      } else if (enabledState === SC.CoreView.DISABLED_AND_BY_PARENT) { // Was disabled before.
+        this._gotoDisabledState();
+
+        // There's no need to continue to further child views.
+        return false;
+      }
     } else {
       // There's no need to continue to further child views.
       return false;
@@ -218,10 +253,19 @@ SC.View.reopen(
 
   /** @private */
   _parentDidDisableInPane: function () {
-    var isEnabled = this.get('isEnabled');
+    var enabledState = this.get('enabledState');
+
+    if (this.get('shouldInheritEnabled')) {
 
-    if (isEnabled && this.get('shouldInheritEnabled')) {
-      this._gotoDisableByParentState();
+      if (enabledState === SC.CoreView.ENABLED) { // Was enabled.
+        this._gotoDisabledByParentState();
+      } else if (enabledState === SC.CoreView.DISABLED) { // Was disabled.
+        this._gotoDisabledAndByParentState();
+      } else { // Was already disabled by ancestor.
+
+        // There's no need to continue to further child views.
+        return false;
+      }
     } else {
       // There's no need to continue to further child views.
       return false;
@@ -249,7 +293,13 @@ SC.View.reopen(
   },
 
   /** @private */
-  _gotoDisableByParentState: function () {
+  _gotoDisabledAndByParentState: function () {
+    // Update the state.
+    this.set('enabledState', SC.CoreView.DISABLED_AND_BY_PARENT);
+  },
+
+  /** @private */
+  _gotoDisabledByParentState: function () {
     // Update the state.
     this.set('enabledState', SC.CoreView.DISABLED_BY_PARENT);
   }

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

@@ -42,13 +42,13 @@ SC.Record = SC.Object.extend(
 
   //@if(debug)
   /* BEGIN DEBUG ONLY PROPERTIES AND METHODS */
+
   /** @private
     Creates string representation of record, with status.
 
     @returns {String}
   */
-
-  toString: function() {
+  toString: function () {
     // We won't use 'readOnlyAttributes' here because accessing them directly
     // avoids a SC.clone() -- we'll be careful not to edit anything.
     var attrs = this.get('store').readDataHash(this.get('storeKey'));
@@ -61,7 +61,7 @@ SC.Record = SC.Object.extend(
     @returns {String}
   */
 
-  statusString: function() {
+  statusString: function () {
     var ret = [], status = this.get('status');
 
     for(var prop in SC.Record) {

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

@@ -59,10 +59,16 @@ SC.SingleAttribute = SC.RecordAttribute.extend(
     if (newRec !== undefined && this.get('isEditable')) {
 
       // can only take other records or null
+      //@if(debug)
       if (newRec && !SC.kindOf(newRec, SC.Record)) {
-        throw new Error("%@ is not an instance of SC.Record".fmt(newRec));
+        throw new Error("Developer Error: %@ is not an instance of SC.Record.".fmt(newRec));
       }
 
+      if (newRec && SC.none(newRec.get('id'))) {
+        throw new Error("Developer Error: Attempted to add a record without a primary key to a to-one relationship. Relationships require that the id always be specified. The record, \"%@\", must be assigned an id (i.e. be saved) before it can be used in the '%@' relationship.".fmt(newRec, attrKey));
+      }
+      //@endif
+
       inverseKey = this.get('inverse');
       if (inverseKey) oldRec = this._scsa_call(record, key);
 

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

@@ -23,6 +23,20 @@
 SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
   /** @scope SC.ManyArray.prototype */ {
 
+  //@if(debug)
+  /* BEGIN DEBUG ONLY PROPERTIES AND METHODS */
+
+  /* @private */
+  toString: function () {
+    var readOnlyStoreIds = this.get('readOnlyStoreIds'),
+      length = this.get('length');
+
+    return "%@({\n    ids: [%@],\n    length: %@,\n    … })".fmt(this.constructor.toString(), readOnlyStoreIds, length);
+  },
+
+  /* END DEBUG ONLY PROPERTIES AND METHODS */
+  //@endif
+
   /**
     `recordType` will tell what type to transform the record to when
     materializing the record.
@@ -222,10 +236,11 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
     records, which can be converted to `storeId`s.
   */
   replace: function(idx, amt, recs) {
-
+    //@if(debug)
     if (!this.get('isEditable')) {
-      throw new Error("%@.%@[] is not editable".fmt(this.get('record'), this.get('propertyName')));
+      throw new Error("Developer Error: %@.%@[] is not editable.".fmt(this.get('record'), this.get('propertyName')));
     }
+    //@endif
 
     var storeIds = this.get('editableStoreIds'),
         len      = recs ? (recs.get ? recs.get('length') : recs.length) : 0,
@@ -235,12 +250,20 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
     // map to store keys
     ids = [] ;
-    for(i=0;i<len;i++) ids[i] = recs.objectAt(i).get('id');
+    for(i=0;i<len;i++) {
+      //@if(debug)
+      if (SC.none(recs.objectAt(i).get('id'))) {
+        throw new Error("Developer Error: Attempted to add a record without a primary key to a to-many relationship. Relationships require that the id always be specified. The record, \"%@\", must be assigned an id (i.e. be saved) before it can be used in the '%@' relationship.".fmt(recs.objectAt(i), pname));
+      }
+      //@endif
+
+      ids[i] = recs.objectAt(i).get('id');
+    }
 
     // if we have an inverse - collect the list of records we are about to
     // remove
     inverse = this.get('inverse');
-    if (inverse && amt>0) {
+    if (inverse && amt > 0) {
       toRemove = SC.ManyArray._toRemove;
       if (toRemove) SC.ManyArray._toRemove = null; // reuse if possible
       else toRemove = [];
@@ -456,4 +479,4 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
     this.recordPropertyDidChange();
   }
 
-}) ;
+});

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

@@ -139,6 +139,21 @@ sc_require('models/record');
 SC.Query = SC.Object.extend(SC.Copyable, SC.Freezable,
   /** @scope SC.Query.prototype */ {
 
+  //@if(debug)
+  /* BEGIN DEBUG ONLY PROPERTIES AND METHODS */
+
+  /* @private */
+  toString: function () {
+    var conditions = this.get('conditions'),
+      location = this.get('location'),
+      parameters = this.get('parameters');
+
+    return "%@.%@({ conditions: '%@', parameters: %@, … })".fmt(this.constructor.toString(), location, conditions, SC.inspect(parameters));
+  },
+
+  /* END DEBUG ONLY PROPERTIES AND METHODS */
+  //@endif
+
   // ..........................................................
   // PROPERTIES
   //

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

@@ -56,6 +56,35 @@ sc_require('models/record');
 SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   /** @scope SC.RecordArray.prototype */ {
 
+  //@if(debug)
+  /* BEGIN DEBUG ONLY PROPERTIES AND METHODS */
+
+  /* @private */
+  toString: function () {
+    var statusString = this.statusString(),
+      storeKeys = this.get('storeKeys'),
+      query = this.get('query'),
+      length = this.get('length');
+
+    return "%@({\n    query: %@,\n    storeKeys: [%@],\n    length: %@,\n    … }) %@".fmt(this.constructor.toString(), query, storeKeys, length, statusString);
+  },
+
+  /** @private */
+  statusString: function() {
+    var ret = [], status = this.get('status');
+
+    for (var prop in SC.Record) {
+      if (prop.match(/[A-Z_]$/) && SC.Record[prop] === status) {
+        ret.push(prop);
+      }
+    }
+
+    return ret.join(" ");
+  },
+
+  /* END DEBUG ONLY PROPERTIES AND METHODS */
+  //@endif
+
   /**
     The store that owns this record array.  All record arrays must have a
     store to function properly.
@@ -676,9 +705,7 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   _storeKeysDidChange: function() {
     var storeKeys = this.get('storeKeys');
 
-    var prev = this._prevStoreKeys, oldLen, newLen,
-        f    = this._storeKeysContentDidChange,
-        fs   = this._storeKeysStateDidChange;
+    var prev = this._prevStoreKeys, oldLen, newLen;
 
     if (storeKeys === prev) { return; } // nothing to do
 

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

@@ -1057,7 +1057,11 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     @returns {SC.Record} Returns a record instance.
   */
   materializeRecord: function (storeKey) {
-    var records = this.records, ret, recordType, attrs;
+    var records = this.records,
+      //@if(debug)
+      updatingRecords = this.updatingRecords,
+      //@endif
+      ret, recordType, attrs;
 
     // look up in cached records
     if (!records) records = this.records = {}; // load cached records
@@ -1071,8 +1075,26 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     attrs = this._TMP_REC_ATTRS ;
     attrs.storeKey = storeKey ;
     attrs.store    = this ;
+
+    //@if(debug)
+    // Add some developer support to prevent a tough to diagnose bug that if
+    // materializeRecord is called during the creation of a record, the store
+    // will inadvertently create a duplicate record instance not because the
+    // actual instance won't have been cached to this.records yet.
+    if (!this.updatingRecords) { updatingRecords = this.updatingRecords = {}; }
+    if (updatingRecords[storeKey]) {
+      throw new Error("Developer Error: The record of type, %@, with storeKey, %@, was materialized a second time before the first call had finished. This will result in two separate instances of the same object being created and should be fixed. A likely cause is using `.observes` code in the record class, which can cause the record to be retrieved somehow while it is still being created.".fmt(recordType, storeKey));
+    }
+
+    updatingRecords[storeKey] = storeKey;
+    //@endif
+
     ret = records[storeKey] = recordType.create(attrs);
 
+    //@if(debug)
+    updatingRecords[storeKey] = null;
+    //@endif
+
     return ret ;
   },