JBoss Rich Faces SVN: r5224 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-01-09 09:56:58 -0500 (Wed, 09 Jan 2008)
New Revision: 5224
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
http://jira.jboss.com/jira/browse/RF-1487
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-01-09 14:53:01 UTC (rev 5223)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-01-09 14:56:58 UTC (rev 5224)
@@ -939,13 +939,13 @@
var data = request.getJSON('_ajax:data');
try {
var newscript = Sarissa.getText(oncomplete,true);
+ if (!window.data) {
+ window.data = data;
+ } else {
+ Object.extend(window.data, data);
+ }
if (event) {
var target = event.target ? event.target : event.srcElement;
- if (!window.data) {
- window.data = data;
- } else {
- Object.extend(window.data, data);
- }
new Function(newscript).apply(target);
} else {
window.eval(newscript);
16 years, 3 months
JBoss Rich Faces SVN: r5223 - in trunk/sandbox/ui/combobox/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-01-09 09:53:01 -0500 (Wed, 09 Jan 2008)
New Revision: 5223
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
component corrected
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 14:49:35 UTC (rev 5222)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 14:53:01 UTC (rev 5223)
@@ -60,10 +60,6 @@
}
-.rich-cb-width {
- width : 150px;
-}
-
.rich-cb-strut {
position : relative;
visibility : hidden;
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 14:49:35 UTC (rev 5222)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 14:53:01 UTC (rev 5223)
@@ -51,14 +51,14 @@
]]>
</jsp:scriptlet>
- <div id="#{clientId}" class="rich-cb-width rich-cb-font rich-cb-shell" style="width:#{listWidth}">
- <input id="comboboxField#{clientId}" class="rich-cb-width rich-cb-font rich-cb-field" type="text" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}">
+ <div id="#{clientId}" class="rich-cb-font rich-cb-shell" style="width:#{listWidth}">
+ <input id="comboboxField#{clientId}" class="rich-cb-font rich-cb-field" type="text" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}">
</input>
<input readonly="true" type="text" value="" class="rich-cb-button rich-cb-font rich-cb-button-bg">
</input>
<input id="comboboxButton#{clientId}" readonly="true" type="text" value="" class="rich-cb-button rich-cb-font rich-cb-button-arrow">
</input>
- <input type="text" class="rich-cb-width rich-cb-strut rich-cb-font">
+ <input type="text" class="rich-cb-strut rich-cb-font" style="width:#{listWidth}">
</input>
<div id="listParent#{clientId}" class="rich-cb-list-cord rich-cb-list-scroll rich-cb-list-decoration rich-cb-list-position" style="display:none">
<div id="list#{clientId}">
16 years, 3 months
JBoss Rich Faces SVN: r5222 - trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-01-09 09:49:35 -0500 (Wed, 09 Jan 2008)
New Revision: 5222
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
Log:
component corrected
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 14:46:42 UTC (rev 5221)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 14:49:35 UTC (rev 5222)
@@ -453,6 +453,6 @@
]
Richfaces.ComboBoxList.CLASSES = {
- ITEM : {NORMAL : "rich-combobox-item rich-combobox-item-normal", SELECTED : "rich-combobox-item rich-combobox-item-selected"},
+ ITEM : {NORMAL : "rich-cb-item rich-cb-item-normal", SELECTED : "rich-cb-item rich-cb-item-selected"},
LIST : {}
}
\ No newline at end of file
16 years, 3 months
JBoss Rich Faces SVN: r5221 - in trunk/sandbox/ui/combobox/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-01-09 09:46:42 -0500 (Wed, 09 Jan 2008)
New Revision: 5221
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
component corrected
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 14:12:13 UTC (rev 5220)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 14:46:42 UTC (rev 5221)
@@ -10,7 +10,6 @@
this.combobox = $(combobox);
this.field = $(fieldId);
this.button = $(buttonId);
- //listWidth = (listWidth.length == 0) ? this.combobox.offsetWidth : listWidth;
var fieldDem = Richfaces.ComboBoxList.getElemXY(this.field);
fieldDem.height = this.field.offsetHeight;
this.comboList = new Richfaces.ComboBoxList(listId, parentListId, classes, listWidth, listHeight, itemsText, onlistcall, fieldDem);
@@ -202,12 +201,18 @@
this.width = width;
this.height = height;
this.fieldDimensions = fieldXY;
- //this.initList(width, height, fieldXY);
+ this.initDimensions();
},
- initList : function(width, height, fieldXY) {
- this.setSize(width, height);
- this.setPosition(fieldXY.top, fieldXY.left, fieldXY.height);
+ initDimensions : function() {
+ this.listParent.style.visibility = "hidden";
+ this.listParent.show();
+
+ Richfaces.ComboBoxList.LAYOUT_BORDER = Richfaces.getBorderWidth(this.listParent, "tb");
+ Richfaces.ComboBoxList.LAYOUT_PADDING = Richfaces.getPaddingWidth(this.listParent, "tb");
+
+ this.listParent.hide();
+ this.listParent.style.visibility = "visible";
},
createDefaultList : function() {
@@ -245,8 +250,6 @@
},
setSize : function() {
- this.listParent.style.width = this.width;
-
var height = this.height;
var currentItemsHeight;
@@ -276,7 +279,15 @@
height = itemHeight * this.defaultRowsAmount;
}
}
+
+ if (Prototype.Browser.IE) {
+ height += Richfaces.ComboBoxList.LAYOUT_BORDER - Richfaces.ComboBoxList.LAYOUT_PADDING;
+ }
this.listParent.style.height = height;
+
+ if (this.width) {
+ this.listParent.style.width = this.width
+ }
},
setPosition : function(fieldTop, fieldLeft, fieldHeight) {
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js 2008-01-09 14:12:13 UTC (rev 5220)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js 2008-01-09 14:46:42 UTC (rev 5221)
@@ -11,4 +11,38 @@
else if (document.body) { // other Explorers
return document.body.clientHeight;
}
-}
\ No newline at end of file
+}
+
+Richfaces.getScrollWidth = function(elem) {
+ if (elem.clientWidth != 0) {
+ return elem.offsetWidth - elem.clientWidth;
+ }
+ return 0;
+}
+
+Richfaces.getBorderWidth = function(el, side) {
+ return Richfaces.getStyles(el, side, Richfaces.borders);
+}
+
+Richfaces.getPaddingWidth = function(el, side) {
+ return Richfaces.getStyles(el, side, Richfaces.paddings);
+}
+
+Richfaces.getMarginWidth = function(el, side) {
+ return Richfaces.getStyles(el, side, Richfaces.margins);
+}
+
+Richfaces.getStyles = function(el, sides, styles) {
+ var val = 0;
+ for(var i = 0, len = sides.length; i < len; i++){
+ //if (el.getStyle) {
+ var w = parseInt(Element.getStyle(el, styles[sides.charAt(i)]), 10);
+ if(!isNaN(w)) val += w;
+ //}
+ }
+ return val;
+}
+
+Richfaces.borders = {l: 'border-left-width', r: 'border-right-width', t: 'border-top-width', b: 'border-bottom-width'},
+Richfaces.paddings = {l: 'padding-left', r: 'padding-right', t: 'padding-top', b: 'padding-bottom'},
+Richfaces.margins = {l: 'margin-left', r: 'margin-right', t: 'margin-top', b: 'margin-bottom'}
\ No newline at end of file
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 14:12:13 UTC (rev 5220)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 14:46:42 UTC (rev 5221)
@@ -51,8 +51,8 @@
]]>
</jsp:scriptlet>
- <div id="#{clientId}" class="rich-cb-width rich-cb-font rich-cb-shell">
- <input id="comboboxField#{clientId}" class="rich-cb-width rich-cb-font rich-cb-field" type="text" size="#{inputSize}" autocomplete="off">
+ <div id="#{clientId}" class="rich-cb-width rich-cb-font rich-cb-shell" style="width:#{listWidth}">
+ <input id="comboboxField#{clientId}" class="rich-cb-width rich-cb-font rich-cb-field" type="text" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}">
</input>
<input readonly="true" type="text" value="" class="rich-cb-button rich-cb-font rich-cb-button-bg">
</input>
16 years, 3 months
JBoss Rich Faces SVN: r5220 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-01-09 09:12:13 -0500 (Wed, 09 Jan 2008)
New Revision: 5220
Modified:
trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - Fix Classes Name 'rich-tabpanel-content', 'rich-tabpanel-position'
Modified: trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2008-01-09 14:11:00 UTC (rev 5219)
+++ trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2008-01-09 14:12:13 UTC (rev 5220)
@@ -272,11 +272,11 @@
<entry>Defines styles for all tabPanel</entry>
</row>
<row>
- <entry>rich-tabPanel-content</entry>
+ <entry>rich-tabpanel-content</entry>
<entry>Defines styles for an internal content</entry>
</row>
<row>
- <entry>rich-tabPanel-content-position</entry>
+ <entry>rich-tabpanel-content-position</entry>
<entry>Defines styles for a wrapper element of a tabPanel content. It should define a shift equal to borders
width in order to overlap panel tabs</entry>
</row>
16 years, 3 months
JBoss Rich Faces SVN: r5219 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-01-09 09:11:00 -0500 (Wed, 09 Jan 2008)
New Revision: 5219
Modified:
trunk/docs/userguide/en/src/main/docbook/included/tab.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - Fix Classes Name 'rich-tab-label'
Modified: trunk/docs/userguide/en/src/main/docbook/included/tab.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tab.xml 2008-01-09 14:06:21 UTC (rev 5218)
+++ trunk/docs/userguide/en/src/main/docbook/included/tab.xml 2008-01-09 14:11:00 UTC (rev 5219)
@@ -316,7 +316,7 @@
</row>
<row>
- <entry>rich-tab-lable</entry>
+ <entry>rich-tab-label</entry>
<entry>Defines styles for a tab lable</entry>
</row>
</tbody>
16 years, 3 months
JBoss Rich Faces SVN: r5218 - in trunk/ui/tree/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-01-09 09:06:21 -0500 (Wed, 09 Jan 2008)
New Revision: 5218
Modified:
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1850
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2008-01-09 14:05:00 UTC (rev 5217)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2008-01-09 14:06:21 UTC (rev 5218)
@@ -296,19 +296,50 @@
}
}
- public String getDraggableScriptOptions(FacesContext context,
- UITreeNode component) {
+ private ScriptOptions createOptions(FacesContext context, UITreeNode component, Class clazz) {
ScriptOptions options = new TreeNodeOptions(component);
- mergeScriptOptions(options, context, component, Draggable.class);
+ mergeScriptOptions(options, context, component, clazz);
convertOptions(options.getMap());
- return ScriptUtils.toScript(options);
+ return options;
}
+
+ protected static final class DnDOptionsHolder {
+ private String dragOptions;
+ private String dropOptions;
- public String getDropzoneScriptOptions(FacesContext context,
+ private String dragCursorOptions;
+ private String dropCursorOptions;
+
+ public DnDOptionsHolder(String dragOptions, String dragCursorOptions,
+ String dropOptions, String dropCursorOptions) {
+ super();
+ this.dragOptions = dragOptions;
+ this.dragCursorOptions = dragCursorOptions;
+ this.dropOptions = dropOptions;
+ this.dropCursorOptions = dropCursorOptions;
+ }
+
+ public String getDragOptions() {
+ return dragOptions;
+ }
+ public String getDropOptions() {
+ return dropOptions;
+ }
+ public String getDragCursorOptions() {
+ return dragCursorOptions;
+ }
+ public String getDropCursorOptions() {
+ return dropCursorOptions;
+ }
+ };
+
+ protected DnDOptionsHolder getScriptOptions(FacesContext context,
UITreeNode component) {
- ScriptOptions options = new TreeNodeOptions(component);
- mergeScriptOptions(options, context, component, Dropzone.class);
- convertOptions(options.getMap());
- return ScriptUtils.toScript(options);
+
+ ScriptOptions dragOptions = createOptions(context, component, Draggable.class);
+ ScriptOptions dropOptions = createOptions(context, component, Dropzone.class);
+
+ return new DnDOptionsHolder(ScriptUtils.toScript(dragOptions), null,
+ ScriptUtils.toScript(dropOptions), null);
}
}
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js 2008-01-09 14:05:00 UTC (rev 5217)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js 2008-01-09 14:06:21 UTC (rev 5218)
@@ -54,7 +54,7 @@
},
getDropzoneOptions: function() {
- var attr = Richfaces.getNSAttribute("dropzoneoptions", $(this.elementID.icon));
+ var attr = Richfaces.getNSAttribute("dropzoneoptions", this.iconElement);
if (attr) {
return attr.parseJSON(EventHandlersWalk);
}
@@ -108,7 +108,7 @@
return window.drag.treeDraggableOptions;
}
- var attr = Richfaces.getNSAttribute("draggableoptions", $(this.elementID.icon));
+ var attr = Richfaces.getNSAttribute("draggableoptions", this.iconElement);
if (attr) {
var opts = attr.parseJSON(EventHandlersWalk);
if (window.drag) {
@@ -131,6 +131,6 @@
getElement: function() {
//returns <tr> holding node without children
- return $(this.elementID.text).parentNode;
+ return this.textElement.parentNode;
}
});
\ No newline at end of file
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 2008-01-09 14:05:00 UTC (rev 5217)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2008-01-09 14:06:21 UTC (rev 5218)
@@ -28,6 +28,30 @@
this.getElements(element, ajaxUpdate);
+ var cells = element.rows[0].cells;
+ var eIcon = null;
+ var eText = null;
+ if ("NETSCAPE" == RichFaces.navigatorType()) {
+ for (var i = 0; i < cells.length; i++) {
+ if (cells[i].id == this.elementID.icon) {
+ eIcon = cells[i];
+ } else if (cells[i].id == this.elementID.text) {
+ eText = cells[i];
+ }
+ if (eIcon && eText) {
+ break;
+ }
+ }
+ } else {
+ var cells = element.rows[0].cells;
+ //seeking by id seems to be miserably slow in IE than by index
+ eIcon = cells[this.elementID.icon];
+ eText = cells[this.elementID.text];
+ }
+
+ this.iconElement = eIcon;
+ this.textElement = eText;
+
this.eventSelectionClick = this.toggleSelection.bindAsEventListener(this);
this.eventMouseOut = this.processMouseOut.bindAsEventListener(this);
this.eventMouseOver = this.processMouseOver.bindAsEventListener(this);
@@ -42,9 +66,7 @@
this.enableDropzoneCursors(dropOpts.acceptCursor, dropOpts.rejectCursor);
}
-
-
- this.observeEvents(element);
+ this.observeEvents(eIcon, eText);
},
destroy: function() {
@@ -59,36 +81,13 @@
this.childs = null;
},
- observeEvents: function(element) {
- var cells = element.rows[0].cells;
- var eIcon = null;
- var eText = null;
- if ("NETSCAPE" == RichFaces.navigatorType()) {
- for (var i = 0; i < cells.length; i++) {
- if (cells[i].id == this.elementID.icon) {
- eIcon = cells[i];
- } else if (cells[i].id == this.elementID.text) {
- eText = cells[i];
- }
- if (eIcon && eText) {
- break;
- }
- }
- } else {
- var cells = element.rows[0].cells;
- //seeking by id seems to be miserably slow in IE than by index
- eIcon = cells[this.elementID.icon];
- eText = cells[this.elementID.text];
- }
-
+ observeEvents: function(eIcon, eText) {
if (eIcon) {
var contextMenu = Richfaces.getNSAttribute("oncontextmenu", eIcon);
if (contextMenu && contextMenu.length > 0) {
this.onContextMenu = new Function("event", contextMenu + "; return true;").bindAsEventListener(this);
}
- }
- if (eIcon) {
Event.observe(eIcon, "mousedown", this.eventSelectionClick);
Event.observe(eIcon, "mouseout", this.eventMouseOut);
Event.observe(eIcon, "mouseover", this.eventMouseOver);
@@ -96,6 +95,7 @@
eIcon.oncontextmenu = this.onContextMenu;
}
}
+
if (eText)
{
Event.observe(eText, "mousedown", this.eventSelectionClick);
Modified: trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2008-01-09 14:05:00 UTC (rev 5217)
+++ trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2008-01-09 14:06:21 UTC (rev 5218)
@@ -161,11 +161,16 @@
}
variables.setVariable("iconClass",iconClass);
]]>
- </jsp:scriptlet>
+ </jsp:scriptlet>
+
+ <c:object value="#{this:getScriptOptions(context, component)}" type="org.richfaces.renderkit.NodeRendererBase$DnDOptionsHolder" var="scriptOptionsMap" />
+
<td
rich:ajaxselectedlistener="#{this:getAjaxSelectedListenerFlag(context, component)}"
- rich:draggableoptions="#{this:getDraggableScriptOptions(context, component)}"
- rich:dropzoneoptions="#{this:getDropzoneScriptOptions(context, component)}"
+ rich:draggableoptions="#{scriptOptionsMap.dragOptions}"
+ rich:dragcursoroptions="#{scriptOptionsMap.dragCursorOptions}"
+ rich:dropzoneoptions="#{scriptOptionsMap.dropOptions}"
+ rich:dropcursoroptions="#{scriptOptionsMap.dropCursorOptions}"
rich:oncontextmenu="#{component.attributes['oncontextmenu']}"
rich:onselected="#{component.attributes['onselected']}"
rich:onexpand="#{component.attributes['onexpand']}"
16 years, 3 months
JBoss Rich Faces SVN: r5217 - trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-01-09 09:05:00 -0500 (Wed, 09 Jan 2008)
New Revision: 5217
Modified:
trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ObjectTemplateElement.java
Log:
Inner classes support for c:object
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ObjectTemplateElement.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ObjectTemplateElement.java 2008-01-09 14:01:01 UTC (rev 5216)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ObjectTemplateElement.java 2008-01-09 14:05:00 UTC (rev 5217)
@@ -21,13 +21,11 @@
package org.ajax4jsf.templatecompiler.elements.std;
-import org.ajax4jsf.builder.generator.GeneratorException;
import org.ajax4jsf.templatecompiler.builder.CompilationContext;
import org.ajax4jsf.templatecompiler.builder.CompilationException;
import org.ajax4jsf.templatecompiler.el.ELParser;
import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory;
import org.ajax4jsf.templatecompiler.elements.TemplateElementBase;
-import org.apache.tools.ant.BuildException;
import org.apache.velocity.VelocityContext;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -89,7 +87,7 @@
VelocityContext context = new VelocityContext();
context.put("variable", this.strThisVariable);
context.put("expression", this.strExpression);
- context.put("type", this.strType);
+ context.put("type", this.strType != null ? this.strType.replace('$', '.') : null);
return this.getComponentBean().processTemplate(getTemplateName(), context);
16 years, 3 months
JBoss Rich Faces SVN: r5216 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-01-09 09:01:01 -0500 (Wed, 09 Jan 2008)
New Revision: 5216
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dragSupport.desc.xml
Log:
http://jira.jboss.com/jira/browse/RF-1858 - add key feature 'Supports drag-and-drop between different forms'
Modified: trunk/docs/userguide/en/src/main/docbook/included/dragSupport.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dragSupport.desc.xml 2008-01-09 13:48:15 UTC (rev 5215)
+++ trunk/docs/userguide/en/src/main/docbook/included/dragSupport.desc.xml 2008-01-09 14:01:01 UTC (rev 5216)
@@ -27,11 +27,20 @@
<title>Key Features</title>
<itemizedlist>
- <listitem>Encodes all necessary JavaScript to perform drag
- actions</listitem>
+ <listitem>
+ Encodes all necessary JavaScript to perform drag
+ actions
+ </listitem>
- <listitem>Can be used within any component type that provides the
- required properties for drag operations</listitem>
+ <listitem>
+ Can be used within any component type that provides the
+ required properties for drag operations
+ </listitem>
+
+ <listitem>
+ Supports drag-and-drop between different forms
+ </listitem>
+
</itemizedlist>
</section>
</section>
\ No newline at end of file
16 years, 3 months
JBoss Rich Faces SVN: r5215 - management/design/progressBar.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-01-09 08:48:15 -0500 (Wed, 09 Jan 2008)
New Revision: 5215
Modified:
management/design/progressBar/Func-Spec-ProgressBar.doc
Log:
Modified: management/design/progressBar/Func-Spec-ProgressBar.doc
===================================================================
(Binary files differ)
16 years, 3 months