sproutcore 1.0.1046 → 1.0.1049.pre.1

data/frameworks/sproutcore/frameworks/foundation/mixins/selection_support.js

@@ -2,9 +2,8 @@
 // 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)
 // ==========================================================================
-
 /**
   @namespace
   
@@ -29,39 +28,38 @@
   @since SproutCore 1.0
 */
 SC.SelectionSupport = {
-  
+
   // ..........................................................
   // PROPERTIES
   // 
-  
   /**
     Walk like a duck.
     
     @property {Boolean}
   */
   hasSelectionSupport: YES,
-  
+
   /**
     If YES, selection is allowed. Default is YES.
     
     @property {Boolean}
   */
   allowsSelection: YES,
-  
+
   /**
     If YES, multiple selection is allowed. Default is YES.
     
     @property {Boolean}
   */
   allowsMultipleSelection: YES,
-  
+
   /**
     If YES, allow empty selection Default is YES.
     
     @property {Boolean}
   */
   allowsEmptySelection: YES,
-  
+
   /**
     Override to return the first selectable object.  For example, if you 
     have groups or want to otherwise limit the kinds of objects that can be
@@ -74,7 +72,7 @@ SC.SelectionSupport = {
   firstSelectableObject: function() {
     return this.get('firstObject');
   }.property(),
-  
+
   /**
     This is the current selection.  You can make this selection and another
     controller's selection work in concert by binding them together. You
@@ -83,10 +81,12 @@ SC.SelectionSupport = {
     @property {SC.SelectionSet}
   */
   selection: function(key, value) {
-        
+
     var old = this._scsel_selection,
-        oldlen = old ? old.get('length') : 0,
-        content, empty, len;
+    oldlen = old ? old.get('length') : 0,
+    content,
+    empty,
+    len;
 
     // whenever we have to recompute selection, reapply all the conditions to
     // the selection.  This ensures that changing the conditions immediately
@@ -94,64 +94,61 @@ SC.SelectionSupport = {
     // 
     // Note also if we don't allowSelection, we don't clear the old selection;
     // we just don't allow it to be changed.
-    if ((value === undefined) || !this.get('allowsSelection')) value = old ;
+    if ((value === undefined) || !this.get('allowsSelection')) value = old;
 
     len = (value && value.isEnumerable) ? value.get('length') : 0;
-    
+
     // if we don't allow multiple selection
-    if ((len>1) && !this.get('allowsMultipleSelection')) {
+    if ((len > 1) && !this.get('allowsMultipleSelection')) {
 
-      if (oldlen>1) {
-        value = SC.SelectionSet.create()
-                  .addObject(old.get('firstObject')).freeze();
-        len   = 1;
+      if (oldlen > 1) {
+        value = SC.SelectionSet.create().addObject(old.get('firstObject')).freeze();
+        len = 1;
       } else {
         value = old;
         len = oldlen;
       }
     }
-    
+
     // if we don't allow empty selection, block that also.  select first 
     // selectable item if necessary.
-    if ((len===0) && !this.get('allowsEmptySelection')) {
-      if (oldlen===0) {
+    if ((len === 0) && !this.get('allowsEmptySelection')) {
+      if (oldlen === 0) {
         value = this.get('firstSelectableObject');
         if (value) value = SC.SelectionSet.create().addObject(value).freeze();
         else value = SC.SelectionSet.EMPTY;
         len = value.get('length');
-        
+
       } else {
         value = old;
         len = oldlen;
       }
     }
-    
+
     // if value is empty or is not enumerable, then use empty set
-    if (len===0) value = SC.SelectionSet.EMPTY;
-    
+    if (len === 0) value = SC.SelectionSet.EMPTY;
+
     // always use a frozen copy...
     value = value.frozenCopy();
     this._scsel_selection = value;
-    
+
     return value;
-    
-  }.property('arrangedObjects', 'allowsEmptySelection', 
-      'allowsMultipleSelection', 'allowsSelection').cacheable(),
-  
+
+  }.property('arrangedObjects', 'allowsEmptySelection', 'allowsMultipleSelection', 'allowsSelection').cacheable(),
+
   /**
     YES if the receiver currently has a non-zero selection.
     
     @property {Boolean}
   */
   hasSelection: function() {
-    var sel = this.get('selection') ;
-    return !!sel && (sel.get('length') > 0) ;
+    var sel = this.get('selection');
+    return !! sel && (sel.get('length') > 0);
   }.property('selection').cacheable(),
-  
+
   // ..........................................................
   // METHODS
   // 
-
   /**
     Selects the passed objects in your content.  If you set "extend" to YES,
     then this will attempt to extend your selection as well.
@@ -163,20 +160,20 @@ SC.SelectionSupport = {
   selectObjects: function(objects, extend) {
 
     // handle passing an empty array
-    if (!objects || objects.get('length')===0) {
+    if (!objects || objects.get('length') === 0) {
       if (!extend) this.set('selection', SC.SelectionSet.EMPTY);
       return this;
     }
-    
+
     var sel = this.get('selection');
     if (extend && sel) sel = sel.copy();
     else sel = SC.SelectionSet.create();
-    
+
     sel.addObjects(objects).freeze();
     this.set('selection', sel);
-    return this ;
+    return this;
   },
-  
+
   /**
     Selects a single passed object in your content.  If you set "extend" to 
     YES then this will attempt to extend your selection as well.
@@ -188,10 +185,10 @@ SC.SelectionSupport = {
   selectObject: function(object, extend) {
     if (object === null) {
       if (!extend) this.set('selection', null);
-      return this ;
-      
+      return this;
+
     } else return this.selectObjects([object], extend);
-  },    
+  },
 
   /**
     Deselects the passed objects in your content.
@@ -201,17 +198,15 @@ SC.SelectionSupport = {
   */
   deselectObjects: function(objects) {
 
-    if (!objects || objects.get('length')===0) return this; // nothing to do
-    
+    if (!objects || objects.get('length') === 0) return this; // nothing to do
     var sel = this.get('selection');
-    if (!sel || sel.get('length')===0) return this; // nothing to do
-
+    if (!sel || sel.get('length') === 0) return this; // nothing to do
     // find index for each and remove it
     sel = sel.copy().removeObjects(objects).freeze();
     this.set('selection', sel.freeze());
-    return this ;
+    return this;
   },
-  
+
   /**
     Deselects the passed object in your content.
     
@@ -222,46 +217,32 @@ SC.SelectionSupport = {
     if (!object) return this; // nothing to do
     else return this.deselectObjects([object]);
   },
-  
-  /**  @private
+
+  /**
     Call this method whenever your source content changes to ensure the 
     selection always remains up-to-date and valid.
+    
+    @returns {Object}
   */
   updateSelectionAfterContentChange: function() {
-    
-    var content = this.get('arrangedObjects'),
-        sel     = this.get('selection'),
-        ret     = sel,
-        indexes, len, max;
-
-    // first, make sure selection goes beyond current items...
-    if (ret && content && ret.get('sources').indexOf(content)>=0) {
-      indexes = ret.indexSetForSource(content);
-      len     = content.get('length') ;
-      max     = indexes ? indexes.get('max') : 0;
-      
-      // to clean this up, just copy the selection and remove the extra 
-      // indexes
-      if (max > len) {
-        ret = ret.copy().remove(content, len, max-len).freeze();
-        this.set('selection', ret);
-      }
+    var arrangedObjects = this.get('arrangedObjects');
+    var selectionSet = this.get('selection');
+    var allowsEmptySelection = this.get('allowsEmptySelection');
+    var indexSet; // Selection index set for arranged objects
+    //
+    // Remove any selection set objects that are no longer in the content
+    indexSet = selectionSet.indexSetForSource(arrangedObjects);
+    if ((indexSet && (indexSet.get('length') !== selectionSet.get('length'))) || (!indexSet && (selectionSet.get('length') > 0))) { // then the selection content has changed
+      selectionSet = selectionSet.copy().constrain(arrangedObjects).freeze();
+      this.set('selection', selectionSet);
     }
-
-    // if we didn't have to recompute the selection anyway, do a quick check
-    // to make sure there are no constraints that need to be recomputed.
-    if (ret === sel) {
-      len = sel ? sel.get('length') : 0;
-      max = content ? content.get('length') : 0;
-      
-      // need to recompute if the selection is empty and it shouldn't be but
-      // only if we have some content; otherwise what's the point?
-      if ((len===0) && !this.get('allowsEmptySelection') && max>0) {
-        this.notifyPropertyChange('selection');
-      }
+    
+    // Reselect an object if required (if content length > 0)
+    if ((selectionSet.get('length') === 0) && (arrangedObjects.get('length') > 0) && !allowsEmptySelection) {
+      this.selectObject(this.get('firstSelectableObject'), NO);
     }
 
-    return this ;
+    return this;
   }
-    
+
 };

data/frameworks/sproutcore/frameworks/foundation/mixins/static_layout.js

@@ -2,12 +2,15 @@
 // 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)
 // ==========================================================================
 
 /**
   @namespace 
 
+  __NOTE:__ SC.StaticLayout is now built in to SC.View.  You do not need to 
+  apply this mixin to use static layout.  Just set useStaticLayout to YES.
+  
   Normally, SproutCore views use absolute positioning to display themselves
   on the screen.  While this is both the fastest and most efficient way to 
   display content in the web browser, sometimes your user interface might need
@@ -57,10 +60,11 @@
     
   }}}
   
+  @deprecated
   @since SproutCore 1.0
 */
 SC.StaticLayout = {
-
+  
   /**
     Walk like a duck.  Used to determine that this mixin has been applied.  
     Note that a view that hasStaticLayout still may not actually use static
@@ -68,56 +72,6 @@ SC.StaticLayout = {
     
     @property {Boolean}
   */
-  hasStaticLayout: YES,
-  
-  /**
-    Activates use of brower's static layout.  You can apply this mixin and
-    still use absolute positioning.  To activate static positioning, set this
-    property to YES.
-
-    @property {Boolean}
-  */
-  useStaticLayout: NO,
-  
-  /** @private - add sc-static-layout class if needed. */
-  renderMixin: function(context, firstTime) {
-    context.setClass('sc-static-layout', this.get('useStaticLayout'));
-  },
-  
-  /**
-    clippingFrame is not available on views with static layout.  This 
-    property will always return null.
-    
-    @function
-  */
-  clippingFrame: null,
-  
-  /**
-    This method is not supported on static layout views.
-    
-    @function
-  */
-  parentViewDidResize: null,
-  
-  /**
-    This method is not supported on static layout views.
-    
-    @function
-  */
-  beginLiveResize: null,
-
-  /**
-    This method is not supported on static layout views.
-    
-    @function
-  */
-  endLiveResize: null,
-
-  /**
-    This method is not supported on static layout views.
-    
-    @function
-  */
-  viewDidResize: null
+  hasStaticLayout: YES
   
 };

data/frameworks/sproutcore/frameworks/foundation/mixins/string.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)
 // ==========================================================================
 
 sc_require('system/locale');
@@ -17,6 +17,91 @@ SC.STRING_HUMANIZE_REGEXP = (/[\-_]/g);
 SC.STRING_TRIM_REGEXP = (/^\s+|\s+$/g);
 SC.STRING_TRIM_LEFT_REGEXP = (/^\s+/g);
 SC.STRING_TRIM_RIGHT_REGEXP = (/\s+$/g);
+SC.STRING_REGEXP_ESCAPED_REGEXP = (/([\\\.\+\*\?\[\^\]\$\(\)\{\}\=\!\<\>\|\:])/g);
+
+// Since there are many strings that are commonly dasherized(), we'll maintain
+// a cache.  Moreover, we'll pre-add some common ones.
+SC.STRING_DASHERIZE_CACHE = {
+  top:      'top',
+  left:     'left',
+  right:    'right',
+  bottom:   'bottom',
+  width:    'width',
+  height:   'height',
+  minWidth: 'min-width',
+  maxWidth: 'max-width'
+};
+
+// Active Support style inflection constants
+SC.INFLECTION_CONSTANTS = {
+  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"      ]
+  ],
+
+  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,                                                            ""       ]
+  ],
+
+  IRREGULAR: [
+      ['move',   'moves'   ],
+      ['sex',    'sexes'   ],
+      ['child',  'children'],
+      ['man',    'men'     ],
+      ['person', 'people'  ]
+  ],
+
+  UNCOUNTABLE: [
+      "sheep",
+      "fish",
+      "series",
+      "species",
+      "money",
+      "rice",
+      "information",
+			"info",
+      "equipment"
+  ]					
+};
+
 
 /**
   @namespace
@@ -45,7 +130,8 @@ SC.String = {
     // it would add some overhead to deal with the arguments and adds stack
     // frames, so we are keeping the implementation separate.
     if(!SC.Locale.currentLocale) SC.Locale.createCurrentLocale();
-    var str = SC.Locale.currentLocale.locWithDefault(this) || this;
+    var str = SC.Locale.currentLocale.locWithDefault(this);
+    if (SC.typeOf(str) !== SC.T_STRING) str = this;
     return str.fmt.apply(str,arguments) ;
   },
 
@@ -59,7 +145,8 @@ SC.String = {
   */
   locWithDefault: function(def) {
     if(!SC.Locale.currentLocale) SC.Locale.createCurrentLocale();
-    var str = SC.Locale.currentLocale.locWithDefault(def) || this;
+    var str = SC.Locale.currentLocale.locWithDefault(this, def);
+    if (SC.typeOf(str) !== SC.T_STRING) str = this;
     var args = SC.$A(arguments); args.shift(); // remove def param
     return str.fmt.apply(str,args) ;
   },
@@ -202,7 +289,21 @@ SC.String = {
     @returns {String} the dasherized string.
   */
   dasherize: function() {
-    return this.decamelize().replace(SC.STRING_DASHERIZE_REGEXP,'-') ;  
+    // Do we have the item in our cache?
+    var cache = SC.STRING_DASHERIZE_CACHE,
+        ret   = cache[this];
+
+    if (ret) {
+      return ret;
+    }
+    else {
+      ret = this.decamelize().replace(SC.STRING_DASHERIZE_REGEXP,'-') ;
+
+      // Add the item to our cache.
+      cache[this] = ret;
+    }
+
+    return ret;
   },
   
   /**
@@ -223,6 +324,19 @@ SC.String = {
     return this.decamelize().replace(SC.STRING_HUMANIZE_REGEXP,' ') ;
   },
   
+  /**
+    Will escape a string so it can be securely used in a regular expression.
+    
+    Useful when you need to use user input in a regular expression without
+    having to worry about it breaking code if any reserved regular expression 
+    characters are used.
+    
+    @returns {String} the string properly escaped for use in a regexp.
+  */
+  escapeForRegExp: function() {
+    return this.replace(SC.STRING_REGEXP_ESCAPED_REGEXP, "\\$1");
+  },
+  
   /**
     Removes any standard diacritic characters from the string. So, for
     example, all instances of 'Á' will become 'A'.
@@ -342,8 +456,77 @@ SC.String = {
   */
   trimRight: function () {
     return this.replace(SC.STRING_TRIM_RIGHT_REGEXP,"");
-  }
+  },
+
+  /**
+    Converts a word into its plural form. 
+    
+    @returns {String} the plural form of the string
+  */
+  pluralize: function() {
+			var idx, len,
+			 		compare = this.split(/\s/).pop(), //check only the last word of a string
+					restOfString = this.replace(compare,''),
+					isCapitalized = compare.charAt(0).match(/[A-Z]/) ? true : false;									
+
+			compare = compare.toLowerCase();
+      for (idx=0, len=SC.INFLECTION_CONSTANTS.UNCOUNTABLE.length; idx < len; idx++) {
+          var uncountable = SC.INFLECTION_CONSTANTS.UNCOUNTABLE[idx];
+          if (compare == uncountable) {	
+              return this.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];
+          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];
+          if (regex.test(compare)) {
+              return this.replace(regex, replace_string);
+          }
+      }
+  },
+
+  /**
+    Converts a word into its singular form. 
     
+    @returns {String} the singular form of the string
+  */
+  singularize: function() {
+			var idx, len,
+					compare = this.split(/\s/).pop(), //check only the last word of a string								
+					restOfString = this.replace(compare,''),	
+					isCapitalized = compare.charAt(0).match(/[A-Z]/) ? true : false;
+
+			compare = compare.toLowerCase();
+      for (idx=0, len=SC.INFLECTION_CONSTANTS.UNCOUNTABLE.length; idx < len; idx++) {
+          var uncountable = SC.INFLECTION_CONSTANTS.UNCOUNTABLE[idx];
+          if (compare == uncountable) {
+              return this.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];
+          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];
+          if (regex.test(compare)) {
+              return this.replace(regex, replace_string);
+          }
+      }
+  }    
 };
 
 /** @private */