sproutcore 1.7.1.beta → 1.8.0

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

@@ -71,11 +71,22 @@ SC.Observers = {
       tuple[0].removeObserver(tuple[1], target, method) ;
     }
 
-    idx = this.queue.length; queue = this.queue ;
+    // tests show that the fastest way is to create a new array. On Safari,
+    // it is fastest to set to null then loop over again to collapse, but for all other browsers
+    // it is not. Plus, this code shouldn't get hit very often anyway (it may not ever get hit
+    // for some apps).
+    idx = this.queue.length; queue = this.queue, newQueue = undefined;
     while(--idx >= 0) {
-      item = queue[idx] ;
-      if ((item[0] === propertyPath) && (item[1] === target) && (item[2] == method) && (item[3] === pathRoot)) queue[idx] = null ;
+      item = queue[idx];
+
+      if (item[0] !== propertyPath || item[1] !== target || item[2] !== method || item[3] !== pathRoot) {
+        if (!newQueue) newQueue = [];
+        newQueue.push(item);
+      }
     }
+
+    // even though performance probably won't be a problem, we are defensive about memory alloc.
+    this.queue = newQueue || this.queue;
   },
 
   /**

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

@@ -12,7 +12,7 @@
 /**
   @namespace
 
-  This private class is used to store information about obversers on a
+  This private class is used to store information about observers on a
   particular key.  Note that this object is not observable.  You create new
   instances by calling SC.beget(SC.ObserverSet) ;
 
@@ -24,23 +24,54 @@ SC.ObserverSet = {
   /**
     Adds the named target/method observer to the set.  The method must be
     a function, not a string.
-
-    Note that in debugging mode only, this method is overridden to also record
-    the name of the object and function that resulted in the target/method
-    being added.
   */
   add: function(target, method, context) {
-    var targetGuid = SC.guidFor(target), methodGuid = SC.guidFor(method);
-    var targets = this._members, members = this.members;
+    var targetGuid = SC.guidFor(target),
+        methodGuid = SC.guidFor(method),
+        targets    = this._members,
+        members    = this.members,
+        indexes    = targets[targetGuid],       // get the set of methods
+        index, member;
 
-    // get the set of methods
-    var indexes = targets[targetGuid];
     if ( !indexes ) indexes = targets[targetGuid] = {};
 
-    if (indexes[methodGuid] === undefined) indexes[methodGuid] = members.length;
-    else return;
+    index = indexes[methodGuid];
+    if (index === undefined) {
+      indexes[methodGuid] = members.length;
+      member = [target, method, context];
 
-    members.push([target, method, context]);
+      //@if(debug)
+      // If deferred call logging info was specified (i.e., in debug mode when
+      // such logging is enabled), we need to add it to the enqueued target/
+      // method.
+      member[3] = arguments[3];
+      //@endif
+
+      members.push(member);
+    }
+    else {
+      //@if(debug)
+      // If deferred call logging info was specified (i.e., in debug mode when
+      // such logging is enabled), we need to add it to the enqueued target/
+      // method.
+      var loggingInfo = arguments[3],
+          memberLoggingInfo;
+
+      if (loggingInfo) {
+        member            = members[index];
+        memberLoggingInfo = member[3];
+        if (!memberLoggingInfo) {
+          member[3] = [loggingInfo];
+        }
+        else if (!(memberLoggingInfo instanceof Array)) {
+          member[3] = [memberLoggingInfo, loggingInfo];
+        }
+        else {
+          memberLoggingInfo.push(loggingInfo);
+        }
+      }
+      //@endif
+    }
   },
 
   /**
@@ -77,11 +108,60 @@ SC.ObserverSet = {
   invokeMethods: function() {
     var members = this.members, member;
 
+    //@if(debug)
+    var shouldLog = SC.LOG_DEFERRED_CALLS,
+        target, method, methodName, loggingInfo, loggingInfos,
+        originatingTarget, originatingMethod, originatingMethodName,
+        originatingStack, j, jLen;
+    //@endif
+
     for( var i=0, l=members.length; i<l; i++ ) {
       member = members[i];
 
       // method.call(target);
       member[1].call(member[0]);
+
+      //@if(debug)
+      // If we have logging info specified for who scheduled the particular
+      // invocation, and logging is enabled, then output it.
+      if (shouldLog) {
+        target      = member[0];
+        method      = member[1];
+        methodName  = method.displayName || method;
+        loggingInfo = member[3];
+        if (loggingInfo) {
+          // If the logging info is not an array, that means only one place
+          // scheduled the invocation.
+          if (!(loggingInfo instanceof Array)) {
+            // We'll treat single-scheduler cases specially to make the output
+            // better for the user, even if it means some essentially-duplicated
+            // code.
+            originatingTarget     = loggingInfo.originatingTarget;
+            originatingMethod     = loggingInfo.originatingMethod;
+            originatingStack      = loggingInfo.originatingStack;
+            originatingMethodName = (originatingMethod ? originatingMethod.displayName : "(unknown)") || originatingMethod;
+            SC.Logger.log("Invoking runloop-scheduled method %@ on %@.  Originated by target %@,  method %@,  stack: ".fmt(methodName, target, originatingTarget, originatingMethodName), originatingStack);
+          }
+          else {
+            SC.Logger.log("Invoking runloop-scheduled method %@ on %@, which was scheduled by multiple target/method pairs:".fmt(methodName, target));
+            loggingInfos = loggingInfo;
+            for (j = 0, jLen = loggingInfos.length;  j < jLen;  ++j) {
+              loggingInfo           = loggingInfos[j];
+              originatingTarget     = loggingInfo.originatingTarget;
+              originatingMethod     = loggingInfo.originatingMethod;
+              originatingStack      = loggingInfo.originatingStack;
+              originatingMethodName = (originatingMethod ? originatingMethod.displayName : "(unknown)") || originatingMethod;
+              SC.Logger.log("  [%@]  originated by target %@,  method %@,  stack:".fmt(j, originatingTarget, originatingMethodName), originatingStack);
+            }
+          }
+        }
+        else {
+          // If we didn't capture information for this invocation, just report
+          // what we can.
+          SC.Logger.log("Invoking runloop-scheduled method %@ on %@, but we didn’t capture information about who scheduled it…".fmt(methodName, target));
+        }
+      }
+      //@endif
     }
   },
 
@@ -97,6 +177,9 @@ SC.ObserverSet = {
     for( var i=0, l=memberArray.length; i<l; i++ ) {
       newMembers[i] = SC.clone(memberArray[i]);
       newMembers[i].length = 3;
+      //@if(debug)
+      newMembers[i].length = 4;
+      //@endif
     }
 
     return newSet;
@@ -119,6 +202,8 @@ SC.ObserverSet = {
   }
 
 } ;
+
 SC.ObserverSet.constructor.prototype = SC.ObserverSet;
-SC.ObserverSet.slice = SC.ObserverSet.clone ;
+SC.ObserverSet.slice = SC.ObserverSet.clone;
+SC.ObserverSet.copy = SC.ObserverSet.clone;
 

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

@@ -18,7 +18,7 @@ sc_require('system/object');
 SC.LOG_BINDINGS = NO ;
 
 /**
-  Performance paramter.  This will benchmark the time spent firing each
+  Performance parameter.  This will benchmark the time spent firing each
   binding.
 
   @property {Boolean}
@@ -285,7 +285,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     until you connect the binding.
 
     The binding will search for the property path starting at the root level
-    unless you specify an alternate root object as the second paramter to this
+    unless you specify an alternate root object as the second parameter to this
     method.  Alternatively, you can begin your property path with either "." or
     "*", which will use the root object of the to side be default.  This special
     behavior is used to support the high-level API provided by SC.Object.
@@ -488,12 +488,9 @@ SC.Binding = /** @scope SC.Binding.prototype */{
   },
 
   _scheduleSync: function() {
-    if (SC.RunLoop.isRunLoopInProgress() || this._syncScheduled) { return; }
-
-    this._syncScheduled = YES;
-    var self = this;
-
-    setTimeout(function() { SC.run(); self._syncScheduled = NO; }, 1);
+    if (SC.RunLoop.isRunLoopInProgress() || SC.Binding._syncScheduled) { return; }
+    SC.Binding._syncScheduled = YES;
+    setTimeout(function() { SC.run(); SC.Binding._syncScheduled = NO; }, 1);
   },
 
   /** @private
@@ -650,17 +647,14 @@ SC.Binding = /** @scope SC.Binding.prototype */{
           key = this._fromPropertyKey ;
       if (!target || !key) return this ; // nothing to do
 
-      // in debug, let's check for whether target is a valid observable with getPath.
+      // Let's check for whether target is a valid observable with getPath.
       // Common cases might have it be a Window or a DOM object.
       //
       // If we have a target, it is ready, but if it is invalid, that is WRONG.
-      //
-      // @if (debug)
       if (!target.isObservable) {
         SC.Logger.warn("Cannot bind '%@' to property '%@' on non-observable '%@'".fmt(this._toPropertyPath, key, target));
         return this;
       }
-      // @endif
 
       // get the new value
       var v = target.getPath(key) ;
@@ -855,7 +849,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
   notEmpty: function(fromPath, placeholder) {
     if (placeholder === undefined) placeholder = SC.EMPTY_PLACEHOLDER ;
     return this.from(fromPath).transform(function(value, isForward) {
-      if (SC.none(value) || (value === '') || (SC.isArray(value) && value.length === 0)) {
+      if (SC.none(value) || (value === '') || (SC.isArray(value) && (value.get ? value.get('length') : value.length)=== 0)) {
         value = placeholder ;
       }
       return value ;
@@ -864,7 +858,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
 
   /**
     Adds a transform that will return the placeholder value if the value is
-    null or undefined.  Otherwise it will passthrough untouched.  See also notEmpty().
+    null or undefined.  Otherwise it will pass through untouched.  See also notEmpty().
 
     @param {String} fromPath from path or null
     @param {Object} [placeholder]

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

@@ -10,7 +10,7 @@
 
   An object that iterates over all of the values in an object.
 
-  An instance of this object is returned everytime you call the
+  An instance of this object is returned every time you call the
   enumerator() method on an object that implements the SC.Enumerable mixin.
 
   Once you create an enumerator instance, you can call nextObject() on it

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

@@ -67,8 +67,8 @@ SC.Error = SC.Object.extend(
 
   /**
     The original error object.  Normally this will return the receiver.
-    However, sometimes another object will masquarade as an error; this gives
-    you a way to get at the underyling error.
+    However, sometimes another object will masquerade as an error; this gives
+    you a way to get at the underlying error.
 
     @type SC.Error
   */

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

@@ -15,7 +15,7 @@ sc_require('mixins/copyable');
 
   A collection of ranges.  You can use an IndexSet to keep track of non-
   continuous ranges of items in a parent array.  IndexSet's are used for
-  selection, for managing invalidation ranges and other data-propogation.
+  selection, for managing invalidation ranges and other data-propagation.
 
   Examples
   ---
@@ -69,8 +69,8 @@ SC.IndexSet = SC.mixin({},
   /**
     To create a set, pass either a start and index or another IndexSet.
 
-    @param {Number} start
-    @param {Number} length
+    @param {Number|SC.IndexSet} start The start of the range or an index set.
+    @param {Number} [length] The length of the range (by default set to 1 if start is a Number)
     @returns {SC.IndexSet}
   */
   create: function(start, length) {
@@ -78,6 +78,16 @@ SC.IndexSet = SC.mixin({},
     ret.initObservable();
     ret.registerDependentKey('min', '[]');
 
+    // @if (debug)
+    // Validate the input to ensure that the parameters
+    // match the function definition.
+    // This is here because `create` doesn't follow the
+    // idiomatic SC convention of passing in an object literal to `create`.
+    if (start && !(SC.typeOf(start) === SC.T_NUMBER || start.isIndexSet)) {
+      throw "SC.IndexSet does not accept `%@` as a parameter to `create`. Take a look at the function signature for proper usage.".fmt(start);
+    }
+    // @endif
+
     // optimized method to clone an index set.
     if (start && start.isIndexSet) {
       ret._content = this._sc_sliceContent(start._content);
@@ -164,7 +174,14 @@ SC.IndexSet = SC.mixin({},
     accel = index - (index % SC.IndexSet.HINT_SIZE);
     ret = content[accel];
     if (ret<0 || ret>index) ret = accel;
-    next = Math.abs(content[ret]);
+    next = content[ret];
+
+    // the accelerator pointed to the middle of a range
+    if (next === undefined) {
+      next = this.rangeStartForIndex(ret);
+    } else {
+      next = Math.abs(next);
+    }
 
     // now step forward through ranges until we find one that includes the
     // index.
@@ -817,7 +834,7 @@ SC.IndexSet = SC.mixin({},
   },
 
   /**
-    Invoke the callback, passing each occuppied range instead of each
+    Invoke the callback, passing each occupied range instead of each
     index.  This can be a more efficient way to iterate in some cases.  The
     callback should have the signature:
 
@@ -1137,7 +1154,7 @@ SC.IndexSet = SC.mixin({},
 
   /**
     Usually observing notifications from IndexSet are not useful, so
-    supress them by default.
+    suppress them by default.
 
     @type Boolean
   */

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

@@ -149,6 +149,37 @@ SC.Logger = SC.Object.create(
   // PROPERTIES
   //
 
+  /**
+    An optional prefix that will be prepended to all log messages, but not any
+    group titles.
+
+    @property {String}
+  */
+  messagePrefix: null,
+
+
+  /**
+    An optional prefix that will be prepended to all log messages that are
+    output to the browser console, but not those that are recorded.  If you
+    specify both this and a 'messagePrefix', both will be output, and only the
+    'messagePrefix' will be recorded.
+
+    @property {String}
+  */
+  outputMessagePrefix: null,
+
+
+  /**
+    An optional prefix that will be prepended to all log messages that are
+    recorded, but not those that are output to the browser console.  If you
+    specify both this and a 'messagePrefix', both will be recorded, and only the
+    'messagePrefix' will be output to the browser console.
+
+    @property {String}
+  */
+  recordedMessagePrefix: null,
+
+
   /**
     The current log level determining what is output to the reporter object
     (usually your browser’s console).  Valid values are:
@@ -169,8 +200,8 @@ SC.Logger = SC.Object.create(
 
 
   /**
-    The current log level determining what is output to the reporter object
-    (usually your browser’s console).  Valid values are the same as with
+    The current log level determining what is recorded to the
+    'recordedLogMessages' buffer.  Valid values are the same as with
     'logOutputLevel':
 
       -  SC.LOGGER_LEVEL_DEBUG
@@ -181,7 +212,7 @@ SC.Logger = SC.Object.create(
 
     If you do not specify this value, it will default to SC.LOGGER_LEVEL_NONE.
 
-    @property: {Constant}
+    @property {Constant}
   */
   logRecordingLevel: SC.LOGGER_LEVEL_NONE,
 
@@ -350,7 +381,7 @@ SC.Logger = SC.Object.create(
 
   /**
     Begins a new group in the console and/or in the recorded array provided
-    the respective log levels are set to ouput/record 'debug' messages.
+    the respective log levels are set to output/record 'debug' messages.
     Every message after this call (at any log level) will be indented for
     readability until a matching {@link SC.Logger.debugGroupEnd} is invoked,
     and you can create as many levels as you want.
@@ -445,7 +476,7 @@ SC.Logger = SC.Object.create(
 
   /**
     Begins a new group in the console and/or in the recorded array provided
-    the respective log levels are set to ouput/record 'info' messages.
+    the respective log levels are set to output/record 'info' messages.
     Every message after this call (at any log level) will be indented for
     readability until a matching {@link SC.Logger.infoGroupEnd} is invoked,
     and you can create as many levels as you want.
@@ -541,7 +572,7 @@ SC.Logger = SC.Object.create(
 
   /**
     Begins a new group in the console and/or in the recorded array provided
-    the respective log levels are set to ouput/record 'warn' messages.
+    the respective log levels are set to output/record 'warn' messages.
     Every message after this call (at any log level) will be indented for
     readability until a matching {@link SC.Logger.warnGroupEnd} is invoked,
     and you can create as many levels as you want.
@@ -635,7 +666,7 @@ SC.Logger = SC.Object.create(
 
   /**
     Begins a new group in the console and/or in the recorded array provided
-    the respective log levels are set to ouput/record 'error' messages.
+    the respective log levels are set to output/record 'error' messages.
     Every message after this call (at any log level) will be indented for
     readability until a matching {@link SC.Logger.errorGroupEnd} is invoked,
     and you can create as many levels as you want.
@@ -804,7 +835,7 @@ SC.Logger = SC.Object.create(
         message = entry.message;
         if (message) {
           // It's a message entry.  Were arguments used, or did we format a
-          // message?  If arguments were used, we need to stringfy those
+          // message?  If arguments were used, we need to stringify those
           // instead of using the message.
           originalArguments = entry.originalArguments;
           line =  prefix + this._indentation(indentation);
@@ -851,8 +882,20 @@ SC.Logger = SC.Object.create(
     @returns {Boolean} Whether or not anything was logged
   */
   log: function() {
-    var reporter = this.get('reporter'),
-        ret      = NO;
+    var reporter     = this.get('reporter'),
+        message      = arguments[0],
+        prefix       = this.get('messagePrefix'),
+        outputPrefix = this.get('outputMessagePrefix'),
+        ret          = NO;
+
+    // If the first argument is a string and a prefix was specified, use it.
+    if (message  &&  SC.typeOf(message) === SC.T_STRING) {
+      if (prefix  ||  outputPrefix) {
+        if (prefix)       message = prefix       + message;
+        if (outputPrefix) message = outputPrefix + message;
+        arguments[0] = message;
+      }
+    }
 
     // Log through the reporter.
     if (this.get('exists')) {
@@ -1106,7 +1149,8 @@ SC.Logger = SC.Object.create(
     // Are we configured to show this type?
     var shouldOutput = this._shouldOutputType(type),
         shouldRecord = this._shouldRecordType(type),
-        hasOtherArguments, i, len, args, output, entry;
+        hasOtherArguments, i, len, args, output, entry, prefix,
+        outputPrefix, recordedPrefix;
 
     // If we're neither going to output nor record the message, then stop now.
     if (!(shouldOutput || shouldRecord)) return;
@@ -1134,18 +1178,26 @@ SC.Logger = SC.Object.create(
       }
     }
 
+    // If a message prefix was specified, use it.
+    prefix = this.get('messagePrefix');
+    if (prefix) message = prefix + message;
+
     if (shouldOutput) {
+      outputPrefix = this.get('outputMessagePrefix');
+
       // We only want to pass the original arguments to _outputMessage() if we
       // didn't format the message ourselves.
       args = automaticallyFormat ? null : originalArguments;
-      this._outputMessage(type, null, this._outputIndentationLevel, message, args);
+      this._outputMessage(type, null, this._outputIndentationLevel, (outputPrefix ? outputPrefix + message : message), args);
     }
 
     // If we're recording the log, append the message now.
     if (shouldRecord) {
+      recordedPrefix = this.get('recordedMessagePrefix');
+
       entry = {
         type:      type,
-        message:   message ? message : YES,
+        message:   message ? (recordedPrefix ? recordedPrefix + message : message) : YES,
         timestamp: new Date()
       };
 
@@ -1346,9 +1398,8 @@ SC.Logger = SC.Object.create(
       // If we formatted, just include the message.  Otherwise, include all
       // the original arguments.
       if (!originalArguments) {
-        output = "";
-        if (timestampStr) output = timestampStr;
-        if (shouldIndent) output =+ this._indentation(indentation);
+        output = timestampStr ? timestampStr : "";
+        if (shouldIndent) output += this._indentation(indentation);
         output += message;
         reporter[type](output);
       }
@@ -1493,11 +1544,11 @@ SC.Logger = SC.Object.create(
   */
   _argumentsToString: function() {
     var ret       = "",
-        delimeter = SC.LOGGER_LOG_DELIMITER,
+        delimiter = SC.LOGGER_LOG_DELIMITER,
         i, len;
 
     for (i = 0, len = (arguments.length - 1);  i < len;  ++i) {
-      ret += arguments[i] + delimeter;
+      ret += arguments[i] + delimiter;
     }
     ret += arguments[len];
     return ret;