sproutcore 1.11.0.rc1 → 1.11.0.rc2

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

@@ -39,7 +39,7 @@ window.SproutCore = window.SproutCore || SC;
 // rest of the methods go into the mixin defined below.
 
 /**
-  @version 1.11.0.rc1
+  @version 1.11.0.rc2
   @namespace
 
   All SproutCore methods and functions are defined
@@ -56,7 +56,7 @@ window.SproutCore = window.SproutCore || SC;
 */
 SC = window.SC; // This is dumb but necessary for jsdoc to get it right
 
-SC.VERSION = '1.11.0.rc1';
+SC.VERSION = '1.11.0.rc2';
 
 /**
   @private

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

@@ -274,6 +274,7 @@ SC.Observable = /** @scope SC.Observable.prototype */ {
       if (ret.isCacheable) {
         cache = this._kvo_cache;
         if (!cache) cache = this._kvo_cache = {};
+
         return (cache[ret.cacheKey] !== undefined) ? cache[ret.cacheKey] : (cache[ret.cacheKey] = ret.call(this, key));
       } else return ret.call(this, key);
     } else return ret;
@@ -337,9 +338,9 @@ SC.Observable = /** @scope SC.Observable.prototype */ {
     if (value === undefined && SC.typeOf(key) === SC.T_HASH) {
       var hash = key;
 
-      for (key in hash) {
-        if (!hash.hasOwnProperty(key)) continue;
-        this.set(key, hash[key]);
+      for (var hashKey in hash) {
+        if (!hash.hasOwnProperty(hashKey)) continue;
+        this.set(hashKey, hash[hashKey]);
       }
 
       return this;
@@ -1204,10 +1205,13 @@ SC.Observable = /** @scope SC.Observable.prototype */ {
         changes.add('*');
         changes.addEach(this._kvo_for('_kvo_observed_keys', SC.CoreSet));
 
-      } else if (key) changes.add(key);
+      } else if (key) {
+        changes.add(key);
+      }
 
       // Now go through the set and add all dependent keys...
-      if (dependents = this._kvo_dependents) {
+      dependents = this._kvo_dependents;
+      if (dependents) {
 
         // NOTE: each time we loop, we check the changes length, this
         // way any dependent keys added to the set will also be evaluated...
@@ -1467,7 +1471,7 @@ SC.Observable = /** @scope SC.Observable.prototype */ {
     seenValues = valueCache[context] || {};
     seenRevisions = revisionCache[context] || {};
 
-    // prepare too loop!
+    // prepare to loop!
     ret = false;
     currentRevision = this._kvo_revision;
     idx = arguments.length;
@@ -1576,11 +1580,10 @@ SC.Observable = /** @scope SC.Observable.prototype */ {
     @returns {Array} Values of property keys.
   */
   getEach: function () {
-    var keys = SC.A(arguments),
-      ret = [], idx, idxLen;
+    var ret = [], idx, idxLen;
 
-    for (idx = 0, idxLen = keys.length; idx < idxLen; idx++) {
-      ret[ret.length] = this.getPath(keys[idx]);
+    for (idx = 0, idxLen = arguments.length; idx < idxLen; idx++) {
+      ret[ret.length] = this.getPath(arguments[idx]);
     }
     return ret;
   },

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

@@ -87,7 +87,8 @@ SC.IndexSet = SC.mixin({},
     if (SC.none(start) && !SC.none(length)) lengthIsValid = NO; // stay invalid.
     else if (SC.none(length)) lengthIsValid = YES;
     else if (SC.typeOf(length) === SC.T_NUMBER && !isNaN(length)) lengthIsValid = YES;
-    // Check validitty and throw if needed.
+
+    // Check validity and throw if needed.
     if (!startIsValid || !lengthIsValid) {
       var argsString = SC.A(arguments).join(', ');
       throw new Error("SC.IndexSet created with invalid parameters (%@). You must call SC.IndexSet with zero, one or two valid numeric arguments.".fmt(argsString));

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

@@ -26,7 +26,9 @@ SC.BENCHMARK_OBJECTS = NO;
 SC._detect_base = function _detect_base(func, parent, name) {
 
   return function invoke_superclass_method() {
-    var base = parent[name], args;
+    var base = parent[name],
+      args,
+      i, len;
 
     //@if(debug)
     if (!base) {
@@ -44,13 +46,16 @@ SC._detect_base = function _detect_base(func, parent, name) {
     //if(base && func === base) { func.base = function () {}; }
     //else { func.base = base; }
 
+    // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
+    // TODO: Add macro to build tools for this.
     if (func.isEnhancement) {
-      // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
-      // TODO: Add macro to build tools for this.
+      // Fast copy.
       args = new Array(arguments.length - 1); // Array.prototype.slice.call(arguments, 1)
-      for (var i = 0, len = args.length; i < len; i++) { args[i] = arguments[i + 1]; }
+      for (i = 0, len = args.length; i < len; i++) { args[i] = arguments[i + 1]; }
     } else {
-      args = arguments;
+      // Fast copy.
+      args = new Array(arguments.length);
+      for (i = 0, len = args.length; i < len; i++) { args[i] = arguments[i]; }
     }
 
     return base.apply(this, args);
@@ -230,16 +235,30 @@ SC._object_extend = function _object_extend(base, ext, proto) {
 
 /** @private */
 SC._enhance = function (originalFunction, enhancement) {
+
   return function () {
     // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
     // TODO: Add macro to build tools for this.
-    var args = new Array(arguments.length + 1); // Array.prototype.slice.call(arguments)
-    for (var i = 1, len = args.length; i < len; i++) { args[i] = arguments[i - 1]; }
+    var enhancedArgs = new Array(arguments.length + 1); // Array.prototype.slice.call(arguments)
+    for (var i = 1, len = enhancedArgs.length; i < len; i++) {
+      enhancedArgs[i] = arguments[i - 1];
+    }
 
+    // Add the original function as the first argument passed to the enhancement.
     var self = this;
-    args[0] = function () { return originalFunction.apply(self, arguments); }; // args.unshift(function ...
-    return enhancement.apply(this, args);
+    enhancedArgs[0] = function () {
+      // Fast copy.
+      var originalArgs = new Array(arguments.length);
+      for (var i = 0, len = originalArgs.length; i < len; i++) {
+        originalArgs[i] = arguments[i];
+      }
+
+      return originalFunction.apply(self, originalArgs);
+    }; // args.unshift(function ...
+
+    return enhancement.apply(this, enhancedArgs);
   };
+
 };
 
 /** @class

data/lib/frameworks/sproutcore/frameworks/runtime/system/set.js

@@ -277,16 +277,18 @@ SC.Set = SC.mixin({},
   add: function(obj) {
     if (this.isFrozen) throw SC.FROZEN_ERROR;
 
-    // cannot add null to a set.
-    if (SC.none(obj)) return this;
-
-    // Implementation note:  SC.hashFor() is inlined because sets are
+    // Implementation note:  SC.none() and SC.hashFor() is inlined because sets are
     // fundamental in SproutCore, and the inlined code is ~ 25% faster than
     // calling SC.hashFor() in IE8.
+
+    // Cannot add null to a set.
+    if (obj === null || obj === undefined) return this;
+
     var hashFunc,
         guid = ((hashFunc = obj.hash) && (typeof hashFunc === "function")) ? hashFunc.call(obj) : SC.guidFor(obj),
         idx  = this[guid],
         len  = this.length;
+
     if ((idx >= len) || (this[idx] !== obj)) {
       this[len] = obj;
       this[guid] = len;
@@ -296,7 +298,7 @@ SC.Set = SC.mixin({},
 
     if (this.isObservable) this.enumerableContentDidChange();
 
-    return this ;
+    return this;
   },
 
   /**

data/lib/frameworks/sproutcore/frameworks/statechart/ext/function.js

@@ -11,52 +11,52 @@
   Extends the JS Function object with the handleEvents method that
   will provide more advanced event handling capabilities when constructing
   your statechart's states.
-  
-  By default, when you add a method to a state, the state will react to 
+
+  By default, when you add a method to a state, the state will react to
   events that matches a method's name, like so:
-  
+
   {{{
-  
+
     state = SC.State.extend({
-    
+
       // Will be invoked when a event named "foo" is sent to this state
       foo: function(event, sender, context) { ... }
-    
+
     })
-  
+
   }}}
-  
-  In some situations, it may be advantageous to use one method that can react to 
+
+  In some situations, it may be advantageous to use one method that can react to
   multiple events instead of having multiple methods that essentially all do the
   same thing. In order to set a method to handle more than one event you use
   the handleEvents method which can be supplied a list of string and/or regular
   expressions. The following example demonstrates the use of handleEvents:
-  
+
   {{{
-  
+
     state = SC.State.extend({
-    
+
       eventHandlerA: function(event, sender, context) {
-      
+
       }.handleEvents('foo', 'bar'),
-      
+
       eventHandlerB: function(event, sender, context) {
-      
+
       }.handleEvents(/num\d/, 'decimal')
-    
+
     })
-  
+
   }}}
-  
+
   Whenever events 'foo' and 'bar' are sent to the state, the method eventHandlerA
   will be invoked. When there is an event that matches the regular expression
-  /num\d/ or the event is 'decimal' then eventHandlerB is invoked. In both 
-  cases, the name of the event will be supplied to the event handler. 
-  
+  /num\d/ or the event is 'decimal' then eventHandlerB is invoked. In both
+  cases, the name of the event will be supplied to the event handler.
+
   It should be noted that the use of regular expressions may impact performance
   since that statechart will not be able to fully optimize the event handling logic based
-  on its use. Therefore the use of regular expression should be used sparingly. 
-  
+  on its use. Therefore the use of regular expression should be used sparingly.
+
   @param {(String|RegExp)...} args
 */
 Function.prototype.handleEvents = function() {
@@ -67,43 +67,43 @@ Function.prototype.handleEvents = function() {
 
 /**
   Extends the JS Function object with the stateObserves method that will
-  create a state observe handler on a given state object. 
-  
-  Use a stateObserves() instead of the common observes() method when you want a 
-  state to observer changes to some property on the state itself or some other 
-  object. 
-  
+  create a state observe handler on a given state object.
+
+  Use a stateObserves() instead of the common observes() method when you want a
+  state to observer changes to some property on the state itself or some other
+  object.
+
   Any method on the state that has stateObserves is considered a state observe
   handler and behaves just like when you use observes() on a method, but with an
   important difference. When you apply stateObserves to a method on a state, those
   methods will be active *only* when the state is entered, otherwise those methods
   will be inactive. This removes the need for you having to explicitly call
   addObserver and removeObserver. As an example:
-  
+
   {{{
-  
+
     state = SC.State.extend({
-    
+
       foo: null,
-      
+
       user: null,
-    
+
       observeHandlerA: function(target, key) {
-        
+
       }.stateObserves('MyApp.someController.status'),
-      
+
       observeHandlerB: function(target, key) {
-      
+
       }.stateObserves('foo'),
-      
+
       observeHandlerC: function(target, key) {
-      
+
       }.stateObserves('.user.name', '.user.salary')
-    
+
     })
-  
+
   }}}
-  
+
   Above, state has three state observe handlers: observeHandlerA, observeHandlerB, and
   observeHandlerC. When state is entered, the state will automatically add itself as
   an observer for all of its registered state observe handlers. Therefore when
@@ -111,12 +111,17 @@ Function.prototype.handleEvents = function() {
   changes then observeHandlerA will be invoked. The moment that state is exited then
   the state will automatically remove itself as an observer for all of its registered
   state observe handlers. Therefore none of the state observe handlers will be
-  invoked until the next time the state is entered. 
-  
+  invoked until the next time the state is entered.
+
   @param {String...} args
 */
 Function.prototype.stateObserves = function() {
   this.isStateObserveHandler = YES;
-  this.args = SC.A(arguments);
+
+  // Fast arguments access.
+  // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
+  this.args = new Array(arguments.length); // SC.A(arguments)
+  for (var i = 0, len = this.args.length; i < len; i++) { this.args[i] = arguments[i]; }
+
   return this;
-};
+};

data/lib/frameworks/sproutcore/frameworks/statechart/system/state.js

@@ -323,9 +323,6 @@ SC.State = SC.Object.extend(
         matchedInitialSubstate = NO,
         initialSubstate = this.get('initialSubstate'),
         substatesAreConcurrent = this.get('substatesAreConcurrent'),
-        statechart = this.get('statechart'),
-        i = 0,
-        len = 0,
         valueIsFunc = NO,
         historyState = null;
 
@@ -1324,7 +1321,7 @@ SC.State = SC.Object.extend(
     statechart framework use.
   */
   _configureAllStateObserveHandlers: function(action) {
-    var key, values, value, dotIndex, path, observer, i, root;
+    var key, values, dotIndex, path, observer, i, root;
 
     for (key in this._registeredStateObserveHandlers) {
       values = this._registeredStateObserveHandlers[key];
@@ -1465,7 +1462,13 @@ SC.State = SC.Object.extend(
   @param args {Hash,...} Optional. Hash objects to be added to the created state
 */
 SC.State.plugin = function(value) {
-  var args = SC.A(arguments); args.shift();
+  var args;
+
+  // Fast arguments access.
+  // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
+  args = new Array(arguments.length - 1); // SC.A(arguments).shift()
+  for (var i = 0, len = args.length; i < len; i++) { args[i] = arguments[i + 1]; }
+
   var func = function() {
     var klass = SC.objectForPropertyPath(value);
     if (!klass) {

data/lib/frameworks/sproutcore/frameworks/statechart/system/statechart.js

@@ -742,7 +742,12 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
       return;
     }
 
-    var args = this._processGotoStateArgs(arguments);
+    // Fast arguments access.
+    // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
+    var args = new Array(arguments.length); //  SC.$A(arguments)
+    for (var i = 0, len = args.length; i < len; i++) { args[i] = arguments[i]; }
+
+    args = this._processGotoStateArgs(args);
 
     state = args.state;
     fromCurrentState = args.fromCurrentState;
@@ -1130,7 +1135,12 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
       return;
     }
 
-    var args = this._processGotoStateArgs(arguments);
+    // Fast arguments access.
+    // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
+    var args = new Array(arguments.length); //  SC.$A(arguments)
+    for (var i = 0, len = args.length; i < len; i++) { args[i] = arguments[i]; }
+
+    args = this._processGotoStateArgs(args);
 
     state = args.state;
     fromCurrentState = args.fromCurrentState;
@@ -1630,7 +1640,6 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
       len = null,
       value = null;
 
-    args = SC.$A(args);
     args = args.filter(function (item) {
       return item !== undefined;
     });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sproutcore
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc1
+  version: 1.11.0.rc2
 platform: ruby
 authors:
 - Strobe, Inc., Apple Inc. and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack