sproutcore 1.0.1046 → 1.0.1049.pre.1

data/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/methods.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start Q$*/

data/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/ui.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

data/frameworks/sproutcore/frameworks/desktop/tests/views/separator.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

data/frameworks/sproutcore/frameworks/desktop/tests/views/source_list/methods.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

data/frameworks/sproutcore/frameworks/desktop/tests/views/source_list/ui.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

data/frameworks/sproutcore/frameworks/desktop/tests/views/split/ui.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /* Test SC.StackedView with a Comments example. */

data/frameworks/sproutcore/frameworks/desktop/tests/views/static_content.js

@@ -0,0 +1,46 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+//            portions copyright ©2010 Apple Inc.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+module('SC.StaticContentView - Basic UI');
+
+test("Frame Recalculation", function() {
+  var callCount = 0, baseCount, content;
+  var pane = SC.PanelPane.create({
+    layout: { width: 500, height: 500, centerX: 0, centerY: 0 },
+    contentView: SC.ScrollView.design({
+      layout: { top: 10, right: 10, bottom: 10, left: 10 }
+    })
+  });
+  var view = SC.StaticContentView.create({
+        content: '<p style="position: relative; margin-top: 80px; font-size: 3em">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>',
+        frameDidChange: function() {
+          callCount += 1;
+        }.observes('frame')
+      });
+
+   pane.setPath('contentView.contentView', view);
+   pane.append();
+   baseCount = callCount;
+   ok(callCount > 0, 'precond - frame should be called at least once when displayed');
+   callCount = 0;
+
+   SC.run(function() { pane.adjust('width', 499); });
+   ok(callCount > 1, 'frame should recompute after parent resizes');
+   callCount = 0;
+
+   content = 'For today, we celebrate the first glorious anniversary of the Information Purification Directives. We have created, for the first time in all history, a garden of pure ideology. Where each worker may bloom secure from the pests of contradictory and confusing truths.Our Unification of Thought is more powerful a weapon than any fleet or army on earth. We are one people. With one will. One resolve. One cause. Our enemies shall talk themselves to death. And we will bury them with their own confusion. We shall prevail!';
+   view.set('content', content);
+   ok(callCount > 0, 'frame should recompute after content changes');
+   callCount = 0;
+
+   SC.RunLoop.begin().end();
+   ok(view.get('layer').textContent.indexOf(content) > -1, 'view should rerender when content changes');
+   view.contentLayoutDidChange();
+   ok(callCount > 0, 'frame should recompute after calling contentLayoutDidChange()');
+
+   pane.remove();
+});

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

data/frameworks/sproutcore/frameworks/desktop/tests/views/tab/ui.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

data/frameworks/sproutcore/frameworks/desktop/tests/views/web/methods.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

data/frameworks/sproutcore/frameworks/desktop/tests/views/web/ui.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*global module test htmlbody ok equals same stop start v*/
 

data/frameworks/sproutcore/frameworks/desktop/tests/views/well/ui.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

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

@@ -2,18 +2,11 @@
 // 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)
 // ==========================================================================
 
 /*jslint evil:true */
 
