X-Git-Url: https://git.infodrom.org/?p=infodrom%2Frico3;a=blobdiff_plain;f=minsrc%2FricoLiveGrid.js;h=d550aaf5e8f51634cb83ade507fd0e49ce6a78f4;hp=61030c12ff64c16da9f72c7015fb5d683f6ecf61;hb=ab25f937447080ebaca56778f6e62ad22b9d8cc8;hpb=65afbb2b78458d67ff3ef687bf80201a47bfe1f1 diff --git a/minsrc/ricoLiveGrid.js b/minsrc/ricoLiveGrid.js index 61030c1..d550aaf 100644 --- 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); - 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) { @@ -574,6 +574,13 @@ Rico.LiveGrid.prototype = { 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); - if (this.columns[c].format.canDrag && Rico.registerDraggable) - Rico.registerDraggable( new Rico.LiveGridDraggable(this, this.pageSize, c), this.options.dndMgrIdx ); - newdiv.innerHTML=' '; // this seems to be required by IE if (this.columns[c]._create) { this.columns[c]._create(newdiv,this.pageSize); + } else { + newdiv.innerHTML=' '; // 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++; @@ -1660,13 +1669,6 @@ Rico.LiveGridMethods = { return -1; }, - findColumnName: function(name) { - for (var n=0; n= 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; } - switch (typeof columnNameOrNum) { + switch (typeof columnIdOrNum) { case 'string': - colnum=this.findColumnName(columnNameOrNum); + colnum=this.findColumnsBySpec('id',columnIdOrNum); break; case 'number': - colnum=columnNameOrNum; + colnum=columnIdOrNum; break; } }