sproutcore 1.0.1046 → 1.0.1049.pre.1

data/frameworks/sproutcore/frameworks/runtime/mixins/freezable.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 require('private/observer_set') ;
@@ -424,7 +424,7 @@ SC.Observable = {
         cachedep, idx, dfunc, cache, func,
         log = SC.LOG_OBSERVERS && !(this.LOG_OBSERVING===NO);
 
-    if (this._kvo_cacheable && (cache = this._kvo_cache)) {
+    if (cache = this._kvo_cache) {
 
       // clear any cached value
       if (!_keepCache) {
@@ -434,18 +434,20 @@ SC.Observable = {
         }
       }
 
-      // if there are any dependent keys and they use caching, then clear the
-      // cache.  This is the same code as is in set.  It is inlined for perf.
-      cachedep = this._kvo_cachedep;
-      if (!cachedep || (cachedep = cachedep[key])===undefined) {
-        cachedep = this._kvo_computeCachedDependentsFor(key);
-      }
+      if (this._kvo_cacheable) {
+        // if there are any dependent keys and they use caching, then clear the
+        // cache.  This is the same code as is in set.  It is inlined for perf.
+        cachedep = this._kvo_cachedep;
+        if (!cachedep || (cachedep = cachedep[key])===undefined) {
+          cachedep = this._kvo_computeCachedDependentsFor(key);
+        }
 
-      if (cachedep) {
-        idx = cachedep.length;
-        while(--idx>=0) {
-          dfunc = cachedep[idx];
-          cache[dfunc.cacheKey] = cache[dfunc.lastSetValueKey] = undefined;
+        if (cachedep) {
+          idx = cachedep.length;
+          while(--idx>=0) {
+            dfunc = cachedep[idx];
+            cache[dfunc.cacheKey] = cache[dfunc.lastSetValueKey] = undefined;
+          }
         }
       }
     }
@@ -1222,21 +1224,25 @@ SC.Observable = {
     Increments the value of a property.
     
     @param key {String} property name
+    @param increment {Number} the amount to increment (optional)
     @returns {Number} new value of property
   */
-  incrementProperty: function(key) { 
-    this.set(key,(this.get(key) || 0)+1); 
+  incrementProperty: function(key,increment) {
+    if (!increment) increment = 1;
+    this.set(key,(this.get(key) || 0)+increment); 
     return this.get(key) ;
   },
 
   /**  
-    decrements a property
+    Decrements the value of a property.
     
     @param key {String} property name
+    @param increment {Number} the amount to decrement (optional)
     @returns {Number} new value of property
   */
-  decrementProperty: function(key) {
-    this.set(key,(this.get(key) || 0) - 1 ) ;
+  decrementProperty: function(key,increment) {
+    if (!increment) increment = 1;
+    this.set(key,(this.get(key) || 0) - increment) ;
     return this.get(key) ;
   },
 
@@ -1315,7 +1321,7 @@ SC.Observable = {
 
 /** @private used by addProbe/removeProbe */
 SC.logChange = function logChange(target, key, value) {
-  console.log("CHANGE: %@[%@] => %@".fmt(target, key, target.get(key))) ;
+  console.log("CHANGE: %@[%@] =>".fmt(target, key), target.get(key));
 };
 
 /**

data/frameworks/sproutcore/frameworks/runtime/private/chain_observer.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 require('system/object');

data/frameworks/sproutcore/frameworks/runtime/private/observer_queue.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('mixins/observable');

data/frameworks/sproutcore/frameworks/runtime/private/observer_set.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 // ........................................................................
@@ -52,7 +52,7 @@ SC.ObserverSet = {
     // implementation is intentionally lazy.
     if (context !== undefined) {
       var contexts = methods.contexts ;
-      if (!context) context = methods.contexts = {} ;
+      if (!contexts) contexts = methods.contexts = {} ;
       contexts[SC.guidFor(method)] = context ;
     }
     
@@ -95,14 +95,19 @@ SC.ObserverSet = {
     Note: does not support context
   */
   invokeMethods: function() {
+    var key, value, idx, target, val;
+    
     // iterate through the set, look for sets.
-    for(var key in this) {
+    for(key in this) {
       if (!this.hasOwnProperty(key)) continue ;
-      var value = this[key] ;
+      value = this[key] ;
       if (value && value.isTargetSet) {
-        var idx = value.length;
-        var target = value.target ;
-        while(--idx>=0) value[idx].call(target);
+        idx = value.length;
+        target = value.target ;
+        while(--idx>=0) {
+          val = value[idx];
+          if(val) val.call(target);
+        }
       }
     }
   },

data/frameworks/sproutcore/frameworks/runtime/protocols/observable_protocol.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /**

data/frameworks/sproutcore/frameworks/runtime/protocols/sparse_array_delegate.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /** @namespace

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('system/object') ;
@@ -438,7 +438,7 @@ SC.Binding = {
       
     // connection is completed, disconnect.
     } else {
-      SC.Observers.removeObserver(this._fromPropertyPath, this, this.fromPropertyDidChange, this._fromRoot) ;
+      SC.Observers.removeObserver(this._fromPropertyPath, this, this.fromPropertyDidChange, (this._fromRoot || this._toRoot)) ;
       if (!this._oneWay) {
         SC.Observers.removeObserver(this._toPropertyPath, this, this.toPropertyDidChange, this._toRoot) ;
       }
@@ -459,7 +459,7 @@ SC.Binding = {
     
     // if the new value is different from the current binding value, then 
     // schedule to register an update.
-    if (v !== this._bindingValue) {
+    if (v !== this._bindingValue || key === '[]') {
 
       this._setBindingValue(target, key) ;
       this._changePending = YES ;
@@ -508,9 +508,8 @@ SC.Binding = {
     var source = this._bindingSource,
         key    = this._bindingKey,
         v, idx;
-        
-    if (!source) return ; // nothing to do
-    this._bindingValue = v = source.getPath(key);
+    
+    this._bindingValue = v = (source ? source.getPath(key) : null);
     
     // apply any transforms to get the to property value also
     var transforms = this._transforms;
@@ -651,7 +650,7 @@ SC.Binding = {
 
       // if the new value is different from the current binding value, then 
       // schedule to register an update.
-      if (v !== this._bindingValue) {
+      if (v !== this._bindingValue || key === '[]') {
         this._setBindingValue(target, key) ;
         this._changePending = YES ;
         SC.Binding._changeQueue.add(this) ; // save for later.  
@@ -895,6 +894,60 @@ SC.Binding = {
       return (t == SC.T_ARRAY) ? (v.length > 0) : (v === '') ? NO : !!v ;
     }) ;
   },
+
+  /**
+    Adds a transform that forwards the logical 'AND' of values at 'pathA' and
+    'pathB' whenever either source changes.  Note that the transform acts strictly
+    as a one-way binding, working only in the direction
+    
+      'pathA' AND 'pathB' --> value  (value returned is the result of ('pathA' && 'pathB'))
+
+    Usage example where a delete button's 'isEnabled' value is determined by whether
+    something is selected in a list and whether the current user is allowed to delete:
+    
+      deleteButton: SC.ButtonView.design({
+        isEnabledBinding: SC.Binding.and('MyApp.itemsController.hasSelection', 'MyApp.userController.canDelete')
+      })
+
+  */
+  and: function(pathA, pathB) {
+
+    // create an object to do the logical computation
+    var gate = SC.Object.create({
+      valueABinding: pathA,
+      valueBBinding: pathB,
+
+      and: function() {
+        return (this.get('valueA') && this.get('valueB'));
+      }.property('valueA', 'valueB').cacheable()
+    });
+
+    // add a transform that depends on the result of that computation.
+    return this.from('and', gate).oneWay();
+  },
+
+  /**
+    Adds a transform that forwards the 'OR' of values at 'pathA' and
+    'pathB' whenever either source changes.  Note that the transform acts strictly
+    as a one-way binding, working only in the direction
+
+      'pathA' AND 'pathB' --> value  (value returned is the result of ('pathA' || 'pathB'))
+
+  */
+  or: function(pathA, pathB) {
+    
+    // create an object to the logical computation
+    var gate = SC.Object.create({
+      valueABinding: pathA,
+      valueBBinding: pathB,
+      
+      or: function() {
+        return (this.get('valueA') || this.get('valueB'));
+      }.property('valueA', 'valueB').cacheable()
+    });
+    
+    return this.from('or', gate).oneWay();
+  },
   
   /**
     Adds a transform to convert the value to the inverse of a bool value.  This

data/frameworks/sproutcore/frameworks/runtime/system/enumerator.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /**

data/frameworks/sproutcore/frameworks/runtime/system/error.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /**

data/frameworks/sproutcore/frameworks/runtime/system/index_set.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('mixins/enumerable') ;
@@ -77,6 +77,7 @@ SC.IndexSet = SC.mixin({},
   create: function(start, length) { 
     var ret = SC.beget(this);
     ret.initObservable();
+    ret.registerDependentKey('min', '[]');
     
     // optimized method to clone an index set.
     if (start && start.isIndexSet) {

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('core') ;
@@ -297,8 +297,13 @@ SC.mixin(SC.Object, /** @scope SC.Object */ {
       
     @returns {SC.Object} new instance of the receiver class.
   */
-  create: function(props) { var C=this; return new C(arguments); },
-
+  create: function() {
+    var C=this, ret = new C(arguments); 
+    if (SC.ObjectDesigner) {
+      SC.ObjectDesigner.didCreateObject(ret, SC.$A(arguments));
+    }
+    return ret ; 
+  },
   /**
     Walk like a duck.  You can use this to quickly test classes.
     
@@ -378,8 +383,28 @@ SC.mixin(SC.Object, /** @scope SC.Object */ {
   */
   kindOf: function(scClass) { 
     return (this === scClass) || this.subclassOf(scClass) ;
-  }  
+  },
   
+  // ..........................................................
+  // Designers
+  //   
+  /**
+    This method works just like extend() except that it will also preserve
+    the passed attributes.
+    
+    @param {Hash} attrs Attributes to add to view
+    @returns {Class} SC.Object subclass to create
+    @function
+  */ 
+  design: function() {
+    if (this.isDesign) return this; // only run design one time
+    var ret = this.extend.apply(this, arguments);
+    ret.isDesign = YES ;
+    if (SC.ObjectDesigner) {
+      SC.ObjectDesigner.didLoadDesign(ret, this, SC.A(arguments));
+    }
+    return ret ;
+  }
 }) ;
 
 // ..........................................
@@ -646,8 +671,13 @@ SC.Object.prototype = {
     
     @returns {void}
   */
-  awake: function(key) { 
-    this.outlets.forEach(function(key) { this.get(key); },this) ;
+  awake: function(key) {
+    var outlets = this.outlets,
+        i, len, outlet;
+    for (i = 0, len = outlets.length;  i < len;  ++i) {
+      outlet = outlets[i];
+      this.get(outlet);
+    }
     this.bindings.invoke('sync'); 
   },
 
@@ -701,7 +731,7 @@ SC.Object.prototype = {
     Note that in development mode only, the object and method that call this
     method will be recorded, for help in debugging scheduled code.
     
-    @param {Funciton|String} method method or method name
+    @param {Function|String} method method or method name
     @returns {SC.Object} receiver
   */
   invokeLast: function(method) {

data/frameworks/sproutcore/frameworks/runtime/system/range_observer.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 

data/frameworks/sproutcore/frameworks/runtime/system/run_loop.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore Costello - Property Observing Library
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('private/observer_set');
@@ -54,9 +54,19 @@ SC.RunLoop = SC.Object.extend(/** @scope SC.RunLoop.prototype */ {
     if (SC.LOG_BINDINGS || SC.LOG_OBSERVERS) {
       console.log("-- SC.RunLoop.beginRunLoop at %@".fmt(this._start));
     } 
+    this._runLoopInProgress = YES;
     return this ; 
   },
   
+  /**
+    YES when a run loop is in progress
+  
+    @property {Boolean}
+  */
+  isRunLoopInProgress: function() {
+    return this._runLoopInProgress;
+  }.property(),
+  
   /**
     Call this method whenever you are done executing code.
     
@@ -87,6 +97,9 @@ SC.RunLoop = SC.Object.extend(/** @scope SC.RunLoop.prototype */ {
       console.log("-- SC.RunLoop.endRunLoop ~ End");
     } 
     
+    SC.RunLoop.lastRunLoopEnd = Date.now();
+    this._runLoopInProgress = NO;
+    
     return this ; 
   },
   
@@ -163,10 +176,9 @@ SC.RunLoop = SC.Object.extend(/** @scope SC.RunLoop.prototype */ {
     @returns {Boolean} YES if items were found in any queue, NO otherwise
   */
   flushApplicationQueues: function() {
-    var hadContent = NO ;
-    
-    // execute any methods in the invokeQueue.
-    var queue = this._invokeQueue;
+    var hadContent = NO,
+        // execute any methods in the invokeQueue.
+        queue = this._invokeQueue;
     if (queue && queue.targets > 0) {
       this._invokeQueue = null; // reset so that a new queue will be created
       hadContent = YES ; // needs to execute again
@@ -234,18 +246,35 @@ SC.RunLoop.end = function() {
   return this ;
 } ;
 
+/**
+  Returns YES when a run loop is in progress
+
+  @return {Boolean}
+*/
+SC.RunLoop.isRunLoopInProgress = function() {
+  if(this.currentRunLoop) return this.currentRunLoop.get('isRunLoopInProgress');
+  return NO;
+};
+
 /**
   Helper method executes the passed function inside of a runloop.  Normally
   not needed but useful for testing.
   
   @param {Function} callback callback to execute
   @param {Object} target context for callback
+  @param {Boolean} if YES, does not start/end a new runloop if one is already running
   @returns {SC} receiver
 */
-SC.run = function(callback, target) {
-  SC.RunLoop.begin();
-  callback.call(target);
-  SC.RunLoop.end();
+SC.run = function(callback, target, useExistingRunLoop) {
+  if(useExistingRunLoop) {
+    var alreadyRunning = SC.RunLoop.isRunLoopInProgress();
+    if(!alreadyRunning) SC.RunLoop.begin();
+    callback.call(target);
+    if(!alreadyRunning) SC.RunLoop.end();
+  } else {
+    SC.RunLoop.begin();
+    callback.call(target);
+    SC.RunLoop.end();
+  }
 };
 
-