r3516 committed - Update droppable for new widget factory.
Revision: 3516
Author: scott.gonzalez
Date: Tue Dec 22 19:58:22 2009
Log: Update droppable for new widget factory.
http://code.google.com/p/jquery-ui/source/detail?r=3516
Modified:
/branches/dev/ui/jquery.ui.droppable.js
=======================================
--- /branches/dev/ui/jquery.ui.droppable.js Tue Dec 22 13:11:49 2009
+++ /branches/dev/ui/jquery.ui.droppable.js Tue Dec 22 19:58:22 2009
@@ -17,7 +17,15 @@
(function($) {
$.widget("ui.droppable", {
-
+ options: {
+ accept: '*',
+ activeClass: false,
+ addClasses: true,
+ greedy: false,
+ hoverClass: false,
+ scope: 'default',
+ tolerance: 'intersect'
+ },
_init: function() {
var o = this.options, accept = o.accept;
@@ -52,14 +60,14 @@
return this;
},
- _setData: function(key, value) {
+ _setOption: function(key, value) {
if(key == 'accept') {
this.accept = $.isFunction(value) ? value : function(d) {
return d.is(value);
};
}
- $.widget.prototype._setData.apply(this, arguments);
+ $.widget.prototype._setOption.apply(this, arguments);
},
_activate: function(event) {
@@ -140,16 +148,7 @@
$.extend($.ui.droppable, {
version: "@VERSION",
- eventPrefix: 'drop',
- defaults: {
- accept: '*',
- activeClass: false,
- addClasses: true,
- greedy: false,
- hoverClass: false,
- scope: 'default',
- tolerance: 'intersect'
- }
+ eventPrefix: 'drop'
});
$.ui.intersect = function(draggable, droppable, toleranceMode) {
--