Updated Rico 2 and Rico 3 with all patches submitted on Sourceforge.

[infodrom/rico3] / minsrc / ricoLiveGrid.js

diff --git a/minsrc/ricoLiveGrid.js b/minsrc/ricoLiveGrid.js
index 61030c1..d550aaf 100644 (file)
--- a/minsrc/ricoLiveGrid.js
+++ b/minsrc/ricoLiveGrid.js
@@ -274,7 +274,7 @@ Rico.Buffer.Base.prototype = {
 
   getWindowStyle: function(windowRow,col) {
     var bufrow=this.bufferRow(windowRow);
 
   getWindowStyle: function(windowRow,col) {
     var bufrow=this.bufferRow(windowRow);

-    return this.attr && this.isVisible(bufrow) && col < this.attr[bufrow].length ? this.attr[bufrow][col] : '';
+    return this.attr && this.isVisible(bufrow) && this.attr[bufrow] && col < this.attr[bufrow].length ? this.attr[bufrow][col] : '';

   },
 
   getWindowValue: function(windowRow,col) {
   },
 
   getWindowValue: function(windowRow,col) {


@@ -574,6 +574,13 @@ Rico.LiveGrid.prototype = {
     if (this.options.windowResize)
       Rico.runLater(100,this,'pluginWindowResize');
     Rico.log("initialize complete for "+this.tableId);
     if (this.options.windowResize)
       Rico.runLater(100,this,'pluginWindowResize');
     Rico.log("initialize complete for "+this.tableId);

+    //alert('clientLeft='+this.scrollDiv.clientLeft);
+    if (this.direction=='rtl' && (!Rico.isWebKit || this.scrollDiv.clientLeft > 0)) {
+      this.scrollTab.style.right='0px';
+    } else {
+      this.scrollTab.style.left='0px';
+      Rico.setStyle(this.tabs[1], {'float': 'left'});
+    }

   }
 };
 
   }
 };
 


@@ -1209,11 +1216,13 @@ Rico.LiveGridMethods = {
       newdiv.className = 'ricoLG_cell '+cls;
       newdiv.id=this.tableId+'_'+this.pageSize+'_'+c;
       this.columns[c].dataColDiv.appendChild(newdiv);
       newdiv.className = 'ricoLG_cell '+cls;
       newdiv.id=this.tableId+'_'+this.pageSize+'_'+c;
       this.columns[c].dataColDiv.appendChild(newdiv);

-      if (this.columns[c].format.canDrag && Rico.registerDraggable)
-        Rico.registerDraggable( new Rico.LiveGridDraggable(this, this.pageSize, c), this.options.dndMgrIdx );
-      newdiv.innerHTML='&nbsp;';   // this seems to be required by IE

       if (this.columns[c]._create) {
         this.columns[c]._create(newdiv,this.pageSize);
       if (this.columns[c]._create) {
         this.columns[c]._create(newdiv,this.pageSize);

+      } else {
+        newdiv.innerHTML='&nbsp;';   // this seems to be required by IE
+      }
+      if (this.columns[c].format.canDrag && Rico.registerDraggable) {
+        Rico.registerDraggable( new Rico.LiveGridDraggable(this, this.pageSize, c), this.options.dndMgrIdx );

       }
     }
     this.pageSize++;
       }
     }
     this.pageSize++;


@@ -1660,13 +1669,6 @@ Rico.LiveGridMethods = {
     return -1;
   },
 
     return -1;
   },
 

-  findColumnName: function(name) {
-    for (var n=0; n<this.columns.length; n++) {
-      if (this.columns[n].fieldName == name) return n;
-    }
-    return -1;
-  },
-  

 /**
  * Searches options.columnSpecs colAttr for matching colValue
  * @return array of matching column indexes
 /**
  * Searches options.columnSpecs colAttr for matching colValue
  * @return array of matching column indexes


@@ -1682,8 +1684,8 @@ Rico.LiveGridMethods = {
 /**
  * Set initial sort
  */
 /**
  * Set initial sort
  */

-  setSortUI: function( columnNameOrNum, sortDirection ) {
-    Rico.log("setSortUI: "+columnNameOrNum+' '+sortDirection);
+  setSortUI: function( columnIdOrNum, sortDirection ) {
+    Rico.log("setSortUI: "+columnIdOrNum+' '+sortDirection);

     var colnum=this.findSortedColumn();
     if (colnum >= 0) {
       sortDirection=this.columns[colnum].getSortDirection();
     var colnum=this.findSortedColumn();
     if (colnum >= 0) {
       sortDirection=this.columns[colnum].getSortDirection();


@@ -1694,12 +1696,12 @@ Rico.LiveGridMethods = {
         sortDirection=sortDirection.toUpperCase();
         if (sortDirection != Rico.ColumnConst.SORT_DESC) sortDirection=Rico.ColumnConst.SORT_ASC;
       }
         sortDirection=sortDirection.toUpperCase();
         if (sortDirection != Rico.ColumnConst.SORT_DESC) sortDirection=Rico.ColumnConst.SORT_ASC;
       }

-      switch (typeof columnNameOrNum) {
+      switch (typeof columnIdOrNum) {

         case 'string':
         case 'string':

-          colnum=this.findColumnName(columnNameOrNum);
+          colnum=this.findColumnsBySpec('id',columnIdOrNum);

           break;
         case 'number':
           break;
         case 'number':

-          colnum=columnNameOrNum;
+          colnum=columnIdOrNum;

           break;
       }
     }
           break;
       }
     }