sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/canvas_image.js

@@ -87,7 +87,7 @@ SC.BaseTheme.canvasImageRenderDelegate = SC.RenderDelegate.create({
         type = dataSource.get('type') || SC.IMAGE_TYPE_URL,
         value = dataSource.get('value');
 
-    // Support for CSS sprites (TODO: Remove this)
+    // Support for CSS sprites
     if (lastClass) jquery.removeClass(lastClass);
     if (value && type === SC.IMAGE_TYPE_CSS_CLASS) {
       jquery.addClass(value);

data/lib/frameworks/sproutcore/frameworks/foundation/resources/text_field.css

@@ -58,7 +58,7 @@
   .sc-hint {
     z-index: 1;
   }  
-  
+
   .sc-hint, .hint {
     position: absolute;
     top: 3px;
@@ -69,6 +69,7 @@
     color: #aaa ;
     font-size: 12px;
     -webkit-font-smoothing: antialiased;
+    cursor: text;
   }
 
   &.text-area .sc-hint,

data/lib/frameworks/sproutcore/frameworks/foundation/spanish.lproj/inflections.js

@@ -0,0 +1,38 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/** @private
+  Active Support style inflection constants
+*/
+SC.hashesForLocale('es', 'inflectionConstants', {
+  /** @private */
+  PLURAL: [
+    [/([^aeéiou])$/i, '$1es'],
+    [/([aeiou]s)$/i, '$1'],
+    [/z$/i, 'ces'],
+    [/á([sn])$/i, 'a$1es'],
+    [/é([sn])$/i, 'e$1es'],
+    [/í([sn])$/i, 'i$1es'],
+    [/ó([sn])$/i, 'o$1es'],
+    [/ú([sn])$/i, 'u$1es'],
+    [/$/, "s"]
+  ],
+
+  /** @private */
+  SINGULAR: [
+    [/es$/i, ''],
+    [/s$/i, ""]
+  ],
+
+  /** @private */
+  IRREGULAR: [
+    ['el', 'los']
+  ],
+
+  /** @private */
+  UNCOUNTABLE: []
+});

data/lib/frameworks/sproutcore/frameworks/foundation/system/benchmark.js

@@ -6,8 +6,6 @@
 // ==========================================================================
 /*globals $A */
 
-sc_require('core') ;
-
 /** @namespace
 
   This bit of meta-programming magic can install a benchmark handler on any
@@ -84,7 +82,7 @@ SC.Benchmark = {
     does not yet exist, you cannot call .start() and .end(), but adding the items to
     SC.benchmarkPreloadEvents will ensure they are included.
 
-    @type Hash
+    @type Object
     @default {}
   */
   events: {},
@@ -97,7 +95,7 @@ SC.Benchmark = {
       - *amt*: the total time consumed by this (divide by runs to get avg)
       - *name*: an optional longer name you assigned to the stat key.  Set this  using name().
 
-    @type Hash
+    @type Object
     @default {}
   */
   stats: {},
@@ -124,7 +122,7 @@ SC.Benchmark = {
     @param {String} name
       A name that identifies the event. If addEvent is called again with the same name,
       the previous call's timestamp will be overwritten.
-    @param {Timestamp} time
+    @param {Number} time
       Optional. The timestamp to record for the event.
   */
   addEvent: function(name, time) {
@@ -145,26 +143,31 @@ SC.Benchmark = {
     @param {String} parentKey
       A unique key that identifies the parent benchmark.  All calls to
       start/end with the same key will be groups together.
-    @param {Boolean} topLevelOnly
-      If true then recursive calls to this method with the same key will be
-      ignored.
     @param {Number} time
       Only pass if you want to explicitly set the start time.  Otherwise the
       start time is now.
+    @param {Boolean} topLevelOnly
+      If true then recursive calls to this method with the same key will be
+      ignored.
     @returns {String} the passed key
   */
   start: function(key, parentKey, time, topLevelOnly) {
-    if (!this.enabled) return ;
+    var start,
+        stat;
 
-    var start = (time || Date.now()), stat;
+    if (this.enabled) {
+      start = time || Date.now();
 
-    if (parentKey) stat = this._subStatFor(key, parentKey) ;
-    else stat = this._statFor(key) ;
+      if (parentKey) stat = this._subStatFor(key, parentKey);
+      else stat = this._statFor(key);
 
-    if (topLevelOnly && stat._starts.length > 0) stat._starts.push('ignore');
-    else stat._starts.push(start) ;
+      if (stat) {
+        if (topLevelOnly && stat._starts.length > 0) stat._starts.push('ignore');
+        else stat._starts.push(start);
 
-    stat._times.push({start: start, _subStats: {}});
+        stat._times.push({ start: start, _subStats: {} });
+      }
+    }
     return key;
   },
 
@@ -181,42 +184,46 @@ SC.Benchmark = {
       time is now.
   */
   end: function(key, parentKey, time) {
-    var stat;
-    if (!this.enabled) return ;
-    if(parentKey)
-    {
-      stat = this._subStatFor(key, parentKey) ;
-    }
-    else
-    {
-      stat = this._statFor(key) ;
-    }
-    var start = stat._starts.pop() ;
-    if (!start) {
-      SC.Logger.log('SC.Benchmark "%@" ended without a matching start.  No information was saved.'.fmt(key));
-      return ;
+    var stat,
+        start,
+        end,
+        dur;
+
+    if (!this.enabled) { return; }
+
+    if (parentKey) {
+      stat = this._subStatFor(key, parentKey);
+    } else {
+      stat = this._statFor(key);
     }
 
-    // top level only.
-    if (start == 'ignore') return ;
+    if (stat && stat._starts.length) {
+      start = stat._starts.pop();
 
-    var end = (time || Date.now()) ;
-    var dur = end - start;
+      // top level only.
+      if (start !== 'ignore') {
+        end = (time || Date.now());
+        dur = end - start;
 
-    stat._times[stat._times.length-1].end = end;
-    stat._times[stat._times.length-1].dur = dur;
+        stat._times[stat._times.length-1].end = end;
+        stat._times[stat._times.length-1].dur = dur;
 
-    stat.amt += dur ;
-    stat.runs++ ;
+        stat.amt += dur;
+        stat.runs++;
 
-    if (this.verbose) this.log(key) ;
+        if (this.verbose) { this.log(key); }
+      }
+    } else {
+      SC.Logger.log('SC.Benchmark "%@" ended without a matching start.  No information was saved.'.fmt(key));
+    }
   },
 
-  /*
+  /**
     Set the inital global start time.
+
+    @param {Number} time global start time
   */
-  setGlobalStartTime: function(time)
-  {
+  setGlobalStartTime: function(time) {
     this.globalStartTime = time;
   },
 
@@ -224,48 +231,58 @@ SC.Benchmark = {
     This is a simple way to benchmark a function.  The function will be
     run with the name you provide the number of times you indicate.  Only the
     function is a required param.
+
+    @param {Function} func function to benchmark
+    @param {String} [key] benchmark key
+    @param {Number} [reps] how many times to run the function
+    @returns {*} Most recent return value from func
   */
   bench: function(func, key, reps) {
-    if (!key) key = "bench%@".fmt(this._benchCount++) ;
-    if (!reps) reps = 1 ;
-    var ret ;
+    var ret;
+    if (!key) { key = "bench%@".fmt(this._benchCount++); }
+    if (!reps) { reps = 1; }
 
-    while(--reps >= 0) {
-      var timeKey = SC.Benchmark.start(key) ;
+    while (--reps >= 0) {
+      SC.Benchmark.start(key);
       ret = func();
-      SC.Benchmark.end(timeKey) ;
+      SC.Benchmark.end(key);
     }
 
     return ret ;
   },
 
   /**
-    This bit of metaprogramming magic install a wrapper around a method and
-    benchmark it whenever it is run.
+    Install a wrapper around a method to benchmark it whenever it is run.
+
+    @param {Object} object target object to install on
+    @param {String} method name of the method on object
+    @param {Boolean} topLevelOnly should recursive calls to this method
+                                  with the same key will be ignored
   */
-  install: function(object,method, topLevelOnly) {
-    // vae the original method.
-    object['b__' + method] = object[method] ;
-    var __func = object['b__' + method];
+  install: function(object, method, topLevelOnly) {
+    // save the original method.
+    var fn = object['b__' + method] = object[method],
+        join = Array.prototype.join;
 
     // replace with this helper.
     object[method] = function() {
-      var key = '%@(%@)'.fmt(method, $A(arguments).join(', ')) ;
-      SC.Benchmark.start(key, topLevelOnly) ;
-      var ret = __func.apply(this, arguments) ;
-      SC.Benchmark.end(key) ;
-      return ret ;
-    } ;
+      var key = '%@(%@)'.fmt(method, join.call(arguments, ', ')),
+          ret;
+      SC.Benchmark.start(key, null, null, topLevelOnly);
+      ret = fn.apply(this, arguments);
+      SC.Benchmark.end(key);
+      return ret;
+    };
   },
 
   /**
     Restore the original method, deactivating the benchmark.
 
     @param {Object} object the object to change
-    @param {String} method the method name as a string.
+    @param {String} method the method name as a string
   */
-  restore: function(object,method) {
-    object[method] = object['b__' + method] ;
+  restore: function(object, method) {
+    object[method] = object['b__' + method];
   },
 
   /**
@@ -532,7 +549,7 @@ SC.Benchmark = {
 
     // the browsers may have their own event hash. Ours uses the same format, so
     // all that we need to do is mixin the browser's to our own.
-    if (typeof webkitPerformnce !== 'undefined') SC.mixin(preloadEvents, webkitPerformane.timing);
+    if (typeof webkitPerformance !== 'undefined') SC.mixin(preloadEvents, webkitPerformance.timing);
 
     // we will attempt to find when the loading started and use that as our
     // global start time, but only do so if the global start time is not already set.
@@ -642,11 +659,19 @@ SC.Benchmark = {
   // Generate the traditional report show multiple runs averaged.
   /** @private */
   _genReport: function(key) {
-    var stat = this._statFor(key) ;
-    var avg = (stat.runs > 0) ? (Math.floor(stat.amt * 1000 / stat.runs) / 1000) : 0 ;
-    var last = stat._times[stat._times.length - 1];
+    var stat = this._statFor(key),
+        avg = (stat.runs > 0) ? (Math.floor(stat.amt * 1000 / stat.runs) / 1000) : 0,
+        last,
+        ret;
+
+    if (stat._times.length) {
+      last = stat._times[stat._times.length - 1];
+      ret = 'BENCH %@ msec: %@ (%@x); latest: %@'.fmt(avg, (stat.name || key), stat.runs, last.end - last.start);
+    } else {
+      ret = 'No information for SC.Benchmark "%@".'.fmt(key);
+    }
 
-    return 'BENCH %@ msec: %@ (%@x); latest: %@'.fmt(avg, (stat.name || key), stat.runs, last.end - last.start);
+    return ret;
   },
 
   // Generate the report in the form of at time line. This returns the parent.
@@ -681,16 +706,20 @@ SC.Benchmark = {
   // creates it.
   /** @private */
   _subStatFor: function(key, parentKey) {
-    var parentTimeLen = this.stats[parentKey]._times.length;
-    if(parentTimeLen === 0) return;
-    var parentSubStats = this.stats[parentKey]._times[this.stats[parentKey]._times.length-1]._subStats;
-    var ret = parentSubStats[key] ;
+    var parentStat = this.stats[parentKey],
+        parentTimeLen = parentStat ? parentStat._times.length : 0,
+        parentSubStats,
+        ret;
+
+    if (!parentTimeLen) { return; }
+    parentSubStats = parentStat._times[parentTimeLen - 1]._subStats;
+    ret = parentSubStats[key];
     if (!ret) {
-      parentSubStats[key] = {
+      ret = parentSubStats[key] = {
         runs: 0, amt: 0, name: key, _starts: [], _times: []
       };
-      ret = parentSubStats[key];
     }
+
     return ret ;
   },
 
@@ -698,14 +727,13 @@ SC.Benchmark = {
   // creates it.
   /** @private */
   _statFor: function(key) {
-    var ret = this.stats[key] ;
+    var ret = this.stats[key];
     if (!ret) {
       ret = this.stats[key] = {
         runs: 0, amt: 0, name: key, _starts: [], _times: []
       };
-      ret = this.stats[key];
     }
-    return ret ;
+    return ret;
   },
 
   /** @private */

data/lib/frameworks/sproutcore/frameworks/foundation/system/string.js

@@ -26,82 +26,6 @@ SC.STRING_DASHERIZE_CACHE = {
   maxWidth: 'max-width'
 };
 
-/** @private
-  Active Support style inflection constants
-*/
-SC.INFLECTION_CONSTANTS = {
-  /** @private */
-  PLURAL: [
-      [/(quiz)$/i,               "$1zes"  ],
-      [/^(ox)$/i,                "$1en"   ],
-      [/([m|l])ouse$/i,          "$1ice"  ],
-      [/(matr|vert|ind)ix|ex$/i, "$1ices" ],
-      [/(x|ch|ss|sh)$/i,         "$1es"   ],
-      [/([^aeiouy]|qu)y$/i,      "$1ies"  ],
-      [/(hive)$/i,               "$1s"    ],
-      [/(?:([^f])fe|([lr])f)$/i, "$1$2ves"],
-      [/sis$/i,                  "ses"    ],
-      [/([ti])um$/i,             "$1a"    ],
-      [/(buffal|tomat)o$/i,      "$1oes"  ],
-      [/(bu)s$/i,                "$1ses"  ],
-      [/(alias|status)$/i,       "$1es"   ],
-      [/(octop|vir)us$/i,        "$1i"    ],
-      [/(ax|test)is$/i,          "$1es"   ],
-      [/s$/i,                    "s"      ],
-      [/$/,                      "s"      ]
-  ],
-
-  /** @private */
-  SINGULAR: [
-      [/(quiz)zes$/i,                                                    "$1"     ],
-      [/(matr)ices$/i,                                                   "$1ix"   ],
-      [/(vert|ind)ices$/i,                                               "$1ex"   ],
-      [/^(ox)en/i,                                                       "$1"     ],
-      [/(alias|status)es$/i,                                             "$1"     ],
-      [/(octop|vir)i$/i,                                                 "$1us"   ],
-      [/(cris|ax|test)es$/i,                                             "$1is"   ],
-      [/(shoe)s$/i,                                                      "$1"     ],
-      [/(o)es$/i,                                                        "$1"     ],
-      [/(bus)es$/i,                                                      "$1"     ],
-      [/([m|l])ice$/i,                                                   "$1ouse" ],
-      [/(x|ch|ss|sh)es$/i,                                               "$1"     ],
-      [/(m)ovies$/i,                                                     "$1ovie" ],
-      [/(s)eries$/i,                                                     "$1eries"],
-      [/([^aeiouy]|qu)ies$/i,                                            "$1y"    ],
-      [/([lr])ves$/i,                                                    "$1f"    ],
-      [/(tive)s$/i,                                                      "$1"     ],
-      [/(hive)s$/i,                                                      "$1"     ],
-      [/([^f])ves$/i,                                                    "$1fe"   ],
-      [/(^analy)ses$/i,                                                  "$1sis"  ],
-      [/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, "$1$2sis"],
-      [/([ti])a$/i,                                                      "$1um"   ],
-      [/(n)ews$/i,                                                       "$1ews"  ],
-      [/s$/i,                                                            ""       ]
-  ],
-
-  /** @private */
-  IRREGULAR: [
-      ['move',   'moves'   ],
-      ['sex',    'sexes'   ],
-      ['child',  'children'],
-      ['man',    'men'     ],
-      ['person', 'people'  ]
-  ],
-
-  /** @private */
-  UNCOUNTABLE: [
-      "sheep",
-      "fish",
-      "series",
-      "species",
-      "money",
-      "rice",
-      "information",
-      "info",
-      "equipment"
-  ]
-};
-
 /**
   @namespace
   @lends SC.String
@@ -311,26 +235,27 @@ SC.mixin(SC.String, {
       var idx, len,
           compare = str.split(/\s/).pop(), //check only the last word of a string
           restOfString = str.replace(compare,''),
-          isCapitalized = compare.charAt(0).match(/[A-Z]/) ? true : false;
+          isCapitalized = compare.charAt(0).match(/[A-Z]/) ? true : false,
+          inflectionConstants = SC.Locale.currentLocale.inflectionConstants;
 
       compare = compare.toLowerCase();
-      for (idx=0, len=SC.INFLECTION_CONSTANTS.UNCOUNTABLE.length; idx < len; idx++) {
-          var uncountable = SC.INFLECTION_CONSTANTS.UNCOUNTABLE[idx];
+      for (idx=0, len=inflectionConstants.UNCOUNTABLE.length; idx < len; idx++) {
+          var uncountable = inflectionConstants.UNCOUNTABLE[idx];
           if (compare == uncountable) {
               return str.toString();
           }
       }
-      for (idx=0, len=SC.INFLECTION_CONSTANTS.IRREGULAR.length; idx < len; idx++) {
-          var singular = SC.INFLECTION_CONSTANTS.IRREGULAR[idx][0],
-              plural   = SC.INFLECTION_CONSTANTS.IRREGULAR[idx][1];
+      for (idx=0, len=inflectionConstants.IRREGULAR.length; idx < len; idx++) {
+          var singular = inflectionConstants.IRREGULAR[idx][0],
+              plural   = inflectionConstants.IRREGULAR[idx][1];
           if ((compare == singular) || (compare == plural)) {
               if(isCapitalized) plural = plural.capitalize();
               return restOfString + plural;
           }
       }
-      for (idx=0, len=SC.INFLECTION_CONSTANTS.PLURAL.length; idx < len; idx++) {
-          var regex          = SC.INFLECTION_CONSTANTS.PLURAL[idx][0],
-              replace_string = SC.INFLECTION_CONSTANTS.PLURAL[idx][1];
+      for (idx=0, len=inflectionConstants.PLURAL.length; idx < len; idx++) {
+          var regex          = inflectionConstants.PLURAL[idx][0],
+              replace_string = inflectionConstants.PLURAL[idx][1];
           if (regex.test(compare)) {
               return str.replace(regex, replace_string);
           }
@@ -347,26 +272,27 @@ SC.mixin(SC.String, {
       var idx, len,
           compare = str.split(/\s/).pop(), //check only the last word of a string
           restOfString = str.replace(compare,''),
-          isCapitalized = compare.charAt(0).match(/[A-Z]/) ? true : false;
+          isCapitalized = compare.charAt(0).match(/[A-Z]/) ? true : false,
+          inflectionConstants = SC.Locale.currentLocale.inflectionConstants;
 
       compare = compare.toLowerCase();
-      for (idx=0, len=SC.INFLECTION_CONSTANTS.UNCOUNTABLE.length; idx < len; idx++) {
-          var uncountable = SC.INFLECTION_CONSTANTS.UNCOUNTABLE[idx];
+      for (idx=0, len=inflectionConstants.UNCOUNTABLE.length; idx < len; idx++) {
+          var uncountable = inflectionConstants.UNCOUNTABLE[idx];
           if (compare == uncountable) {
               return str.toString();
           }
       }
-      for (idx=0, len=SC.INFLECTION_CONSTANTS.IRREGULAR.length; idx < len; idx++) {
-          var singular = SC.INFLECTION_CONSTANTS.IRREGULAR[idx][0],
-              plural   = SC.INFLECTION_CONSTANTS.IRREGULAR[idx][1];
+      for (idx=0, len=inflectionConstants.IRREGULAR.length; idx < len; idx++) {
+          var singular = inflectionConstants.IRREGULAR[idx][0],
+              plural   = inflectionConstants.IRREGULAR[idx][1];
           if ((compare == singular) || (compare == plural)) {
               if(isCapitalized) singular = singular.capitalize();
               return restOfString + singular;
           }
       }
-      for (idx=0, len=SC.INFLECTION_CONSTANTS.SINGULAR.length; idx < len; idx++) {
-          var regex          = SC.INFLECTION_CONSTANTS.SINGULAR[idx][0],
-              replace_string = SC.INFLECTION_CONSTANTS.SINGULAR[idx][1];
+      for (idx=0, len=inflectionConstants.SINGULAR.length; idx < len; idx++) {
+          var regex          = inflectionConstants.SINGULAR[idx][0],
+              replace_string = inflectionConstants.SINGULAR[idx][1];
           if (regex.test(compare)) {
               return str.replace(regex, replace_string);
           }