Upgrade to ExtJS 3.0.3 - Released 10/11/2009

[extjs.git] / src / widgets / list / ListView.js

diff --git a/src/widgets/list/ListView.js b/src/widgets/list/ListView.js
index d02bdf7..72400f0 100644 (file)
--- a/src/widgets/list/ListView.js
+++ b/src/widgets/list/ListView.js
@@ -1,5 +1,5 @@
 /*!
- * Ext JS Library 3.0.0
+ * Ext JS Library 3.0.3
  * Copyright(c) 2006-2009 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
@@ -138,9 +138,10 @@ Ext.ListView = Ext.extend(Ext.DataView, {
      */\r
     /**\r
      * @cfg {Number} scrollOffset The amount of space to reserve for the scrollbar (defaults to\r
-     * <tt>19</tt> pixels)\r
+     * <tt>undefined</tt>). If an explicit value isn't specified, this will be automatically\r
+     * calculated.\r
      */\r
-    scrollOffset : 19,\r
+    scrollOffset : undefined,\r
     /**\r
      * @cfg {Boolean/Object} columnResize\r
      * Specify <tt>true</tt> or specify a configuration object for {@link Ext.ListView.ColumnResizer}\r
@@ -188,6 +189,11 @@ Ext.ListView = Ext.extend(Ext.DataView, {
      * The template to be used for the header row.  See {@link #tpl} for more details.\r
      */\r
 \r
+    /*\r
+     * IE has issues when setting percentage based widths to 100%. Default to 99.\r
+     */\r
+    maxWidth: Ext.isIE ? 99 : 100,\r
+    \r
     initComponent : function(){\r
         if(this.columnResize){\r
             this.colResizer = new Ext.ListView.ColumnResizer(this.colResizer);\r
@@ -225,9 +231,13 @@ Ext.ListView = Ext.extend(Ext.DataView, {
                 '</tpl>'\r
             );\r
         };\r
-        var cs = this.columns, allocatedWidth = 0, colsWithWidth = 0, len = cs.length;\r
+        var cs = this.columns, \r
+            allocatedWidth = 0, \r
+            colsWithWidth = 0, \r
+            len = cs.length, \r
+            columns = [];\r
         for(var i = 0; i < len; i++){\r
-            var c = cs[i];\r
+            var c = Ext.apply({}, cs[i]);\r
             if(!c.tpl){\r
                 c.tpl = new Ext.XTemplate('{' + c.dataIndex + '}');\r
             }else if(Ext.isString(c.tpl)){\r
@@ -239,12 +249,14 @@ Ext.ListView = Ext.extend(Ext.DataView, {
                 allocatedWidth += c.width;\r
                 colsWithWidth++;\r
             }\r
+            columns.push(c);\r
         }\r
+        cs = this.columns = columns;\r
         // auto calculate missing column widths\r
         if(colsWithWidth < len){\r
             var remaining = len - colsWithWidth;\r
-            if(allocatedWidth < 100){\r
-                var perCol = ((100-allocatedWidth) / remaining);\r
+            if(allocatedWidth < this.maxWidth){\r
+                var perCol = ((this.maxWidth-allocatedWidth) / remaining);\r
                 for(var j = 0; j < len; j++){\r
                     var c = cs[j];\r
                     if(!Ext.isNumber(c.width)){\r
@@ -257,6 +269,9 @@ Ext.ListView = Ext.extend(Ext.DataView, {
     },\r
 \r
     onRender : function(){\r
+        this.autoEl = {\r
+            cls: 'x-list-wrap'  \r
+        };\r
         Ext.ListView.superclass.onRender.apply(this, arguments);\r
 \r
         this.internalTpl.overwrite(this.el, {columns: this.columns});\r
@@ -310,7 +325,7 @@ Ext.ListView = Ext.extend(Ext.DataView, {
         }\r
         var bdp = bd.parentNode;\r
         if(Ext.isNumber(w)){\r
-            var sw = w - this.scrollOffset;\r
+            var sw = w - Ext.num(this.scrollOffset, Ext.getScrollBarWidth());\r
             if(this.reserveScrollOffset || ((bdp.offsetWidth - bdp.clientWidth) > 10)){\r
                 bd.style.width = sw + 'px';\r
                 hd.style.width = sw + 'px';\r
@@ -325,7 +340,7 @@ Ext.ListView = Ext.extend(Ext.DataView, {
                 }, 10);\r
             }\r
         }\r
-        if(Ext.isNumber(h == 'number')){\r
+        if(Ext.isNumber(h)){\r
             bdp.style.height = (h - hd.parentNode.offsetHeight) + 'px';\r
         }\r
     },\r