sproutcore 1.7.1.beta → 1.8.0

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroller.js

@@ -89,6 +89,11 @@ test('hasButtons', function() {
   equals(view2.$('.button-bottom, .button-top').length, 0, 'scrollers with buttons should not have an up or a down button');  
 });
 
+test('hasThumb', function() {
+  equals(view.$('.thumb').height(), view.get('thumbLength'),  'vertical scroller should have the right height');
+  equals(view1.$('.thumb').width(), view1.get('thumbLength'), 'horizontal scroller should have the right width');
+});
+
 test('aria-role', function() {
   var viewElem = view.$();
   equals(viewElem.attr('role'), 'scrollbar', 'aria role set to the scroller');

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

@@ -431,13 +431,13 @@ var pane;
         viewElem  = sv.$(),
         segments, i, len, segmentViewElem, role;
 
-    equals(viewElem.attr('role'), 'tablist', "The segmented view has aria role set");
+    equals(viewElem.attr('role'), 'group', "The segmented view has aria role set");
 
     segments = sv.get('childViews');
     for( i = 0, len = segments.length; i<len; ++i) {
       segmentViewElem = segments[i].$();
       role = segmentViewElem.attr('role');
-      equals(role, "tab", "segment " + (i+1) + " have aria role set");
+      equals(role, "button", "segment " + (i+1) + " have aria role set");
     }
   });
 

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select/ui.js

@@ -83,9 +83,22 @@ var pane = SC.ControlTestPane.design()
       isEnabledKey: 'isEnabled',
       itemSortKey: 'pos',
       showCheckbox: YES
-    }) ;
+    })
+
+    // sample11
+    .add("SelectButtonWithEmptyName", SC.SelectView, {
+      items: [{ title: "None", icon: 'select-button-icon' },
+        { title: "Low", icon: 'select-button-icon' },
+        { title: "Medium", icon: 'select-button-icon' },
+        { title: "High", icon: 'select-button-icon' }],
+      itemTitleKey: 'title',
+      itemIconKey: 'icon',
+      emptyName: '<empty>',
+      escapeHTML: NO,
+      showCheckbox: YES
+    });
 
-    pane.show();
+pane.show();
 
 // ..........................................................
 // TEST VIEWS
@@ -112,6 +125,7 @@ test("Check the visiblity of the selectButtons", function() {
   ok(pane.view('redraw').get('isVisibleInWindow'), 'redraw.isVisibleInWindow should be YES') ;
   ok(pane.view('SelectButtonWithIcon').get('isVisibleInWindow'), 'SelectButtonWithIcon.isVisibleInWindow should be YES') ;
   ok(pane.view('StaticLayout').get('isVisibleInWindow'), 'StaticLayout.isVisibleInWindow should be YES') ;
+  ok(pane.view('SelectButtonWithEmptyName').get('isVisibleInWindow'), 'SelectButtonWithEmptyName.isVisibleInWindow should be YES') ;
 }) ;
 
 //test2
@@ -194,7 +208,7 @@ test("redraw", function() {
   view.set('items', ['Calendar', 'Work', 'Home']);
   SC.RunLoop.end();
   ok(view.get('items').length === 3, "Items length should be 3");
-  
+
   // Can someone actually put a redraw test here?
 }) ;
 
@@ -222,3 +236,18 @@ test("StaticLayout", function() {
   ok(!view.$().hasClass('disabled'), 'should not have disabled class');
   ok(!view.$().hasClass('sel'), 'should not have sel class');
 });
+
+//test11
+test("SelectButtonWithEmptyName", function() {
+  var view=pane.view('SelectButtonWithEmptyName').$(),
+      label = pane.view('SelectButtonWithEmptyName').$('label');
+      console.log('label = ' + label);
+  ok(!view.hasClass('icon'), 'hasClass(Icon) should be NO') ;
+  ok(view.hasClass('sc-view'), 'hasClass(sc-view) should be YES') ;
+  ok(view.hasClass('sc-button-view'), 'hasClass(sc-button-view) should be YES') ;
+  ok(view.hasClass('sc-regular-size'), 'hasClass(sc-regular-size) should be YES') ;
+  ok(!view.hasClass('sel'), 'hasClass(sel) should be NO') ;
+  ok(!view.hasClass('disabled'), 'hasClass(disabled) should be NO') ;
+  ok(!view.hasClass('def'), 'hasClass(def) should be NO') ;
+  equals(label[0].innerHTML, '<empty>', 'The label should be "<empty>"');
+});

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/split/methods.js

