sproutcore 1.4.5 → 1.5.0.pre.3

data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/rangeObserver.js

@@ -10,28 +10,28 @@
 sc_require('debug/test_suites/array/base');
 
 SC.ArraySuite.define(function(T) {
-  
+
   var expected, array, observer, rangeObserver ;
 
   // ..........................................................
-  // MODULE: isDeep = YES 
-  // 
+  // MODULE: isDeep = YES
+  //
   module(T.desc("RangeObserver Methods"), {
     setup: function() {
       expected = T.objects(10);
       array = T.newObject(expected);
 
       observer = T.observer();
-      rangeObserver = array.addRangeObserver(SC.IndexSet.create(2,3), 
+      rangeObserver = array.addRangeObserver(SC.IndexSet.create(2,3),
                 observer, observer.rangeDidChange, null, NO);
-      
+
     },
-    
+
     teardown: function() {
       T.destroyObject(array);
     }
   });
-  
+
   test("returns RangeObserver object", function() {
     ok(rangeObserver && rangeObserver.isRangeObserver, 'returns a range observer object');
   });
@@ -40,49 +40,49 @@ SC.ArraySuite.define(function(T) {
   //
   // // ..........................................................
   // // EDIT PROPERTIES
-  // // 
+  // //
   //
   // test("editing property on object in range should fire observer", function() {
   //   var obj = array.objectAt(3);
   //   obj.set('foo', 'BAR');
   //   observer.expectRangeChange(array, obj, 'foo', SC.IndexSet.create(3));
   // });
-  // 
+  //
   // test("editing property on object outside of range should NOT fire observer", function() {
   //   var obj = array.objectAt(0);
   //   obj.set('foo', 'BAR');
   //   equals(observer.callCount, 0, 'observer should not fire');
   // });
-  // 
-  // 
+  //
+  //
   // test("updating property after changing observer range", function() {
   //   array.updateRangeObserver(rangeObserver, SC.IndexSet.create(8,2));
   //   observer.callCount = 0 ;// reset b/c callback should happen here
-  // 
+  //
   //   var obj = array.objectAt(3);
   //   obj.set('foo', 'BAR');
   //   equals(observer.callCount, 0, 'modifying object in old range should not fire observer');
-  //   
+  //
   //   obj = array.objectAt(9);
   //   obj.set('foo', 'BAR');
   //   observer.expectRangeChange(array, obj, 'foo', SC.IndexSet.create(9));
-  //   
+  //
   // });
-  // 
+  //
   // test("updating a property after removing an range should not longer update", function() {
   //   array.removeRangeObserver(rangeObserver);
-  // 
+  //
   //   observer.callCount = 0 ;// reset b/c callback should happen here
-  // 
+  //
   //   var obj = array.objectAt(3);
   //   obj.set('foo', 'BAR');
   //   equals(observer.callCount, 0, 'modifying object in old range should not fire observer');
-  //   
+  //
   // });
 
   // ..........................................................
   // REPLACE
-  // 
+  //
 
   test("replacing object in range fires observer with index set covering only the effected item", function() {
     array.replace(2, 1, T.objects(1));
@@ -101,7 +101,7 @@ SC.ArraySuite.define(function(T) {
 
   test("updating range should be reflected by replace operations", function() {
     array.updateRangeObserver(rangeObserver, SC.IndexSet.create(9,1));
-    
+
     observer.callCount = 0 ;
     array.replace(2, 1, T.objects(1));
     equals(observer.callCount, 0, 'observer should not fire');
@@ -117,7 +117,7 @@ SC.ArraySuite.define(function(T) {
 
   test("removing range should no longer fire observers", function() {
     array.removeRangeObserver(rangeObserver);
-    
+
     observer.callCount = 0 ;
     array.replace(2, 1, T.objects(1));
     equals(observer.callCount, 0, 'observer should not fire');
@@ -133,32 +133,32 @@ SC.ArraySuite.define(function(T) {
 
   // ..........................................................
   // GROUPED CHANGES
-  // 
-  
+  //
+
   test("grouping property changes should notify observer only once at end with single IndexSet", function() {
-    
+
     array.beginPropertyChanges();
     array.replace(2, 1, T.objects(1));
     array.replace(4, 1, T.objects(1));
     array.endPropertyChanges();
-    
+
     var set = SC.IndexSet.create().add(2).add(4); // both edits
     observer.expectRangeChange(array, null, '[]', set);
   });
 
   test("should notify observer when some but not all grouped changes are inside range", function() {
-    
+
     array.beginPropertyChanges();
     array.replace(2, 1, T.objects(1));
     array.replace(9, 1, T.objects(1));
     array.endPropertyChanges();
-    
+
     var set = SC.IndexSet.create().add(2).add(9); // both edits
     observer.expectRangeChange(array, null, '[]', set);
   });
-  
+
   test("should NOT notify observer when grouping changes all outside of observer", function() {
-    
+
     array.beginPropertyChanges();
     array.replace(0, 1, T.objects(1));
     array.replace(9, 1, T.objects(1));
@@ -166,15 +166,15 @@ SC.ArraySuite.define(function(T) {
 
     equals(observer.callCount, 0, 'observer should not fire');
   });
-  
+
   // ..........................................................
   // INSERTING
-  // 
-  
+  //
+
   test("insertAt in range fires observer with index set covering edit to end of array", function() {
     var newItem = T.objects(1)[0],
         set     = SC.IndexSet.create(3,array.get('length')-2);
-        
+
     array.insertAt(3, newItem);
     observer.expectRangeChange(array, null, '[]', set);
   });
@@ -182,22 +182,22 @@ SC.ArraySuite.define(function(T) {
   test("insertAt BEFORE range fires observer with index set covering edit to end of array", function() {
     var newItem = T.objects(1)[0],
         set     = SC.IndexSet.create(0,array.get('length')+1);
-        
+
     array.insertAt(0, newItem);
     observer.expectRangeChange(array, null, '[]', set);
   });
 
   test("insertAt AFTER range does not fire observer", function() {
     var newItem = T.objects(1)[0];
-        
+
     array.insertAt(9, newItem);
     equals(observer.callCount, 0, 'observer should not fire');
   });
-  
+
   // ..........................................................
   // REMOVING
-  // 
-  
+  //
+
   test("removeAt IN range fires observer with index set covering edit to end of array plus delta", function() {
     var set     = SC.IndexSet.create(3,array.get('length')-3);
     array.removeAt(3);
@@ -214,36 +214,36 @@ SC.ArraySuite.define(function(T) {
     array.removeAt(9);
     equals(observer.callCount, 0, 'observer should not fire');
   });
-  
-  
-  
-  
+
+
+
+
   // ..........................................................
   // MODULE: No explicit range
-  // 
+  //
   module(T.desc("RangeObserver Methods - No explicit range"), {
     setup: function() {
       expected = T.objects(10);
       array = T.newObject(expected);
 
       observer = T.observer();
-      rangeObserver = array.addRangeObserver(null, observer, 
+      rangeObserver = array.addRangeObserver(null, observer,
                           observer.rangeDidChange, null, NO);
-      
+
     },
-    
+
     teardown: function() {
       T.destroyObject(array);
     }
   });
-  
+
   test("returns RangeObserver object", function() {
     ok(rangeObserver && rangeObserver.isRangeObserver, 'returns a range observer object');
   });
 
   // ..........................................................
   // REPLACE
-  // 
+  //
 
   test("replacing object in range fires observer with index set covering only the effected item", function() {
     array.replace(2, 1, T.objects(1));
@@ -262,7 +262,7 @@ SC.ArraySuite.define(function(T) {
 
   test("removing range should no longer fire observers", function() {
     array.removeRangeObserver(rangeObserver);
-    
+
     observer.callCount = 0 ;
     array.replace(2, 1, T.objects(1));
     equals(observer.callCount, 0, 'observer should not fire');
@@ -278,27 +278,27 @@ SC.ArraySuite.define(function(T) {
 
   // ..........................................................
   // GROUPED CHANGES
-  // 
-  
+  //
+
   test("grouping property changes should notify observer only once at end with single IndexSet", function() {
-    
+
     array.beginPropertyChanges();
     array.replace(2, 1, T.objects(1));
     array.replace(4, 1, T.objects(1));
     array.endPropertyChanges();
-    
+
     var set = SC.IndexSet.create().add(2).add(4); // both edits
     observer.expectRangeChange(array, null, '[]', set);
   });
 
   // ..........................................................
   // INSERTING
-  // 
-  
+  //
+
   test("insertAt in range fires observer with index set covering edit to end of array", function() {
     var newItem = T.objects(1)[0],
         set     = SC.IndexSet.create(3,array.get('length')-2);
-        
+
     array.insertAt(3, newItem);
     observer.expectRangeChange(array, null, '[]', set);
   });
@@ -310,11 +310,11 @@ SC.ArraySuite.define(function(T) {
     array.pushObject(newItem);
     observer.expectRangeChange(array, null, '[]', set);
   });
-  
+
   // ..........................................................
   // REMOVING
-  // 
-  
+  //
+
   test("removeAt fires observer with index set covering edit to end of array", function() {
     var set     = SC.IndexSet.create(3,array.get('length')-3);
     array.removeAt(3);
@@ -326,33 +326,33 @@ SC.ArraySuite.define(function(T) {
     array.popObject();
     observer.expectRangeChange(array, null, '[]', set);
   });
-  
-  
+
+
   // ..........................................................
-  // MODULE: isDeep = NO 
-  // 
+  // MODULE: isDeep = NO
+  //
   module(T.desc("RangeObserver Methods - isDeep NO"), {
     setup: function() {
       expected = T.objects(10);
       array = T.newObject(expected);
 
       observer = T.observer();
-      rangeObserver = array.addRangeObserver(SC.IndexSet.create(2,3), 
+      rangeObserver = array.addRangeObserver(SC.IndexSet.create(2,3),
                 observer, observer.rangeDidChange, null, NO);
-      
+
     },
-    
+
     teardown: function() {
       T.destroyObject(array);
     }
   });
-  
+
   test("editing property on object at any point should not fire observer", function() {
-    
-    var indexes = [0,3,9], 
+
+    var indexes = [0,3,9],
         loc     = 3,
         obj,idx;
-        
+
     while(--loc>=0) {
       idx = indexes[loc];
       obj = array.objectAt(idx);
@@ -360,12 +360,12 @@ SC.ArraySuite.define(function(T) {
       equals(observer.callCount, 0, 'observer should not fire when editing object at index %@'.fmt(idx));
     }
   });
-  
+
   test("replacing object in range fires observer with index set", function() {
     array.replace(2, 1, T.objects(1));
     observer.expectRangeChange(array, null, '[]', SC.IndexSet.create(2,1));
   });
-    
-  
+
+
 });
 

data/lib/frameworks/sproutcore/frameworks/runtime/license.js

@@ -1,28 +1,29 @@
-/*! @license
-==========================================================================
-SproutCore Costello -- Property Observing Library
-Copyright ©2006-2011, Strobe Inc. and contributors.
-Portions copyright ©2008-2010 Apple Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a 
-copy of this software and associated documentation files (the "Software"), 
-to deal in the Software without restriction, including without limitation 
-the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the 
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
-DEALINGS IN THE SOFTWARE.
-
-For more information about SproutCore, visit http://www.sproutcore.com
-
-==========================================================================
-@license */
+/**
+ * @license
+ * ==========================================================================
+ * SproutCore Costello -- Property Observing Library
+ * Copyright ©2006-2011, Strobe Inc. and contributors.
+ * Portions copyright ©2008-2010 Apple Inc. All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"), 
+ * to deal in the Software without restriction, including without limitation 
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ * and/or sell copies of the Software, and to permit persons to whom the 
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in 
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * For more information about SproutCore, visit http://www.sproutcore.com
+ * 
+ * ==========================================================================
+ */

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

@@ -15,80 +15,80 @@ SC.OUT_OF_RANGE_EXCEPTION = "Index out of range" ;
 
 /**
   @namespace
-  
-  This module implements Observer-friendly Array-like behavior.  This mixin is 
-  picked up by the Array class as well as other controllers, etc. that want to  
+
+  This module implements Observer-friendly Array-like behavior.  This mixin is
+  picked up by the Array class as well as other controllers, etc. that want to
   appear to be arrays.
-  
-  Unlike SC.Enumerable, this mixin defines methods specifically for 
+
+  Unlike SC.Enumerable, this mixin defines methods specifically for
   collections that provide index-ordered access to their contents.  When you
   are designing code that needs to accept any kind of Array-like object, you
-  should use these methods instead of Array primitives because these will 
-  properly notify observers of changes to the array. 
-  
+  should use these methods instead of Array primitives because these will
+  properly notify observers of changes to the array.
+
   Although these methods are efficient, they do add a layer of indirection to
-  your application so it is a good idea to use them only when you need the 
+  your application so it is a good idea to use them only when you need the
   flexibility of using both true JavaScript arrays and "virtual" arrays such
   as controllers and collections.
-  
-  You can use the methods defined in this module to access and modify array 
-  contents in a KVO-friendly way.  You can also be notified whenever the 
+
+  You can use the methods defined in this module to access and modify array
+  contents in a KVO-friendly way.  You can also be notified whenever the
   membership if an array changes by changing the syntax of the property to
   .observes('*myProperty.[]') .
-  
+
   To support SC.Array in your own class, you must override two
-  primitives to use it: replace() and objectAt().  
-  
+  primitives to use it: replace() and objectAt().
+
   Note that the SC.Array mixin also incorporates the SC.Enumerable mixin.  All
   SC.Array-like objects are also enumerable.
-  
+
   @extends SC.Enumerable
   @since SproutCore 0.9.0
 */
 SC.Array = {
-  
+
   /**
     Walk like a duck - use isSCArray to avoid conflicts
   */
   isSCArray: YES,
-  
+
   /**
     @field {Number} length
-    
+
     Your array must support the length property.  Your replace methods should
     set this property whenever it changes.
   */
   // length: 0,
-  
+
   /**
-    This is one of the primitves you must implement to support SC.Array.  You 
-    should replace amt objects started at idx with the objects in the passed 
+    This is one of the primitves you must implement to support SC.Array.  You
+    should replace amt objects started at idx with the objects in the passed
     array.  You should also call this.enumerableContentDidChange() ;
-    
-    @param {Number} idx 
-      Starting index in the array to replace.  If idx >= length, then append to 
+
+    @param {Number} idx
+      Starting index in the array to replace.  If idx >= length, then append to
       the end of the array.
-      
-    @param {Number} amt 
-      Number of elements that should be removed from the array, starting at 
+
+    @param {Number} amt
+      Number of elements that should be removed from the array, starting at
       *idx*.
-      
-    @param {Array} objects 
-      An array of zero or more objects that should be inserted into the array at 
-      *idx* 
+
+    @param {Array} objects
+      An array of zero or more objects that should be inserted into the array at
+      *idx*
   */
   replace: function(idx, amt, objects) {
     throw "replace() must be implemented to support SC.Array" ;
   },
-  
+
   /**
-    This is one of the primitives you must implement to support SC.Array.  
-    Returns the object at the named index.  If your object supports retrieving 
+    This is one of the primitives you must implement to support SC.Array.
+    Returns the object at the named index.  If your object supports retrieving
     the value of an array item using get() (i.e. myArray.get(0)), then you do
     not need to implement this method yourself.
-    
+
     @param {Number} idx
-      The index of the item to return.  If idx exceeds the current length, 
+      The index of the item to return.  If idx exceeds the current length,
       return null.
   */
   objectAt: function(idx) {
@@ -96,27 +96,27 @@ SC.Array = {
     if (idx >= this.get('length')) return undefined;
     return this.get(idx);
   },
-  
+
   /**
     @field []
-    
+
     This is the handler for the special array content property.  If you get
-    this property, it will return this.  If you set this property it a new 
+    this property, it will return this.  If you set this property it a new
     array, it will replace the current content.
-    
+
     This property overrides the default property defined in SC.Enumerable.
   */
   '[]': function(key, value) {
     if (value !== undefined) {
       this.replace(0, this.get('length'), value) ;
-    }  
+    }
     return this ;
   }.property(),
-  
+
   /**
-    This will use the primitive replace() method to insert an object at the 
+    This will use the primitive replace() method to insert an object at the
     specified index.
-    
+
     @param {Number} idx index of insert the object at.
     @param {Object} object object to insert
   */
@@ -125,30 +125,30 @@ SC.Array = {
     this.replace(idx,0,[object]) ;
     return this ;
   },
-  
+
   /**
-    Remove an object at the specified index using the replace() primitive 
+    Remove an object at the specified index using the replace() primitive
     method.  You can pass either a single index, a start and a length or an
     index set.
-    
-    If you pass a single index or a start and length that is beyond the 
+
+    If you pass a single index or a start and length that is beyond the
     length this method will throw an SC.OUT_OF_RANGE_EXCEPTION
-    
+
     @param {Number|SC.IndexSet} start index, start of range, or index set
     @param {Number} length length of passing range
     @returns {Object} receiver
   */
   removeAt: function(start, length) {
-    
+
     var delta = 0, // used to shift range
         empty = [];
-    
+
     if (typeof start === SC.T_NUMBER) {
-      
+
       if ((start < 0) || (start >= this.get('length'))) {
         throw SC.OUT_OF_RANGE_EXCEPTION;
       }
-      
+
       // fast case
       if (length === undefined) {
         this.replace(start,1,empty);
@@ -157,7 +157,7 @@ SC.Array = {
         start = SC.IndexSet.create(start, length);
       }
     }
-    
+
     this.beginPropertyChanges();
     start.forEachRange(function(start, length) {
       start -= delta ;
@@ -165,10 +165,10 @@ SC.Array = {
       this.replace(start, length, empty); // remove!
     }, this);
     this.endPropertyChanges();
-    
+
     return this ;
   },
-    
+
   /**
     Search the array of this object, removing any occurrences of it.
     @param {object} obj object to remove
@@ -181,11 +181,11 @@ SC.Array = {
     }
     return this ;
   },
-  
+
   /**
     Search the array for the passed set of objects and remove any occurrences
-    of the. 
-    
+    of the.
+
     @param {SC.Enumerable} objects the objects to remove
     @returns {SC.Array} receiver
   */
@@ -195,21 +195,21 @@ SC.Array = {
     this.endPropertyChanges();
     return this;
   },
-  
+
   /**
-    Push the object onto the end of the array.  Works just like push() but it 
+    Push the object onto the end of the array.  Works just like push() but it
     is KVO-compliant.
   */
   pushObject: function(obj) {
     this.insertAt(this.get('length'), obj) ;
     return obj ;
   },
-  
-  
+
+
   /**
     Add the objects in the passed numerable to the end of the array.  Defers
     notifying observers of the change until all objects are added.
-    
+
     @param {SC.Enumerable} objects the objects to add
     @returns {SC.Array} receiver
   */
@@ -221,20 +221,20 @@ SC.Array = {
   },
 
   /**
-    Pop object from array or nil if none are left.  Works just like pop() but 
+    Pop object from array or nil if none are left.  Works just like pop() but
     it is KVO-compliant.
   */
   popObject: function() {
     var len = this.get('length') ;
     if (len === 0) return null ;
-    
+
     var ret = this.objectAt(len-1) ;
     this.removeAt(len-1) ;
     return ret ;
   },
-  
+
   /**
-    Shift an object from start of array or nil if none are left.  Works just 
+    Shift an object from start of array or nil if none are left.  Works just
     like shift() but it is KVO-compliant.
   */
   shiftObject: function() {
@@ -243,9 +243,9 @@ SC.Array = {
     this.removeAt(0) ;
     return ret ;
   },
-  
+
   /**
-    Unshift an object to start of array.  Works just like unshift() but it is 
+    Unshift an object to start of array.  Works just like unshift() but it is
     KVO-compliant.
   */
   unshiftObject: function(obj) {
@@ -253,11 +253,11 @@ SC.Array = {
     return obj ;
   },
 
-  
+
   /**
     Adds the named objects to the beginning of the array.  Defers notifying
     observers until all objects have been added.
-    
+
     @param {SC.Enumerable} objects the objects to add
     @returns {SC.Array} receiver
   */
@@ -267,14 +267,14 @@ SC.Array = {
     this.endPropertyChanges();
     return this;
   },
-  
-  /**  
+
+  /**
     Compares each item in the array.  Returns true if they are equal.
   */
   isEqual: function(ary) {
     if (!ary) return false ;
     if (ary == this) return true;
-    
+
     var loc = ary.get('length') ;
     if (loc != this.get('length')) return false ;
 
@@ -283,27 +283,27 @@ SC.Array = {
     }
     return true ;
   },
-  
+
   /**
     Generates a new array with the contents of the old array, sans any null
     values.
-    
+
     @returns {Array}
   */
   compact: function() { return this.without(null); },
-  
+
   /**
     Generates a new array with the contents of the old array, sans the passed
     value.
-    
+
     @param {Object} value
     @returns {Array}
   */
   without: function(value) {
     if (this.indexOf(value)<0) return this; // value not present.
     var ret = [] ;
-    this.forEach(function(k) { 
-      if (k !== value) ret[ret.length] = k; 
+    this.forEach(function(k) {
+      if (k !== value) ret[ret.length] = k;
     }) ;
     return ret ;
   },
@@ -311,7 +311,7 @@ SC.Array = {
   /**
     Generates a new array with only unique values from the contents of the
     old array.
-    
+
     @returns {Array}
   */
   uniq: function() {
@@ -321,51 +321,61 @@ SC.Array = {
     });
     return ret ;
   },
-  
+
   /**
     Returns the largest Number in an array of Numbers. Make sure the array
     only contains values of type Number to get expected result.
-    
+
     Note: This only works for dense arrays.
-    
+
     @returns {Number}
   */
   max: function() {
     return Math.max.apply(Math, this);
   },
-  
+
   /**
     Returns the smallest Number in an array of Numbers. Make sure the array
     only contains values of type Number to get expected result.
-    
+
     Note: This only works for dense arrays.
-    
+
     @returns {Number}
   */
   min: function() {
     return Math.min.apply(Math, this);
   },
-  
+
   rangeObserverClass: SC.RangeObserver,
-  
+
+  /**
+    Returns YES if object is in the array
+
+    @param {Object} object to look for
+    @returns {Boolean}
+  */
+  contains: function(obj){
+    return this.indexOf(obj) >= 0;
+  },
+
   /**
     Creates a new range observer on the receiver.  The target/method callback
-    you provide will be invoked anytime any property on the objects in the 
+    you provide will be invoked anytime any property on the objects in the
     specified range changes.  It will also be invoked if the objects in the
     range itself changes also.
-    
+
     The callback for a range observer should have the signature:
-    
+
     {{{
       function rangePropertyDidChange(array, objects, key, indexes, conext)
     }}}
-    
+
     If the passed key is '[]' it means that the object itself changed.
-    
-    The return value from this method is an opaque reference to the 
-    range observer object.  You can use this reference to destroy the 
+
+    The return value from this method is an opaque reference to the
+    range observer object.  You can use this reference to destroy the
     range observer when you are done with it or to update its range.
-    
+
     @param {SC.IndexSet} indexes indexes to observe
     @param {Object} target object to invoke on change
     @param {String|Function} method the method to invoke
@@ -381,29 +391,29 @@ SC.Array = {
     if (this._array_oldLength===undefined) {
       this._array_oldLength = this.get('length') ;
     }
-    
+
     var C = this.rangeObserverClass ;
     var isDeep = NO; //disable this feature for now
     var ret = C.create(this, indexes, target, method, context, isDeep) ;
     rangeob.add(ret);
-    
+
     // first time a range observer is added, begin observing the [] property
     if (!this._array_isNotifyingRangeObservers) {
       this._array_isNotifyingRangeObservers = YES ;
       this.addObserver('[]', this, this._array_notifyRangeObservers);
     }
-    
+
     return ret ;
   },
-  
+
   /**
-    Moves a range observer so that it observes a new range of objects on the 
+    Moves a range observer so that it observes a new range of objects on the
     array.  You must have an existing range observer object from a call to
     addRangeObserver().
-    
+
     The return value should replace the old range observer object that you
     pass in.
-    
+
     @param {SC.RangeObserver} rangeObserver the range observer
     @param {SC.IndexSet} indexes new indexes to observe
     @returns {SC.RangeObserver} the range observer (or a new one)
@@ -411,14 +421,14 @@ SC.Array = {
   updateRangeObserver: function(rangeObserver, indexes) {
     return rangeObserver.update(this, indexes);
   },
-
+  
   /**
     Removes a range observer from the receiver.  The range observer must
     already be active on the array.
-    
+
     The return value should replace the old range observer object.  It will
     usually be null.
-    
+
     @param {SC.RangeObserver} rangeObserver the range observer
     @returns {SC.RangeObserver} updated range observer or null
   */
@@ -428,12 +438,12 @@ SC.Array = {
     if (rangeob) rangeob.remove(rangeObserver) ; // clear
     return ret ;
   },
-  
+
   /**
-    Updates observers with content change.  To support range observers, 
+    Updates observers with content change.  To support range observers,
     you must pass three change parameters to this method.  Otherwise this
     method will assume the entire range has changed.
-    
+
     This also assumes you have already updated the length property.
     @param {Number} start the starting index of the change
     @param {Number} amt the final range of objects changed
@@ -441,22 +451,22 @@ SC.Array = {
     @returns {SC.Array} receiver
   */
   enumerableContentDidChange: function(start, amt, delta) {
-    var rangeob = this._array_rangeObservers, 
+    var rangeob = this._array_rangeObservers,
         oldlen  = this._array_oldLength,
         newlen, length, changes ;
 
-    this.beginPropertyChanges();    
+    this.beginPropertyChanges();
     this.notifyPropertyChange('length'); // flush caches
 
     // schedule info for range observers
     if (rangeob && rangeob.length>0) {
 
       // if no oldLength has been cached, just assume 0
-      if (oldlen === undefined) oldlen = 0;    
+      if (oldlen === undefined) oldlen = 0;
       this._array_oldLength = newlen = this.get('length');
-      
+
       // normalize input parameters
-      // if delta was not passed, assume it is the different between the 
+      // if delta was not passed, assume it is the different between the
       // new and old length.
       if (start === undefined) start = 0;
       if (delta === undefined) delta = newlen - oldlen ;
@@ -466,53 +476,53 @@ SC.Array = {
       } else {
         length = amt ;
       }
-      
+
       changes = this._array_rangeChanges;
       if (!changes) changes = this._array_rangeChanges = SC.IndexSet.create();
       changes.add(start, length);
     }
-    
+
     this.notifyPropertyChange('[]') ;
     this.endPropertyChanges();
-    
+
     return this ;
   },
-  
+
   /**  @private
-    Observer fires whenever the '[]' property changes.  If there are 
+    Observer fires whenever the '[]' property changes.  If there are
     range observers, will notify observers of change.
   */
   _array_notifyRangeObservers: function() {
     var rangeob = this._array_rangeObservers,
         changes = this._array_rangeChanges,
-        len     = rangeob ? rangeob.length : 0, 
+        len     = rangeob ? rangeob.length : 0,
         idx, cur;
-        
+
     if (len > 0 && changes && changes.length > 0) {
       for(idx=0;idx<len;idx++) rangeob[idx].rangeDidChange(changes);
       changes.clear(); // reset for later notifications
     }
   }
-  
+
 } ;
 
 // Add SC.Array to the built-in array before we add SC.Enumerable to SC.Array
 // since built-in Array's are already enumerable.
-SC.mixin(Array.prototype, SC.Array) ; 
+SC.mixin(Array.prototype, SC.Array) ;
 SC.Array = SC.mixin({}, SC.Enumerable, SC.Array) ;
 
 // Add any extra methods to SC.Array that are native to the built-in Array.
 /**
   Returns a new array that is a slice of the receiver.  This implementation
-  uses the observable array methods to retrieve the objects for the new 
+  uses the observable array methods to retrieve the objects for the new
   slice.
-  
-  @param beginIndex {Integer} (Optional) index to begin slicing from.     
+
+  @param beginIndex {Integer} (Optional) index to begin slicing from.
   @param endIndex {Integer} (Optional) index to end the slice at.
   @returns {Array} New array with specified slice
 */
 SC.Array.slice = function(beginIndex, endIndex) {
-  var ret = []; 
+  var ret = [];
   var length = this.get('length') ;
   if (SC.none(beginIndex)) beginIndex = 0 ;
   if (SC.none(endIndex) || (endIndex > length)) endIndex = length ;
@@ -522,20 +532,20 @@ SC.Array.slice = function(beginIndex, endIndex) {
 
 /**
   Returns the index for a particular object in the index.
-  
+
   @param {Object} object the item to search for
   @param {NUmber} startAt optional starting location to search, default 0
   @returns {Number} index of -1 if not found
 */
 SC.Array.indexOf = function(object, startAt) {
   var idx, len = this.get('length');
-  
+
   if (startAt === undefined) startAt = 0;
   else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
   if (startAt < 0) startAt += len;
-  
+
   for(idx=startAt;idx<len;idx++) {
-    if (this.objectAt(idx) === object) return idx ;
+    if (this.objectAt(idx, YES) === object) return idx ;
   }
   return -1;
 };
@@ -545,18 +555,18 @@ if (!Array.prototype.indexOf) Array.prototype.indexOf = SC.Array.indexOf;
 
 /**
   Returns the last index for a particular object in the index.
-  
+
   @param {Object} object the item to search for
   @param {NUmber} startAt optional starting location to search, default 0
   @returns {Number} index of -1 if not found
 */
 SC.Array.lastIndexOf = function(object, startAt) {
   var idx, len = this.get('length');
-  
+
   if (startAt === undefined) startAt = len-1;
   else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
   if (startAt < 0) startAt += len;
-  
+
   for(idx=startAt;idx>=0;idx--) {
     if (this.objectAt(idx) === object) return idx ;
   }
@@ -575,7 +585,7 @@ if (!Array.prototype.lastIndexOf) {
 // because working with arrays are so common.
 (function() {
   SC.mixin(Array.prototype, {
-    
+
     // primitive for array support.
     replace: function(idx, amt, objects) {
       if (this.isFrozen) throw SC.FROZEN_ERROR ;
@@ -585,15 +595,15 @@ if (!Array.prototype.lastIndexOf) {
         var args = [idx, amt].concat(objects) ;
         this.splice.apply(this,args) ;
       }
-      
+
       // if we replaced exactly the same number of items, then pass only the
-      // replaced range.  Otherwise, pass the full remaining array length 
+      // replaced range.  Otherwise, pass the full remaining array length
       // since everything has shifted
       var len = objects ? (objects.get ? objects.get('length') : objects.length) : 0;
       this.enumerableContentDidChange(idx, amt, len - amt) ;
       return this ;
     },
-    
+
     // If you ask for an unknown property, then try to collect the value
     // from member items.
     unknownProperty: function(key, value) {
@@ -603,41 +613,41 @@ if (!Array.prototype.lastIndexOf) {
       }
       return ret ;
     }
-    
+
   });
-    
+
   // If browser did not implement indexOf natively, then override with
   // specialized version
   var indexOf = Array.prototype.indexOf;
   if (!indexOf || (indexOf === SC.Array.indexOf)) {
     Array.prototype.indexOf = function(object, startAt) {
       var idx, len = this.length;
-      
+
       if (startAt === undefined) startAt = 0;
       else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
       if (startAt < 0) startAt += len;
-      
+
       for(idx=startAt;idx<len;idx++) {
         if (this[idx] === object) return idx ;
       }
       return -1;
-    } ; 
+    } ;
   }
-  
+
   var lastIndexOf = Array.prototype.lastIndexOf ;
   if (!lastIndexOf || (lastIndexOf === SC.Array.lastIndexOf)) {
     Array.prototype.lastIndexOf = function(object, startAt) {
       var idx, len = this.length;
-      
+
       if (startAt === undefined) startAt = len-1;
       else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
       if (startAt < 0) startAt += len;
-      
+
       for(idx=startAt;idx>=0;idx--) {
         if (this[idx] === object) return idx ;
       }
       return -1;
     };
   }
-  
+
 })();