sproutcore 1.4.5 → 1.5.0.pre.3

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

@@ -272,6 +272,8 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
       record.recordDidChange(pname);
     } 
     
+    this.enumerableContentDidChange(idx, amt, len - amt);
+    
     return this;
   },
   
@@ -402,7 +404,8 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
   
   /** @private */
   unknownProperty: function(key, value) {
-    var ret = this.reducedProperty(key, value);
+    var ret;
+    if (SC.typeOf(key) === SC.T_STRING) ret = this.reducedProperty(key, value);
     return ret === undefined ? sc_super() : ret;
   },
 

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

@@ -21,7 +21,7 @@ sc_require('models/record');
   array.
   
   The information below about RecordArray internals is only intended for those
-  who need to override this class for some reason to do some special.
+  who need to override this class for some reason to do something special.
   
   h2. Internal Notes
   
@@ -30,14 +30,20 @@ sc_require('models/record');
   storeKeys.  The underlying array can be a real array or it may be a 
   SparseArray, which is how you implement incremental loading.
   
-  If the RecordArray is created with an SC.Query objects as well (and it 
+  If the RecordArray is created with an SC.Query object as well (and it 
   almost always will have a Query object), then the RecordArray will also 
   consult the query for various delegate operations such as determining if 
   the record array should update automatically whenever records in the store
-  changes.
+  changes. It will also ask the Query to refresh the storeKeys whenever records 
+  change in the store.
+  
+  If the SC.Query object has complex matching rules, it might be 
+  computationally heavy to match a large dataset to a query. To avoid the 
+  browser from ever showing a slow script timer in this scenario, the query
+  matching is by default paced at 100ms. If query matching takes longer than 
+  100ms, it will chunk the work with setTimeout to avoid too much computation
+  to happen in one runloop.
   
-  It will also ask the Query to refresh the storeKeys whenever records change
-  in the store.
   
   @extends SC.Object
   @extends SC.Enumerable
@@ -470,13 +476,20 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
         changed   = this._scq_changedStoreKeys,
         didChange = NO,
         K         = SC.Record,
+        storeKeysToPace = [],
+        startDate = new Date(),
         rec, status, recordType, sourceKeys, scope, included;
-
+    
     // if we have storeKeys already, just look at the changed keys
     var oldStoreKeys = storeKeys;
     if (storeKeys && !_flush) {
+      
       if (changed) {
         changed.forEach(function(storeKey) {
+          if(storeKeysToPace.length>0 || new Date()-startDate>SC.RecordArray.QUERY_MATCHING_THRESHOLD) {
+            storeKeysToPace.push(storeKey);
+            return;
+          }
           // get record - do not include EMPTY or DESTROYED records
           status = store.peekStatus(storeKey);
           if (!(status & K.EMPTY) && !((status & K.DESTROYED) || (status === K.BUSY_DESTROYING))) {
@@ -497,10 +510,14 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
               storeKeys.removeObject(storeKey);
             } // if (storeKeys.indexOf)
           } // if (included)
+          
         }, this);
         // make sure resort happens
         didChange = YES ;
+        
       } // if (changed)
+      
+      //console.log(this.toString() + ' partial flush took ' + (new Date()-startDate) + ' ms');
     
     // if no storeKeys, then we have to go through all of the storeKeys 
     // and decide if they belong or not.  ick.
@@ -509,7 +526,6 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
       // collect the base set of keys.  if query has a parent scope, use that
       if (scope = query.get('scope')) {
         sourceKeys = scope.flush().get('storeKeys');
-
       // otherwise, lookup all storeKeys for the named recordType...
       } else if (recordType = query.get('expandedRecordTypes')) {
         sourceKeys = SC.IndexSet.create();
@@ -517,11 +533,16 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
           sourceKeys.addEach(store.storeKeysFor(recordType));
         });
       }
-
+      
       // loop through storeKeys to determine if it belongs in this query or 
       // not.
       storeKeys = [];
       sourceKeys.forEach(function(storeKey) {
+        if(storeKeysToPace.length>0 || new Date()-startDate>SC.RecordArray.QUERY_MATCHING_THRESHOLD) {
+          storeKeysToPace.push(storeKey);
+          return;
+        }
+        
         status = store.peekStatus(storeKey);
         if (!(status & K.EMPTY) && !((status & K.DESTROYED) || (status === K.BUSY_DESTROYING))) {
           rec = store.materializeRecord(storeKey);
@@ -529,9 +550,27 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
         }
       });
       
