Moved rico.js to minsrc and is now part of rico_min.js. Files are now sent to the...

[infodrom/rico3] / minsrc / ricoGridCommon.js

diff --git a/minsrc/ricoGridCommon.js b/minsrc/ricoGridCommon.js
index ced18d0..655e62e 100644 (file)
--- a/minsrc/ricoGridCommon.js
+++ b/minsrc/ricoGridCommon.js
@@ -539,7 +539,7 @@ Rico.GridCommon = {
       }
     }
     Rico.log('opening columnChooser');
-    this.columnChooser.openPopup(1,this.hdrHt);
+    this.columnChooser.openPopup(3,this.hdrHt+3);
     for (x=0;x<this.columns.length;x++) {
       this.columns[x].ChooserBox.checked=this.columns[x].visible;
       this.columns[x].ChooserBox.disabled = !this.columns[x].canHideShow();
@@ -729,7 +729,7 @@ Rico.TableColumnBase.prototype = {
  * Common code used to initialize the column in both SimpleGrid & LiveGrid
  */
   baseInit: function(liveGrid,colIdx,hdrInfo,tabIdx) {
-    Rico.log("TableColumnBase.init index="+colIdx+" tabIdx="+tabIdx);
+    Rico.log("TableColumnBase.baseInit index="+colIdx+" tabIdx="+tabIdx);
     this.liveGrid  = liveGrid;
     this.index     = colIdx;
     this.hideWidth = Rico.isKonqueror || Rico.isWebKit || liveGrid.headerRowCnt>1 ? 5 : 2;  // column width used for "hidden" columns. Anything less than 5 causes problems with Konqueror. Best to keep this greater than padding used inside cell.
@@ -751,14 +751,12 @@ Rico.TableColumnBase.prototype = {
     this.mouseUpHandler  = Rico.eventHandle(this,'handleMouseUp');
     this.mouseOutHandler = Rico.eventHandle(this,'handleMouseOut');
 
-    this.fieldName = 'col'+this.index;
     this.format={type:"text"};
     var spec = liveGrid.options.columnSpecs[colIdx];
     if (typeof spec == 'object') Rico.extend(this.format, spec);
     Rico.addClass(this.dataColDiv, this.colClassName());
     this.visible=true;
     if (typeof this.format.visible=='boolean') this.visible=this.format.visible;
-    Rico.log("TableColumn.init index="+colIdx+" fieldName="+this.fieldName);
     this.sortable     = typeof this.format.canSort=='boolean' ? this.format.canSort : liveGrid.options.canSortDefault;
     this.currentSort  = Rico.ColumnConst.UNSORTED;
     this.filterable   = typeof this.format.canFilter=='boolean' ? this.format.canFilter : liveGrid.options.canFilterDefault;
@@ -866,7 +864,7 @@ Rico.TableColumnBase.prototype = {
     this.origWidth=parseInt(this.colWidth,10);
     var p=Rico.positionedOffset(this.hdrCell);
     if (this.liveGrid.direction=='rtl') {
-      this.edge=p.left+this.liveGrid.options.scrollBarWidth;
+      this.edge=p.left;
       switch (this.tabIdx) {
         case 0: this.edge+=this.liveGrid.innerDiv.offsetWidth; break;
         case 1: this.edge-=this.liveGrid.scrollDiv.scrollLeft; break;