Author: nbelaevski
Date: 2007-03-07 13:55:53 -0500 (Wed, 07 Mar 2007)
New Revision: 37
Added:
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js
Modified:
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
Log:
DnD "multi" indicator enhancements.
{label} is now {count} + {units} | 'items' where
{count} - is items count
{units} - units name eg. computers, mails, etc. 'items' by default
Added:
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js
===================================================================
---
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js
(rev 0)
+++
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js 2007-03-07
18:55:53 UTC (rev 37)
@@ -0,0 +1,53 @@
+DnD.getDnDDefaultParams = function(elt) {
+ var attr = elt.attributes["rich:defaultdndparams"];
+
+ if (attr) {
+ return attr.value.parseJSON();
+ }
+
+ return null;
+}
+
+DnD.getDnDMergedParams = function(elt, name) {
+ var params = DnD.getDnDDefaultParams(elt);
+
+ var attr = elt.attributes[name];
+
+ if (attr) {
+ var dndParams = attr.value.parseJSON();
+ if (params) {
+ if (dndParams) {
+ Object.extend(params, dndParams);
+ }
+ } else {
+ params = dndParams;
+ }
+ }
+
+ return params;
+};
+
+DnD.getDnDDragParams = function(elt) {
+ return DnD.getDnDMergedParams(elt, "rich:dragdndparams");
+};
+
+DnD.getDnDDropParams = function(elt) {
+ return DnD.getDnDMergedParams(elt, "rich:dropdndparams");
+};
+
+DnD.setDefaultDnDParams = function(params) {
+ if (params) {
+ if (drag && drag.source && drag.source.getDraggableItems &&
drag.source.getDraggableItems() > 1) {
+ if (!params) {
+ params = {};
+ }
+
+ var itemsCount = drag.source.getDraggableItems();
+ params["count"] = itemsCount;
+ if (!params["label"]) {
+ params["label"] = params["count"] + " " +
(params["units"] ?
+ params["units"] : "items");
+ }
+ }
+ }
+};
Modified:
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js
===================================================================
---
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-03-07
18:08:08 UTC (rev 36)
+++
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-03-07
18:55:53 UTC (rev 37)
@@ -4,37 +4,6 @@
*/
DnD.Draggable = function() {};
-if (!DnD.getDnDDefaultParams) {
- DnD.getDnDDefaultParams = function(elt) {
- var attr = elt.attributes["rich:defaultdndparams"];
-
- if (attr) {
- return attr.value.parseJSON();
- }
-
- return null;
- };
-}
-
-DnD.getDnDDragParams = function(elt) {
- var params = DnD.getDnDDefaultParams(elt);
-
- var attr = elt.attributes["rich:dragdndparams"];
-
- if (attr) {
- var dndParams = attr.value.parseJSON();
- if (params) {
- if (dndParams) {
- Object.extend(params, dndParams);
- }
- } else {
- params = dndParams;
- }
- }
-
- return params;
-};
-
DnD.Draggable.prototype = {
getElement: function() {
@@ -81,13 +50,9 @@
if (indicator) {
var dndParams = this.getDnDDragParams();
- if (this.getDraggableItems && this.getDraggableItems() > 1) {
- if (!dndParams) {
- dndParams = {};
- }
+ DnD.setDefaultDnDParams(dndParams);
- dndParams["draggableItems"] = this.getDraggableItems();
-
+ if (this.getDraggableItems && this.getDraggableItems() > 1) {
indicator.setContent("default", false, dndParams);
} else {
indicator.setContent("default", true, dndParams);
Modified:
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js
===================================================================
---
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js 2007-03-07
18:08:08 UTC (rev 36)
+++
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js 2007-03-07
18:55:53 UTC (rev 37)
@@ -5,37 +5,6 @@
*/
DnD.Dropzone = function(){};
-if (!DnD.getDnDDefaultParams) {
- DnD.getDnDDefaultParams = function(elt) {
- var attr = elt.attributes["rich:defaultdndparams"];
-
- if (attr) {
- return attr.value.parseJSON();
- }
-
- return null;
- };
-}
-
-DnD.getDnDDropParams = function(elt) {
- var params = DnD.getDnDDefaultParams(elt);
-
- var attr = elt.attributes["rich:dropdndparams"];
-
- if (attr) {
- var dndParams = attr.value.parseJSON();
- if (params) {
- if (dndParams) {
- Object.extend(params, dndParams);
- }
- } else {
- params = dndParams;
- }
- }
-
- return params;
-};
-
DnD.Dropzone.DROP_TARGET_ID = "dropTargetId";
DnD.Dropzone.prototype = {
@@ -106,13 +75,9 @@
var accepts = this.accept(drag);
var markerType = accepts ? "accept" : "reject";
+ DnD.setDefaultDnDParams(dndParams);
+
if (drag.source.getDraggableItems && drag.source.getDraggableItems()
> 1) {
- if (!dndParams) {
- dndParams = {};
- }
-
- dndParams["draggableItems"] = drag.source.getDraggableItems();
-
indicator.setContent(markerType, false, dndParams);
} else {
indicator.setContent(markerType, true, dndParams);
Modified:
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
===================================================================
---
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-03-07
18:08:08 UTC (rev 36)
+++
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-03-07
18:55:53 UTC (rev 37)
@@ -114,6 +114,7 @@
PrototypeScript.class.getName(),
"/org/richfaces/renderkit/html/scripts/json/json.js",
DnDScript.class.getName(),
+ "/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js",
"/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js"
};
}
Modified:
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
===================================================================
---
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-03-07
18:08:08 UTC (rev 36)
+++
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-03-07
18:55:53 UTC (rev 37)
@@ -190,6 +190,7 @@
PrototypeScript.class.getName(),
"/org/richfaces/renderkit/html/scripts/json/json.js",
DnDScript.class.getName(),
+ "/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js",
"/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js"
};
}
Show replies by date