-// Constants
-SC.TOGGLE_BEHAVIOR = 'toggle';
-SC.PUSH_BEHAVIOR =   'push';
-SC.TOGGLE_ON_BEHAVIOR = "on";
-SC.TOGGLE_OFF_BEHAVIOR = "off" ;
-SC.HOLD_BEHAVIOR = 'hold' ;
-
 /** @class
 
   Implements a push-button-style button.  This class is used to implement 
@@ -21,6 +14,11 @@ SC.HOLD_BEHAVIOR = 'hold' ;
   and SC.RadioView which are implemented as field views, but can also be 
   treated as buttons.
   
+  By default, a button uses the SC.Control mixin which will apply CSS 
+  classnames when the state of the button changes:
+    - active     when button is active
+    - sel        when button is toggled to a selected state
+  
   @extends SC.View
   @extends SC.Control
   @extends SC.Button
@@ -29,10 +27,27 @@ SC.HOLD_BEHAVIOR = 'hold' ;
 SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
 /** @scope SC.ButtonView.prototype */ {
   
-  tagName: 'a',
+  /**
+    What type of element this view is represented as
+    
+    @property {String}
+  */
+  tagName: 'div',
+  
+  /**
+    ButtonView's renderers should be smart enough to...
+  */
+  controlSize: SC.REGULAR_CONTROL_SIZE,
+
+  /**
+    Class names that will be applied to this view
+    
+    @property {Array}
+  */
   classNames: ['sc-button-view'],
   
   /**
+    This property used to be called theme. We changed it now 
     optionally set this to the theme you want this button to have.  
     
     This is used to determine the type of button this is.  You generally 
@@ -41,27 +56,36 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     
     The default SproutCore theme supports "regular", "capsule", "checkbox", 
     and "radio"
+    
+    @property {String}
   */
-  theme: 'square',
+  controlStyle: 'square',
   
   /**
     Optionally set the behavioral mode of this button.  
   
     Possible values are:
-
-    - *SC.PUSH_BEHAVIOR* Pressing the button will trigger an action tied to the button. Does not change the value of the button.
-    - *SC.TOGGLE_BEHAVIOR* Pressing the button will invert the current value of the button. If the button has a mixed value, it will be set to true.
-    - *SC.TOGGLE_ON_BEHAVIOR* Pressing the button will set the current state to true no matter the previous value.
-    - *SC.TOGGLE_OFF_BEHAVIOR* Pressing the button will set the current state to false no matter the previous value.
-  
-  */  
+    - *SC.PUSH_BEHAVIOR* Pressing the button will trigger an action tied to the 
+      button. Does not change the value of the button.
+    - *SC.TOGGLE_BEHAVIOR* Pressing the button will invert the current value of 
+      the button. If the button has a mixed value, it will be set to true.
+    - *SC.TOGGLE_ON_BEHAVIOR* Pressing the button will set the current state to 
+      true no matter the previous value.
+    - *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'
+      
+    @property {String}
+  */
   buttonBehavior: SC.PUSH_BEHAVIOR,
 
   /*
-    If buttonBehavior is SC.HOLD_BEHAVIOR, this specifies, in miliseconds, how often to trigger the action.
-    Ignored for other behaviors.
+    If buttonBehavior is SC.HOLD_BEHAVIOR, this specifies, in miliseconds, how 
+    often to trigger the action. Ignored for other behaviors.
+    
+    @property {Number}
   */
-
   holdInterval: 100,
 
   /**
@@ -69,20 +93,26 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     
     This is the same as setting the keyEquivalent to 'return'.  This will also
     apply the "def" classname to the button.
+    
+    @property {Boolean}
   */
   isDefault: NO,
   isDefaultBindingDefault: SC.Binding.oneWay().bool(),
   
   /**
     If YES, then this button will be triggered when you hit escape.
-    
     This is the same as setting the keyEquivalent to 'escape'.
+    
+    @property {Boolean}
   */  
   isCancel: NO,
   isCancelBindingDefault: SC.Binding.oneWay().bool(),
 
   /**
-    The button href value.  This can be used to create localized button href values.  Setting an empty or null href will set it to javascript:;
+    The button href value.  This can be used to create localized button href 
+    values.  Setting an empty or null href will set it to javascript:;
+    
+    @property {String}
   */
   href: '',
 
@@ -103,7 +133,7 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     clicked.  It is generally better to use the target/action approach and 
     to implement your code in a controller of some type.
     
-    @type String
+    @property {String}
   */
   action: null,
   
@@ -115,29 +145,61 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     null, then the button will search the responder chain for a view that 
     implements the action when the button is pressed instead.
     
-    @type Object
+    @property {Object}
   */
   target: null,
   
-  /**
-    fakes a click... evt is optional.  
-    
-    Temporarily highlights the button to show that it is being triggered.  
-    Does nothing if the button is disabled. 
+  /** 
+    If YES, use a focus ring.
     
-    @returns {bool} success/failure of the request
-  */  
-  triggerAction: function(evt) {  
+    @property {Boolean}
+  */
+  supportFocusRing: NO,
+
+  /**
+    Called when the user presses a shortcut key, such as return or cancel,
+    associated with this button.
+
+    Highlights the button to show that it is being triggered, then, after a
+    delay, performs the button's action.
+
+    Does nothing if the button is disabled.
+
+    @param {Event} evt
+    @returns {Boolean} success/failure of the request
+  */
+  triggerAction: function(evt) {
+    // If this button is disabled, we have nothing to do
     if (!this.get('isEnabled')) return NO;
+
+    // Set active state of the button so it appears highlighted
     this.set('isActive', YES);
+
+    // Invoke the actual action method after a small delay to give the user a
+    // chance to see the highlight. This is especially important if the button
+    // closes a pane, for example.
+    this.invokeLater('_triggerActionAfterDelay', 200, evt);
+    return YES;
+  },
+
+  /** @private
+    Called by triggerAction after a delay; this method actually
+    performs the action and restores the button's state.
+
+    @param {Event} evt
+  */
+  _triggerActionAfterDelay: function(evt) {
     this._action(evt, YES);
     this.didTriggerAction();
-    this.invokeLater('set', 200, 'isActive', NO);
-    return true;
+    this.set('isActive', NO);
   },
-  
+
   /**
-    This method is called anytime the button's action is triggered.  You can implement this method in your own subclass to perform any cleanup needed after an action is performed.
+    This method is called anytime the button's action is triggered.  You can 
+    implement this method in your own subclass to perform any cleanup needed 
+    after an action is performed.
+    
+    @property {function}
   */
   didTriggerAction: function() {},
 
@@ -150,6 +212,8 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     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.
+    
+    @property {Number}
   */
   titleMinWidth: 80,
   
@@ -158,6 +222,11 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
 
   /** @private - save keyEquivalent for later use */
   init: function() {
+    //Add to the classNames array the controlStyle
+    var classnames = SC.clone(this.get('classNames'));
+    classnames.push(this.get('controlStyle'));
+    this.set('classNames', classnames);
+    
     sc_super();
     
     //cache the key equivalent
@@ -170,41 +239,47 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
   // isCancel and isDefault also cause a refresh but this is implemented as 
   // a separate observer (see below)
   displayProperties: ['href', 'icon', 'title', 'value', 'toolTip'],
-
-  render: function(context, firstTime) {
-    // add href attr if tagName is anchor...
-    var href, toolTip, classes;
-    if (this.get('tagName') === 'a') {
-      href = this.get('href');
-      if (!href || (href.length === 0)) href = "javascript"+":;";
-      context.attr('href', href);
-    }
-
-    // If there is a toolTip set, grab it and localize if necessary.
-    toolTip = this.get('toolTip') ;
-    if (SC.typeOf(toolTip) === SC.T_STRING) {
-      if (this.get('localize')) toolTip = toolTip.loc() ;
-      context.attr('title', toolTip) ;
-      context.attr('alt', toolTip) ;
-    }
+  
+  
+  /**
+    This property is used to call the right render style for the button.
+    * This might be a future way to start implementing the render method
+    as part of the theme
+  */ 
+  
+  renderStyle: 'renderDefault', //SUPPORTED DEFAULT, IMAGE
+  
+  /**
+    Creates the button view's renderer.
+  */
+  createRenderer: function(theme) {
+    var ret, style = this.get('renderStyle');
+    if (style==="renderDefault") ret = theme.button();
+    if (style==="renderImage") ret = theme.imageButton();
+    this.updateRenderer(ret); // updating looks _exactly_ like normal stuff for us.
+    return ret;
+  },
+  
+  updateRenderer: function(r) {
+    var toolTip = this.get("toolTip");
+    if (toolTip && this.get("localize")) toolTip = toolTip.loc();
     
-    // add some standard attributes & classes.
-    classes = this._TEMPORARY_CLASS_HASH;
-    classes.def = this.get('isDefault');
-    classes.cancel = this.get('isCancel');
-    classes.icon = !!this.get('icon');
-    context.attr('role', 'button')
-      .setClass(classes).addClass(this.get('theme'));
-    // render inner html 
-    if(firstTime){
-       context = context.push("<span class='sc-button-inner' style = 'min-width:%@px'>"
-            .fmt(this.get('titleMinWidth')));
-      this.renderTitle(context, firstTime) ; // from button mixin
-      context.push("</span>") ;
-    }else{
-      this.renderTitle(context, firstTime) ;
-    }
-   },
+    r.attr({
+      toolTip: toolTip,
+      isAnchor: this.get("tagName") === 'a',
+      href: this.get("href"),
+      isDefault: this.get('isDefault'),
+      isCancel: this.get('isCancel'),
+      icon: this.get('icon'),
+      supportFocusRing: this.get("supportFocusRing"),
+      titleMinWidth: this.get('titleMinWidth'),
+      
+      title: this.get("displayTitle"),
+      escapeHTML: this.get("escapeHTML"),
+      needsEllipsis: this.get("needsEllipsis")
+    });
+  },
+  
   
   /** @private {String} used to store a previously defined key equiv */
   _defaultKeyEquivalent: null,
@@ -248,7 +323,7 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
       this._isFocused = YES ;
       this.becomeFirstResponder();
       if (this.get('isVisibleInWindow')) {
-        this.$()[0].focus();
+        this.renderer.focus();
       }
     }
 
@@ -259,7 +334,9 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     Remove the active class on mouseOut if mouse is down.
   */  
   mouseExited: function(evt) {
-    if (this._isMouseDown) this.set('isActive', NO);
+    if (this._isMouseDown) {
+      this.set('isActive', NO);
+    }
     return YES;
   },
 
@@ -267,7 +344,9 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     If mouse was down and we renter the button area, set the active state again.
   */  
   mouseEntered: function(evt) {
-    this.set('isActive', this._isMouseDown);
+    if (this._isMouseDown) {
+      this.set('isActive', YES);
+    }
     return YES;
   },
 
@@ -279,14 +358,62 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     this._isMouseDown = false;
 
     if (this.get('buttonBehavior') !== SC.HOLD_BEHAVIOR) {
-      var inside = this.$().within(evt.target) ;
+      var inside = this.renderer.causedEvent(evt) ;
       if (inside && this.get('isEnabled')) this._action(evt) ;
     }
 
     return YES ;
   },
   
+  touchStart: function(touch){
+    var buttonBehavior = this.get('buttonBehavior');
+
+    if (!this.get('isEnabled')) return YES ; // handled event, but do nothing
+    this.set('isActive', YES);
+
+    if (buttonBehavior === SC.HOLD_BEHAVIOR) {
+      this._action(touch);
+    } else if (!this._isFocused && (buttonBehavior!==SC.PUSH_BEHAVIOR)) {
+      this._isFocused = YES ;
+      this.becomeFirstResponder();
+      if (this.get('isVisibleInWindow')) {
+        this.$()[0].focus();
+      }
+    }
+
+    // don't want to do whatever default is...
+    touch.preventDefault();
+
+    return YES;
+  },
   
+  touchesDragged: function(evt, touches) {
+    if (!this.touchIsInBoundary(evt)) {
+      if (!this._touch_exited) this.set('isActive', NO);
+      this._touch_exited = YES;
+    } else {
+      if (this._touch_exited) this.set('isActive', YES);
+      this._touch_exited = NO;
+    }
+    
+    evt.preventDefault();
+    return YES;
+  },
+  
+  touchEnd: function(touch){
+    this._touch_exited = NO;
+    this.set('isActive', NO); // track independently in case isEnabled has changed
+
+    if (this.get('buttonBehavior') !== SC.HOLD_BEHAVIOR) {
+      if (this.touchIsInBoundary(touch)) this._action();
+    }
+    
+    touch.preventDefault();
+    return YES ;
+  },
+  
+  
+  /** @private */
   keyDown: function(evt) {
     // handle tab key
     if (evt.which === 9) {
@@ -343,21 +470,26 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     }
   },
 
+  /** @private */
   _runAction: function(evt) {
     var action = this.get('action'),
-        target = this.get('target') || null;
+        target = this.get('target') || null,
+        rootResponder = this.getPath('pane.rootResponder');
 
     if (action) {
       if (this._hasLegacyActionHandler()) {
-        // old school... 
+        // old school... V
         this._triggerLegacyActionHandler(evt);
       } else {
-        // newer action method + optional target syntax...
-        this.getPath('pane.rootResponder').sendAction(action, target, this, this.get('pane'));
+        if (rootResponder) {
+          // newer action method + optional target syntax...
+          this.getPath('pane.rootResponder').sendAction(action, target, this, this.get('pane'), null, this);
+        }
       }
     }
   },
 
+  /** @private */
   _runHoldAction: function(evt, skipRepeat) {
     if (this.get('isActive')) {
       this._runAction();
@@ -405,14 +537,52 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
       this._isFocused = YES ;
       this.becomeFirstResponder();
       if (this.get('isVisibleInWindow')) {
-        this.$()[0].focus();
+        if (this.renderer) this.renderer.focus();
       }
     }
   },
   
   willLoseKeyResponderTo: function(responder) {
     if (this._isFocused) this._isFocused = NO ;
+  },
+  
+  didAppendToDocument: function() {
+   if(parseInt(SC.browser.msie, 0)===7){
+      var layout = this.get('layout');
+      if(this.get('useStaticLayout') && layout.width && 
+        (layout.width.indexOf && layout.width.indexOf('auto')!=-1)){
+        var elem = this.$();
+        if(elem && elem[0]){
+          var w = elem[0].clientWidth;
+          if(w!==0){
+            var padding = parseInt(elem.css('paddingRight'),0);
+            this.$('.sc-button-label').css('minWidth', w-(padding*2)+'px');
+          }
+        }
+      }
+    }
   }
   
 }) ;
 
+// ..........................................................
+// CONSTANTS
+//
+SC.TOGGLE_BEHAVIOR = 'toggle';
+SC.PUSH_BEHAVIOR =   'push';
+SC.TOGGLE_ON_BEHAVIOR = 'on';
+SC.TOGGLE_OFF_BEHAVIOR = 'off';
+SC.HOLD_BEHAVIOR = 'hold';
+
+/**
+  The delay after which "click" behavior should transition to "click and hold"
+  behavior. This is used by subclasses such as PopupButtonView and
+  SelectButtonView.
+
+  @constant
+  @type Number
+*/
+SC.ButtonView.CLICK_AND_HOLD_DELAY = 300;
+
+SC.REGULAR_BUTTON_HEIGHT=24;
+