JBoss Rich Faces SVN: r2156 - in trunk: ui/effect/src/main/resources/org/richfaces/renderkit/html/script and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: SergeySmirnov
Date: 2007-08-08 13:21:00 -0400 (Wed, 08 Aug 2007)
New Revision: 2156
Modified:
trunk/samples/effect-sample/src/main/webapp/effect.xhtml
trunk/ui/effect/src/main/resources/org/richfaces/renderkit/html/script/processEffect.js
trunk/ui/effect/src/main/templates/effect.jspx
Log:
'on' removal for effect name. ability to add observer to object like window
Modified: trunk/samples/effect-sample/src/main/webapp/effect.xhtml
===================================================================
--- trunk/samples/effect-sample/src/main/webapp/effect.xhtml 2007-08-08 17:20:56 UTC (rev 2155)
+++ trunk/samples/effect-sample/src/main/webapp/effect.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
@@ -72,7 +72,8 @@
<div id="dpanel" style="width:100px;height:100px;background-color:lightgreen"> </div>
- <e:effect event="click" for="dpanel" type="Fade" params="duration:0.8, id:'my'" />
+ <e:effect event="onclick" for="dpanel" type="Fade" params="duration:0.8, id:'my'" />
+ <e:effect event="load" for="window" type="Fade" params="duration:0.8" />
<div style="margin:10px;"><a href='javascript:void(0)'
onclick='new Effect["Opacity"]( document.getElementById("mynewpanel"),{duration:0.8, from:1.0, to:0.2} );'>Click for Demo!</a><br /></div>
Modified: trunk/ui/effect/src/main/resources/org/richfaces/renderkit/html/script/processEffect.js
===================================================================
--- trunk/ui/effect/src/main/resources/org/richfaces/renderkit/html/script/processEffect.js 2007-08-08 17:20:56 UTC (rev 2155)
+++ trunk/ui/effect/src/main/resources/org/richfaces/renderkit/html/script/processEffect.js 2007-08-08 17:21:00 UTC (rev 2156)
@@ -5,7 +5,11 @@
"var h=Object.extend(param.evalJSON(), aparam);"+
"new Effect[h.type||etype]($(h.id||cid),h);");
+Richfaces.effectEventOnOut = new Function("ename",
+"return ename.substr(0,2)=='on'?ename.substr(2):ename;");
+
+
/*
Richfaces.addEffectObserve= new Function("oid", "oevent","otype","oparams","useCapture",
"var funcpart='{}';"+
Modified: trunk/ui/effect/src/main/templates/effect.jspx
===================================================================
--- trunk/ui/effect/src/main/templates/effect.jspx 2007-08-08 17:20:56 UTC (rev 2155)
+++ trunk/ui/effect/src/main/templates/effect.jspx 2007-08-08 17:21:00 UTC (rev 2156)
@@ -52,8 +52,9 @@
<c:if test="#{needsObserver}">
<script type="text/javascript" x:passThruWithExclusions="name,type,for">
//<![CDATA[
-var pm ="{"+"#{params}"+"}";
-Event.observe($('#{forid}'),'#{event}', Function("Richfaces.processEffect('#{forid}','#{type}',{},pm );"),false);
+var pm ="{"+"#{params}"+"}";var ename = Richfaces.effectEventOnOut('#{event}');
+var obj= typeof #{forid} == "object"? #{forid}:$('#{forid}');
+Event.observe(obj,ename, Function("Richfaces.processEffect('#{forid}','#{type}',{},pm );"),{#{params}}.useCapture||false);
//]]>
</script>
</c:if>
18 years, 9 months
JBoss Rich Faces SVN: r2155 - in trunk/ui/tabPanel/src/main: java/org/richfaces/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dbiatenia
Date: 2007-08-08 13:20:56 -0400 (Wed, 08 Aug 2007)
New Revision: 2155
Modified:
trunk/ui/tabPanel/src/main/config/component/tabPanel.xml
trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
trunk/ui/tabPanel/src/main/templates/tabPanel.jspx
Log:
new attribute 'headerClass' added to tabpanel
Modified: trunk/ui/tabPanel/src/main/config/component/tabPanel.xml
===================================================================
--- trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2007-08-08 16:36:35 UTC (rev 2154)
+++ trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2007-08-08 17:20:56 UTC (rev 2155)
@@ -122,6 +122,12 @@
</description>
<defaultvalue>"1px"</defaultvalue>
</property>
+ <property>
+ <name>headerClass</name>
+ <classname>java.lang.String</classname>
+ <description>A CSS style is for the header of a tab panel.
+ </description>
+ </property>
&html_attributes;
&html_events;
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-08-08 16:36:35 UTC (rev 2154)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-08-08 17:20:56 UTC (rev 2155)
@@ -192,4 +192,9 @@
public abstract String getHeaderSpacing();
public abstract void setHeaderSpacing(String value);
+
+ public abstract String getHeaderClass();
+
+ public abstract void setHeaderClass(String value);
+
}
Modified: trunk/ui/tabPanel/src/main/templates/tabPanel.jspx
===================================================================
--- trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2007-08-08 16:36:35 UTC (rev 2154)
+++ trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2007-08-08 17:20:56 UTC (rev 2155)
@@ -33,7 +33,7 @@
<tbody>
<tr>
- <td align="#{component.attributes['headerAlignment']}" class="dr-bottom-line">
+ <td align="#{component.attributes['headerAlignment']}" class="dr-bottom-line #{component.attributes['headerClass']}">
<f:call name="utils.encodeBeginFormIfNessesary" />
<!--table border="0" cellpadding="0" cellspacing="0" style="position:relative;top:1px"-->
<table border="0" cellpadding="0" cellspacing="0">
18 years, 9 months
JBoss Rich Faces SVN: r2154 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-08-08 12:36:35 -0400 (Wed, 08 Aug 2007)
New Revision: 2154
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml
Log:
fixed error with picture
Modified: trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml 2007-08-08 16:33:05 UTC (rev 2153)
+++ trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml 2007-08-08 16:36:35 UTC (rev 2154)
@@ -84,7 +84,7 @@
<title>Simplest dragIndicator </title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/dragIndicator3.gif"/>
+ <imagedata fileref="images/dragIndicator3.png"/>
</imageobject>
</mediaobject>
</figure>
18 years, 9 months
JBoss Rich Faces SVN: r2153 - trunk/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-08-08 12:33:05 -0400 (Wed, 08 Aug 2007)
New Revision: 2153
Added:
trunk/docs/userguide/en/src/main/resources/images/dragIndicator3.png
Log:
Added: trunk/docs/userguide/en/src/main/resources/images/dragIndicator3.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/dragIndicator3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 9 months
JBoss Rich Faces SVN: r2152 - in trunk/ui/tree/src/main: resources/org/richfaces/renderkit/html/css and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-08-08 12:16:41 -0400 (Wed, 08 Aug 2007)
New Revision: 2152
Modified:
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
trunk/ui/tree/src/main/templates/htmlTree.jspx
trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
Log:
Change nesting tables markup to div-based one
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-08-08 15:25:04 UTC (rev 2151)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-08-08 16:16:41 UTC (rev 2152)
@@ -70,11 +70,12 @@
}
protected String getToggleScript(FacesContext context, UITreeNode treeNode, String to) {
- if ("handle".equals(to) && treeNode.getUITree().isToggleOnClick() ||
- "mainRow".equals(to) && !treeNode.getUITree().isToggleOnClick())
+ UITree tree = treeNode.getUITree();
+ if ("handle".equals(to) && tree.isToggleOnClick() ||
+ "mainRow".equals(to) && !tree.isToggleOnClick())
return "";
- UITree tree = treeNode.getUITree();
+ boolean showLines = tree.isShowConnectingLines();
String id = treeNode.getClientId(context);
if (UITree.SWITCH_AJAX.equals(tree.getSwitchType())) {
@@ -87,10 +88,13 @@
parameters.put(id + NODE_EXPANDED_INPUT_SUFFIX, String.valueOf(!tree
.isExpanded()));
+
+ boolean isLast = false;
if (((Boolean) (treeNode.getAttributes().get("isLastElement")))
.booleanValue()) {
parameters.put(tree.getBaseClientId(context)
+ UITree.LAST_ELEMENT_FLAG, Boolean.TRUE);
+ isLast=true;
}
function.addParameter(eventOptions);
@@ -98,6 +102,7 @@
function.appendScript(buffer);
buffer.append(";");
return buffer.toString();
+
} else if (UITree.SWITCH_SERVER.equals(tree.getSwitchType())) {
String paramName = id + NODE_EXPANDED_INPUT_SUFFIX;
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java 2007-08-08 15:25:04 UTC (rev 2151)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java 2007-08-08 16:16:41 UTC (rev 2152)
@@ -62,7 +62,7 @@
int level = this.rowKey != null ? this.rowKey.depth() : 0;
int delta = level - newRowKey.depth();
-
+
//System.out.println("TreeDataModelEventNavigator.followRowKey() " + delta);
if (delta > 0) {
@@ -74,11 +74,11 @@
throw new IllegalArgumentException("One or more nodes skipped in falldown - maybe illegal RowKey, incorrect model or model handler!");
}
}
+
+ stackedLast = new Boolean(actualLast);
- stackedLast = new Boolean(actualLast);
+ this.tree.setRowKey(context, newRowKey);
- this.tree.setRowKey(context, newRowKey);
-
if (delta > 0) {
afterUp(delta);
} else if (delta == -1) {
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-08-08 15:25:04 UTC (rev 2151)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-08-08 16:16:41 UTC (rev 2152)
@@ -63,6 +63,7 @@
private String clientId;
private boolean expanded;
private boolean showLines;
+ private boolean isLastElement;
private RendererDataModelEventNavigator(UITree tree,
TreeRowKey floatingKey, FacesContext context, Flag droppedDownToLevelFlag) {
@@ -97,46 +98,48 @@
return id;
}
- public void afterDown() throws IOException {
- openLevelDownTable(context, tree, writer);
- }
-
public void afterUp(int levels) throws IOException {
+ //writer.write("** afterUp **");
for (int i = 0; i < levels; i++) {
- closeLevelDownTable(context, tree, writer);
- writer.endElement("td");
- writer.endElement("tr");
+ closeDiv();
}
+ //if (!isLastElement) closeDiv();
}
+ public void afterDown() throws IOException {
+ }
+
public void beforeDown() throws IOException {
+ //writer.write("** beforeDown **");
droppedDownToLevelFlag.setFlag();
+
+ if (this.getRowKey()==null ) openDiv();
- writer.startElement("tr", tree);
+ }
+
+ public void beforeUp(int levels) throws IOException {
+ }
+
+ public void openDiv() throws IOException {
+ writer.startElement("div", tree);
getUtils().writeAttribute(writer, "id", clientId + "childs");
if (!expanded) {
getUtils().writeAttribute(writer, "style", "display: none;");
}
-
+
+ String styleClasses = "";
if (this.getRowKey() != null) {
- writer.startElement("td", tree);
- if (!isStackedLastElement()) {
- if (showLines)
- getUtils().writeAttribute(writer, "class",
- "dr-tree-h-ic-line");
- }
- writer.endElement("td");
+ styleClasses = "dr-tree-h-ic-div";
+ if (!isStackedLastElement() && showLines) styleClasses += " dr-tree-h-ic-line";
}
-
- writer.startElement("td", tree);
- getUtils().writeAttribute(writer, "colspan", "2");
- getUtils().writeAttribute(writer, "id", clientId + "childs:td");
- getUtils().writeAttribute(writer, "valign", "top");
+ if (styleClasses!="") getUtils().writeAttribute(writer, "class", styleClasses);
}
-
- public void beforeUp(int levels) {
+
+ public void closeDiv() throws IOException {
+ writer.endElement("div");
}
+
}
private class DataVisitorWithLastElement implements DataVisitor,
@@ -150,13 +153,13 @@
private final UITree tree;
- private final TreeDataModelEventNavigator navigator;
+ private final RendererDataModelEventNavigator navigator;
private TreeStateAdvisor methodBindingAdvisor = null;
private DataVisitorWithLastElement(ResponseWriter writer,
Flag flag, UITree tree,
- TreeDataModelEventNavigator navigator) {
+ RendererDataModelEventNavigator navigator) {
this.writer = writer;
this.flag = flag;
this.tree = tree;
@@ -170,8 +173,7 @@
navigator.followRowKey(context, (TreeRowKey) rowKey);
if (!flag.isFlagSet()) {
- closeLevelDownTable(context, tree, writer);
- openLevelDownTable(context, tree, writer);
+ navigator.closeDiv();
} else {
flag.resetFlag();
}
@@ -182,6 +184,8 @@
nodeFacet.getAttributes().put("isLastElement", new Boolean(isLastElement));
renderChild(context, nodeFacet);
+ //writer.write("** after renderChild **");
+ navigator.openDiv();
} finally {
if (oldAttrValue != null) {
nodeFacet.getAttributes().put("isLastElement", oldAttrValue);
@@ -305,6 +309,8 @@
encodeScripts = true;
renderedAreas.add(id);
encodedAreaIds.add(id);
+ renderedAreas.add(id+":childs");
+ encodedAreaIds.add(id+":childs");
}
}
@@ -464,13 +470,13 @@
if (key != null) {
droppedDownToLevelFlag.setFlag();
- openLevelDownTable(context, input, writer);
+ //openLevelDownTable(context, input, writer);
input.setRowKey(context, key);
} else {
input.setRowKey(context, null);
}
- TreeDataModelEventNavigator levelNavigator = new RendererDataModelEventNavigator(input, rowKey, context,
+ RendererDataModelEventNavigator levelNavigator = new RendererDataModelEventNavigator(input, rowKey, context,
droppedDownToLevelFlag);
final TreeRange stateRange = (TreeRange) input.getComponentState().getRange();
@@ -502,9 +508,9 @@
droppedDownToLevelFlag, input,
levelNavigator), treeRange, key, null);
- if (key != null) {
+ /*if (key != null) {
closeLevelDownTable(context, input, writer);
- }
+ }*/
levelNavigator.followRowKey(context, null);
} finally {
@@ -512,28 +518,6 @@
input.restoreOrigValue();
}
}
-
- private void openLevelDownTable(FacesContext context, UITree tree,
- ResponseWriter writer) throws IOException {
- writer.startElement("table", tree);
-
- UITreeNode node = tree.getNodeFacet();
-
- RendererUtils utils = getUtils();
- utils.writeAttribute(writer, "border", "0");
- utils.writeAttribute(writer, "cellpadding", "0");
- utils.writeAttribute(writer, "cellspacing", "0");
- utils.writeAttribute(writer, "id", node.getClientId(context));
- utils.writeAttribute(writer, "style", "width: 100%;");
- utils.writeAttribute(writer, "rich:nodeId", node.getId());
- writer.startElement("tbody", tree);
- }
-
- private void closeLevelDownTable(FacesContext context, UITree tree,
- ResponseWriter writer) throws IOException {
- writer.endElement("tbody");
- writer.endElement("table");
- }
}
class Flag {
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-08-08 15:25:04 UTC (rev 2151)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-08-08 16:16:41 UTC (rev 2152)
@@ -11,9 +11,14 @@
display: none;
}
+.dr-tree-h-ic-div {
+ margin-left : 8px;
+ padding-left : 10px;
+}
+
.dr-tree-h-ic {
width: 16px;
- padding : 1px
+ padding: 1px;
}
.dr-tree-h-ic-img-md{
@@ -31,7 +36,7 @@
}
.dr-tree-h-ic-line {
- background-position: center;
+ background-position: left;
background-repeat: repeat-y;
}
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2007-08-08 15:25:04 UTC (rev 2151)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2007-08-08 16:16:41 UTC (rev 2152)
@@ -66,7 +66,7 @@
this.onContextMenu = new Function(contextMenu + "; return true;");
}
- var childsTd = $(childsRowId + Tree.ID_DEVIDER + Tree.ID_CHILDS_TD);
+ var childsTd = $(childsRowId/* + Tree.ID_DEVIDER + Tree.ID_CHILDS_TD*/);
if (childsTd) {
for(var child = childsTd.firstChild; child != null; child = child.nextSibling ) {
if (child.nodeType == 1 && child.tagName.toLowerCase() == "table") {
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2007-08-08 15:25:04 UTC (rev 2151)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2007-08-08 16:16:41 UTC (rev 2152)
@@ -112,7 +112,7 @@
var contentId = this.id;
this.elements.contentTd = $(contentId +
- Tree.ID_DEVIDER + Tree.ID_CHILDS_ROW + Tree.ID_DEVIDER + Tree.ID_CHILDS_TD);
+ Tree.ID_DEVIDER + Tree.ID_CHILDS_ROW/* + Tree.ID_DEVIDER + Tree.ID_CHILDS_TD*/);
if (this.elements.contentTd) {
for(var child = this.elements.contentTd.firstChild; child != null; child = child.nextSibling ) {
Modified: trunk/ui/tree/src/main/templates/htmlTree.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-08-08 15:25:04 UTC (rev 2151)
+++ trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-08-08 16:16:41 UTC (rev 2152)
@@ -44,11 +44,15 @@
<f:parameter value="id,style,class"/>
</f:call>
- <table width="100%" cellpadding="0" cellspacing="0" border="0">
+ <!-- table width="100%" cellpadding="0" cellspacing="0" border="0">
<tbody>
<vcp:body />
</tbody>
- </table>
+ </table-->
+ <div id="#{clientId}:children">
+ <vcp:body />
+ </div>
+
<f:call name="encodeSelectionStateInput" />
<f:clientId var="clientId" />
Modified: trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2007-08-08 15:25:04 UTC (rev 2151)
+++ trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2007-08-08 16:16:41 UTC (rev 2152)
@@ -31,6 +31,9 @@
<f:call name="initializeLines" />
<f:call name="initializeResources" />
+ <table border="0" cellpadding="0" cellspacing="0" id="#{clientId}" style="width:100%">
+ <tbody>
+
<tr id="#{clientId}:mainRow" onclick="#{component.attributes['onclick']} #{this:getToggleScript(context, component, 'mainRow')}" >
<f:call name="encodeAttributeParameters" />
@@ -204,4 +207,7 @@
<vcp:body />
</td>
</tr>
+ </tbody>
+ </table>
+
</f:root>
\ No newline at end of file
18 years, 9 months
JBoss Rich Faces SVN: r2151 - in trunk/ui/scrollable-grid/src/main: javascript and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-08-08 11:25:04 -0400 (Wed, 08 Aug 2007)
New Revision: 2151
Modified:
trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
trunk/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js
trunk/ui/scrollable-grid/src/main/javascript/ClientUILib.js
Log:
http://jira.jboss.com/jira/browse/RF-518
Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
===================================================================
--- trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-08-08 14:44:32 UTC (rev 2150)
+++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-08-08 15:25:04 UTC (rev 2151)
@@ -278,7 +278,7 @@
writer.startElement(HTML.TR_ELEMENT, grid);
state.setFrozenColumnCount(GridUtils.getFrozenColumnsCount(grid));
getUtils().writeAttribute(writer, "id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sgrid-rb " + state.getRowClass(index));
+ getUtils().writeAttribute(writer, "class","dr-sgrid-rb rich-sgrid-row" + state.getRowClass(index));
if (log.isDebugEnabled()) {
log.debug("rowIndex : " + index);
@@ -287,7 +287,7 @@
ColumnWalker.iterateOverColumns(context, grid, cellRenderer, writer, state);
if(!state.isFrozenPart()){
writer.startElement("td", grid);
- getUtils().writeAttribute(writer, "class","dr-sgrid-bc " + state.getColumnClass(state.getCellIndex()));
+ getUtils().writeAttribute(writer, "class","dr-sgrid-bc rich-sgrid-row" + state.getColumnClass(state.getCellIndex()));
writer.endElement("td");
}
writer.endElement(HTML.TR_ELEMENT);
@@ -337,7 +337,7 @@
row_id = baseClientId + ":f:" + state.getRowIndex();
writer.startElement("tr", grid);
- getUtils().writeAttribute(writer, "class","dr-sgrid-rb " + state.getRowClass(state.getRowIndex()));
+ getUtils().writeAttribute(writer, "class","dr-sgrid-rb rich-sgrid-row" + state.getRowClass(state.getRowIndex()));
getUtils().writeAttribute(writer,"id",row_id);
collection.add(row_id);
@@ -352,7 +352,7 @@
writer.startElement("tr", grid);
getUtils().writeAttribute(writer,"id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sgrid-rb " + state.getRowClass(state.getRowIndex()));
+ getUtils().writeAttribute(writer, "class","dr-sgrid-rb rich-sgrid-row" + state.getRowClass(state.getRowIndex()));
normalTRRendered = true;
collection.add(row_id);
Modified: trunk/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- trunk/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-08-08 14:44:32 UTC (rev 2150)
+++ trunk/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-08-08 15:25:04 UTC (rev 2151)
@@ -180,8 +180,8 @@
}
this.rowsCount = Math.min(templNormal.rows.length, this.grid.dataModel.getCount());
- var cell = templNormal.rows[0].cells[0];
- this.defaultRowHeight = cell!=null ? Element.getHeight(cell) : 0;
+
+ this.defaultRowHeight = this._calcDefaultRowHeight();
//if(ClientUILib.isGecko) {
// this.defaultRowHeight -= this.getBorderWidth("tb") + this.getPadding("tb");
//}
@@ -202,6 +202,13 @@
}
},
updateSize: function() {
+
+ var defHeight = this._calcDefaultRowHeight();
+
+ if (isFinite(defHeight)) {
+ this.defaultRowHeight = defHeight;
+ }
+
var row = this.templNormal.getElement().rows[0];
if(row) {
this.defaultRowHeight = Element.getHeight(row.cells[0]);
@@ -764,5 +771,11 @@
}
}
this.scrollBox.updateScrollPos();
+ },
+
+ _calcDefaultRowHeight: function() {
+ var templNormal = this.templNormal.getElement();
+ return Math.ceil(templNormal.offsetHeight / templNormal.rows.length);
+
}
});
Modified: trunk/ui/scrollable-grid/src/main/javascript/ClientUILib.js
===================================================================
--- trunk/ui/scrollable-grid/src/main/javascript/ClientUILib.js 2007-08-08 14:44:32 UTC (rev 2150)
+++ trunk/ui/scrollable-grid/src/main/javascript/ClientUILib.js 2007-08-08 15:25:04 UTC (rev 2151)
@@ -83,9 +83,18 @@
this.packages[libName] = true;
},
log: function(level, infoText) {
- if(ClientUILogger.isCreated)
+ if(ClientUILogger.isCreated){
ClientUILogger.log(level, infoText);
+ } else {
+ switch(level) {
+ case ClientUILogger.INFO: LOG.info(infoText); break;
+ case ClientUILogger.ERROR: LOG.error(infoText); break;
+ case ClientUILogger.WARNING: LOG.warn(infoText); break;
+ default: LOG.a4jDebug(infoText);;
+ }
+ }
},
+
initBrowser: function() {
var ua = navigator.userAgent.toLowerCase();
/** @type Boolean */
@@ -205,7 +214,7 @@
}
};
-ClientUILib.load(true);
+ClientUILib.load();
// declare predefined packages
var ClientUI = {
18 years, 9 months
JBoss Rich Faces SVN: r2150 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-08-08 10:44:32 -0400 (Wed, 08 Aug 2007)
New Revision: 2150
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml
Log:
fixed errors
Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-08-08 14:27:21 UTC (rev 2149)
+++ trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-08-08 14:44:32 UTC (rev 2150)
@@ -296,7 +296,7 @@
<para>For skinnability implementation, the components use a style class redefinition method.
Default style classes are mapped on skin parameters.</para>
- <para>There are two ways to redefine the appearance of all dropDownMenus at once:</para>
+ <para>There are two ways to redefine the appearance of all drop-down menus at once:</para>
<itemizedlist>
<listitem>
@@ -304,7 +304,7 @@
</listitem>
<listitem>
- <para>Add to a user's style sheets style classes used by a dropDownMenu</para>
+ <para>Add to a user's style sheets style classes used by a drop-down menu</para>
</listitem>
</itemizedlist>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2007-08-08 14:27:21 UTC (rev 2149)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2007-08-08 14:44:32 UTC (rev 2150)
@@ -165,13 +165,13 @@
<title> Look-and-Feel Customization</title>
<para> For skinnability implementation, the components use a style class redefinition
method. Default style classes are mapped on skin parameters. </para>
- <para> There are two ways to redefine the appearance of all menuItems at once: </para>
+ <para> There are two ways to redefine the appearance of all menu items at once: </para>
<itemizedlist>
<listitem>
<para>Redefine the corresponding skin parameters</para>
</listitem>
<listitem>
- <para>Add to user's style sheets style classes used by a menuItem</para>
+ <para>Add to user's style sheets style classes used by a menu item</para>
</listitem>
</itemizedlist>
</section>
@@ -346,10 +346,10 @@
</tbody>
</tgroup>
</table>
- <para> In order to redefine the style for all menuItems on a page using CSS, it's
+ <para> In order to redefine the style for all menu items on a page using CSS, it's
enough to create classes with the same names and define the necessary properties in
them. </para>
- <para> To change the style of particular menuItems define your own style classes in the
+ <para> To change the style of particular menu items define your own style classes in the
corresponding menuItem attributes. </para>
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml 2007-08-08 14:27:21 UTC (rev 2149)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml 2007-08-08 14:44:32 UTC (rev 2150)
@@ -74,11 +74,11 @@
For skinnability implementation, the components use a style class redefinition method. Default style classes are mapped on skin parameters.
</para>
<para>
- There are two ways to redefine the appearance of all menuSeparators at once:
+ There are two ways to redefine the appearance of all menu separators at once:
</para>
<itemizedlist>
<listitem><para>Redefine the corresponding skin parameters</para></listitem>
- <listitem><para>Add to user's style sheets style classes used by a menuSeparator</para></listitem>
+ <listitem><para>Add to user's style sheets style classes used by a menu separator</para></listitem>
</itemizedlist>
</section>
<section>
@@ -132,10 +132,10 @@
</tgroup>
</table>
<para>
- In order to redefine a style for all menuSeparators in a page using CSS, it's enough to create classes with the same names and define the necessary properties in them.
+ In order to redefine a style for all menu separators in a page using CSS, it's enough to create classes with the same names and define the necessary properties in them.
</para>
<para>
- To change the style peculiarities of the particular menuSeparators, define your own style classes in the corresponding menuSeparator attributes.
+ To change the style peculiarities of the particular menu separators, define your own style classes in the corresponding menuSeparator attributes.
</para>
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml 2007-08-08 14:27:21 UTC (rev 2149)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml 2007-08-08 14:44:32 UTC (rev 2150)
@@ -438,7 +438,7 @@
it's enough to create classes with the same names and define the necessary properties
in them.</para>
- <para>To change the style of particular panel menu groups components define your own style
+ <para>To change the style of particular panel menu groups define your own style
classes in the corresponding panelMenuGroup attributes. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml 2007-08-08 14:27:21 UTC (rev 2149)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml 2007-08-08 14:44:32 UTC (rev 2150)
@@ -388,7 +388,7 @@
<para>In order to redefine the style for all panel menu items on a page using CSS, it's
enough to create classes with the same names and define the necessary properties in them.</para>
- <para>To change the style of particular panel menu items components define your own style
+ <para>To change the style of particular panel menu items define your own style
classes in the corresponding panelMenuItem attributes.</para>
</section>
18 years, 9 months
JBoss Rich Faces SVN: r2149 - trunk/docs/ajaxguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkukharchuk
Date: 2007-08-08 10:27:21 -0400 (Wed, 08 Aug 2007)
New Revision: 2149
Modified:
trunk/docs/ajaxguide/en/src/main/docbook/included/loadBundle.xml
Log:
http://jira.jboss.com/jira/browse/AJSF-105
Modified: trunk/docs/ajaxguide/en/src/main/docbook/included/loadBundle.xml
===================================================================
--- trunk/docs/ajaxguide/en/src/main/docbook/included/loadBundle.xml 2007-08-08 14:24:29 UTC (rev 2148)
+++ trunk/docs/ajaxguide/en/src/main/docbook/included/loadBundle.xml 2007-08-08 14:27:21 UTC (rev 2149)
@@ -44,7 +44,7 @@
<emphasis role="bold">Example:</emphasis>
<programlisting role="JAVA"><![CDATA[import org.ajax4jsf.component.html.AjaxLoadBundle;
...
-LoadBundle myBundle = new LoadBundle();
+AjaxLoadBundle myBundle = new AjaxLoadBundle();
...
]]></programlisting>
</para>
18 years, 9 months
JBoss Rich Faces SVN: r2148 - trunk/docs/ajaxguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkukharchuk
Date: 2007-08-08 10:24:29 -0400 (Wed, 08 Aug 2007)
New Revision: 2148
Modified:
trunk/docs/ajaxguide/en/src/main/docbook/included/ajaxListener.xml
Log:
http://jira.jboss.com/jira/browse/AJSF-107
Modified: trunk/docs/ajaxguide/en/src/main/docbook/included/ajaxListener.xml
===================================================================
--- trunk/docs/ajaxguide/en/src/main/docbook/included/ajaxListener.xml 2007-08-08 13:45:52 UTC (rev 2147)
+++ trunk/docs/ajaxguide/en/src/main/docbook/included/ajaxListener.xml 2007-08-08 14:24:29 UTC (rev 2148)
@@ -28,7 +28,7 @@
</tgroup>
</table>
- <!--
+
<section>
<title>Creating on a page</title>
<para>Simple Component definition on a page:</para>
@@ -37,14 +37,14 @@
<emphasis role="bold">Example:</emphasis>
</para>
- <programlisting role="XML"><![CDATA[<a4j:ajaxListenet type=""/>
+ <programlisting role="XML"><![CDATA[...
+ <a4j:ajaxListener type="demo.Bean"/>
+...
]]></programlisting>
</section>
- -->
-
+
<section>
<title>Dynamical creation of a component from Java code</title>
-
<para>
<emphasis role="bold">Example:</emphasis>
<programlisting role="JAVA"><![CDATA[import org.ajax4jsf.component.html.AjaxListener;
@@ -66,9 +66,42 @@
a good place for update the list of re-rendered components, for example.
Ajax Listener is not invoked for non-Ajax request and when RichFaces works in "Ajax Request generates
Non-Ajax Response" mode. Therefore, Ajax Listener invocation is a good indicator that Ajax response is going to be processed.
-Attribute 'type' defines the fully qualified Java class name for listener. This class should implement org.ajax4jsf.events.AjaxListener interface.
-You can access to the source of the event (Ajax component) using event.getSource() call.
+Attribute 'type' defines the fully qualified Java class name for listener. This class should implement org.ajax4jsf.framework.ajax.AjaxListener
+interface. You can access to the source of the event (Ajax component) using event.getSource() call.
</para>
- </section>
+ </section>
+ <section>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+
+ <programlisting role="XML"><![CDATA[...
+
+ <a4j:commandLink id="cLink" value="Click it To Send Ajax Request">
+ <a4j:ajaxListener type="demo.Bean"/>
+ </a4j:commandLink>
+...
+]]></programlisting>
+
+<para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+
+ <programlisting role="XML"><![CDATA[
+package demo;
+
+import org.ajax4jsf.framework.ajax.AjaxEvent;
+
+public class Bean implements org.ajax4jsf.framework.ajax.AjaxListener{
+
+...
+ public void processAjax(AjaxEvent arg0){
+ //Custom Developer Code
+ }
+...
+}
+]]></programlisting>
+ </section>
+
</chapter>
\ No newline at end of file
18 years, 9 months
JBoss Rich Faces SVN: r2147 - trunk/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-08-08 09:45:52 -0400 (Wed, 08 Aug 2007)
New Revision: 2147
Added:
trunk/docs/userguide/en/src/main/resources/images/message1.png
Log:
http://jira.jboss.com/jira/browse/RF-501
Added: trunk/docs/userguide/en/src/main/resources/images/message1.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/message1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 9 months