Upgrade to ExtJS 4.0.7 - Released 10/19/2011

[extjs.git] / docs / source / Button2.html
diff --git a/docs/source/Button2.html b/docs/source/Button2.html

index 148b94d..14f9eb8 100644 (file)
--- a/docs/source/Button2.html
+++ b/docs/source/Button2.html
@@ -3,8 +3,8 @@
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>The source code</title>
-  <link href="../prettify/prettify.css" type="text/css" rel="stylesheet" />
-  <script type="text/javascript" src="../prettify/prettify.js"></script>
+  <link href="../resources/prettify/prettify.css" type="text/css" rel="stylesheet" />
+  <script type="text/javascript" src="../resources/prettify/prettify.js"></script>
    <style type="text/css">
      .highlight { display: block; background-color: #ddd; }
    </style>
@@ -51,6 +51,8 @@ Ext.define('Ext.layout.component.Button', {
              ownerEl = owner.el,
              btnEl = owner.btnEl,
              btnInnerEl = owner.btnInnerEl,
+            btnIconEl = owner.btnIconEl,
+            sizeIconEl = (owner.icon || owner.iconCls) &amp;&amp; (owner.iconAlign == &quot;top&quot; || owner.iconAlign == &quot;bottom&quot;),
              minWidth = owner.minWidth,
              maxWidth = owner.maxWidth,
              ownerWidth, btnFrameWidth, metrics;
@@ -65,17 +67,22 @@ Ext.define('Ext.layout.component.Button', {
              // In IE7 strict mode button elements with width:auto get strange extra side margins within
              // the wrapping table cell, but they go away if the width is explicitly set. So we measure
              // the size of the text and set the width to match.
-            if (owner.text &amp;&amp; Ext.isIE7 &amp;&amp; Ext.isStrict &amp;&amp; btnEl &amp;&amp; btnEl.getWidth() &gt; 20) {
+            if (owner.text &amp;&amp; (Ext.isIE6 || Ext.isIE7) &amp;&amp; Ext.isStrict &amp;&amp; btnEl &amp;&amp; btnEl.getWidth() &gt; 20) {
                  btnFrameWidth = me.btnFrameWidth;
                  metrics = Ext.util.TextMetrics.measure(btnInnerEl, owner.text);
                  ownerEl.setWidth(metrics.width + btnFrameWidth + me.adjWidth);
                  btnEl.setWidth(metrics.width + btnFrameWidth);
                  btnInnerEl.setWidth(metrics.width + btnFrameWidth);
+
+                if (sizeIconEl) {
+                    btnIconEl.setWidth(metrics.width + btnFrameWidth);
+                }
              } else {
                  // Remove any previous fixed widths
                  ownerEl.setWidth(null);
                  btnEl.setWidth(null);
                  btnInnerEl.setWidth(null);
+                btnIconEl.setWidth(null);
              }
  
              // Handle maxWidth/minWidth config
@@ -108,7 +115,7 @@ Ext.define('Ext.layout.component.Button', {
          me.callParent(arguments);
          me.setElementSize(owner.btnEl, btnWidth, btnHeight);
          me.setElementSize(btnInnerEl, btnWidth, btnHeight);
-        if (isNum(btnHeight)) {
+        if (btnHeight &gt;= 0) {
              btnInnerEl.setStyle('line-height', btnHeight - btnFrameHeight + 'px');
          }