Author: pkawiak Date: 2008-07-22 05:14:14 -0400 (Tue, 22 Jul 2008) New Revision: 9726 Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss Log: Preventing overlapping icons; IE6 lack of hover fix. Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-07-22 08:21:18 UTC (rev 9725) +++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-07-22 09:14:14 UTC (rev 9726) @@ -1607,8 +1607,10 @@ // menu if ("header".equals(facetName)) { writer.startElement(HTML.DIV_ELEM, column); + String menuDivId = clientId + ":menuDiv"; + writer.writeAttribute(HTML.id_ATTRIBUTE, menuDivId, null); writer.writeAttribute(HTML.class_ATTRIBUTE, - "extdt-menu-div", null); + "extdt-menu-div-out", null); writer.endElement(HTML.DIV_ELEM); } Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-07-22 08:21:18 UTC (rev 9725) +++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-07-22 09:14:14 UTC (rev 9726) @@ -312,10 +312,10 @@ header.adjustSeparators(); this.hideSplashScreen(); }, - update: function(refreshEvents) { - this.createControls(); - if ( !ClientUILib.isIE ) { - if (this.fakeIeRow) { + update: function(refreshEvents) { + this.createControls(); + if ( !ClientUILib.isIE ) { + if (this.fakeIeRow) { this.table.getElement().deleteRow(this.fakeIeRow); this.fakeIeRow = null; } Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-07-22 08:21:18 UTC (rev 9725) +++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-07-22 09:14:14 UTC (rev 9726) @@ -12,7 +12,9 @@ this.eventSepClick = this.OnSepClick.bindAsEventListener(this); this.eventSepMouseDown = this.OnSepMouseDown.bindAsEventListener(this); this.eventSepMouseMove = this.OnSepMouseMove.bindAsEventListener(this); - this.eventSepMouseUp = this.OnSepMouseUp.bindAsEventListener(this); + this.eventSepMouseUp = this.OnSepMouseUp.bindAsEventListener(this); + this.eventHeaderCellMouseOver = this.OnHeaderCellMouseOver.bindAsEventListener(this); + this.eventHeaderCellMouseOut = this.OnHeaderCellMouseOut.bindAsEventListener(this); var showMenuFct = this.extDt.options.showMenuFunction; if (showMenuFct) { @@ -22,6 +24,19 @@ this.createControl(elementId); }, + + OnHeaderCellMouseOver: function(event) { + var el = this.extDt._findParentElement(event, "th"); + var menuDiv = $(el.id+"header:menuDiv"); + menuDiv.className = "extdt-menu-div-on"; + }, + + OnHeaderCellMouseOut: function(event) { + var el = this.extDt._findParentElement(event, "th"); + var menuDiv = $(el.id+"header:menuDiv"); + menuDiv.className = "extdt-menu-div-out"; + }, + getVisibleWidth: function() { var sum = 0; for(var i=0; i<this.getColumnsNumber()-1; i++){ @@ -42,6 +57,9 @@ } this.adjustSeparators(); }, + + + parseTemplate: function(template) { if(!template) { return false; @@ -124,8 +142,11 @@ //remove listeners Utils.DOM.Event.removeListeners(menuImage); + Utils.DOM.Event.removeListeners(headerChild); Utils.DOM.Event.removeListeners(sepSpan); //add listeners + Utils.DOM.Event.observe(headerChild,'mouseover',this.eventHeaderCellMouseOver); + Utils.DOM.Event.observe(headerChild,'mouseout',this.eventHeaderCellMouseOut); Utils.DOM.Event.observe(menuImage,'click',this.menuImageMouseDown); Utils.DOM.Event.observe(sepSpan, 'click', this.eventSepClick); Utils.DOM.Event.observe(sepSpan, 'mousedown', this.eventSepMouseDown); Modified: trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss 2008-07-22 08:21:18 UTC (rev 9725) +++ trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss 2008-07-22 09:14:14 UTC (rev 9726) @@ -62,23 +62,24 @@ .extdt-dr-menucell{ } - - .extdt-dr-menucell: hover{ - background-position: center right; - background-repeat: no-repeat; - } .extdt-maindiv { background-repeat:no-repeat; background-position:center; } - .extdt-menu-div { + .extdt-menu-div-out { height: 23px; position: absolute; width: 20px; } + .extdt-menu-div-on { + height: 23px; + position: absolute; + width: 20px; + } + .extdt-group-row { height: 15px; } @@ -290,9 +291,10 @@ </f:verbatim> -<u:selector name=".extdt-menu-div" > - <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/images/s.gif"/> +<u:selector name=".extdt-menu-div-on" > + <u:style name="background"> + <f:verbatim skin="additionalBackgroundColor"/> + <f:resource f:key="/org/richfaces/renderkit/html/images/menuHover.gif"/> </u:style> </u:selector> @@ -322,12 +324,6 @@ <u:style name="border-collapse" value="collapse" /> </u:selector> -<u:selector name=".extdt-dr-menucell: hover"> - <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/images/menuHover.gif"/> - </u:style> -</u:selector> - <u:selector name=".extdt-maindiv"> <u:style name="border" value="solid"> <!--tableBorderColor--> <f:verbatim skin="tableBorderWidth" />