@@ -49,6 +49,18 @@ test("Layout direction is Vertical",function() {
   equals(view.getPath('thumbViewCursor.cursorStyle'),"ns-resize",'The Cursor is');
 });
 
+test("Cursor remains correct after drag", function() {
+  view.set('layoutDirection', SC.LAYOUT_HORIZONTAL) ;
+  equals(view.getPath('thumbViewCursor.cursorStyle'), "ew-resize", 'The Cursor is');
+ 	
+ 	// Trigger the action
+ 	var elem = view.getPath('dividerView.layer');
+ 	SC.Event.trigger(elem, 'mousedown'); 	
+ 	SC.Event.trigger(elem, 'mouseup');
+  
+  equals(view.getPath('thumbViewCursor.cursorStyle'), "ew-resize",'The Cursor is');
+});
+
 // 
 // test("performing the mouse up event", function() {
 // 	var elem = thumb.get('layer');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/stacked/ui_comments.js

@@ -15,6 +15,18 @@ var CommentView = SC.View.extend(SC.StaticLayout, SC.Control, {
   
   classNames: 'comment-view',
 
+  contentKeys: {
+    'contentFromKey': 'from',
+    'contentDateKey': 'date',
+    'contentCommentKey': 'comment'
+  },
+
+  contentFromKey: 'from',
+
+  contentDateKey: 'date',
+
+  contentCommentKey: 'comment',
+
   contentPropertyDidChange: function(target, key) {
 
     // update everything!

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/methods.js

@@ -42,11 +42,3 @@ module("SC.TabView", {
   }
 });
 
-test("Methods of TabView are untested");
-
-
-//_tab_nowShowingDidChange: function() {
-
-//_tab_saveUserDefault: function() {
-
-//_tab_itemsDidChange: function() {

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

@@ -62,7 +62,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
 
   /**
     Tied to the isEnabled state
-    
+
     @type Boolean
     @default YES
   */
@@ -90,8 +90,8 @@ SC.ButtonView = SC.View.extend(SC.Control,
 
   // ..........................................................
   // Value Handling
-  // 
-  
+  //
+
   /**
     Used to automatically update the state of the button view for toggle style
     buttons.
@@ -103,26 +103,26 @@ SC.ButtonView = SC.View.extend(SC.Control,
     `toggleOffValue`.  Alternatively, if you leave these properties set to
     `YES` or `NO`, the button will do its best to convert a value to an
     appropriate state:
-  
+
      - `null`, `false`, `0` -- `isSelected = false`
      - any other single value -- `isSelected = true`
      - array -- if all values are the same state, that state; otherwise `MIXED`.
-    
+
     @type Object
     @default null
-  */  
+  */
   value: null,
 
   /**
     Value of a selected toggle button.
-    
+
     For a toggle button, set this to any object value you want. The button
     will be selected if the value property equals the targetValue. If the
     value is an array of multiple items that contains the targetValue, then
     the button will be set to a mixed state.
-    
+
     default is YES
-    
+
     @type Boolean|Object
     @default YES
   */
@@ -130,11 +130,11 @@ SC.ButtonView = SC.View.extend(SC.Control,
 
   /**
     Value of an unselected toggle button.
-    
+
     For a toggle button, set this to any object value you want.  When the
     user toggle's the button off, the value of the button will be set to this
     value.
-    
+
     @type Boolean|Object
     @default NO
   */
@@ -143,16 +143,16 @@ SC.ButtonView = SC.View.extend(SC.Control,
 
   // ..........................................................
   // Title Handling
-  // 
-  
+  //
+
   /**
     If YES, then the title will be localized.
-    
+
     @type Boolean
     @default NO
   */
   localize: NO,
-  
+
   /** @private */
   localizeBindingDefault: SC.Binding.bool(),
 
@@ -160,26 +160,28 @@ SC.ButtonView = SC.View.extend(SC.Control,
     The button title.  If localize is `YES`, then this should be the
     localization key to display.  Otherwise, this will be the actual string
     displayed in the title.  This property is observable and bindable.
-    
+
     @type String
     @default ""
   */
   title: "",
 
+  tooltip: "",
+
   /**
     If set, the title property will be updated automatically
     from the content using the key you specify.
-    
+
     @type String
     @default null
   */
   contentTitleKey: null,
-  
+
   /**
     The button icon. Set this to either a URL or a CSS class name (for
     spriting). Note that if you pass a URL, it must contain at
     least one slash to be detected as such.
-    
+
     @type String
     @default null
   */
@@ -188,7 +190,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
   /**
     If you set this property, the icon will be updated automatically from the
     content using the key you specify.
-    
+
     @type String
     @default null
   */
@@ -198,15 +200,15 @@ SC.ButtonView = SC.View.extend(SC.Control,
     If YES, button will attempt to display an ellipsis if the title cannot
     fit inside of the visible area. This feature is not available on all
     browsers.
-    
+
     @type Boolean
     @default YES
   */
   needsEllipsis: YES,
-  
+
   /**
     This is generated by localizing the title property if necessary.
-    
+
     @type String
     @observes 'title'
     @observes 'localize'
@@ -215,10 +217,10 @@ SC.ButtonView = SC.View.extend(SC.Control,
     var ret = this.get('title');
     return (ret && this.get('localize')) ? SC.String.loc(ret) : (ret || '');
   }.property('title','localize').cacheable(),
-  
+
   /**
     The key equivalent that should trigger this button on the page.
-    
+
     @type String
     @default null
   */
@@ -227,7 +229,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
 
   // ..........................................................
   // BEHAVIOR
-  // 
+  //
 
   /**
     The behavioral mode of this button.
@@ -243,7 +245,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
      - `SC.TOGGLE_OFF_BEHAVIOR` -- Pressing the button will set the current state to
        false no matter the previous value.
      - `SC.HOLD_BEHAVIOR` -- Pressing the button will cause the action to repeat at a
-       regular interval specifed by 'holdInterval'
+       regular interval specified by 'holdInterval'
 
     @type String
     @default SC.PUSH_BEHAVIOR
@@ -331,7 +333,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
 
   // ..........................................................
   // Auto Resize Support
-  // 
+  //
   //
   // These properties are provided so that SC.AutoResize can be mixed in
   // to enable automatic resizing of the button.
@@ -345,7 +347,8 @@ SC.ButtonView = SC.View.extend(SC.Control,
   */
   /** @private */
   autoResizeLayer: function() {
-    return this.get('layer');
+    var ret = this.invokeRenderDelegateMethod('getRenderedAutoResizeLayer', this.$());
+    return ret || this.get('layer');
   }.property('layer').cacheable(),
 
   /** @private */
@@ -414,24 +417,6 @@ SC.ButtonView = SC.View.extend(SC.Control,
   */
   didTriggerAction: function() {},
 
-  /*
-    TODO Why is this not set by the theme? --TD
-  */
-  /**
-    The minimum width the button title should consume.  This property is used
-    when generating the HTML styling for the title itself.  The default
-    width of 80 usually provides a nice looking style, but you can set it to 0
-    if you want to disable minimum title width.
-
-    Note that the title width does not exactly match the width of the button
-    itself.  Extra padding added by the theme can impact the final total
-    size.
-
-    @type Number
-    @default 80
-  */
-  titleMinWidth: 80,
-
 
   // ................................................................
   // INTERNAL SUPPORT
@@ -450,13 +435,13 @@ SC.ButtonView = SC.View.extend(SC.Control,
     }
 
     // if value is not null, update isSelected to match value.  If value is
-    // null, we assume you may be using isSelected only.  
+    // null, we assume you may be using isSelected only.
     if (!SC.none(this.get('value'))) this._button_valueDidChange();
   },
 
   /**
     The WAI-ARIA role of the button.
-    
+
     @type String
     @default 'button'
     @readOnly
@@ -470,59 +455,36 @@ SC.ButtonView = SC.View.extend(SC.Control,
   /**
     The following properties affect how `SC.ButtonView` is rendered, and will
     cause the view to be rerendered if they change.
-    
+
     @type Array
     @default [
-      'icon', 'displayTitle', 'value', 'displayToolTip', 'isDefault', 'isCancel', 
-      'escapeHTML', 'needsEllipsis', 'hint', 'titleMinWidth', 'supportFocusRing'
+      'icon', 'displayTitle', 'value', 'displayToolTip', 'isDefault', 'isCancel',
+      'escapeHTML', 'needsEllipsis', 'tooltip', 'supportFocusRing'
     ]
   */
   displayProperties: [
-    'icon', 'displayTitle', 'value', 'displayToolTip', 'isDefault', 'isCancel', 
-    'escapeHTML', 'needsEllipsis', 'hint', 'titleMinWidth', 'supportFocusRing'
+    'icon', 'displayTitle', 'value', 'displayToolTip', 'isDefault', 'isCancel',
+    'escapeHTML', 'needsEllipsis', 'tooltip', 'supportFocusRing',
+    'buttonBehavior'
   ],
 
   /**
     The name of the render delegate in the theme that should be used to
     render the button.
-    
+
     In this case, the 'button' property will be retrieved from the theme and
     set to the render delegate of this view.
-    
+
     @type String
     @default 'buttonRenderDelegate'
   */
   renderDelegateName: 'buttonRenderDelegate',
 
-  /**
-    Updates the value, title, and icon keys based on the content object, if
-    set.
-    
-    @type {Object} target the target of the object that changed
-    @type {String} key name of property that changed
-    @returns {SC.ButtonView} receiver
-  */
-  contentPropertyDidChange: function(target, key) {
-    var del = this.get('displayDelegate'), 
-        content = this.get('content'), value ;
-
-    var valueKey = this.getDelegateProperty('contentValueKey', del) ;
-    if (valueKey && (key === valueKey || key === '*')) {
-      this.set('value', content ? (content.get ? content.get(valueKey) : content[valueKey]) : null) ;
-    }
-
-    var titleKey = this.getDelegateProperty('contentTitleKey', del) ;
-    if (titleKey && (key === titleKey || key === '*')) {
-      this.set('title', content ? (content.get ? content.get(titleKey) : content[titleKey]) : null) ;
-    }
-
-    var iconKey = this.getDelegateProperty('contentIconKey', del);
-    if (iconKey && (key === iconKey || key === '*')) {
-      this.set('icon', content ? (content.get ? content.get(iconKey) : content[iconKey]) : null) ;
-    }
-    
-    return this ;
-  },
+   contentKeys: {
+     'contentValueKey': 'value',
+     'contentTitleKey': 'title',
+     'contentIconKey': 'icon'
+   },
 
   /** @private - when title changes, dirty display. */
   _button_displayObserver: function() {
@@ -530,9 +492,9 @@ SC.ButtonView = SC.View.extend(SC.Control,
   }.observes('title', 'icon', 'value'),
 
   /**
-    Handle a key equivalent if set.  Trigger the default action for the 
+    Handle a key equivalent if set.  Trigger the default action for the
     button.  Depending on the implementation this may vary.
-    
+
     @param {String} keystring
     @param {SC.Event} evt
     @returns {Boolean}  YES if handled, NO otherwise
@@ -545,13 +507,13 @@ SC.ButtonView = SC.View.extend(SC.Control,
     var equiv = this.get('keyEquivalent');
 
     // button has defined a keyEquivalent and it matches!
-    // if triggering succeeded, true will be returned and the operation will 
-    // be handeled (i.e performKeyEquivalent will cease crawling the view 
+    // if triggering succeeded, true will be returned and the operation will
+    // be handled (i.e performKeyEquivalent will cease crawling the view
     // tree)
     if (equiv) {
       if (equiv === keystring) return this.triggerAction(evt);
-    
-    // should fire if isDefault OR isCancel.  This way if isDefault AND 
+
+    // should fire if isDefault OR isCancel.  This way if isDefault AND
     // isCancel, responds to both return and escape
     } else if ((this.get('isDefault') && (keystring === 'return')) ||
         (this.get('isCancel') && (keystring === 'escape'))) {
@@ -562,27 +524,27 @@ SC.ButtonView = SC.View.extend(SC.Control,
   },
 
   // ..........................................................
-  // VALUE <-> isSelected STATE MANAGEMNT
-  // 
+  // VALUE <-> isSelected STATE MANAGEMENT
+  //
 
   /**
     This is the standard logic to compute a proposed isSelected state for a
     new value.  This takes into account the `toggleOnValue`/`toggleOffValue`
     properties, among other things.  It may return `YES`, `NO`, or
     `SC.MIXED_STATE`.
-    
+
     @param {Object} value
     @returns {Boolean} return state
   */
   computeIsSelectedForValue: function(value) {
     var targetValue = this.get('toggleOnValue'), state, next ;
-    
+
     if (SC.typeOf(value) === SC.T_ARRAY) {
 
       // treat a single item array like a single value
       if (value.length === 1) {
         state = (value[0] == targetValue) ;
-        
+
       // for a multiple item array, check the states of all items.
       } else {
         state = null;
@@ -594,7 +556,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
           return state === SC.MIXED_STATE ; // stop when we hit a mixed state.
         });
       }
-      
+
     // for single values, just compare to the toggleOnValue...use truthiness
     } else {
       if(value === SC.MIXED_STATE) state = SC.MIXED_STATE;
@@ -611,7 +573,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
         state = this.computeIsSelectedForValue(value);
     this.set('isSelected', state) ; // set new state...
   }.observes('value'),
-  
+
   /** @private
     Whenever the selected state is changed, make sure the button value is
     also updated.  Note that this may be called because the value has just
@@ -620,7 +582,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
   _button_isSelectedDidChange: function() {
     var newState = this.get('isSelected'),
         curState = this.computeIsSelectedForValue(this.get('value'));
-    
+
     // fix up the value, but only if computed state does not match.
     // never fix up value if isSelected is set to MIXED_STATE since this can
     // only come from the value.
@@ -633,11 +595,11 @@ SC.ButtonView = SC.View.extend(SC.Control,
 
   /** @private
     Used to store the keyboard equivalent.
-    
+
     Setting the isDefault property to YES, for example, will cause the
     `keyEquivalent` property to 'return'. This cached value is used to restore
     the `keyEquivalent` property if isDefault is set back to NO.
-    
+
     @type String
   */
   _defaultKeyEquivalent: null,
@@ -832,19 +794,20 @@ SC.ButtonView = SC.View.extend(SC.Control,
   _runAction: function(evt) {
     var action = this.get('action'),
         target = this.get('target') || null,
-        rootResponder = this.getPath('pane.rootResponder');
-        
+        rootResponder;
+
     if (action) {
-      if (this._hasLegacyActionHandler()) {
-        // old school... V
-        this._triggerLegacyActionHandler(evt);
+      if (action && (SC.typeOf(action) === SC.T_FUNCTION)) {
+        this.action(evt);
+        return;
       } else {
+        rootResponder = this.getPath('pane.rootResponder');
         if (rootResponder) {
           // newer action method + optional target syntax...
           rootResponder.sendAction(action, target, this, this.get('pane'), null, this);
         }
       }
-    }    
+    }
   },
 
   /** @private */
@@ -861,27 +824,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
     }
   },
 
-  /** @private */
-  _hasLegacyActionHandler: function() {
-    var action = this.get('action');
-    if (action && (SC.typeOf(action) === SC.T_FUNCTION)) return true;
-    if (action && (SC.typeOf(action) === SC.T_STRING) && (action.indexOf('.') != -1)) return true;
-    return false;
-  },
-  
-  /** @private */
-  _triggerLegacyActionHandler: function( evt )
-  {
-    if (!this._hasLegacyActionHandler()) return false;
-  
-    var action = this.get('action');
-    if (SC.typeOf(action) === SC.T_FUNCTION) this.action(evt);
-    if (SC.typeOf(action) === SC.T_STRING) {
-      eval("this.action = function(e) { return "+ action +"(this, e); };");
-      this.action(evt);
-    }
-  },
-  
+
   /** @private */
   didBecomeKeyResponderFrom: function(keyView) {
     // focus the text field.
@@ -893,15 +836,17 @@ SC.ButtonView = SC.View.extend(SC.Control,
       }
     }
   },
-  
+
   /** @private */
   willLoseKeyResponderTo: function(responder) {
     if (this._isFocused) this._isFocused = NO ;
   },
-  
+
   /** @private */
   didAppendToDocument: function() {
-    if(parseInt(SC.browser.msie, 0)===7 && this.get('useStaticLayout')){
+    if(SC.browser.isIE &&
+        SC.browser.compare(SC.browser.engineVersion, '7') === 0 &&
+        this.get('useStaticLayout')){
       var layout = this.get('layout'),
           elem = this.$(), w=0;
       if(elem && elem[0] && (w=elem[0].clientWidth) && w!==0 && this._labelMinWidthIE7===0){
@@ -936,7 +881,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
   @constant
   @type Number
 */
-SC.ButtonView.CLICK_AND_HOLD_DELAY = SC.browser.msie ? 600 : 300;
+SC.ButtonView.CLICK_AND_HOLD_DELAY = SC.browser.isIE ? 600 : 300;
 
 SC.REGULAR_BUTTON_HEIGHT=24;