+      //console.log(this.toString() + ' full flush took ' + (new Date()-startDate) + ' ms');
+      
       didChange = YES ;
     }
-
+    
+    // if we reach our threshold of pacing we need to schedule the rest of the
+    // storeKeys to also be updated
+    if(storeKeysToPace.length>0) {
+      var self = this;
+      // use setTimeout here to guarantee that we hit the next runloop, 
+      // and not the same runloop which the invoke* methods do not guarantee
+      window.setTimeout(function() {
+        SC.run(function() {
+          if(!self || self.get('isDestroyed')) return;
+          self.set('needsFlush', YES);
+          self._scq_changedStoreKeys = SC.IndexSet.create().addEach(storeKeysToPace);
+          self.flush();
+        });
+      }, 1);
+    }
+    
     // clear set of changed store keys
     if (changed) changed.clear();
     
@@ -653,5 +692,14 @@ SC.RecordArray.mixin({
     
     @property {SC.Error}
   */
-  NOT_EDITABLE: SC.Error.desc("SC.RecordArray is not editable")
+  NOT_EDITABLE: SC.Error.desc("SC.RecordArray is not editable"),
+  
+  /**
+    Number of milliseconds to allow a query matching to run for. If this number
+    is exceeded, the query matching will be paced so as to not lock up the 
+    browser (by essentially splitting the work with a setTimeout)
+    
+    @property {Number}
+  */
+  QUERY_MATCHING_THRESHOLD: 100
 });

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

@@ -92,7 +92,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     var ret = this.get('dataSource');
     if (typeof ret === SC.T_STRING) {
       ret = SC.objectForPropertyPath(ret);
-      if (ret) ret = ret.create();
+      if (ret && ret.isClass) ret = ret.create();
       if (ret) this.set('dataSource', ret);
     }
     return ret;
@@ -243,15 +243,6 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
   */
   changelog: null,
   
-  /**
-    A set of SC.RecordArray that have been returned from findAll with an 
-    SC.Query. These will all be notified with _notifyRecordArraysWithQuery() 
-    whenever the store changes.
-  
-    @property {Array}
-  */
-  recordArraysWithQuery: null,
-  
   /**
     An array of SC.Error objects associated with individual records in the
     store (indexed by store keys).
@@ -1599,7 +1590,6 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     @returns {Boolean} if the action was succesful.
   */
   commitRecords: function(recordTypes, ids, storeKeys, params) {
-    
     var source    = this._getDataSource(),
         isArray   = SC.typeOf(recordTypes) === SC.T_ARRAY,    
         retCreate= [], retUpdate= [], retDestroy = [], 
@@ -1815,8 +1805,8 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     ret = storeKey = recordType.storeKeyFor(id); // needed to cache
       
     if (this.readStatus(storeKey) & K.BUSY) {
-        this.dataSourceDidComplete(storeKey, dataHash, id);
-      } else this.pushRetrieve(recordType, id, dataHash, storeKey);
+      this.dataSourceDidComplete(storeKey, dataHash, id);
+    } else this.pushRetrieve(recordType, id, dataHash, storeKey);
     
     // return storeKey
     return ret ;
@@ -2338,7 +2328,8 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     storeKey.  As opposed to storeKeyFor() however, this method
     will NOT generate a new storeKey but returned undefined.
     
