3:31 a.m.
Author: pkawiak
Date: 2008-07-24 04:31:09 -0400 (Thu, 24 Jul 2008)
New Revision: 9761
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.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
trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx
Log:
Changing the way of displaying splashScreen on load to prevent constant CPU load
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java
===================================================================
---
trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java 2008-07-23
23:42:07 UTC (rev 9760)
+++
trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java 2008-07-24
08:31:09 UTC (rev 9761)
@@ -202,6 +202,7 @@
public void encodeCaption(FacesContext context, SequenceDataAdaptor table)
throws IOException {
ResponseWriter writer = context.getResponseWriter();
+ String clientId = table.getClientId(context);
UIComponent caption = table.getFacet("caption");
if (caption != null) {
String captionClass = (String) table.getAttributes().get(
@@ -219,6 +220,8 @@
if (captionStyle != null) {
writer.writeAttribute("style", captionStyle,
"captionStyle");
}
+ writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + ":caption",
+ null);
renderChild(context, caption);
writer.endElement("caption");
}
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-23
23:42:07 UTC (rev 9760)
+++
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-07-24
08:31:09 UTC (rev 9761)
@@ -31,7 +31,7 @@
function(){
grid.update(true);
},
- Utils.Condition.ElementPresent(id+':header'), 5);
+ Utils.Condition.ElementPresent(id+':od'), 5);
},
destroy: function() {
@@ -124,8 +124,8 @@
this.mainDiv.setStyle({display:'none'});
}
this.table.setStyle({visibility:'hidden'});
- this.mainDiv.getElement().removeClassName('extdt-splscr-hddn');
- this.mainDiv.getElement().addClassName('extdt-splscr-vsbl');
+ var splshscr = this.splashScreen;
+ splshscr.className = 'extdt-ss-vsbl';
},
hideSplashScreen: function(){
@@ -133,8 +133,7 @@
this.mainDiv.setStyle({display:''});
}
this.table.setStyle({visibility:'visible'});
- this.mainDiv.getElement().removeClassName('extdt-splscr-vsbl');
- this.mainDiv.getElement().addClassName('extdt-splscr-hddn');
+ this.splashScreen.className = 'extdt-ss-hdn';
},
OnWindowResize: function(event) {
@@ -217,6 +216,7 @@
var id = this.id;
this.table = new ClientUI.common.box.Box(this.id +":tu",null,true);
var table = this.table;
+ this.splashScreen = $(this.id+":splashscreen");
this.mainDiv = new ClientUI.common.box.Box(this.id,null,true);
this.outerDiv = new ClientUI.common.box.Box(this.id +":od",null,true);
this.tableB = $(this.id +":n")
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-23
23:42:07 UTC (rev 9760)
+++
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-07-24
08:31:09 UTC (rev 9761)
@@ -78,6 +78,7 @@
}
this.headerRow = new ClientUI.common.box.Box(this.extDtId
+":headerRow",this.getElement(),true);
this.filterRow = new ClientUI.common.box.Box(this.extDtId
+":filterRow",this.getElement(),true);
+ this.caption = new ClientUI.common.box.Box(this.extDtId
+":caption",this.getElement(),true);
var colgroup = $(this.extDtId +":colgroup:header");
this.cols = colgroup.getElementsByTagName("col");
this.columnsNumber = this.cols.length;
@@ -123,6 +124,14 @@
return this.headerRow.getHeight() + this.filterRow.getHeight();
},
+ getTotalHeight: function() {
+ var ret = this.headerRow.getHeight() + this.filterRow.getHeight();
+ if (this.caption) {
+ ret += this.caption.getHeight();
+ }
+ return ret;
+ },
+
OnMenuImageMouseDown: function(event) {
var el = this.extDt._findParentElement(event, "th");
var columnId = (el) ? el.id : null;
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-23
23:42:07 UTC (rev 9760)
+++
trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss 2008-07-24
08:31:09 UTC (rev 9761)
@@ -64,8 +64,6 @@
}
.extdt-maindiv {
- background-repeat:no-repeat;
- background-position:center;
}
.extdt-menu-div-out {
@@ -90,6 +88,23 @@
margin-left: 10px;
}
+ .extdt-ss-hdn {
+ display: none;
+ position: absolute;
+ }
+
+ .extdt-ss-vsbl {
+ position: absolute;
+ display: block;
+ width: 100%;
+ height: 100%;
+ top: 0px;
+ left: 0px;
+ background-color: white;
+ background-repeat:no-repeat;
+ background-position:center;
+ }
+
.extdt-group-cell {
height: 15px;
background-color: #eeeeee;
@@ -283,12 +298,6 @@
overflow-y:auto;
}
- .extdt-splscr-hddn{
- }
-
- .extdt-splscr-vsbl{
- }
-
</f:verbatim>
<u:selector name=".extdt-menu-div-on" >
@@ -310,11 +319,18 @@
</u:style>
</u:selector>
-<u:selector name=".extdt-splscr-vsbl" >
- <u:style name="border" value="solid">
<!--tableBorderColor-->
+<u:selector name=".extdt-ss-vsbl" >
+ <u:style name="border-right" value="solid">
<!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
- </u:style>
+ </u:style>
+ <u:style name="border-bottom" value="solid">
<!--tableBorderColor-->
+ <f:verbatim skin="tableBorderWidth" />
+ <f:verbatim skin="tableBorderColor" />
+ </u:style>
+ <u:style name="background-image">
+ <f:resource
f:key="/org/richfaces/renderkit/html/images/loading.gif"/>
+ </u:style>
</u:selector>
<u:selector name=".extdt-dr-table" >
@@ -329,9 +345,6 @@
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
</u:style>
- <u:style name="background-image">
- <f:resource f:key="/org/richfaces/renderkit/html/images/loading.gif"/>
- </u:style>
</u:selector>
<u:selector name=".extdt-group-image-expanded">
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx
===================================================================
---
trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-07-23
23:42:07 UTC (rev 9760)
+++
trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-07-24
08:31:09 UTC (rev 9761)
@@ -67,7 +67,7 @@
<div
id="#{clientId}"
- class="extdt-maindiv extdt-splscr-vsbl"
+ class="extdt-maindiv"
style="width:#{component.attributes['width']};
height:#{component.attributes['height']}"
@@ -91,7 +91,8 @@
<td colspan="#{columnsCount}" style="padding: 0px;">
<div id="#{clientId}:sd" class="extdt-content"
style="height:50px;width:100%;">
<table id="#{clientId}:n" width="100%"
- class="extdt-dr-table rich-table
#{component.attributes['styleClass']}"
style="#{component.attributes['style']}"
+ class="extdt-dr-table rich-table
#{component.attributes['styleClass']}"
+ style="#{component.attributes['style']}"
<f:call
name="utils.encodePassThruWithExclusions">
<f:parameter
value="height,value,name,type,id,class,rows,style,width" />
@@ -113,6 +114,9 @@
</table>
<f:call name="contributorsEncodeHere" />
</div>
+ <f:clientid var="clientId"/>
+ <div id="#{clientId}:splashscreen"
class=".extdt-ss-vsbl">
+ </div>
<script type="text/javascript">
//<![CDATA[
delete #{this:getJavaScriptVarName(context, component)};