Merged in /branches/dev r3251:3620 (excluding autocomplete, modal, tooltip, menu; including menu static tests).

1 files changed, 13 insertions, 13 deletions

diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index f9a9e8672..3c8c88b96 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -9,6 +9,7 @@
  *
  * Depends:
  *	jquery.ui.core.js
+ *	jquery.ui.widget.js
  *	jquery.ui.draggable.js
  *	jquery.ui.mouse.js
  *	jquery.ui.widget.js
@@ -16,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;
@@ -51,14 +60,14 @@ $.widget("ui.droppable", {
 		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) {
@@ -139,16 +148,7 @@ $.widget("ui.droppable", {
 
 $.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) {