Author: nbelaevski
Date: 2007-03-30 09:26:07 -0400 (Fri, 30 Mar 2007)
New Revision: 220
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:
RF-53 fixed: Drag Indicator's acceptClass and rejectClass attributes don't work
Demo 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-30
12:17:01 UTC (rev 219)
+++
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-03-30
13:26:07 UTC (rev 220)
@@ -44,8 +44,6 @@
*
*/
public class DragIndicatorRendererBase extends HeaderResourcesRendererBase {
- public static final String ACCEPT_CLASS_ATTR = "ils:acceptclass";
- public static final String REJECT_CLASS_ATTR = "ils:rejectclass";
public static final String ACCEPT_CLASS = "acceptClass";
public static final String REJECT_CLASS = "rejectClass";
public static final String RENDERER_TYPE =
"com.exadel.jsf.renderer.DropIndicatorRenderer";
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-30
12:17:01 UTC (rev 219)
+++
trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-03-30
13:26:07 UTC (rev 220)
@@ -98,7 +98,10 @@
}
};
-function createDragIndicator(elt) {
+function createDragIndicator(elt, acceptClass, rejectClass) {
Object.extend(elt, DragIndicator);
+
+ elt.ils_acceptClass = acceptClass;
+ elt.ils_rejectClass = rejectClass;
}
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-30
12:17:01 UTC (rev 219)
+++
trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-03-30
13:26:07 UTC (rev 220)
@@ -34,7 +34,7 @@
/*]]>*/
<f:call name="encodeChildScripts" />
/*<![CDATA[*/
- createDragIndicator(elt);
+ createDragIndicator(elt, '#{component.attributes["acceptClass"]}',
'#{component.attributes["rejectClass"]}');
/*]]>*/
</script>
<vcp:body />
Modified: trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-03-30
12:17:01 UTC (rev 219)
+++ trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-03-30
13:26:07 UTC (rev 220)
@@ -12,6 +12,16 @@
.dropzoneDecoration {
width: 100px; height: 100px; border: 2px dotted navy;
}
+
+ .accept {
+ border: 3px dotted green;
+ padding: 10px;
+ }
+
+ .reject {
+ border: 3px dashed red;
+ padding: 10px;
+ }
</style>
</head>
<body>
@@ -61,7 +71,7 @@
</h:dataTable>
</h:panelGrid>
- <dnd:dragIndicator id="indicator">
+ <dnd:dragIndicator id="indicator" acceptClass="accept"
rejectClass="reject">
<f:facet name="single">
<f:verbatim>
{marker} <b>{testDrag}</b> {label}
Show replies by date