sproutcore 1.9.1 → 1.9.2

data/lib/frameworks/sproutcore/frameworks/desktop/views/segmented.js

@@ -51,7 +51,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     @type Boolean
     @default YES
   */
-  acceptsFirstResponder: function() {
+  acceptsFirstResponder: function () {
     if (SC.FOCUS_ALL_CONTROLS) { return this.get('isEnabled'); }
     return NO;
   }.property('isEnabled').cacheable(),
@@ -313,7 +313,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     Call itemsDidChange once to initialize segment child views for the items that exist at
     creation time.
   */
-  init: function() {
+  init: function () {
     sc_super();
 
     var title = this.get('overflowTitle'),
@@ -339,7 +339,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     this.itemsDidChange();
   },
 
-  shouldHandleOverflowDidChange: function() {
+  shouldHandleOverflowDidChange: function () {
     if (this.get('shouldHandleOverflow')) {
       // remeasure should show/hide it as needed
       this.invokeLast(this.remeasure);
@@ -352,7 +352,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     Called whenever the number of items changes.  This method populates SegmentedView's childViews, taking
     care to re-use existing childViews if possible.
   */
-  itemsDidChange: function() {
+  itemsDidChange: function () {
     var items = this.get('items') || [],
         item,
         localItem,                        // Used to avoid altering the original items
@@ -499,7 +499,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     This observer method is called whenever any of the relevant properties of an item change.  This only applies
     to SC.Object based items that may be observed.
   */
-  itemContentDidChange: function(item, key, alwaysNull, index) {
+  itemContentDidChange: function (item, key, alwaysNull, index) {
     var items = this.get('items'),
         childViews = this.get('childViews'),
         childView;
@@ -522,7 +522,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   /** @private
     Whenever the view resizes, we need to check to see if we're overflowing.
   */
-  viewDidResize: function() {
+  viewDidResize: function () {
     var isHorizontal = this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL,
         visibleDim = isHorizontal ? this.$().width() : this.$().height();
 
@@ -535,7 +535,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   /** @private
     Whenever visibility changes, we need to check to see if we're overflowing.
   */
-  isVisibleInWindowDidChange: function() {
+  isVisibleInWindowDidChange: function () {
     if (this.get('shouldHandleOverflow')) {
       this.invokeLast(this.remeasure);
     }
@@ -545,7 +545,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     Calling this method forces the segments to be remeasured and will also adjust the
     segments for overflow if necessary.
   */
-  remeasure: function() {
+  remeasure: function () {
     if (!this.get('shouldHandleOverflow')) { return; }
     var renderDelegate = this.get('renderDelegate'),
         childViews = this.get('childViews'),
@@ -571,7 +571,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   /** @private
     This method is called to adjust the segment views to see if we need to handle for overflow.
    */
-  adjustOverflow: function() {
+  adjustOverflow: function () {
     if (!this.get('shouldHandleOverflow')) { return; }
 
     var childViews = this.get('childViews'),
@@ -600,8 +600,17 @@ SC.SegmentedView = SC.View.extend(SC.Control,
       dimToFit = (i === length - 1) ? curElementsDim : curElementsDim + this.cachedOverflowDim;
 
       if (dimToFit > visibleDim) {
-        // Add the localItem to the overflowItems
-        this.overflowItems.pushObject(childView.get('localItem'));
+        // Create a menu item based on the original item.
+        overflowItem = {};
+        localItem = childView.get('localItem');
+
+        overflowItem[this.get('itemTitleKey')] = localItem.get(this.get('itemTitleKey'));
+        overflowItem[this.get('itemIconKey')] = localItem.get(this.get('itemIconKey'));
+        overflowItem[this.get('itemIsEnabledKey')] = localItem.get(this.get('itemIsEnabledKey'));
+        overflowItem[this.get('itemKeyEquivalentKey')] = localItem.get(this.get('itemKeyEquivalentKey'));
+        overflowItem[this.get('itemValueKey')] = localItem.get(this.get('itemValueKey'));
+
+        this.overflowItems.pushObject(overflowItem);
 
         // Record that we're now overflowing
         this.isOverflowing = YES;
@@ -638,7 +647,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
 
     It ignores the last segment (the overflow segment).
   */
-  segmentDimensions: function() {
+  segmentDimensions: function () {
     var cv = this.get('childViews'),
         v, f,
         dims = [],
@@ -656,7 +665,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   /**
     Return the dimension (height or width depending on the layout direction) over the overflow segment.
   */
-  overflowSegmentDim: function() {
+  overflowSegmentDim: function () {
     var cv = this.get('childViews'),
         v, f,
         isHorizontal = this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL;
@@ -673,7 +682,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   /**
     Return the index of the segment view that is the target of the mouse click.
   */
-  indexForClientPosition: function(x, y) {
+  indexForClientPosition: function (x, y) {
     var cv = this.get('childViews'),
         length, i,
         v, rect,
@@ -724,7 +733,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     Determines the index into the displayItems array where the passed mouse
     event occurred.
   */
-  displayItemIndexForEvent: function(evt) {
+  displayItemIndexForEvent: function (evt) {
     var renderDelegate = this.get('renderDelegate');
     var x = evt.clientX;
     var y = evt.clientY;
@@ -747,7 +756,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  keyDown: function(evt) {
+  keyDown: function (evt) {
     var childViews,
         childView,
         i, length,
@@ -806,7 +815,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  mouseDown: function(evt) {
+  mouseDown: function (evt) {
     var childViews = this.get('childViews'),
         childView,
         overflowIndex = childViews.get('length') - 1,
@@ -829,7 +838,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  mouseUp: function(evt) {
+  mouseUp: function (evt) {
     var activeChildView,
         index;
 
@@ -851,7 +860,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  mouseMoved: function(evt) {
+  mouseMoved: function (evt) {
     var childViews = this.get('childViews'),
         overflowIndex = childViews.get('length') - 1,
         activeChildView,
@@ -881,7 +890,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  mouseEntered: function(evt) {
+  mouseEntered: function (evt) {
     var childViews = this.get('childViews'),
         childView,
         overflowIndex = childViews.get('length') - 1,
@@ -906,7 +915,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  mouseExited: function(evt) {
+  mouseExited: function (evt) {
     var activeChildView;
 
     // if mouse was down, hide active index
@@ -921,7 +930,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  touchStart: function(touch) {
+  touchStart: function (touch) {
     var childViews = this.get('childViews'),
         childView,
         overflowIndex = childViews.get('length') - 1,
@@ -945,7 +954,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  touchEnd: function(touch) {
+  touchEnd: function (touch) {
     var activeChildView,
         index;
 
@@ -966,7 +975,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  touchesDragged: function(evt, touches) {
+  touchesDragged: function (evt, touches) {
     var isTouching = this.touchIsInBoundary(evt),
         childViews = this.get('childViews'),
         overflowIndex = childViews.get('length') - 1,
@@ -1005,7 +1014,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  _touchDidExit: function(evt) {
+  _touchDidExit: function (evt) {
     var activeChildView;
 
     if (this.isTouching) {
@@ -1018,7 +1027,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   },
 
   /** @private */
-  _touchDidEnter: function(evt) {
+  _touchDidEnter: function (evt) {
     var childViews = this.get('childViews'),
         childView,
         overflowIndex = childViews.get('length') - 1,
@@ -1042,7 +1051,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     Simulates the user clicking on the segment at the specified index. This
     will update the value if possible and fire the action.
   */
-  triggerItemAtIndex: function(index) {
+  triggerItemAtIndex: function (index) {
     var childViews = this.get('childViews'),
         childView,
         sel, value, val, empty, mult;
@@ -1126,7 +1135,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   /** @private
     Invoked whenever an item is selected in the overflow menu.
   */
-  selectOverflowItem: function(menu) {
+  selectOverflowItem: function (menu) {
     var item = menu.get('selectedItem');
 
     this.triggerItemAtIndex(item.get('index'));
@@ -1141,7 +1150,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   /** @private
     Presents the popup menu containing overflowed segments.
   */
-  showOverflowMenu: function() {
+  showOverflowMenu: function () {
     var childViews = this.get('childViews'),
         overflowViewIndex = childViews.get('length') - 1,
         overflowItems = this.overflowItems,
@@ -1157,16 +1166,16 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     isArray = SC.isArray(value);
     for (var i = 0; i < overflowItemsLength; i++) {
       var item = overflowItems.objectAt(i),
-          itemValueKey = this.get('itemValueKey');
+        itemValueKey = this.get('itemValueKey');
 
-      if (isArray ? value.indexOf(item.get(itemValueKey)) >= 0 : value === item.get(itemValueKey)) {
-        item.set('isChecked', YES);
+      if (isArray ? value.indexOf(item[itemValueKey]) >= 0 : value === item[itemValueKey]) {
+        item.isChecked = YES;
       } else {
-        item.set('isChecked', NO);
+        item.isChecked = NO;
       }
 
       // Track the matching segment index
-      item.set('index', startIndex + i);
+      item.index = startIndex + i;
     }
 
     // TODO: we can't pass a shortcut key to the menu, because it isn't a property of SegmentedView (yet?)
@@ -1183,7 +1192,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
 
       // We need to be able to update our overflow segment even if the user clicks outside of the menu.  Since
       // there is no callback method or observable property when the menu closes, override modalPaneDidClick().
-      modalPaneDidClick: function() {
+      modalPaneDidClick: function () {
         sc_super();
 
         // Cleanup
@@ -1204,7 +1213,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   /** @private
     Whenever the value changes, update the segments accordingly.
   */
-  valueDidChange: function() {
+  valueDidChange: function () {
     var value = this.get('value'),
         overflowItemsLength,
         childViews = this.get('childViews'),

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

@@ -106,7 +106,6 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
   htmlForTitleAndIcon: function(dataSource) {
     var title = dataSource.get('title'),
         hint = dataSource.get('hint'),
-        hintEnabled = dataSource.get('hintEnabled'),
         escapeHTML = dataSource.get('escapeHTML'),
         icon = dataSource.get('icon') || '';
 
@@ -115,9 +114,8 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
     if (title && escapeHTML) {
       title = SC.RenderContext.escapeHTML(title) ;
     }
-
-    if (hintEnabled && hint && !title) {
-      if (escapeHTML) hint = SC.RenderContext.escapeHTML(hint);
+      if (escapeHTML) { hint = SC.RenderContext.escapeHTML(hint); }
+    if (hint && !title) {
       title = "<span class='sc-hint'>" + hint + "</span>";
     }
 

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

@@ -71,6 +71,7 @@
   border: 1px solid #CC6633; 
   background-color: #FFCC33; 
   background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#FFCD82), to(#DE9C00));
+  border-radius: 4px;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   line-height: 14px;

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/label/ui.js

@@ -19,6 +19,11 @@ var pane = SC.ControlTestPane.design()
     isEnabled: NO
   })
 
+  .add("hint", SC.LabelView, {
+    hint: 'Get on with it!',
+    isEditable: true
+  })
+
   .add("selectable", SC.LabelView, {
     value:'hello',
     isTextSelectable: YES
@@ -175,4 +180,12 @@ test("Check that the title is set or not and if it is in the appropriate element
   equals(viewElem.text(), '', 'has correct empty value set');
 });
 
+test("The hint property should appear if the label is editable and has no value.", function () {
+  var viewElem = pane.view('hint').$();
+
+  viewElem = viewElem.find('.sc-hint');
+  equals(viewElem.length, 1, "has an .sc-hint span inside");
+  equals(viewElem.text(), 'Get on with it!', 'has correct hint value set');
+});
+
 })();

data/lib/frameworks/sproutcore/frameworks/foundation/views/inline_text_field.js

@@ -435,31 +435,14 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.InlineEditor,
     return YES;
   },
 
-  // do it here instead of waiting on the binding to make sure the UI
-  // updates immediately.
-  /** @private */
-  fieldValueDidChange: function(partialChange) {
-    arguments.callee.base.call(this, partialChange) ;
-    //this.resizeToFit(this.getFieldValue()) ;
-  },
-
-  // invoked when the user presses return.  If this is a multi-line field,
-  // then allow the newine to proceed.  Otherwise, try to commit the
-  // edit.
+  // Invoked when the user presses return.  If this is a multi-line field,
+  // then allow the new line to proceed by calling the super class. 
+  // Otherwise, try to commit the edit.
   /** @private */
   insertNewline: function(evt) {
     if (this.get('isTextArea')) {
-      evt.allowDefault();
-      return arguments.callee.base.call(this, evt) ;
+      return sc_super();
     } else {
-      // TODO : this is a work around. There is a bug where the
-      // last character would get dropped
-      // if the editing was completed by pressing return
-      // needs to be fixed
-      if (this.get('value') != this.$input().val()) {
-        this.set('value', this.$input().val());
-      }
-
       this.commitEditing() ;
       return YES ;
     }
@@ -489,18 +472,6 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.InlineEditor,
       if(prev && prev.beginEditing) prev.beginEditing();
     }
     return YES ;
-  },
-
-  /** @private */
-  deleteForward: function(evt) {
-    evt.allowDefault();
-    return YES;
-  },
-
-  /** @private */
-  deleteBackward: function(evt) {
-    evt.allowDefault();
-    return YES ;
   }
 });
 

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

@@ -30,7 +30,7 @@ SC.LabelView = SC.View.extend(SC.Control, SC.InlineEditable,
 
   classNames: ['sc-label-view'],
 
-  displayProperties: ['displayTitle', 'textAlign', 'fontWeight', 'icon', 'escapeHTML', 'needsEllipsis', 'hint', 'toolTip'],
+  displayProperties: ['displayTitle', 'displayHint', 'escapeHTML', 'textAlign', 'fontWeight', 'icon', 'needsEllipsis', 'toolTip'],
 
   /**
     The delegate that gets notified of events related to the editing process. Set
@@ -103,14 +103,11 @@ SC.LabelView = SC.View.extend(SC.Control, SC.InlineEditable,
   */
   hint: null,
 
-  /*
-    Whether hint should be shown or not. By default this is tied to isEditable
-    so the hint will only show if isEditable is YES.
-
-    @type Boolean
-    @property
-  */
+  /** @deprecated */
   hintEnabled: function() {
+    //@if(debug)
+    SC.warn("Developer Warning: The hintEnabled property of SC.LabelView is deprecated.  Please simply get the isEditable property to determine if the hint will be displayed instead.");
+    //@endif
     return this.get('isEditable');
   }.property('isEditable').cacheable(),
 
@@ -149,12 +146,12 @@ SC.LabelView = SC.View.extend(SC.Control, SC.InlineEditable,
   renderDelegateName: 'labelRenderDelegate',
 
   /**
-    [RO] The value that will actually be displayed.
+    The value that will actually be displayed.
 
     This property is dynamically computed by applying localization,
     string conversion and other normalization utilities.
 
-    @field
+    @type String
   */
   displayTitle: function() {
     var value, formatter;
@@ -187,20 +184,37 @@ SC.LabelView = SC.View.extend(SC.Control, SC.InlineEditable,
     // 4. Localize
     if (value && this.getDelegateProperty('localize', this.displayDelegate)) value = SC.String.loc(value) ;
 
-    return value ;
+    return value;
   }.property('value', 'localize', 'formatter').cacheable(),
 
-
   /**
-    [RO] The hint value that will actually be displayed.
-
-    This property is dynamically computed by applying localization
-    and other normalization utilities.
+    The hint that will actually be displayed depending on localization and
+    sanitizing (or not).
 
+    @type String
   */
+  displayHint: function () {
+    var hint = this.get('hint'),
+      isEditable = this.get('isEditable');
+
+    if (isEditable) {
+      if (hint && this.getDelegateProperty('localize', this.displayDelegate)) {
+        hint = SC.String.loc(hint);
+      }
+    } else {
+      hint = null;
+    }
+
+    return hint;
+  }.property('hint', 'localize', 'isEditable').cacheable(),
+
+  /** @deprecated */
   hintValue: function() {
+    //@if(debug)
+    SC.warn("Developer Warning: The hintValue property of SC.LabelView is deprecated.  Please simply get the hint or displayHint (localized) property instead.");
+    //@endif
     var hintVal = this.get('hint');
-    return hintVal ;
+    return hintVal;
   }.property('hint').cacheable(),
 
   /**