aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.droppable.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2013-03-19 19:59:31 +0100
committerFelix Nagel <info@felixnagel.com>2013-03-19 19:59:31 +0100
commit1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2 (patch)
tree77edf8d66ab74aa11b86c286ba2a528b4d3c36de /ui/jquery.ui.droppable.js
parent5a9a80f86cc7844e7357af834c61cc14431110d1 (diff)
parent1c1f7c6184ba6f6a13e93960ea77c293f9d4308e (diff)
downloadjquery-ui-1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2.tar.gz
jquery-ui-1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.droppable.js')
-rw-r--r--ui/jquery.ui.droppable.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index 552b24a58..6bc4b594d 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -82,7 +82,7 @@ $.widget("ui.droppable", {
return d.is(value);
};
}
- $.Widget.prototype._setOption.apply(this, arguments);
+ this._super( key, value );
},
_activate: function(event) {
@@ -152,7 +152,7 @@ $.widget("ui.droppable", {
}
this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function() {
- var inst = $.data(this, "ui-droppable");
+ var inst = $( this ).droppable( "instance" );
if(
inst.options.greedy &&
!inst.options.disabled &&
@@ -331,11 +331,11 @@ $.ui.ddmanager = {
// find droppable parents with same scope
scope = this.options.scope;
parent = this.element.parents(":data(ui-droppable)").filter(function () {
- return $.data(this, "ui-droppable").options.scope === scope;
+ return $(this).droppable( "instance" ).options.scope === scope;
});
if (parent.length) {
- parentInstance = $.data(parent[0], "ui-droppable");
+ parentInstance = $( parent[ 0 ] ).droppable( "instance" );
parentInstance.greedyChild = (c === "isover");
}
}