sproutcore 1.5.0 → 1.6.0.beta.1

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

@@ -1293,29 +1293,14 @@ SC.Query.mixin( /** @scope SC.Query */ {
   orderStoreKeys: function(storeKeys, query, store) {
     // apply the sort if there is one
     if (storeKeys) {
-      
-      // Set tmp variable because we can't pass variables to sort function.
-      // Do this instead of generating a temporary closure function for perf.
-      // We'll use a stack-based approach in case our sort routine ends up
-      // calling code that triggers a recursive invocation of orderStoreKeys.
-      var K           = SC.Query,
-          tempStores  = K._TMP_STORES,
-          tempQueries = K._TMP_QUERIES;
-      if (!tempStores)  tempStores  = K._TMP_STORES = [];
-      if (!tempQueries) tempQueries = K._TMP_QUERIES = [];
-      
-      tempStores.push(store);
-      tempQueries.push(query);
-        
-      var res = storeKeys.sort(SC.Query.compareStoreKeys);
-      
-      K._TMP_STORES.pop();
-      K._TMP_QUERIES.pop();
+      var res = storeKeys.sort(function(a, b) {
+        return SC.Query.compareStoreKeys(query, store, a, b);
+      });
     }
 
     return storeKeys;
   },
-  
+
   /** 
     Default sort method that is used when calling `containsStoreKeys()`
     or `containsRecords()` on this query. Simply materializes two records
@@ -1325,71 +1310,11 @@ SC.Query.mixin( /** @scope SC.Query */ {
     @param {Number} storeKey2 a store key
     @returns {Number} -1 if record1 < record2,  +1 if record1 > record2, 0 if equal
   */
-  compareStoreKeys: function(storeKey1, storeKey2) {
-    var K           = SC.Query,
-        tempStores  = K._TMP_STORES,
-        tempQueries = K._TMP_QUERIES,
-        store       = tempStores[tempStores.length - 1],
-        query       = tempQueries[tempQueries.length - 1],
-        compareFunc = query.compare,
-        record1     = store.materializeRecord(storeKey1),
+  compareStoreKeys: function(query, store, storeKey1, storeKey2) {
+    var record1     = store.materializeRecord(storeKey1),
         record2     = store.materializeRecord(storeKey2);
 
-    // If the query implements a custom 'compare' function, then use it.
-    // Otherwise, we have the logic from the standard version inlined here.
-    if (compareFunc !== K.prototype.compare) {
-      return compareFunc.call(query, record1, record2);
-    }
-    else {
-      // THIS CODE IS THE SAME AS THE 'compare' METHOD, EXCEPT THAT 'this' HAS
-      // BEEN CHANGED TO 'query'.
-      //
-      // It is inlined here to avoid the extra method invocation in the
-      // typical case where the client does not supply a custom 'compare'
-      // function.
-      
-      var result = 0, 
-          propertyName, order, len, i;
-
-      // fast cases go here
-      if (record1 === record2) return 0;
-    
-      // if called for the first time we have to build the order array
-      if (!query._isReady) query.parse();
-      if (!query._isReady) { // can't parse. guid is wrong but consistent
-        return SC.compare(record1.get('id'),record2.get('id'));
-      }
-    
-      // For every property specified in orderBy until non-eql result is found.
-      // Or, if orderBy is a comparison function, simply invoke it with the
-      // records.
-      order = query._order;
-      if (SC.typeOf(order) === SC.T_FUNCTION) {
-        result = order.call(null, record1, record2);
-      }
-      else {
-        len   = order ? order.length : 0;
-        for (i=0; result===0 && (i < len); i++) {
-          propertyName = order[i].propertyName;
-          // if query property has a registered comparison use that
-          if (SC.Query.comparisons[propertyName]) {
-            result = SC.Query.comparisons[propertyName](
-                      record1.get(propertyName),record2.get(propertyName));
-                  
-          // if not use default SC.compare()
-          } else {
-            result = SC.compare(
-                      record1.get(propertyName), record2.get(propertyName) );
-          }
-      
-          if ((result!==0) && order[i].descending) result = (-1) * result;
-        }
-      }
-
-      // return result or compare by guid
-      if (result !== 0) return result ;
-      else return SC.compare(record1.get('id'),record2.get('id'));
-    }
+    return query.compare(record1, record2);
   },
   
   /**

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

@@ -438,13 +438,10 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
     this.set('needsFlush', YES);
 
-    // if we have storeKeys already, then flush immediately because
-    // it will not be as expensive as if we are starting from scratch
     if (this.get('storeKeys')) {
       this.flush();
-    }
-    else {
-      this.enumerableContentDidChange();
+    } else {
+      this.arrayContentDidChange();
     }
 
     return this;
@@ -712,6 +709,16 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
   }.observes('storeKeys'),
 
+  /** @private
+    If anyone adds an array observer on to the record array, make sure
+    we flush so that the observers don't fire the first time length is
+    calculated.
+  */
+  addArrayObservers: function() {
+    this.flush();
+    return SC.Array.addArrayObservers.apply(this, arguments);
+  },
+
   /** @private
     Invoked whenever the content of the `storeKeys` array changes.  This will
     dump any cached record lookup and then notify that the enumerable content

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

@@ -1406,7 +1406,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
   },
   
   /**
-    function that propigates a function all to all children
+    function that propagates a function call to all children
   */
   _propagateToChildren: function(storeKey, func){
     // Handle all the child Records

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

@@ -0,0 +1,82 @@
+(function(root) {
+  var store;
+  var query;
+  var recordArray;
+
+  module("SC.RecordArray - implements array content observers", {
+    setup: function() {
+    },
+
+    teardown: function() {
+      root.MyRecord = undefined;
+    }
+  });
+
+  test("notifies when a record is added to the store that matches a query", function() {
+    var callCount = 0,
+        lastRemovedCount = 0,
+        lastAddedCount = 0;
+
+    SC.run(function() {
+      store = SC.Store.create();
+      root.MyRecord = SC.Record.extend();
+      query = SC.Query.local(MyRecord);
+
+      recordArray = store.find(query);
+
+      recordArray.addArrayObservers({
+        didChange: function(start, removedCount, addedCount) {
+          lastRemovedCount = removedCount;
+          lastAddedCount = addedCount;
+        },
+
+        willChange: function() {}
+      });
+
+      store.createRecord(MyRecord, {});
+    });
+
+    equals(lastAddedCount, 1);
+    equals(lastRemovedCount, 0);
+    equals(recordArray.get('length'), 1);
+  });
+
+  test("notifies when a record is removed from the store that matches a query", function() {
+    var lastRemovedCount = 0,
+        lastAddedCount = 0;
+
+    var record;
+
+    SC.run(function() {
+      store = SC.Store.create();
+      root.MyRecord = SC.Record.extend();
+      query = SC.Query.local(MyRecord);
+
+      recordArray = store.find(query);
+
+      recordArray.addArrayObservers({
+        didChange: function(start, removedCount, addedCount) {
+          lastRemovedCount = removedCount;
+          lastAddedCount = addedCount;
+        },
+
+        willChange: function() {}
+      });
+
+      record = store.createRecord(MyRecord, {
+        guid: 1
+      });
+    });
+
+    equals(lastAddedCount, 1);
+    equals(lastRemovedCount, 0);
+
+    SC.run(function() {
+      record.destroy();
+    });
+
+    equals(lastAddedCount, 0);
+    equals(lastRemovedCount, 1);
+    equals(recordArray.get('length'), 0);
+  });
+})(this);

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

@@ -165,6 +165,23 @@ test("calling storeDidChangeStoreKeys() with a matching recordType should not un
   equals(fooRecsController.get('bigCost'), NO, 'fooRecsController should not have spent big cost');
 });
 
+test("adding an array observer to a SC.RecordArray should cause the array to flush", function() {
+  var callCount = 0;
+  debugger;
+
+  recs.addArrayObservers({
+    didChange: function() {
+      callCount++;
+    },
+
+    willChange: function() { }
+  });
+
+  recs.get('length');
+
+  equals(callCount, 0, "does not cause array observers to be fired when getting length");
+});
+
 
 // ..........................................................
 // SPECIAL CASES

data/lib/frameworks/sproutcore/frameworks/debug/core.js

@@ -19,7 +19,7 @@ SC.mapDisplayNames = function(obj, level, path, seenHash, seenArray) {
   // Lazily instantiate the hash of types we'll use a hash for the "have we
   // seen this before?" structure.  (Some types are not safe to put in a hash
   // in this manner, so we'll use the hash for its algorithmic advantage when
-  // possible, but fall back to an array using indexOf() when necessary.)
+  // possible, but fall back to an array using `indexOf()` when necessary.)
   if (!SC._mapDisplayNamesUseHashForSeenTypesHash) {
     var types = SC._mapDisplayNamesUseHashForSeenTypes ;
     var typesHash = {} ;

data/lib/frameworks/sproutcore/frameworks/debug/invoke_once_last_debugging.js

@@ -7,7 +7,7 @@
 
 // When in debug mode, it’s useful for our observer sets (which are used by
 // invokeOnce and invokeLast) to record which code scheduled the
-// invokeOnce/invokeLast targets/methods.
+// `invokeOnce`/`invokeLast` targets/methods.
 
 window.SC = window.SC || {};
 

data/lib/frameworks/sproutcore/frameworks/desktop/core.js

@@ -7,10 +7,10 @@
 
 
 /**
-  If set to NO, then pressing backspace will NOT navigate to the previous 
+  If set to `NO`, then pressing backspace will NOT navigate to the previous
   page in the browser history, which is the default behavior in most browsers.
   
-  Usually it is best to leave this property set to NO in order to prever the
+  Usually it is best to leave this property set to `NO` in order to prevent the
   user from inadvertantly losing data by pressing the backspace key.
 
   @static

data/lib/frameworks/sproutcore/frameworks/desktop/english.lproj/slider.css

@@ -1,9 +1,8 @@
 /* @override http://localhost:4020/static/sproutcore/en/desktop/_cache/sc.theme/1228020574/slider.css */
 
 /* @group SC.SliderView */
-
 .sc-slider-view {
-	height: 21px;
+  height: 21px;
 }
 
 .blur .sc-slider-view,
@@ -14,46 +13,50 @@
 }
 
 /* sc-inner is the slider bar */
- .sc-slider-view .sc-inner {
-	position: absolute;
-	left: 8px;
-	right: 8px;
-	height: 5px;
-	top: 6px;
-	background: gray ;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
+.sc-slider-view .track {
+  position: absolute;
+  left: 8px;
+  right: 8px;
+  height: 5px;
+  top: 6px;
+  background: gray;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.sc-slider-view .track .middle {
+
 }
 
-.sc-slider-view .sc-inner .sc-leftcap,
-.sc-slider-view .sc-inner .sc-righcap {
+.sc-slider-view .track .left,
+.sc-slider-view .track .right {
   display: none;
 }
 
-.blur .sc-slider-view .sc-inner,
-.focus .sc-slider-view.disabled .sc-inner {
-	border: 1px #ccc solid;
+.blur .sc-slider-view .track,
+.focus .sc-slider-view.disabled .track {
+  border: 1px #ccc solid;
 }
 
-.focus .sc-slider-view .sc-inner {
-	border: 1px #999 solid;
+.focus .sc-slider-view .track {
+  border: 1px #999 solid;
 }
 
- .sc-slider-view .sc-handle {
-	height: 12px;
-	width: 12px;
-	margin-left: -9px;
-	top: -4px;
-	position: absolute ;
-	background: black;
-	border-radius:6px;
-	-moz-border-radius:6px;
-	-webkit-transform: translate3d(0,0,0);
-	-webkit-transition: left 0.01s ease-in-out;
+.sc-slider-view .sc-handle {
+  height: 12px;
+  width: 12px;
+  margin-left: -9px;
+  top: -4px;
+  position: absolute;
+  background: black;
+  border-radius: 6px;
+  -moz-border-radius: 6px;
+  -webkit-transform: translate3d(0, 0, 0);
+  -webkit-transition: left 0.01s ease-in-out;
 }
 
 .focus .sc-slider-view .sc-handle {
+
 }
 
 .blur .sc-slider-view .sc-handle,

data/lib/frameworks/sproutcore/frameworks/desktop/mixins/border.js

@@ -17,8 +17,8 @@ SC.BORDER_NONE   = null ;
   @namespace
   @deprecated
 
-  The SC.Border mixin has be deprecated in favour of applying border properties
-  to an SC.View's layout object. See {@link SC.View#layout}.
+  The `SC.Border` mixin has be deprecated in favour of applying border properties
+  to an `SC.View`'s layout object. See {@link SC.View#layout}.
 
   The Border mixin can be applied to any view to give it a visual border.
   In addition to specifying the mixin itself, you should specify the border
@@ -27,17 +27,18 @@ SC.BORDER_NONE   = null ;
   Border style can be any predefined CSS class name or a border color.
 
   If you specify a CSS class name, it must end in "-border". Additionally,
-  you should set the borderTop, borderRight, borderBottom, and borderLeft
-  properties so SproutCore can accurately account for the size of your view.
+  you should set the `borderTop`, `borderRight`, `borderBottom`, and
+  `borderLeft` properties so SproutCore can accurately account for the size
+  of your view.
 
   SproutCore pre-defines several useful border styles including:
 
-    - SC.BORDER_BEZEL  - displays an inlaid bezel
-    - SC.BORDER_BLACK  - displays a black border
-    - SC.BORDER_GRAY   - displays a gray border
-    - SC.BORDER_TOP    - displays a border on the top only
-    - SC.BORDER_BOTTOM - displays a border on the bottom only
-    - SC.BORDER_NONE   - disables the border
+   - `SC.BORDER_BEZEL`  -- displays an inlaid bezel
+   - `SC.BORDER_BLACK`  -- displays a black border
+   - `SC.BORDER_GRAY`   -- displays a gray border
+   - `SC.BORDER_TOP`    -- displays a border on the top only
+   - `SC.BORDER_BOTTOM` -- displays a border on the bottom only
+   - `SC.BORDER_NONE`   -- disables the border
 
   @since SproutCore 1.0
 */
@@ -98,7 +99,7 @@ SC.Border = {
   hasBorder: YES,
 
   /**
-    Make sure we re-render if the borderStyle property changes.
+    Make sure we re-render if the `borderStyle` property changes.
     @private
   */
   displayProperties: ['borderStyle'],

data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_fast_path.js

@@ -8,7 +8,7 @@
 /** 
   @namespace
   
-  An experimental CollectionView mixin that makes it extremely fast under
+  An experimental `CollectionView` mixin that makes it extremely fast under
   certain circumstances, including for mobile devices.
 */
 SC.CollectionFastPath = {
@@ -80,7 +80,7 @@ SC.CollectionFastPath = {
   },
   
   /**
-    Configures a pooled view, calling .awakeFromPool if it is defined.
+    Configures a pooled view, calling `.awakeFromPool` if it is defined.
 
     @param {SC.View} itemView
     @param {Hash} attrs
@@ -123,7 +123,7 @@ SC.CollectionFastPath = {
   
   /**
     Releases an item view. If the item view is pooled, it puts it into the pool;
-    otherwise, this calls .destroy().
+    otherwise, this calls `.destroy()`.
     
     This is called for one of two purposes: to release a view that is no longer displaying,
     or to release an older cached version of a view that needed to be replaced because the
@@ -163,7 +163,7 @@ SC.CollectionFastPath = {
   
   /** @private
     Determines the example view for a content index. There are two optional parameters that will
-    speed things up: contentObject and isGroupView. If you don't supply them, they must be computed.
+    speed things up: `contentObject` and `isGroupView`. If you don't supply them, they must be computed.
   */
   exampleViewForItem: function(item, index) {
     var del = this.get('contentDelegate'),
@@ -190,7 +190,7 @@ SC.CollectionFastPath = {
     This may seem somewhat awkward, but it is for memory performance: this fills in a hash
     YOU provide with the properties for the given content index.
     
-    Properties include both the attributes given to the view and some CollectionView tracking
+    Properties include both the attributes given to the view and some `CollectionView` tracking
     properties, most importantly the exampleView.
   */
   setAttributesForItem: function(item, index, attrs) {
@@ -563,7 +563,7 @@ SC.CollectionFastPath = {
   
   /** @private
     Tries to find an item for the given example view in a dom pool.
-    If one could not be found, returns null.
+    If one could not be found, returns `null`.
   */
   itemFromDOMPool: function(exampleView) {
     var pool = this.domPoolForExampleView(exampleView);
@@ -663,7 +663,7 @@ SC.CollectionFastPath = {
   
   
   /** @private
-    Tells ScrollView that this should receive live updates during touch scrolling.
+    Tells `ScrollView` that this should receive live updates during touch scrolling.
     We are so fast, aren't we?
   */
   _lastTopUpdate: 0,

data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_row_delegate.js

@@ -9,7 +9,7 @@
 /** 
   @namespace
   
-  CollectionRowDelegates are consulted by SC.ListView and SC.TableView to
+  `CollectionRowDelegate`s are consulted by `SC.ListView` and `SC.TableView` to
   control the height of rows, including specifying custom heights for
   specific rows.
   
@@ -45,7 +45,7 @@ SC.CollectionRowDelegate = {
   
   /**
     This is useful if you are using a custom item view that needs to be padded.
-    This value is added to the top and bottom of the itemHeight.
+    This value is added to the top and bottom of the `itemHeight`.
     
     @type Number
     @default 0
@@ -53,7 +53,7 @@ SC.CollectionRowDelegate = {
   rowPadding: 0,
   
   /**
-    Total row height used for calculation. Equal to itemHeight + twice rowPadding.
+    Total row height used for calculation. Equal to `itemHeight + (2 * rowPadding)`.
     
     @type Number
   */
@@ -79,7 +79,7 @@ SC.CollectionRowDelegate = {
   customRowHeightIndexes: null,
   
   /**
-    Called for each index in the customRowHeightIndexes set to get the 
+    Called for each index in the `customRowHeightIndexes` set to get the
     actual row height for the index.  This method should return the default
     rowHeight if you don't want the row to have a custom height.
     

data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_view_delegate.js

@@ -8,10 +8,10 @@
 /**
   @namespace
 
-  A Collection View Delegate is consulted by a SC.CollectionView to make
+  A Collection View Delegate is consulted by a `SC.CollectionView` to make
   policy decisions about certain behaviors such as selection control and
   drag and drop.  If you need to control other aspects of your data, you may
-  also want to add the SC.CollectionContent mixin.
+  also want to add the `SC.CollectionContent` mixin.
   
   To act as a Collection Delegate, just apply this mixin to your class.  You
   must then set the "delegate" property on the CollectionView to your object.
@@ -74,7 +74,7 @@ SC.CollectionViewDelegate = {
 
   /**
     Called by the collection when attempting to deselect an item.  Return the
-    actual indexes you want to allow to be deselected.  Return null to
+    actual indexes you want to allow to be deselected.  Return `null` to
     disallow the change.  The default allows all selection.
     
     Note that you should not modify the passed in IndexSet.  clone it instead.
@@ -93,11 +93,11 @@ SC.CollectionViewDelegate = {
   // 
 
   /**
-    Called by the collection view whenever the deleteSelection() method is
+    Called by the collection view whenever the `deleteSelection()` method is
     called.  You can implement this method to get fine-grained control over
     which items can be deleted.  To prevent deletion, return null.
     
-    This method is only called if canDeleteContent is YES on the collection
+    This method is only called if canDeleteContent is `YES` on the collection
     view.
     
     @param {SC.CollectionView} view the collection view
@@ -116,8 +116,8 @@ SC.CollectionViewDelegate = {
     deletion method.
     
     If you simply want to control the items to be deleted, you should instead
-    implement collectionViewShouldDeleteItems(). This method will only be
-    called if canDeleteContent is YES and collectionViewShouldDeleteIndexes()
+    implement `collectionViewShouldDeleteItems()`. This method will only be
+    called if canDeleteContent is `YES` and `collectionViewShouldDeleteIndexes()`
     returns a non-empty index set
     
     @param {SC.CollectionView} view collection view
@@ -154,7 +154,7 @@ SC.CollectionViewDelegate = {
     may enable content reordering but then implement this method to prevent
     reordering of certain items in the view.
     
-    The default implementation always returns YES.
+    The default implementation always returns `YES`.
     
     @param {SC.CollectionView} view the collection view
     @returns {Boolean} YES to alow, NO to prevent it
@@ -170,13 +170,13 @@ SC.CollectionViewDelegate = {
     You can implement this method to return an array of the data types you
     will provide for the drag data.
     
-    If you return null or an empty array, can you have set canReorderContent
-    to YES on the CollectionView, then the drag will go ahead but only 
-    reordering will be allowed.  If canReorderContent is NO, then the drag
+    If you return `null` or an empty array, can you have set `canReorderContent`
+    to `YES` on the CollectionView, then the drag will go ahead but only
+    reordering will be allowed.  If `canReorderContent` is `NO`, then the drag
     will not be allowed to start.
     
     If you simply want to control whether a drag is allowed or not, you
-    should instead implement collectionViewShouldBeginDrag().
+    should instead implement `collectionViewShouldBeginDrag()`.
     
     The default returns an empty array.
     
@@ -192,7 +192,7 @@ SC.CollectionViewDelegate = {
     to provide the drag data for the drop.
     
     This method should be implemented essentially as you would implement the
-    dragDataForType() if you were a drag data source.  You will never be asked
+    `dragDataForType()` if you were a drag data source.  You will never be asked
     to provide drag data for a reorder event, only for other types of data.
     
     The default implementation returns null.
@@ -230,14 +230,14 @@ SC.CollectionViewDelegate = {
     general which operations you might support and specifically the operations
     you would support if the user dropped an item over a specific location.
     
-    If the proposedDropOperation parameter is SC.DROP_ON or SC.DROP_BEFORE,
-    then the proposedInsertionPoint will be a non-negative value and you
+    If the `proposedDropOperation` parameter is `SC.DROP_ON` or `SC.DROP_BEFORE`,
+    then the `proposedInsertionPoint` will be a non-negative value and you
     should determine the specific operations you will support if the user
     dropped the drag item at that point.
     
     If you do not like the proposed drop operation or insertion point, you
-    can override these properties as well by setting the proposedDropOperation
-    and proposedInsertionIndex properties on the collection view during this
+    can override these properties as well by setting the `proposedDropOperation`
+    and `proposedInsertionIndex` properties on the collection view during this
     method. These properties are ignored all other times.
     
     @param {SC.CollectionView} view the collection view
@@ -254,12 +254,12 @@ SC.CollectionViewDelegate = {
   
   /**
     Called by the collection view to actually accept a drop.  This method will
-    only be invoked AFTER your validateDrop method has been called to
+    only be invoked AFTER your `validateDrop method has been called to
     determine if you want to even allow the drag operation to go through.
     
     You should actually make changes to the data model if needed here and
     then return the actual drag operation that was performed. If you return
-    SC.DRAG_NONE and the dragOperation was SC.DRAG_REORDER, then the default
+    `SC.DRAG_NONE` and the dragOperation was `SC.DRAG_REORDER`, then the default
     reorder behavior will be provided by the collection view.
     
     @param {SC.CollectionView} view
@@ -288,7 +288,7 @@ SC.CollectionViewDelegate = {
   },
 
   /**
-    Allows the ghost view created in collectionViewDragViewFor to be displayed
+    Allows the ghost view created in `collectionViewDragViewFor` to be displayed
     like a cursor instead of the default implementation. This sets the view 
     origin to be the location of the mouse cursor.