* Allow dragdrop attributes to be stored as XML attributes

diff --git a/webcit/static/ctdldragdrop.js b/webcit/static/ctdldragdrop.js
index 6e152fa1ad3fce85a8ea55c0741a6f600c2443fb..aefd398fe6b93d582e8eaf2fad43ea991bf41087 100644 (file)
--- a/webcit/static/ctdldragdrop.js
+++ b/webcit/static/ctdldragdrop.js
@@ -16,7 +16,7 @@ function mouseDownHandler(event) {
   if (target.nodeName.toLowerCase() == "td") {
     actualTarget = target.parentNode;
   }
-  if (!actualTarget.dropEnabled) {
+  if (!actualTarget.dropEnabled && actualTarget.getAttribute("citadel:dropenabled") == null) {
     return;
   }
   turnOffTextSelect();
@@ -41,7 +41,8 @@ function mouseUpHandler(event) {
 function mouseMoveHandler(event) {
   if (draggedElement != null) {
     if (dragAndDropElement == null) {
-    dragAndDropElement = draggedElement.ctdlDnDElement();
+      var dragAndDropElementFunction = (draggedElement.ctdlDnDElement) ? draggedElement.ctdlDndElement : eval(draggedElement.getAttribute("citadel:dndelement"));
+      dragAndDropElement = dragAndDropElementFunction.call();
     dragAndDropElement.className = "draganddrop";
     document.body.appendChild(dragAndDropElement);
     }