sproutcore 1.7.1.beta → 1.8.0

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/gestureable.js

@@ -13,7 +13,7 @@
   
   SproutCore views have built-in touch events. However, sometimes you may want
   to recognize gestures like tap, pinch, swipe, etc. This becomes tedious if you
-  need to do this often, and moreso if you need to check for multiple possible
+  need to do this often, and more so if you need to check for multiple possible
   gestures on the same view.
   
   SC.Gesturable allows you to define a collection of gestures (SC.Gesture objects)
@@ -130,7 +130,7 @@ SC.Gesturable = {
     
     If you override touchStart, you will need to call gestureTouchStart to
     give the gesture system control of the touch. You will continue to get
-    events until if and when a gesture decides to take "posession" of a touch—
+    events until if and when a gesture decides to take "possession" of a touch—
     at this point, you will get a [gestureName]Start event.
     
     You do not have to call gestureTouchStart immediately; you can call it

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_editable.js

@@ -107,7 +107,7 @@ SC.InlineEditable = {
 
     Will fail if the delegate returns NO to inlineEditorShouldBeginEditing.
 
-    @returns {Boolean} whether the view succesfully entered edit mode
+    @returns {Boolean} whether the view successfully entered edit mode
   */
   beginEditing: function() {
     var del;
@@ -158,7 +158,7 @@ SC.InlineEditable = {
     @returns {Boolean} if the view is allowed to begin editing
   */
   inlineEditorShouldBeginEditing: function() {
-    return !this.isEditing && this.isEditable;
+    return !this.get('isEditing') && this.get('isEditable');
   },
 
   // TODO: implement validator

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_editor.js

@@ -83,7 +83,7 @@ SC.InlineEditor = {
     @returns {Boolean} whether the editor was able to successfully begin editing
   */
   beginEditing:function(editable) {
-    if(this.get('isEditing') || !editable) return NO;
+    if(this.get('isEditing') || !editable || !editable.isInlineEditable) return NO;
 
     var del, target;
 
@@ -98,6 +98,10 @@ SC.InlineEditor = {
     // first responder
     this.invokeLast(this._callDidBegin);
 
+    // remember that we invoked in case commit gets called before the invoke
+    // goes off
+    this._didBeginInvoked = YES;
+
     return YES;
   },
 
@@ -108,6 +112,11 @@ SC.InlineEditor = {
     and didBegin is supposed to occur after the editor becomes first responder.
   */
   _callDidBegin: function() {
+    // don't notify if we already ended editing
+    if(!this.get('isEditing')) return NO;
+
+    this._didBeginInvoked = NO;
+
     var target = this._target, del;
 
     del = this.delegateFor('inlineEditorDidBeginEditing', this.inlineEditorDelegate, target);
@@ -129,6 +138,9 @@ SC.InlineEditor = {
   commitEditing:function() {
     if(!this.get('isEditing')) return NO;
 
+    // if the handler was invoked but never went off, call it now
+    if(this._didBeginInvoked) this._callDidBegin();
+
     var del, target = this._target;
 
     del = this.delegateFor('inlineEditorShouldCommitEditing', this.inlineEditorDelegate, target);
@@ -159,6 +171,9 @@ SC.InlineEditor = {
   discardEditing:function() {
     if(!this.get('isEditing')) return NO;
 
+    // if the handler was invoked but never went off, call it now
+    if(this._didBeginInvoked) this._callDidBegin();
+
     var del, target = this._target;
 
     del = this.delegateFor('inlineEditorShouldDiscardEditing', this.inlineEditorDelegate, target);

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

@@ -20,7 +20,7 @@
   when you use static and relative positioning.
   
   This mixin can be added to a view class to enable the use of any kind of 
-  static and relative browser positionining.  In exchange for using static
+  static and relative browser positioning.  In exchange for using static
   layout, you will lose a few features that are normally available on a view
   class such as the 'frame' and 'clippingFrame' properties as well as 
   notifications when your view or parentView are resized.

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/validatable.js

@@ -8,37 +8,37 @@
 /**
   @namespace
 
-  Views that include the Validatable mixin can be used with validators to 
-  ensure their values are valid.  
-  
+  Views that include the Validatable mixin can be used with validators to
+  ensure their values are valid.
+
 */
 SC.Validatable = {
-  
+
   /** @private */
   initMixin: function() {
     this._validatable_validatorDidChange() ;
   },
-  
+
   /**
-    The validator for this field.  
-  
-    Set to a validator class or instance.  If this points to a class, it will 
+    The validator for this field.
+
+    Set to a validator class or instance.  If this points to a class, it will
     be instantiated when the validator is first used.
-    
+
     @type SC.Validator
     @default null
   */
   validator: null,
 
   /**
-    This property must return the human readable name you want used when 
+    This property must return the human readable name you want used when
     describing an error condition.  For example, if set this property to
     "Your Email", then the returned error string might be something like
     "Your Email is not valid".
-    
+
     You can return a loc string here if you like.  It will be localized when
     it is placed into the error string.
-    
+
     @type String
     @default null
   */
@@ -46,32 +46,32 @@ SC.Validatable = {
 
   /**
     YES if the receiver is currently valid.
-    
+
     This property watches the value property by default.  You can override
     this property if you want to use some other method to calculate the
     current valid state.
-    
+
     @field
     @type Boolean
     @default YES
   */
-  isValid: function() { 
-    return SC.typeOf(this.get('value')) !== SC.T_ERROR; 
+  isValid: function() {
+    return SC.typeOf(this.get('value')) !== SC.T_ERROR;
   }.property('value'),
-  
+
   /**
-    The form that the view belongs to.  May be null if the view does not 
-    belong to a form.  This property is usually set automatically by an 
+    The form that the view belongs to.  May be null if the view does not
+    belong to a form.  This property is usually set automatically by an
     owner form view.
-    
+
     @type SC.View
     @default null
   */
   ownerForm: null,
-  
+
   /**
-    Attempts to validate the receiver. 
-    
+    Attempts to validate the receiver.
+
     Runs the validator and returns SC.VALIDATE_OK, SC.VALIDATE_NO_CHANGE,
     or an error object.  If no validator is installed, this method will
     always return SC.VALIDATE_OK.
@@ -87,12 +87,12 @@ SC.Validatable = {
       if (partialChange) {
         ret = this._validator.validatePartial(form,this) ;
 
-        // if the partial returned NO_CHANGE, then check to see if the 
+        // if the partial returned NO_CHANGE, then check to see if the
         // field is valid anyway.  If it is not valid, then don't update the
-        // value.  This way the user can have partially constructed values 
+        // value.  This way the user can have partially constructed values
         // without the validator trying to convert it to an object.
         if ((ret == SC.VALIDATE_NO_CHANGE) && (this._validator.validateChange(form, this) == SC.VALIDATE_OK)) {
-          ret = SC.VALIDATE_OK; 
+          ret = SC.VALIDATE_OK;
         }
       } else ret = this._validator.validateChange(form, this) ;
     }
@@ -100,20 +100,20 @@ SC.Validatable = {
   },
 
   /**
-    Runs validateSubmit.  You should use this in your implementation of 
+    Runs validateSubmit.  You should use this in your implementation of
     validateSubmit.  If no validator is installed, this always returns
     SC.VALIDATE_OK
-    
+
     @returns {String}
   */
   performValidateSubmit: function() {
     return this._validator ? this._validator.validateSubmit(this.get('ownerForm'), this) : SC.VALIDATE_OK;
   },
-  
+
   /**
-    Runs a keypress validation.  Returns YES if the keypress should be 
+    Runs a keydown validation.  Returns YES if the keydown should be
     allowed, NO otherwise.  If no validator is defined, always returns YES.
-    
+
     @param {String} charStr the key string
     @returns {Boolean}
   */
@@ -123,33 +123,33 @@ SC.Validatable = {
     if (!charStr) return YES ;
     return this._validator ? this._validator.validateKeyDown(this.get('ownerForm'), this, charStr) : YES;
   },
-  
+
   /**
     Returns the validator object, if one has been created.
-    
+
     @field
     @type SC.Validator
   */
   validatorObject: function() {
     return this._validator;
   }.property(),
-  
+
   /**
-    Invoked by the owner form just before submission.  Override with your 
-    own method to commit any final changes after you perform validation. 
-    
-    The default implementation simply calls performValidateSubmit() and 
+    Invoked by the owner form just before submission.  Override with your
+    own method to commit any final changes after you perform validation.
+
+    The default implementation simply calls performValidateSubmit() and
     returns that value.
-    
+
     @type Boolean
   */
   validateSubmit: function() { return this.performValidateSubmit(); },
-  
+
   /**
     Convert the field value string into an object.
-    
+
     This method will call the validators objectForFieldValue if it exists.
-    
+
     @param {Object} fieldValue the raw value from the field.
     @param {Boolean} partialChange
     @returns {Object}
@@ -157,19 +157,19 @@ SC.Validatable = {
   objectForFieldValue: function(fieldValue, partialChange) {
     return this._validator ? this._validator.objectForFieldValue(fieldValue, this.get('ownerForm'), this) : fieldValue ;
   },
-  
+
   /**
     Convert the object into a field value.
-    
+
     This method will call the validator's fieldValueForObject if it exists.
-    
+
     @param object {Object} the objec to convert
     @returns {Object}
   */
   fieldValueForObject: function(object) {
     return this._validator ? this._validator.fieldValueForObject(object, this.get('ownerForm'), this) : object ;
   },
-  
+
   /** @private */
   _validatable_displayObserver: function() {
     this.displayDidChange();
@@ -192,7 +192,7 @@ SC.Validatable = {
       this._validator = val;
       if (this._validator) this._validator.attachTo(form, this) ;
       this.propertyDidChange('validatorObject');
-    }  
+    }
   }.observes('validator', 'ownerForm')
 
 };

data/lib/frameworks/sproutcore/frameworks/foundation/private/tree_item_observer.js

@@ -260,7 +260,7 @@ SC.TreeItemObserver = SC.Object.extend(SC.Array, SC.CollectionContent, {
 
         // if this branch range is before the start loc, just remove it and
         // go on.  If cur is somewhere inside of the range, then save to pass
-        // on.  Note use of operation to determine the abiguous end op.
+        // on.  Note use of operation to determine the ambiguous end op.
         if ((i+len === cur) && operation === SC.DROP_AFTER) cur -= i;
         else if (i+len > cur) cur -= i; // put inside of nested range
         else {
@@ -697,7 +697,7 @@ SC.TreeItemObserver = SC.Object.extend(SC.Array, SC.CollectionContent, {
 
   /**
     Called just before a branch observer is removed.  Should stop any
-    observering and invalidate any child observers.
+    observing and invalidate any child observers.
   */
   destroy: function() {
     this.invalidateBranchObserversAt(0);
@@ -779,7 +779,7 @@ SC.TreeItemObserver = SC.Object.extend(SC.Array, SC.CollectionContent, {
 
   /**
     Computes the current disclosure state of the item by asking the item or
-    the delegate.  If no pitem or index is passed, the parentItem and idex
+    the delegate.  If no pitem or index is passed, the parentItem and index
     will be used.
   */
   _computeDisclosureState: function(item, pitem, index) {

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/helpers/sizing.js

@@ -150,7 +150,7 @@ SC.RenderDelegate.reopen({
     Retrieves the given property for the specified data source. This property
     may be static, or may be computed specifically for this data source. This
     version fo `getPropertyFor` will check in your size hashes to see if any
-    properties have been overriden.
+    properties have been overridden.
     
     @param {DataSource} dataSource The data source to get the property
     for. Some properties may differ based on the data source; for instance,

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

@@ -39,6 +39,11 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
   
   render: function(dataSource, context) {
     this.addSizeClassName(dataSource, context);
+    
+    var toolTip = dataSource.get('toolTip');
+    if (toolTip) {
+      context.attr('title', toolTip);
+    }
 
     /*
       TODO [CC @ 1.5] These properties have been deprecated. We should remove them
@@ -52,7 +57,7 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
     context.setClass('ellipsis', dataSource.get('needsEllipsis') || NO);
     context.setClass('icon', dataSource.get('icon') || NO);
 
-    var html = this._htmlForTitleAndIcon(dataSource);
+    var html = this.htmlForTitleAndIcon(dataSource);
     context.push(html);
     
     // we could use didChangeFor, but in this case, checking the generated
@@ -73,18 +78,35 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
       textAlign: dataSource.get('textAlign') || null
     });
     
+    var toolTip = dataSource.get('toolTip');
+    if (toolTip) {
+      jquery.attr('title', toolTip);
+    }
+    else {
+      jquery.removeAttr('title');
+    }
+    
     jquery.setClass('ellipsis', dataSource.get('needsEllipsis') || NO);
 
-    var html = this._htmlForTitleAndIcon(dataSource);
+    var html = this.htmlForTitleAndIcon(dataSource);
     if (dataSource.get('renderState')._lastHTMLForTitleAndIcon !== html) {
       jquery.html(html);
       dataSource.get('renderState')._lastHTMLForTitleAndIcon = html;
     }
   },
   
-  _htmlForTitleAndIcon: function(dataSource) {
+  /**
+    Generates the HTML for the title and icon of the label. Render delegates can
+    override this to change how that HTML renders without affecting the rest of the
+    rendering of the label.
+
+    @param dataSource The data source that provides the title and icon properties.
+    @return the html to use
+  */
+  htmlForTitleAndIcon: function(dataSource) {
     var title = dataSource.get('title'),
         hint = dataSource.get('hint'),
+        hintEnabled = dataSource.get('hintEnabled'),
         escapeHTML = dataSource.get('escapeHTML'),
         icon = dataSource.get('icon') || '';
 
@@ -94,7 +116,7 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
       title = SC.RenderContext.escapeHTML(title) ;
     }
 
-    if (hint && !title) {
+    if (hintEnabled && hint && !title) {
       if (escapeHTML) hint = SC.RenderContext.escapeHTML(hint);
       title = "<span class='sc-hint'>" + hint + "</span>";
     }
@@ -112,8 +134,8 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
         icon = '<img src="'+SC.BLANK_IMAGE_URL+'" alt="" class="icon '+icon+'" />';
       }
     }
-    
+
     return icon + title;
   }
-  
+
 });

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

@@ -331,7 +331,7 @@ SC.RenderDelegate = /** @scope SC.RenderDelegate.prototype */{
     be looked up on the render delegate.
     
     NOTE: this implementation is a reference implementation. It
-    is overriden in the sizing code (helpers/sizing.js) to be
+    is overridden in the sizing code (helpers/sizing.js) to be
     size-sensitive.
   */
   getPropertyFor: function(dataSource, propertyName) {

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

@@ -98,11 +98,6 @@
   -moz-opacity:0.4;
 }
 
-
-.no-min-width {
-  min-width: 20px !important;
-}
-
 .sc-benchmark-event {
   position: absolute;
   z-index: 1;

data/lib/frameworks/sproutcore/frameworks/foundation/resources/bootstrap.rhtml

@@ -14,8 +14,8 @@
 var SC = SC || { MODULE_INFO: {}, LAZY_INSTANTIATION: {} };
 SC.browser = (function() {
   // THIS CODE IS DEPRECATED AND IS NO LONGER MAINTAINED
-  var userAgent = navigator.userAgent.toLowerCase();
-  var version = (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1] ;
+  var userAgent = navigator.userAgent.toLowerCase(),
+      version = (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1] ;
 
   var browser = {
     version: version,
@@ -34,33 +34,48 @@ SC.browser = (function() {
 })();
 
 SC.setupBodyClassNames = function() {
-  var el = document.body ;
-  var browser, platform, shadows, borderRad, classNames;
+  var el = document.body,
+      browser, platform, shadows, borderRad, classNames, style, ieVersion;
   if (!el) return ;
-  browser = SC.browser.current ;
-  platform = (SC.browser.windows) ? 'windows' : (SC.browser.mac) ? 'mac' : 'other-platform' ;
-  
-  shadows = (document.documentElement.style.MozBoxShadow !== undefined) || 
-                (document.documentElement.style.webkitBoxShadow !== undefined) ||
-                (document.documentElement.style.oBoxShadow !== undefined) ||
-                (document.documentElement.style.boxShadow !== undefined);
   
-  borderRad = (document.documentElement.style.MozBorderRadius !== undefined) || 
-              (document.documentElement.style.webkitBorderRadius !== undefined) ||
-              (document.documentElement.style.oBorderRadius !== undefined) ||
-              (document.documentElement.style.borderRadius !== undefined);
+  browser = SC.browser.current ;
+  platform = SC.browser.windows ? 'windows' : SC.browser.mac ? 'mac' : 'other-platform' ;
+  style = document.documentElement.style;
+  shadows = (style.MozBoxShadow !== undefined) || 
+                (style.webkitBoxShadow !== undefined) ||
+                (style.oBoxShadow !== undefined) ||
+                (style.boxShadow !== undefined);
   
+  borderRad = (style.MozBorderRadius !== undefined) || 
+              (style.webkitBorderRadius !== undefined) ||
+              (style.oBorderRadius !== undefined) ||
+              (style.borderRadius !== undefined);
   
-  classNames = (el.className) ? el.className.split(' ') : [] ;
+  classNames = el.className ? el.className.split(' ') : [] ;
   if(shadows) classNames.push('box-shadow');
   if(borderRad) classNames.push('border-rad');
-  classNames.push(browser) ;
-  if (browser === 'chrome') classNames.push('safari');
-  classNames.push(platform) ;
+  classNames.push(browser, platform) ;
+  
+  ieVersion = parseInt(SC.browser.msie,10);
+  if (ieVersion) {
+    if (ieVersion === 7) {
+      classNames.push('ie7');
+    } 
+    else if (ieVersion === 8) {
+      classNames.push('ie8');
+    }
+    else if (ieVersion === 9) {
+      classNames.push('ie9');
+    }
+  }
+  
+  if(browser==="safari" || browser==="chrome") classNames.push('webkit');
   if (SC.browser.mobileSafari) classNames.push('mobile-safari') ;
+  if ('createTouch' in document) classNames.push('touch');
   el.className = classNames.join(' ') ;
 } ;
 
+
 <% end %>
 <% content_for('setup_body_class_names') do %>
 if (SC.setupBodyClassNames) SC.setupBodyClassNames() ;