[richfaces-svn-commits] JBoss Rich Faces SVN: r167 - in trunk: richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts and 2 other directories.
Author: nbelaevski
Date: 2007-03-26 15:24:34 -0400 (Mon, 26 Mar 2007)
New Revision: 167
Modified:
trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java
trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js
trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx
Log:
http://jira.jboss.com/jira/browse/RF-32 fixed
Sample app. updated
Modified:
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java
===================================================================
---
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-03-26
15:55:04 UTC (rev 166)
+++
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-03-26
19:24:34 UTC (rev 167)
@@ -35,6 +35,7 @@
import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase;
import org.richfaces.component.UIDragIndicator;
+import org.richfaces.component.nsutils.NSUtils;
import org.richfaces.org.apache.commons.lang.StringEscapeUtils;
/**
@@ -179,4 +180,12 @@
//surround by CDATAs
responseWriter.write("/*]]>*/");
}
+
+ public void encodeNamespace(FacesContext context, UIDragIndicator component) throws
IOException {
+ NSUtils.writeNameSpace(context, component);
+ }
+
+ public void encodeDnDParams(FacesContext context, UIDragIndicator component) throws
IOException {
+ DnDParametersEncoder.getInstance().doEncode(context, component);
+ }
}
Modified:
trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js
===================================================================
---
trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-03-26
15:55:04 UTC (rev 166)
+++
trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-03-26
19:24:34 UTC (rev 167)
@@ -10,6 +10,8 @@
params = {};
}
+ Object.extend(params, DnD.getDnDDefaultParams(this));
+
if (!params['marker']) {
if (params[name]) {
params['marker'] = params[name];
Modified:
trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx
===================================================================
---
trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-03-26
15:55:04 UTC (rev 166)
+++
trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-03-26
19:24:34 UTC (rev 167)
@@ -14,6 +14,7 @@
<h:scripts>
new org.ajax4jsf.framework.resource.PrototypeScript(),
new org.ajax4jsf.framework.ajax.AjaxScript(),
+ /org/richfaces/renderkit/html/scripts/dnd/dnd-common.js,
scripts/drag-indicator.js
</h:scripts>
<h:styles>css/dragIndicator.xcss</h:styles>
@@ -21,6 +22,9 @@
<f:clientId var="clientId" />
<div id="#{clientId}" class="drgind_fly drgind_default drag_indicator
#{component.attributes['styleClass']}" style="display: none;
#{component.attributes['style']}">
+ <f:call name="encodeNamespace" />
+ <f:call name="encodeDnDParams" />
+
<script type="text/javascript">
/*<![CDATA[*/
var elt = $("#{clientId}");
Modified: trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-03-26
15:55:04 UTC (rev 166)
+++ trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-03-26
19:24:34 UTC (rev 167)
@@ -67,6 +67,14 @@
{marker} <b>{testDrag}</b> {label}
</f:verbatim>
</f:facet>
+
+ <dnd:dndParam name="accept" value="ACCEPT:" />
+
+ <dnd:dndParam name="reject">
+ <f:verbatim>
+ <i style="text-decoration: line-through;">REJECT:</i>
+ </f:verbatim>
+ </dnd:dndParam>
</dnd:dragIndicator>
<h:panelGrid columns="1" style="position: relative; left:
140px;">