Author: nbelaevski
Date: 2007-08-30 20:08:59 -0400 (Thu, 30 Aug 2007)
New Revision: 2633
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js
Log:
http://jira.jboss.com/jira/browse/RF-749
http://jira.jboss.com/jira/browse/RF-787
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js
===================================================================
---
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-08-30
23:48:36 UTC (rev 2632)
+++
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-08-31
00:08:59 UTC (rev 2633)
@@ -37,7 +37,7 @@
}
if (this.mouseMoveProvidesButton && !Event.isLeftClick(event)) {
- this.endDrag();
+ this.endDrag(event);
}
}
},
@@ -199,7 +199,7 @@
var options = this.getDraggableOptions();
if (options && options.ondragstart) {
- options.ondragstart();
+ options.ondragstart(event);
}
// cancel out any text selections
@@ -237,7 +237,7 @@
var options = this.getDraggableOptions();
if (options && options.ondragend) {
- options.ondragend();
+ options.ondragend(event);
}
},
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js
===================================================================
---
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js 2007-08-30
23:48:36 UTC (rev 2632)
+++
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js 2007-08-31
00:08:59 UTC (rev 2633)
@@ -93,6 +93,12 @@
indicator.reject();
}
}
+
+ var opts = this.getDropzoneOptions();
+ if (opts && opts.ondragenter) {
+ opts.ondragenter.call(event);
+ }
+
},
@@ -111,6 +117,10 @@
indicator.leave();
}
+ var opts = this.getDropzoneOptions();
+ if (opts && opts.ondragexit) {
+ opts.ondragexit(event);
+ }
},
dragUp: function(event) {