-    @param {String} id a record id
+    @param {SC.Record} recordType the record type
+    @param {String} primaryKey the primary key
     @returns {Number} a storeKey.
   */
   storeKeyExists: function(recordType, primaryKey) {

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

@@ -18,6 +18,7 @@ if (!SC.LOG_RUNLOOP_INVOCATIONS) SC.LOG_RUNLOOP_INVOCATIONS = false;
 
 
 SC.addInvokeOnceLastDebuggingInfo = function() {
+  return;
   
   SC.ObserverSet.add = function(target, method, context, originatingTarget, originatingMethod, originatingStack) {
     var targetGuid = (target) ? SC.guidFor(target) : "__this__";
@@ -35,12 +36,10 @@ SC.addInvokeOnceLastDebuggingInfo = function() {
     // context is really useful sometimes but not used that often so this
     // implementation is intentionally lazy.
     if (context !== undefined) {
-      if (!methods.contexts) methods.contexts = {} ;
-      methods.contexts[SC.guidFor(method)] = context ;
+      var contexts = methods.contexts || (methods.contexts = {}) ;
+      contexts[SC.guidFor(method)] = context ;
     }
-
-    this._membersCacheIsValid = NO ;
-
+    
     // THIS IS THE PORTION THAT DIFFERS FROM THE STANDARD IMPLEMENTATION
     
     // Recording the calling object/function can be a useful debugging tool.

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

@@ -60,17 +60,41 @@
 
 /* @group Icon */
 
+.sc-list-item-view img.icon,
+.sc-list-item-view img.right-icon {
+	margin-top: -9px;
+	position: absolute;
+	top: 50%;
+}
+
 .sc-list-item-view img.icon {
-	position: absolute ;
 	left: 5px;
-	top: 50%;
-	margin-top: -9px;
 }
 
 .sc-list-item-view.has-checkbox img.icon {
 	left: 25px;
 }
 
+.sc-list-item-view img.right-icon {
+  right: 5px;
+}
+
+.sc-list-item-view.has-count img.right-icon {
+  right: 32px;
+}
+.sc-list-item-view.has-count.two-digit img.right-icon {
+  right: 38px;
+}
+.sc-list-item-view.has-count.three-digit img.right-icon {
+  right: 44px;
+}
+.sc-list-item-view.has-count.four-digit img.right-icon {
+  right: 50px;
+}
+.sc-list-item-view.has-count.five-digit img.right-icon {
+  right: 56px;
+}
+
 /* @end */
 
 /* @group Checkbox */

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

@@ -1,12 +1,6 @@
 .sc-segmented-view {
   display: block;
-  text-align: center;
-}
-
-.sc-segmented-view .sc-segment {
-	text-decoration: none ;
-	color: black ;
-	text-align: center;
+  white-space: nowrap;
 }
 
 .sc-segment:active, .sc-segment:focus {
@@ -25,12 +19,15 @@
 /* @group Layout */
 
 .sc-segmented-view .sc-segment {
-	display: block;
+	display: inline-block;
 	top: 0;
 	height: 22px;
 	line-height: 22px;
 	border-right: 1px #555 solid;
 	text-shadow: #b0b0b0 0px 1px 0px;
+	text-decoration: none ;
+	color: black ;
+	text-align: center;
 }
 
 .sc-segmented-view .sc-button-inner {

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

@@ -27,7 +27,7 @@ SC.CollectionFastPath = {
   */
   createItemViewFromExampleView: function(exampleView, attrs) {
     // create the example view
-    var ret = exampleView.create(attrs);
+    var ret = this.createItemView(exampleView, null, attrs);
     
     // for our pooling, if it is poolable, mark the view as poolable and
     // give it a reference to its pool.

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

@@ -23,13 +23,41 @@ SC.CollectionRowDelegate = {
   isCollectionRowDelegate: YES,
   
   /**
-    Default row height.  Unless you implement some custom row height 
+    Default item height. Size of an item without spacing or padding. 
+    Unless you implement some custom row height 
     support, this row height will be used for all items.
     
     @property
     @type Number
   */
-  rowHeight: 18,
+  itemHeight: 18,
+  
+  /**
+    Default row spacing. This inserts empty space between rows that you can use for borders.
+    
+    @property
+    @type Number
+  */
+  rowSpacing: 0,
+  
+  /**
+    Default row padding. 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.
+    
+    @property
+    @type Number
+  */
+  rowPadding: 0,
+  
+  /**
+    Total row height used for calculation. Equal to itemHeight + twice rowPadding.
+    
+    @property
+    @type Number
+  */
+  rowHeight: function() {
+    return this.get('itemHeight') + this.get('rowPadding') * 2;
+  }.property('itemHeight', 'rowPadding'),
 
   /**
     Index set of rows that should have a custom row height.  If you need 
@@ -56,6 +84,4 @@ SC.CollectionRowDelegate = {
   contentIndexRowHeight: function(view, content, contentIndex) {
     return this.get('rowHeight');    
   }
-  
-  
 };

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

@@ -0,0 +1,130 @@
+// ========================================================================
+// SproutCore -- JavaScript Application Framework
+// Copyright ©2006-2011, Strobe Inc. and contributors.
+// Portions copyright ©2008 Apple Inc.  All rights reserved.
+// ========================================================================
+
+/**
+  @namespace
+  NavigationBuilder is an implementation of the Builder protocol. It implements
+  buildIn/Out (though these only relay to buildIn/OutNavigation, so feel free to
+  override if needed; the navigation builders will still be accessible).
+  
+  Building in and out animates the view in and out to and from the left and right.
+*/
+
+SC.NavigationBuilder = {
+  /*@scope SC.NavigationBuilder.prototype */ // YOU LIE! But it helps docs.
+  
+  isNavigationBuilder: YES,
+  
+  /**
+    The transitions to be used for navigation; these are mixed in to the existing
+    transitions hash if one exists, or become the transitions hash otherwise.
+    
+    If NO, it uses the (hard-coded) defaults.
+  */
+  navigationTransitions: NO,
+  
+  initMixin: function() {
+    // force integrate SC.Animatable
+    var animatable = SC.Animatable;
+    if (animatable && !this.isAnimatable) {
+      // okay, let's mix it in!
+      this.mixin(animatable);
+    } else if (!animatable) { 
+      // check that we actually have SC.Animatable
+      console.error(
+        "SC.NavigationView and SC.NavigationBuilder require SC.Animatable " + 
+        "to perform animations, but it is not present. Please ensure your app or framework " +
+        "references it."
+      );
+    }
+    
+    var navigationTransitions = this.get("navigationTransitions");
+    if (!navigationTransitions && SC.Animatable) {
+      navigationTransitions = {
+        // these being identical helps us.
+        left: { duration: 0.25, timing: SC.Animatable.TRANSITION_EASE_IN_OUT, action: "navigationBuildDidFinish" },
+        transform: { duration: 0.25, timing: SC.Animatable.TRANSITION_EASE_IN_OUT, action: "navigationBuildDidFinish" }
+      };
+    }
+    
+    // mix in transitions (a base set will have been added by SC.Animatable alrady)
+    if (SC.Animatable) SC.mixin(this.transitions, navigationTransitions);
+  },
+  
+  /**
+    @private
+    Determines metrics of the view. This may be adapted to work with non-CSS transforms in future...
+  */
+  metrics: function() {
+    var f = this.computeFrameWithParentFrame();
+    return f;
+  },
+  
+  /**
+    @private
+    Applies the supplied CSS transform.
+  */
+  transform: function(pos) {
+    if (SC.platform.supportsCSS3DTransforms) {
+      this.adjust("transform", "translate3d(" + pos + "px,0px,0px)");
+    } else {
+      this.adjust("transform", "translate(" + pos + "px,0px)");
+    }
+  },
+  
+  /**
+    Builds in the navigation.
+  */
+  buildInNavigation: function() {
+    // set initial state
+    var metrics = this.metrics();
+    this.disableAnimation();
+    this.transform(this.get("buildDirection") === SC.TO_LEFT ? metrics.width : -metrics.width);
+    this.enableAnimation();
+    
+    // now, (delayed) call transform to go to the correct spot
+    this.invokeLater("transform", 10, 0);
+  },
+  
+  buildOutNavigation: function() {
+    // we already have an initial state
+    var metrics = this.metrics();
+    this.transform(this.get("buildDirection") === SC.TO_LEFT ? -metrics.width : metrics.width);
+  },
+  
+  /**
+    You may override this. If you do, call buildInNavigation to call the original functionality.
+    You may need to override navigationBuildDidFinish as well if you call buildInNavigation.
+  */
+  buildIn: function() {
+    this.buildInNavigation();
+  },
+  
+  /**
+    You may override this. If you do, call buildOutNavigation to call the original functionality.
+    You may need to override navigationBuildDidFinish as well if you call buildOutNavigation.
+  */
+  buildOut: function() {
+    this.buildOutNavigation();
+  },
+  
+  /**
+    This ensures that the view has a CSS transform set, even if it is added without build in, etc.
+  */
+  resetBuild: function() {
+    this.transform(0);
+  },
+  
+  /**
+    Called when the transitions finish.
+  */
+  navigationBuildDidFinish: function() {
+    if (this.isBuildingIn) this.buildInDidFinish();
+    else if (this.isBuildingOut) this.buildOutDidFinish();
+  }
+  
+} ;
+