sproutcore 1.4.5 → 1.5.0.pre.3

data/lib/frameworks/sproutcore/frameworks/{foundation → amber}/system/root_responder.js

@@ -56,6 +56,10 @@ SC.RootResponder = SC.Object.extend({
   init: function() {
     sc_super();
     this.panes = SC.Set.create();
+
+    if (SC.platform.supportsCSSTransitions) {
+      this[SC.platform.cssPrefix+'TransitionEnd'] = this.transitionEnd;
+    }
   },
 
   // .......................................................
@@ -422,20 +426,20 @@ SC.RootResponder = SC.Object.extend({
     @returns {Boolean} YES if action was performed, NO otherwise
     @test in targetForAction
   */
-  sendAction: function( action, target, sender, pane, context) {
-    target = this.targetForAction(action, target, sender, pane) ;
-
+  sendAction: function( action, target, sender, pane, context, firstResponder) {
+    target = this.targetForAction(action, target, sender, pane, firstResponder) ;
+    
     // HACK: If the target is a ResponderContext, forward the action.
     if (target && target.isResponderContext) {
-      return !!target.sendAction(action, sender, context);
+      return !!target.sendAction(action, sender, context, firstResponder);
     } else return target && target.tryToPerform(action, sender);
   },
 
-  _responderFor: function(target, methodName) {
+  _responderFor: function(target, methodName, firstResponder) {
     var defaultResponder = target ? target.get('defaultResponder') : null;
-
+    
     if (target) {
-      target = target.get('firstResponder') || target;
+      target = firstResponder || target.get('firstResponder') || target;
       do {
         if (target.respondsTo(methodName)) return target ;
       } while ((target = target.get('nextResponder'))) ;
@@ -472,9 +476,10 @@ SC.RootResponder = SC.Object.extend({
     @param {String} method name for target
     @param {Object} sender optional sender
     @param {SC.Pane} optional pane
+    @param {firstResponder} a first responder to use
     @returns {Object} target object or null if none found
   */
-  targetForAction: function(methodName, target, sender, pane) {
+  targetForAction: function(methodName, target, sender, pane, firstResponder) {
 
     // 1. no action, no target...
     if (!methodName || (SC.typeOf(methodName) !== SC.T_STRING)) {
@@ -501,7 +506,8 @@ SC.RootResponder = SC.Object.extend({
 
     // 3. an explicit pane was passed...
     if (pane) {
-      return this._responderFor(pane, methodName) ;
+      target = this._responderFor(pane, methodName, firstResponder); 
+      if (target) return target;
     }
 
     // 4. no target or pane passed... try to find target in the active panes
@@ -588,13 +594,14 @@ SC.RootResponder = SC.Object.extend({
     @param {Array} keyNames
     @param {Element} target
     @param {Object} receiver - optional if you don't want 'this'
+    @param {Boolean} useCapture
     @returns {SC.RootResponder} receiver
   */
-  listenFor: function(keyNames, target, receiver) {
+  listenFor: function(keyNames, target, receiver, useCapture) {
     receiver = receiver ? receiver : this;
     keyNames.forEach( function(keyName) {
       var method = receiver[keyName] ;
-      if (method) SC.Event.add(target, keyName, receiver, method) ;
+      if (method) SC.Event.add(target, keyName, receiver, method, null, useCapture) ;
     },this) ;
     target = null ;
     return receiver ;
@@ -620,7 +627,12 @@ SC.RootResponder = SC.Object.extend({
 
     // handle animation events
     this.listenFor('webkitAnimationStart webkitAnimationIteration webkitAnimationEnd'.w(), document);
-    
+
+    // CSS Transitions
+    if (SC.platform.supportsCSSTransitions) {
+      this.listenFor(['transitionEnd', SC.platform.cssPrefix+'TransitionEnd'], document);
+    }
+
     // handle special case for keypress- you can't use normal listener to block the backspace key on Mozilla
     if (this.keypress) {
       if (SC.CAPTURE_BACKSPACE_KEY && SC.browser.mozilla) {
@@ -771,7 +783,7 @@ SC.RootResponder = SC.Object.extend({
       }
     }
   },
-
+  
   // ................................................................................
   // TOUCH SUPPORT
   //
@@ -802,7 +814,7 @@ SC.RootResponder = SC.Object.extend({
   _touches: {},
 
   /**
-    Returns the touches that are registered to the specified view; undefined if none.
+    Returns the touches that are registered to the specified view or responder; undefined if none.
 
     When views receive a touch event, they have the option to subscribe to it.
     They are then mapped to touch events and vice-versa. This returns touches mapped to the view.
@@ -820,53 +832,70 @@ SC.RootResponder = SC.Object.extend({
     This is useful for implementing scaling.
   */
   averagedTouchesForView: function(view, added) {
-    var t = this.touchesForView(view);
-    if ((!t || t.length === 0) && !added) return {x: 0, y: 0, d: 0, touchCount: 0};
+    var t = this.touchesForView(view),
+    
+    // cache per view to avoid gc
+    averaged = view._scrr_averagedTouches || (view._scrr_averagedTouches = {});
+    
+    if ((!t || t.length === 0) && !added) {
+      averaged.x = 0;
+      averaged.y = 0;
+      averaged.d = 0;
+      averaged.touchCount = 0;
+      
+    } else {
+      // make array of touches using cached array
+      var touches = this._averagedTouches_touches || (this._averagedTouches_touches = []);
+      touches.length = 0;
+    
+      // copy touches into array
+      if (t) {
+        var i, len = t.length;
+        for(i = 0; i < len; i++) {
+          touches.push(t[i]);
+        }
+      }
 
-    // make array of touches
-    var touches;
-    if (t) touches = t.toArray();
-    else touches = [];
+      // add added if needed
+      if (added) touches.push(added);
 
-    // add added if needed
-    if (added) touches.push(added);
+      // prepare variables for looping
+      var idx, touch,
+          ax = 0, ay = 0, dx, dy, ad = 0;
+      len = touches.length;
 
-    // prepare variables for looping
-    var idx, len = touches.length, touch,
-        ax = 0, ay = 0, dx, dy, ad = 0;
+      // first, add
+      for (idx = 0; idx < len; idx++) {
+        touch = touches[idx];
+        ax += touch.pageX; ay += touch.pageY;
+      }
 
-    // first, add
-    for (idx = 0; idx < len; idx++) {
-      touch = touches[idx];
-      ax += touch.pageX; ay += touch.pageY;
-    }
+      // now, average
+      ax /= len;
+      ay /= len;
 
-    // now, average
-    ax /= len;
-    ay /= len;
+      // distance
+      for (idx = 0; idx < len; idx++) {
+        touch = touches[idx];
 
-    // distance
-    for (idx = 0; idx < len; idx++) {
-      touch = touches[idx];
+        // get distance from average
+        dx = Math.abs(touch.pageX - ax);
+        dy = Math.abs(touch.pageY - ay);
 
-      // get distance from average
-      dx = Math.abs(touch.pageX - ax);
-      dy = Math.abs(touch.pageY - ay);
+        // Pythagoras was clever...
+        ad += Math.pow(dx * dx + dy * dy, 0.5);
+      }
 
-      // Pythagoras was clever...
-      ad += Math.pow(dx * dx + dy * dy, 0.5);
+      // average
+      ad /= len;
+    
+      averaged.x = ax;
+      averaged.y = ay;
+      averaged.d = ad;
+      averaged.touchCount = len;
     }
-
-    // average
-    ad /= len;
-
-    // return
-    return {
-      x: ax,
-      y: ay,
-      d: ad,
-      touchCount: len
-    };
+    
+    return averaged;
   },
 
   assignTouch: function(touch, view) {
@@ -919,6 +948,14 @@ SC.RootResponder = SC.Object.extend({
     touch.view = undefined;
   },
 
+  _flushQueuedTouchResponder: function(){
+    if (this._queuedTouchResponder) {
+      var queued = this._queuedTouchResponder;
+      this._queuedTouchResponder = null;
+      this.makeTouchResponder.apply(this, queued);
+    }
+  },
+
   /**
     The touch responder for any given touch is the view which will receive touch events
     for that touch. Quite simple.
@@ -958,13 +995,27 @@ SC.RootResponder = SC.Object.extend({
     events on the views. The event object is passed so that functions such as stopPropagation may be called.
   */
   makeTouchResponder: function(touch, responder, shouldStack, upViewChain) {
+
+    // In certain cases (SC.Gesture being one), we have to call makeTouchResponder 
+    // from inside makeTouchResponder so we queue it up here.
+    if (this._isMakingTouchResponder) {
+      this._queuedTouchResponder = [touch, responder, shouldStack, upViewChain];
+      return;
+    }
+    this._isMakingTouchResponder = YES;
+
+
     var stack = touch.touchResponders, touchesForView;
 
     // find the actual responder (if any, I suppose)
     // note that the pane's sendEvent function is slightly clever:
     // if the target is already touch responder, it will just return it without calling touchStart
     // we must do the same.
-    if (touch.touchResponder === responder) return;
+    if (touch.touchResponder === responder) {
+      this._isMakingTouchResponder = NO;
+      this._flushQueuedTouchResponder();
+      return;
+    }
 
     // send touchStart
     // get the target pane
@@ -1041,6 +1092,11 @@ SC.RootResponder = SC.Object.extend({
         touch.nextTouchResponder = stack[stack.length - 2];
       }
     }
+
+
+    this._isMakingTouchResponder = NO;
+    this._flushQueuedTouchResponder();
+
   },
 
   /**
@@ -1296,6 +1352,10 @@ SC.RootResponder = SC.Object.extend({
         // update touch
         touchEntry.pageX = touch.pageX;
         touchEntry.pageY = touch.pageY;
+        touchEntry.clientX = touch.clientX;
+        touchEntry.clientY = touch.clientY;
+        touchEntry.screenX = touch.screenX;
+        touchEntry.screenY = touch.screenY;
         touchEntry.timeStamp = evt.timeStamp;
         touchEntry.event = evt;
 
@@ -1332,6 +1392,10 @@ SC.RootResponder = SC.Object.extend({
         firstTouch = viewTouches.firstObject();
         evt.pageX = firstTouch.pageX;
         evt.pageY = firstTouch.pageY;
+        evt.clientX = firstTouch.clientX;
+        evt.clientY = firstTouch.clientY;
+        evt.screenX = firstTouch.screenX;
+        evt.screenY = firstTouch.screenY;
         evt.touchContext = this; // so it can call touchesForView
 
         // and go
@@ -1374,6 +1438,10 @@ SC.RootResponder = SC.Object.extend({
         touchEntry.timeStamp = evt.timeStamp;
         touchEntry.pageX = touch.pageX;
         touchEntry.pageY = touch.pageY;
+        touchEntry.clientX = touch.clientX;
+        touchEntry.clientY = touch.clientY;
+        touchEntry.screenX = touch.screenX;
+        touchEntry.screenY = touch.screenY;
         touchEntry.type = 'touchend';
         touchEntry.event = evt;
 
@@ -1411,7 +1479,7 @@ SC.RootResponder = SC.Object.extend({
     evt.isCancel = YES;
     this.touchend(evt);
   },
-
+	
   // ..........................................................
   // KEYBOARD HANDLING
   //
@@ -1508,9 +1576,10 @@ SC.RootResponder = SC.Object.extend({
   */
   keydown: function(evt) {
     if (SC.none(evt)) return YES;
-
     var keyCode = evt.keyCode;
-
+    if(SC.browser.mozilla && evt.keyCode===9){
+      this.keydownCounter=1;
+    } 
     // Fix for IME input (japanese, mandarin).
     // If the KeyCode is 229 wait for the keyup and
     // trigger a keyDown if it is is enter onKeyup.
@@ -1580,6 +1649,10 @@ SC.RootResponder = SC.Object.extend({
         keyCode   = evt.keyCode,
         isFirefox = !!SC.browser.mozilla;
 
+    if(SC.browser.mozilla && evt.keyCode===9){
+      this.keydownCounter++;
+      if(this.keydownCounter==2) return YES;
+    }
     // delete is handled in keydown() for most browsers
     if (isFirefox && (evt.which === 8)) {
       //get the keycode and set it for which.
@@ -1592,7 +1665,7 @@ SC.RootResponder = SC.Object.extend({
     } else {
       var isFirefoxArrowKeys = (keyCode >= 37 && keyCode <= 40 && isFirefox),
           charCode           = evt.charCode;
-      if ((charCode !== undefined && charCode === 0) && !isFirefoxArrowKeys) return YES;
+      if ((charCode !== undefined && charCode === 0 && evt.keyCode!==9) && !isFirefoxArrowKeys) return YES;
       if (isFirefoxArrowKeys) evt.which = keyCode;
       return this.sendEvent('keyDown', evt) ? evt.hasCustomEventHandling:YES;
     }
@@ -1649,10 +1722,10 @@ SC.RootResponder = SC.Object.extend({
     if(!SC.browser.msie) window.focus();
     
     // First, save the click count. The click count resets if the mouse down
-    // event occurs more than 200 ms later than the mouse up event or more
+    // event occurs more than 250 ms later than the mouse up event or more
     // than 8 pixels away from the mouse down event.
     this._clickCount += 1 ;
-    if (!this._lastMouseUpAt || ((Date.now()-this._lastMouseUpAt) > 200)) {
+    if (!this._lastMouseUpAt || ((Date.now()-this._lastMouseUpAt) > 250)) {
       this._clickCount = 1 ;
     } else {
       var deltaX = this._lastMouseDownX - evt.clientX,
@@ -1707,7 +1780,6 @@ SC.RootResponder = SC.Object.extend({
 
     var handler = null, view = this._mouseDownView,
         targetView = this.targetViewForEvent(evt);
-    this._lastMouseUpAt = Date.now() ;
 
     // record click count.
     evt.clickCount = this._clickCount ;
@@ -1744,6 +1816,10 @@ SC.RootResponder = SC.Object.extend({
 
     // cleanup
     this._mouseCanDrag = NO; this._mouseDownView = null ;
+
+    // Save timestamp of mouseup at last possible moment.
+    // (This is used to calculate double click events)
+    this._lastMouseUpAt = Date.now() ;
   
     return (handler) ? evt.hasCustomEventHandling : YES ;
   },
@@ -1921,6 +1997,18 @@ SC.RootResponder = SC.Object.extend({
       throw e;
     }
 
+    return view ? evt.hasCustomEventHandling : YES;
+  },
+
+  transitionEnd: function(evt){
+    try {
+      var view = this.targetViewForEvent(evt) ;
+      this.sendEvent('transitionDidEnd', evt, view) ;
+    } catch (e) {
+      console.warn('Exception during transitionDidEnd: %@'.fmt(e)) ;
+      throw e;
+    }
+
     return view ? evt.hasCustomEventHandling : YES;
   }
 
@@ -1964,6 +2052,10 @@ SC.Touch = function(touch, touchContext) {
 
   this.startX = this.pageX = touch.pageX;
   this.startY = this.pageY = touch.pageY;
+  this.clientX = touch.clientX;
+  this.clientY = touch.clientY;
+  this.screenX = touch.screenX;
+  this.screenY = touch.screenY;
 };
 
 SC.Touch.prototype = {

data/lib/frameworks/sproutcore/frameworks/{runtime → amber}/system/selection_set.js

@@ -5,36 +5,31 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-sc_require('system/object');
-sc_require('mixins/enumerable');
-sc_require('mixins/copyable');
-sc_require('mixins/freezable');
-
 /** @class
 
-  A SelectionSet contains a set of objects that represent the current 
+  A SelectionSet contains a set of objects that represent the current
   selection.  You can select objects by either adding them to the set directly
   or indirectly by selecting a range of indexes on a source object.
-  
+
   @extends SC.Object
   @extends SC.Enumerable
   @extends SC.Freezable
   @extends SC.Copyable
   @since SproutCore 1.0
 */
-SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable, 
+SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
   /** @scope SC.SelectionSet.prototype */ {
-  
+
   /**
     Walk like a duck.
-    
+
     @property {Boolean}
   */
   isSelectionSet: YES,
-  
+
   /**
     Total number of indexes in the selection set
-    
+
     @property {Number}
   */
   length: function() {
@@ -48,12 +43,12 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
 
   // ..........................................................
   // INDEX-BASED SELECTION
-  // 
+  //
 
   /**
-    A set of all the source objects used in the selection set.  This 
+    A set of all the source objects used in the selection set.  This
     property changes automatically as you add or remove index sets.
-    
+
     @property {SC.Array}
   */
   sources: function() {
@@ -61,24 +56,24 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         sets = this._sets,
         len  = sets ? sets.length : 0,
         idx, set, source;
-        
+
     for(idx=0;idx<len;idx++) {
       set = sets[idx];
       if (set && set.get('length')>0 && set.source) ret.push(set.source);
     }
     return ret ;
   }.property().cacheable(),
-  
+
   /**
     Returns the index set for the passed source object or null if no items are
     seleted in the source.
-    
+
     @param {SC.Array} source the source object
     @returns {SC.IndexSet} index set or null
   */
   indexSetForSource: function(source) {
     if (!source || !source.isSCArray) return null; // nothing to do
-    
+
     var cache   = this._indexSetCache,
         objects = this._objects,
         ret, idx;
@@ -94,7 +89,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
     if (!ret) {
       ret = this._indexSetForSource(source, NO);
       if (ret && ret.get('length')===0) ret = null;
-    
+
       if (objects) {
         if (ret) ret = ret.copy();
         objects.forEach(function(o) {
@@ -104,19 +99,19 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
           }
         }, this);
       }
-      
+
       if (ret) {
         ret = cache[SC.guidFor(source)] = ret.frozenCopy();
         ret._sourceRevision = source.propertyRevision;
       }
     }
-    
+
     return ret;
   },
-    
-  /** 
+
+  /**
     @private
-  
+
     Internal method gets the index set for the source, ignoring objects
     that have been added directly.
   */
@@ -128,7 +123,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         sets  = this._sets,
         len   = sets ? sets.length : 0,
         ret   = null;
-                
+
     if (index >= len) index = null;
     if (SC.none(index)) {
       if (canCreate && !this.isFrozen) {
@@ -139,34 +134,34 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         this[guid] = len;
         this.propertyDidChange('sources');
       }
-      
+
     } else ret = sets ? sets[index] : null;
     return ret ;
   },
-  
+
   /**
     Add the passed index, range of indexSet belonging to the passed source
     object to the selection set.
-    
+
     The first parameter you pass must be the source array you are selecting
-    from.  The following parameters may be one of a start/length pair, a 
+    from.  The following parameters may be one of a start/length pair, a
     single index, a range object or an IndexSet.  If some or all of the range
     you are selecting is already in the set, it will not be selected again.
-    
+
     You can also pass an SC.SelectionSet to this method and all the selected
     sets will be added from their instead.
-    
+
     @param {SC.Array} source source object or object to add.
     @param {Number} start index, start of range, range or IndexSet
     @param {Number} length length if passing start/length pair.
     @returns {SC.SelectionSet} receiver
   */
   add: function(source, start, length) {
-    
+
     if (this.isFrozen) throw SC.FROZEN_ERROR ;
 
     var sets, len, idx, set, oldlen, newlen, setlen, objects;
-    
+
     // normalize
     if (start === undefined && length === undefined) {
       if (!source) throw "Must pass params to SC.SelectionSet.add()";
@@ -184,7 +179,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         if (objects) this.addObjects(objects);
         this.endPropertyChanges();
         return this ;
-        
+
       }
     }
 
@@ -192,7 +187,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
     oldlen = this.get('length');
     setlen = set.get('length');
     newlen = oldlen - setlen;
-        
+
     set.add(start, length);
 
     this._indexSetCache = null;
@@ -210,23 +205,23 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
   /**
     Removes the passed index, range of indexSet belonging to the passed source
     object from the selection set.
-    
+
     The first parameter you pass must be the source array you are selecting
-    from.  The following parameters may be one of a start/length pair, a 
+    from.  The following parameters may be one of a start/length pair, a
     single index, a range object or an IndexSet.  If some or all of the range
     you are selecting is already in the set, it will not be selected again.
-    
+
     @param {SC.Array} source source object. must not be null
     @param {Number} start index, start of range, range or IndexSet
     @param {Number} length length if passing start/length pair.
     @returns {SC.SelectionSet} receiver
   */
   remove: function(source, start, length) {
-    
+
     if (this.isFrozen) throw SC.FROZEN_ERROR ;
-    
+
     var sets, len, idx, set, oldlen, newlen, setlen, objects;
-    
+
     // normalize
     if (start === undefined && length === undefined) {
       if (!source) throw "Must pass params to SC.SelectionSet.remove()";
@@ -235,7 +230,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         sets = source._sets;
         objects = source._objects;
         len  = sets ? sets.length : 0;
-            
+
         this.beginPropertyChanges();
         for(idx=0;idx<len;idx++) {
           set = sets[idx];
@@ -246,22 +241,22 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         return this ;
       }
     }
-    
+
     // save starter info
     set    = this._indexSetForSource(source, YES);
     oldlen = this.get('length');
     newlen = oldlen - set.get('length');
 
-    // if we have objects selected, determine if they are in the index 
+    // if we have objects selected, determine if they are in the index
     // set and remove them as well.
     if (set && (objects = this._objects)) {
-      
+
       // convert start/length to index set so the iterator below will work...
       if (length !== undefined) {
         start = SC.IndexSet.create(start, length);
         length = undefined;
       }
-      
+
       objects.forEach(function(object) {
         idx = source.indexOf(object);
         if (start.contains(idx)) {
@@ -270,7 +265,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         }
       }, this);
     }
-    
+
     // remove indexes from source index set
     set.remove(start, length);
     setlen = set.get('length');
@@ -287,10 +282,10 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
     return this ;
   },
 
-  
+
   /**
     Returns YES if the selection contains the named index, range of indexes.
-    
+
     @param {Object} source source object for range
     @param {Number} start index, start of range, range object, or indexSet
     @param {Number} length optional range length
@@ -300,7 +295,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
     if (start === undefined && length === undefined) {
       return this.containsObject(source);
     }
-    
+
     var set = this.indexSetForSource(source);
     if (!set) return NO ;
     return set.contains(start, length);
@@ -309,7 +304,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
   /**
     Returns YES if the index set contains any of the passed indexes.  You
     can pass a single index, a range or an index set.
-    
+
     @param {Object} source source object for range
     @param {Number} start index, range, or IndexSet
     @param {Number} length optional range length
@@ -320,37 +315,37 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
     if (!set) return NO ;
     return set.intersects(start, length);
   },
-  
-  
+
+
   // ..........................................................
   // OBJECT-BASED API
-  // 
+  //
 
   _TMP_ARY: [],
-  
+
   /**
-    Adds the object to the selection set.  Unlike adding an index set, the 
-    selection will actually track the object independent of its location in 
+    Adds the object to the selection set.  Unlike adding an index set, the
+    selection will actually track the object independent of its location in
     the array.
-    
-    @param {Object} object 
+
+    @param {Object} object
     @returns {SC.SelectionSet} receiver
   */
-  addObject: function(object) {  
+  addObject: function(object) {
     var ary = this._TMP_ARY, ret;
     ary[0] = object;
-    
+
     ret = this.addObjects(ary);
     ary.length = 0;
-    
+
     return ret;
   },
-  
+
   /**
     Adds objects in the passed enumerable to the selection set.  Unlike adding
     an index set, the seleciton will actually track the object independent of
     its location the array.
-    
+
     @param {SC.Enumerable} objects
     @returns {SC.SelectionSet} receiver
   */
@@ -362,7 +357,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
 
     cur.addEach(objects);
     newlen = cur.get('length');
-    
+
     this._indexSetCache = null;
     if (newlen !== oldlen) {
       this.propertyDidChange('length');
@@ -373,41 +368,41 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
 
   /**
     Removes the object from the selection set.  Note that if the selection
-    set also selects a range of indexes that includes this object, it may 
+    set also selects a range of indexes that includes this object, it may
     still be in the selection set.
-    
-    @param {Object} object 
+
+    @param {Object} object
     @returns {SC.SelectionSet} receiver
   */
-  removeObject: function(object) {  
+  removeObject: function(object) {
     var ary = this._TMP_ARY, ret;
     ary[0] = object;
-    
+
     ret = this.removeObjects(ary);
     ary.length = 0;
-    
+
     return ret;
   },
-  
+
   /**
     Removes the objects from the selection set.  Note that if the selection
-    set also selects a range of indexes that includes this object, it may 
+    set also selects a range of indexes that includes this object, it may
     still be in the selection set.
-    
-    @param {Object} object 
+
+    @param {Object} object
     @returns {SC.SelectionSet} receiver
   */
   removeObjects: function(objects) {
     var cur = this._objects,
         oldlen, newlen, sets;
-        
+
     if (!cur) return this;
 
     oldlen = cur.get('length');
 
     cur.removeEach(objects);
     newlen = cur.get('length');
-    
+
     // also remove from index sets, if present
     if (sets = this._sets) {
       sets.forEach(function(set) {
@@ -416,7 +411,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         newlen += set.get('length');
       }, this);
     }
-    
+
     this._indexSetCache = null;
     if (newlen !== oldlen) {
       this.propertyDidChange('length');
@@ -428,7 +423,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
   /**
     Returns YES if the selection contains the passed object.  This will search
     selected ranges in all source objects.
-    
+
     @param {Object} object the object to search for
     @returns {Boolean}
   */
@@ -436,7 +431,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
     // fast path
     var objects = this._objects ;
     if (objects && objects.contains(object)) return YES ;
-    
+
     var sets = this._sets,
         len  = sets ? sets.length : 0,
         idx, set;
@@ -444,70 +439,70 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
       set = sets[idx];
       if (set && set.indexOf(object)>=0) return YES;
     }
-    
+
     return NO ;
   },
-  
-  
+
+
   // ..........................................................
   // GENERIC HELPER METHODS
-  // 
-  
+  //
+
   /**
     Constrains the selection set to only objects found in the passed source
-    object.  This will remove any indexes selected in other sources, any 
+    object.  This will remove any indexes selected in other sources, any
     indexes beyond the length of the content, and any objects not found in the
     set.
-    
+
     @param {Object} source the source to limit
     @returns {SC.SelectionSet} receiver
   */
   constrain: function(source) {
     var set, len, max, objects;
-    
+
     this.beginPropertyChanges();
-    
+
     // remove sources other than this one
     this.get('sources').forEach(function(cur) {
       if (cur === source) return; //skip
       var set = this._indexSetForSource(source, NO);
       if (set) this.remove(source, set);
-    },this); 
-    
+    },this);
+
     // remove indexes beyond end of source length
     set = this._indexSetForSource(source, NO);
     if (set && ((max=set.get('max'))>(len=source.get('length')))) {
       this.remove(source, len, max-len);
     }
-    
+
     // remove objects not in source
     if (objects = this._objects) {
       objects.forEach(function(cur) {
         if (source.indexOf(cur)<0) this.removeObject(cur);
       },this);
     }
-    
+
     this.endPropertyChanges();
     return this ;
   },
-  
+
   /**
-    Returns YES if the passed index set or selection set contains the exact 
-    same source objects and indexes as  the receiver.  If you pass any object 
+    Returns YES if the passed index set or selection set contains the exact
+    same source objects and indexes as  the receiver.  If you pass any object
     other than an IndexSet or SelectionSet, returns NO.
-    
+
     @param {Object} obj another object.
     @returns {Boolean}
   */
   isEqual: function(obj) {
     var left, right, idx, len, sources, source;
-    
+
     // fast paths
     if (!obj || !obj.isSelectionSet) return NO ;
     if (obj === this) return YES;
     if ((this._sets === obj._sets) && (this._objects === obj._objects)) return YES;
     if (this.get('length') !== obj.get('length')) return NO;
-    
+
     // check objects
     left = this._objects;
     right = obj._objects;
@@ -528,31 +523,31 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
       if (!!right !== !!left) return NO ;
       if (left && !left.isEqual(right)) return NO ;
     }
-    
+
     return YES ;
   },
 
   /**
     Clears the set.  Removes all IndexSets from the object
-    
+
     @returns {SC.SelectionSet}
   */
   clear: function() {
     if (this.isFrozen) throw SC.FROZEN_ERROR;
     if (this._sets) this._sets.length = 0 ; // truncate
     if (this._objects) this._objects = null;
-    
+
     this._indexSetCache = null;
     this.propertyDidChange('length');
     this.enumerableContentDidChange();
     this.notifyPropertyChange('sources');
-    
+
     return this ;
   },
-  
+
   /**
-   Clones the set into a new set.  
-   
+   Clones the set into a new set.
+
    @returns {SC.SelectionSet}
   */
   copy: function() {
@@ -560,7 +555,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         sets = this._sets,
         len  = sets ? sets.length : 0 ,
         idx, set;
-    
+
     if (sets && len>0) {
       sets = ret._sets = sets.slice();
       for(idx=0;idx<len;idx++) {
@@ -569,14 +564,14 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         ret[SC.guidFor(set.source)] = idx;
       }
     }
-    
+
     if (this._objects) ret._objects = this._objects.copy();
     return ret ;
   },
-  
+
   /**
-    @private 
-    
+    @private
+
     Freezing a SelectionSet also freezes its internal sets.
   */
   freeze: function() {
@@ -584,34 +579,34 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
     var sets = this._sets,
         loc  = sets ? sets.length : 0,
         set ;
-        
+
     while(--loc >= 0) {
       if (set = sets[loc]) set.freeze();
     }
-    
+
     if (this._objects) this._objects.freeze();
     return sc_super();
   },
-  
+
   // ..........................................................
   // ITERATORS
-  // 
-  
+  //
+
   /** @private */
   toString: function() {
     var sets = this._sets || [];
-    sets = sets.map(function(set) { 
-      return set.toString().replace("SC.IndexSet", SC.guidFor(set.source)); 
+    sets = sets.map(function(set) {
+      return set.toString().replace("SC.IndexSet", SC.guidFor(set.source));
     }, this);
     if (this._objects) sets.push(this._objects.toString());
-    return "SC.SelectionSet:%@<%@>".fmt(SC.guidFor(this), sets.join(','));  
+    return "SC.SelectionSet:%@<%@>".fmt(SC.guidFor(this), sets.join(','));
   },
-  
+
   /** @private */
   firstObject: function() {
     var sets    = this._sets,
         objects = this._objects;
-        
+
     // if we have sets, get the first one
     if (sets && sets.get('length')>0) {
       var set  = sets ? sets[0] : null,
@@ -619,22 +614,22 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
           idx  = set ? set.firstObject() : -1;
       if (src && idx>=0) return src.objectAt(idx);
     }
-    
+
     // otherwise if we have objects, get the first one
     return objects ? objects.firstObject() : undefined;
-    
+
   }.property(),
-  
+
   /** @private
-    Implement primitive enumerable support.  Returns each object in the 
+    Implement primitive enumerable support.  Returns each object in the
     selection.
   */
-  nextObject: function(count, lastObject, context) { 
+  nextObject: function(count, lastObject, context) {
     var objects, ret;
-    
+
     // TODO: Make this more efficient.  Right now it collects all objects
-    // first.  
-    
+    // first.
+
     if (count === 0) {
       objects = context.objects = [];
       this.forEach(function(o) { objects.push(o); }, this);
@@ -643,28 +638,28 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
 
     objects = context.objects ;
     ret = objects[count];
-    
+
     if (count+1 >= context.max) {
       context.objects = context.max = null;
     }
-    
+
     return ret ;
   },
-  
-  /** 
+
+  /**
     Iterates over the selection, invoking your callback with each __object__.
-    This will actually find the object referenced by each index in the 
+    This will actually find the object referenced by each index in the
     selection, not just the index.
 
     The callback must have the following signature:
-    
+
     {{{
       function callback(object, index, source, indexSet) { ... }
     }}}
-    
+
     If you pass a target, it will be used when the callback is called.
-    
-    @param {Function} callback function to invoke.  
+
+    @param {Function} callback function to invoke.
     @param {Object} target optional content. otherwise uses window
     @returns {SC.SelectionSet} receiver
   */
@@ -673,24 +668,24 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         objects = this._objects,
         len = sets ? sets.length : 0,
         set, idx;
-        
+
     for(idx=0;idx<len;idx++) {
       set = sets[idx];
       if (set) set.forEachObject(callback, target);
     }
-    
+
     if (objects) objects.forEach(callback, target);
     return this ;
-  }  
-  
+  }
+
 });
 
 /** @private */
 SC.SelectionSet.prototype.clone = SC.SelectionSet.prototype.copy;
 
-/** 
+/**
   Default frozen empty selection set
-  
+
   @property {SC.SelectionSet}
 */
 SC.SelectionSet.EMPTY = SC.SelectionSet.create().freeze();