Upgrade to ExtJS 3.1.1 - Released 02/08/2010

[extjs.git] / examples / ux / ColumnHeaderGroup.js

diff --git a/examples/ux/ColumnHeaderGroup.js b/examples/ux/ColumnHeaderGroup.js
index 99cc78e..e9ad21b 100644 (file)
--- a/examples/ux/ColumnHeaderGroup.js
+++ b/examples/ux/ColumnHeaderGroup.js
@@ -1,15 +1,11 @@
 /*!
 /*!

- * Ext JS Library 3.1.0
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.1.1
+ * Copyright(c) 2006-2010 Ext JS, LLC

  * licensing@extjs.com
  * http://www.extjs.com/license
  */
 Ext.ns('Ext.ux.grid');\r
 \r
  * licensing@extjs.com
  * http://www.extjs.com/license
  */
 Ext.ns('Ext.ux.grid');\r
 \r

-if(Ext.isWebKit){\r
-    Ext.grid.GridView.prototype.borderWidth = 0;\r
-}\r
-\r

 Ext.ux.grid.ColumnHeaderGroup = Ext.extend(Ext.util.Observable, {\r
 \r
     constructor: function(config){\r
 Ext.ux.grid.ColumnHeaderGroup = Ext.extend(Ext.util.Observable, {\r
 \r
     constructor: function(config){\r


@@ -378,7 +374,7 @@ Ext.ux.grid.ColumnHeaderGroup = Ext.extend(Ext.util.Observable, {
             }\r
         }\r
         return {\r
             }\r
         }\r
         return {\r

-            width: (Ext.isBorderBox ? width : Math.max(width - this.borderWidth, 0)) + 'px',\r
+            width: (Ext.isBorderBox || (Ext.isWebKit && !Ext.isSafari2) ? width : Math.max(width - this.borderWidth, 0)) + 'px',\r

             hidden: hidden\r
         };\r
     },\r
             hidden: hidden\r
         };\r
     },\r


@@ -458,8 +454,8 @@ Ext.ux.grid.ColumnHeaderGroup = Ext.extend(Ext.util.Observable, {
         if(cm.isFixed(newIndex)){\r
             return false;\r
         }\r
         if(cm.isFixed(newIndex)){\r
             return false;\r
         }\r

-        var row = Ext.ux.grid.ColumnHeaderGroup.prototype.getGroupRowIndex.call(this.view, h), \r
-            oldGroup = Ext.ux.grid.ColumnHeaderGroup.prototype.getGroupSpan.call(this.view, row, oldIndex), \r
+        var row = Ext.ux.grid.ColumnHeaderGroup.prototype.getGroupRowIndex.call(this.view, h),\r
+            oldGroup = Ext.ux.grid.ColumnHeaderGroup.prototype.getGroupSpan.call(this.view, row, oldIndex),\r

             newGroup = Ext.ux.grid.ColumnHeaderGroup.prototype.getGroupSpan.call(this.view, row, newIndex),\r
             oldIndex = oldGroup.col;\r
             newIndex = newGroup.col + (pt == "after" ? newGroup.colspan : 0);\r
             newGroup = Ext.ux.grid.ColumnHeaderGroup.prototype.getGroupSpan.call(this.view, row, newIndex),\r
             oldIndex = oldGroup.col;\r
             newIndex = newGroup.col + (pt == "after" ? newGroup.colspan : 0);\r