[richfaces-svn-commits] JBoss Rich Faces SVN: r21436 - in trunk/ui/dnd/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.
Author: nbelaevski
Date: 2011-02-03 15:26:45 -0500 (Thu, 03 Feb 2011)
New Revision: 21436
Modified:
trunk/ui/dnd/ui/src/main/java/org/richfaces/renderkit/DropTargetRenderer.java
trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js
Log:
https://issues.jboss.org/browse/RF-10106
Modified: trunk/ui/dnd/ui/src/main/java/org/richfaces/renderkit/DropTargetRenderer.java
===================================================================
---
trunk/ui/dnd/ui/src/main/java/org/richfaces/renderkit/DropTargetRenderer.java 2011-02-03
20:24:17 UTC (rev 21435)
+++
trunk/ui/dnd/ui/src/main/java/org/richfaces/renderkit/DropTargetRenderer.java 2011-02-03
20:26:45 UTC (rev 21436)
@@ -134,10 +134,12 @@
AbstractDropTarget dropTarget = (AbstractDropTarget)component;
Set<String> acceptedTypes =
CoreAjaxRendererUtils.asSimpleSet(dropTarget.getAcceptedTypes());
- if (acceptedTypes.contains("@none")) {
- acceptedTypes = NONE_SET;
- } else if (acceptedTypes.contains("@all")) {
- acceptedTypes = ALL_SET;
+ if (acceptedTypes != null) {
+ if (acceptedTypes.contains("@none")) {
+ acceptedTypes = NONE_SET;
+ } else if (acceptedTypes.contains("@all")) {
+ acceptedTypes = ALL_SET;
+ }
}
options.put("acceptedTypes", acceptedTypes);
Modified:
trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js
===================================================================
---
trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js 2011-02-03
20:24:17 UTC (rev 21435)
+++
trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js 2011-02-03
20:26:45 UTC (rev 21436)
@@ -107,7 +107,7 @@
accept : function(draggable) {
var accept = false;
var acceptType = draggable.data("type");
- if (acceptType) {
+ if (acceptType && this.options.acceptedTypes) {
$.each(this.options.acceptedTypes, function() {
if (this == "@none") {
return false;