sproutcore 1.5.0.rc.1 → 1.5.0.rc.2

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/enumerable.js

@@ -32,7 +32,7 @@ sc_require('system/enumerator');
      with an SC.Object subclass, you should be sure to change the length
      property using set().
 
-  2. If you must implement nextObject().  See documentation.
+  2. You must implement nextObject().  See documentation.
 
   Once you have these two methods implemented, apply the SC.Enumerable mixin
   to your class and you will be able to enumerate the contents of your object
@@ -805,411 +805,8 @@ SC.Reducers = /** @scope SC.Reducers.prototype */ {
     @param {Array} removedObjects the objects that were removed
     @returns {Object} receiver
   */
-  enumerableContentDidChange: function(start, length, delta, addedObjects, removedObjects) {
-    this._setupContentObservers(addedObjects, removedObjects);
+  enumerableContentDidChange: function(start, length, deltas) {
     this.notifyPropertyChange('[]') ;
-    this._notifyEnumerableObservers(addedObjects, removedObjects, start);
-  },
-
-  /**
-    For all registered property chains on this object, removed them from objects
-    being removed from the enumerable, and clone them onto newly added objects.
-
-    @param {Object[]} addedObjects the objects being added to the enumerable
-    @param {Object[]} removedObjects the objected being removed from the enumerable
-    @returns {Object} receiver
-  */
-  setupPropertyChainsForEnumerableContent: function(addedObjects, removedObjects) {
-    var chains = this._kvo_enumerable_property_chains;
-
-    if (chains) {
-      chains.forEach(function(chain) {
-        var idx, len = removedObjects.get('length'),
-            chainGuid = SC.guidFor(chain),
-            clonedChain, item, kvoChainList = '_kvo_enumerable_property_clones';
-
-        chain.notifyPropertyDidChange();
-
-        for (idx = 0; idx < len; idx++) {
-          item = removedObjects[idx];
-          clonedChain = item[kvoChainList][chainGuid];
-          clonedChain.deactivate();
-          delete item[kvoChainList][chainGuid];
-        }
-
-        len = addedObjects.get('length');
-        for (idx = 0; idx < len; idx++) {
-          this._clonePropertyChainToItem(chain, addedObjects[idx]);
-        }
-      }, this);
-    }
-    return this ;
-  },
-
-  /**
-    Register a property chain to propagate to enumerable content.
-
-    This will clone the property chain to each item in the enumerable,
-    then save it so that it is automatically set up and torn down when
-    the enumerable content changes.
-
-    @param {String} property the property being listened for on this object
-    @param {SC._PropertyChain} chain the chain to clone to items
-  */
-  registerDependentKeyWithChain: function(property, chain) {
-    // Get the set of all existing property chains that should
-    // be propagated to enumerable contents. If that set doesn't
-    // exist yet, _kvo_for() will create it.
-    var kvoChainList = '_kvo_enumerable_property_chains',
-        chains, item, clone, cloneList;
-
-    chains = this._kvo_for(kvoChainList, SC.CoreSet);
-
-    // Save a reference to the chain on this object. If new objects
-    // are added to the enumerable, we will clone this chain and add
-    // it to the new object.
-    chains.add(chain);
-
-    this.forEach(function(item) {
-      this._clonePropertyChainToItem(chain, item);
-    }, this);
-  },
-
-  /**
-    Clones an SC._PropertyChain to a content item.
-
-    @param {SC._PropertyChain} chain
-    @param {Object} item
-  */
-  _clonePropertyChainToItem: function(chain, item) {
-    var clone        = SC.clone(chain),
-        kvoCloneList = '_kvo_enumerable_property_clones',
-        cloneList;
-
-    clone.object = item;
-
-    cloneList = item[kvoCloneList] = item[kvoCloneList] || {};
-    cloneList[SC.guidFor(chain)] = clone;
-
-    clone.activate(item);
-  },
-
-  /**
-    Removes a dependent key from the enumerable, and tears it down on
-    all content objects.
-
-    @param {String} property
-    @param {SC._PropertyChain} chain
-  */
-  removeDependentKeyWithChain: function(property, chain) {
-    var kvoChainList = '_kvo_enumerable_property_chains',
-        kvoCloneList = '_kvo_enumerable_property_clones',
-        chains, item, clone, cloneList;
-
-    this.forEach(function(item) {
-      item.removeDependentKeyWithChain(property, chain);
-
-      cloneList = item[kvoCloneList];
-      clone = cloneList[SC.guidFor(chain)];
-
-      clone.deactivate(item);
-    }, this);
-  },
-
-  /**
-    Called when the contents of the enumerable mutates.
-
-    Implementers of classes that mixin SC.Enumerable should ensure that they
-    call enumerableContentDidChange(), which invokes this method automatically.
-
-    @param {Array} addedObjects the array of objects that were added to the enumerable
-    @param {Array} removedObjects the array of objects that were removed from the enumerable
-    @param {Number} index the index at which the mutation occurred
-  */
-  _notifyEnumerableObservers: function(addedObjects, removedObjects, index) {
-    var observers, members, member, memberLoc, membersLength;
-    var target, method, context;
-
-    observers = this._kvo_enumerable_observers;
-
-    if (observers) {
-      members = SC.clone(observers.getMembers());
-      membersLength = members.length;
-
-      for(memberLoc=0; memberLoc < membersLength; memberLoc++) {
-        member = members[memberLoc];
-
-        target = member[0];
-        method = member[1];
-        context = member[2];
-
-        method.call(target, addedObjects, removedObjects, index, this, context);
-      }
-    }
-  },
-
-  /**
-    Adds an enumerable observer to the enumerable.
-
-    Enumerable observers are called whenever the enumerable's content
-    mutates. For example, adding an object via pushObject(), or replacing
-    objects via replace(), will cause all enumerable observers to be fired.
-
-    Observer methods that you register should have the following signature:
-
-        enumerableDidChange: function(addedObjects, removedObjects, index, source)
-
-    addedObjects will contain an array of the objects added and removedObjects
-    will contain an array of the objects that were removed. The index parameter
-    contains the index at which the mutation occurred.
-
-    The fourth parameter, source, is the enumerable that mutated. This is useful
-    if you register the same observer method on multiple enumerables.
-
-    If you pass a context parameter to addEnumerableObserver(), it will be
-    included when the observer is fired:
-
-        function(addedObjects, removedObjects, sender, context);
-
-    @param {Object} target the target object to invoke
-    @param {String|Function} method the method to invoke
-    @param {Object} context optional context
-
-    @returns {SC.Object} self
-  */
-  addEnumerableObserver: function(target, method, context) {
-    var observers;
-
-    // Normalize parameters. If a function is passed as
-    // target, make it the method.
-    if (method === undefined) {
-      method = target;
-      target = this;
-    }
-
-    // Call the observer in the context of the enumerable
-    // if no explicit target is given.
-    if (!target) { target = this; }
-
-    // If the method is provided as a string, look it up on
-    // the target.
-    if (typeof method === "string") {
-      method = target[method];
-    }
-
-    if (!method) {
-      throw "You must pass a method to addEnumerableObserver()";
-    }
-
-    observers = this._kvo_for('_kvo_enumerable_observers', SC.ObserverSet);
-    observers.add(target, method, context);
-
-    return this;
-  },
-
-  /**
-    Removes an enumerable observer. Expects the same target and method that
-    were used to register the observer.
-
-    @param {Object} target the target object to invoke
-    @param {String|Function} method the method to invoke
-
-    @returns {SC.Object} self
-  */
-  removeEnumerableObserver: function(target, method) {
-    var observers;
-
-    // Normalize parameters. If a function is passed as
-    // target, make it the method.
-    if (method === undefined) {
-      method = target;
-      target = this;
-    }
-
-    // Call the observer in the context of the enumerable
-    // if no explicit target is given.
-    if (!target) { target = this; }
-
-    // If the method is provided as a string, look it up on
-    // the target.
-    if (typeof method === "string") {
-      method = target[method];
-    }
-
-    if (!method) {
-      throw "You must pass a method to removeEnumerableObserver()";
-    }
-
-    observers = this._kvo_enumerable_observers;
-
-    if (observers) {
-      observers.remove(target, method);
-    } else {
-      throw "%@: Can't remove observers if no observer has been added.";
-    }
-
-    return this;
-  },
-
-  /**
-    @private
-
-    Clones a segment of an observer chain and applies it
-    to an element of this Enumerable.
-
-    @param {Object} item The element
-    @param {SC._ChainObserver} chainObserver the chain segment to begin from
-  */
-  _resumeChainObservingForItemWithChainObserver: function(item, chainObserver) {
-    var observer = SC.clone(chainObserver.next);
-    var key = observer.property;
-
-    // The chain observer should create new observers on the child object
-    observer.object = item;
-    item.addObserver(key, observer, observer.propertyDidChange);
-
-    // if we're in the initial chained observer setup phase, add the tail
-    // of the current observer segment to the list of tracked tails.
-    if(chainObserver.root.tails) {
-      chainObserver.root.tails.pushObject(observer.tail());
-    }
-
-    observer.propertyDidChange();
-
-    // Maintain a list of observers on the item so we can remove them
-    // if it is removed from the enumerable.
-    item._kvo_for(SC.keyFor('_kvo_content_observers', key)).push(observer);
-  },
-
-  /**
-    @private
-
-    When enumerable content has changed, remove enumerable observers from
-    items that are no longer in the enumerable, and add observers to newly
-    added items.
-
-    @param {Array} addedObjects the array of objects that have been added
-    @param {Array} removedObjects the array of objects that have been removed
-  */
-  _setupContentObservers: function(addedObjects, removedObjects) {
-    if (!addedObjects) { addedObjects = this; }
-    if (!removedObjects) { removedObjects = []; }
-
-    // Check the last values passed and skip this step if they are
-    // the same.
-    //
-    // TODO: This is obviously a suboptimal workaround to the fact that
-    // enumerableContentDidChange can get called twice when implementing
-    // SC.ArrayController. We should revisit how enumerableContentDidChange
-    // works in that context. --TD
-    var lastAdded = this._lastAdded;
-    var lastRemoved = this._lastRemoved;
-
-    if(lastAdded === addedObjects) { addedObjects = []; }
-    if(lastRemoved === removedObjects) { removedObjects = []; }
-
-    this._lastAdded = addedObjects;
-    this._lastRemoved = removedObjects;
-
-    var observedKeys = this._kvo_for('_kvo_content_observed_keys', SC.CoreSet);
-    var kvoKey;
-
-    // Only setup and teardown enumerable observers if we have keys to observe
-    if (observedKeys.get('length') > 0) {
-
-      // added and resume the chain observer.
-      observedKeys.forEach(function(key) {
-        kvoKey = SC.keyFor('_kvo_content_observers', key);
-
-        // Loop through removed objects and remove any enumerable observers that
-        // belong to them.
-        removedObjects.forEach(function(item) {
-          item._kvo_for(kvoKey).forEach(function(observer) {
-            observer.destroyChain();
-          }, this);
-        }, this);
-        var lastObserver;
-
-        // Get all original ChainObservers associated with the key
-        this._kvo_for(kvoKey).forEach(function(observer) {
-          // if there are no added objects or removed objects, this
-          // object is a proxy (like ArrayController), which does
-          // not currently receive the added or removed objects.
-          // As a result, walk down to the last element of the
-          // chain and trigger its propertyDidChange, which will
-          // invalidate anything listening.
-          if(!addedObjects.get('length') && !removedObjects.get('length')) {
-            lastObserver = observer;
-            while(lastObserver.next) { lastObserver = lastObserver.next; }
-            lastObserver.propertyDidChange();
-          } else {
-            addedObjects.forEach(function(item) {
-              this._resumeChainObservingForItemWithChainObserver(item, observer);
-            }, this);
-          }
-        }, this);
-      }, this);
-    }
-  },
-
-  /**
-    @private
-
-    Adds a content observer. Content observers are able to
-    propagate chain observers to each member item in the enumerable,
-    so that the observer is fired whenever a single item changes.
-
-    You should never call this method directly. Instead, you should
-    call addObserver() with the special '@each' property in the path.
-
-    For example, if you wanted to observe changes to each item's isDone
-    property, you could call:
-
-        arrayController.addObserver('@each.isDone');
-
-    @param {SC._ChainObserver} chainObserver the chain observer to propagate
-  */
-  _addContentObserver: function(chainObserver) {
-    var key = chainObserver.next.property;
-
-    // Add the key to a set so we know what we are observing
-    this._kvo_for('_kvo_content_observed_keys', SC.CoreSet).push(key);
-
-    // Add the passed ChainObserver to an ObserverSet for that key
-    var kvoKey = SC.keyFor('_kvo_content_observers', key);
-    this._kvo_for(kvoKey).push(chainObserver);
-
-    // set up chained observers on the initial content
-    this._setupContentObservers(this);
-  },
-
-  /**
-    @private
-
-    Removes a content observer. Pass the same chain observer
-    that was used to add the content observer.
-
-    @param {SC._ChainObserver} chainObserver the chain observer to propagate
-  */
-
-  _removeContentObserver: function(chainObserver) {
-    var observers, kvoKey;
-    var observedKeys = this._kvo_content_observed_keys;
-    var key = chainObserver.next.property;
-
-    if (observedKeys.contains(key)) {
-
-      kvoKey = SC.keyFor('_kvo_content_observers', key);
-      observers = this._kvo_for(kvoKey);
-
-      observers.removeObject(chainObserver);
-
-      this._setupContentObservers([], this);
-
-      if (observers.length === 0) {
-        this._kvo_for('_kvo_content_observed_keys').remove(key);
-      }
-    }
   },
 
   /**

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/observable.js

@@ -438,13 +438,13 @@ SC.Observable = /** @scope SC.Observable.prototype */{
       var keyChains = chains[key];
 
       if (keyChains) {
+        this.beginPropertyChanges();
         keyChains = SC.clone(keyChains);
         keyChains.forEach(function(chain) {
           // Invalidate the property that depends on the changed key.
           chain.notifyPropertyDidChange();
-          // Now that the chain is potentially invalid, rebuild it.
-          chain.rebuildChain();
         });
+        this.endPropertyChanges();
       }
     }
 
@@ -560,9 +560,6 @@ SC.Observable = /** @scope SC.Observable.prototype */{
     registerDependentKeyWithChain: function(property, chain) {
       var chains = this._chainsFor(property), next;
       chains.add(chain);
-
-      next = chain.next;
-      if (next) { next.activate(this); }
     },
 
     /** @private
@@ -578,9 +575,6 @@ SC.Observable = /** @scope SC.Observable.prototype */{
       if (chains.get('length') === 0) {
         delete this._kvo_property_chains[property];
       }
-
-      next = chain.next;
-      if (next) { next.deactivate(); }
     },
 
     /** @private
@@ -1408,7 +1402,7 @@ SC.Observable = /** @scope SC.Observable.prototype */{
     },
 
     /**
-      Notifies all of observers of a property changes.
+      Notifies observers of all possible property changes.
 
       Sometimes when you make a major update to your object, it is cheaper to
       simply notify all observers that their property might have changed than

data/lib/frameworks/sproutcore/frameworks/runtime/private/property_chain.js

@@ -31,8 +31,7 @@ sc_require('system/object');
 */
 
 SC._PropertyChain = SC.Object.extend(
-/** @scope SC.ObjectController.prototype */ {
-
+/** @scope SC.Object.prototype */ {
   /**
     The object represented by this node in the chain.
 
@@ -80,52 +79,52 @@ SC._PropertyChain = SC.Object.extend(
     assume it is the root node in the chain and treat the target as the previous
     object.
 
-    @param {Object} [prev] The previous object in the chain.
+    @param {Object} [newObject] The object in the chain to hook to.
   */
-  activate: function(prev) {
-    var object   = this.get('object'),
-        property = this.get('property');
+  activate: function(newObject) {
+    var curObject = this.get('object'),
+        property  = this.get('property'),
+        nextObject;
 
     // If no parameter is passed, assume we are the root in the chain
     // and look up property relative to the target, since dependent key
     // paths are always relative.
-    if (!prev) { prev = this.get('target'); }
-
-    // If this node has not yet been associated with an object,
-    // look up the object and associate it.
-    if (!object) {
-      // In the special case of @each, we treat the enumerable as the next
-      // property.
-      if (property === '@each') {
-        object = prev;
-      } else {
-        object = prev.get(property);
-      }
-      this.set('object', object);
+    if (!newObject) { newObject = this.get('target'); }
+
+    if (curObject && curObject!==newObject) {
+      this.deactivate();
     }
+    this.set('object', newObject);
 
-    // If there is still no object, don't associate any KVO
-    // property chains.
-    if (!object) { return; }
+    // In the special case of @each, we treat the enumerable as the next
+    // property so just skip registering it
+    if (newObject && property!=='@each') {
+      newObject.registerDependentKeyWithChain(property, this);
+    }
+
+    // now - lookup the object for the next one...
+    if (this.next) {
+      nextObject = newObject ? newObject.get(property) : undefined;
+      this.next.activate(nextObject);
+    }
 
-    // Register this node with the object, and tell it which key changing should
-    // cause the node to be notified.
-    object.registerDependentKeyWithChain(this.get('nextProperty'), this);
+    return this;
   },
 
   /**
-    Removes this segment of the chain from the object it represents. This is usually
-    called when the object represented by the previous segment in the chain changes.
+    Removes this segment of the chain from the object it represents. This is 
+    usually called when the object represented by the previous segment in the 
+    chain changes.
   */
   deactivate: function() {
-    var object       = this.get('object'),
-        nextProperty = this.get('nextProperty');
+    var object   = this.get('object'),
+        property = this.get('property');
 
     // If the chain element is not associated with an object,
     // we don't need to deactivate anything.
-    if (!object) { return; }
-
-    object.removeDependentKeyWithChain(nextProperty, this);
+    if (object) object.removeDependentKeyWithChain(property, this);
+    if (this.next) this.next.deactivate();
+    return this;
   },
 
   /**
@@ -133,36 +132,41 @@ SC._PropertyChain = SC.Object.extend(
   */
   notifyPropertyDidChange: function() {
     var target       = this.get('target'),
-        toInvalidate = this.get('toInvalidate');
+        toInvalidate = this.get('toInvalidate'),
+        curObj, newObj;
 
     // Tell the target of the chain to invalidate the property
     // that depends on this element of the chain
     target.propertyDidChange(toInvalidate);
-  },
 
-  /**
-    Deactivates the current chain, then recreates it with the new
-    values.
-  */
-  rebuildChain: function() {
-    this.deactivate();
-    this.activate();
+    // If there are more dependent keys in the chain, we need
+    // to invalidate them and set them up again.
+    if (this.next) {
+      // Get the new value of the object associated with this node to pass to
+      // activate().
+      curObj = this.get('object');
+      newObj = curObj.get(this.get('property'));
+
+      this.next.activate(newObj); // reactivate down the line
+    }
   },
 
+  //@ if (debug)
   /**
     Returns a string representation of the chain segment.
 
     @returns {String}
   */
   toString: function() {
-    return "SC._ChainProperty(target: %@, property: %@)".fmt(
+    return "SC._PropertyChain(target: %@, property: %@)".fmt(
       this.get('target'), this.get('property'));
   }
+  //@ endif
 });
 
 SC._PropertyChain.createChain = function(path, target, toInvalidate) {
   var parts = path.split('.');
-  var len = parts.length - 1,
+  var len = parts.length,
       i   = 1;
 
   var root = SC._PropertyChain.create({
@@ -172,10 +176,11 @@ SC._PropertyChain.createChain = function(path, target, toInvalidate) {
     nextProperty: parts[1]
   });
 
-  root.set('length', len--);
+
+  root.set('length', len);
   var tail = root;
 
-  while(len--) {
+  while(--len >= 1) {
     tail = tail.next = SC._PropertyChain.create({
       property:     parts[i],
       target:       target,

data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js

@@ -339,7 +339,13 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     this.isConnected = YES ;
     this._connectionPending = YES ; // its connected but not really...
     this._syncOnConnect = YES ;
+
     SC.Binding._connectQueue.add(this) ;
+
+    if (!SC.RunLoop.isRunLoopInProgress()) {
+      this._scheduleSync();
+    }
+
     return this;
   },
 
@@ -446,6 +452,8 @@ SC.Binding = /** @scope SC.Binding.prototype */{
       this._setBindingValue(target, key) ;
       this._changePending = YES ;
       SC.Binding._changeQueue.add(this) ; // save for later.
+
+      this._scheduleSync();
     }
   },
 
@@ -473,9 +481,20 @@ SC.Binding = /** @scope SC.Binding.prototype */{
       this._setBindingValue(target, key) ;
       this._changePending = YES ;
       SC.Binding._changeQueue.add(this) ; // save for later.
+
+      this._scheduleSync();
     }
   },
 
+  _scheduleSync: function() {
+    if (SC.RunLoop.isRunLoopInProgress() || this._syncScheduled) { return; }
+
+    this._syncScheduled = YES;
+    var self = this;
+
+    setTimeout(function() { SC.run(); self._syncScheduled = NO; }, 1);
+  },
+
   /** @private
     Saves the source location for the binding value.  This will be used later
     to actually update the binding value.
@@ -844,7 +863,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
 
   /**
     Adds a transform that will return the placeholder value if the value is
-    null.  Otherwise it will passthrough untouched.  See also notEmpty().
+    null or undefined.  Otherwise it will passthrough untouched.  See also notEmpty().
 
     @param {String} fromPath from path or null
     @param {Object} placeholder optional placeholder;

data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js

@@ -118,15 +118,6 @@ SC._object_extend = function _object_extend(base, ext, proto) {
 
     // Possibly add to a bindings.
     if (key.length > 7 && key.slice(-7) === "Binding") {
-      // Properties MUST be established before a binding can be made from them.
-      // We won't slow things down by checking in production, but in dev, give a warning.
-      // @if (debug)
-      var bindPropertyKey = key.substr(0, key.length - 7);
-      if (ext[bindPropertyKey] === undefined && base[bindPropertyKey] === undefined) {
-        SC.Logger.warn("Uninitialized property '%@'. '%@' will not work as expected.".fmt(bindPropertyKey, key));
-      }
-      // @endif
-
       if (!clonedBindings) {
         bindings = (bindings || SC.EMPTY_ARRAY).slice() ;
         clonedBindings = YES ;