diff options
author | Scott González <scott.gonzalez@gmail.com> | 2009-06-09 00:46:00 +0000 |
---|---|---|
committer | Scott González <scott.gonzalez@gmail.com> | 2009-06-09 00:46:00 +0000 |
commit | 8634ba993ceec7c9bbd34b6e0e2a666494b385a4 (patch) | |
tree | 5033d6ec9e3b0bf57821b337b5d7a87b3e705936 /ui/ui.draggable.js | |
parent | ce94b548d012b74862d35c80a235ecaa31717dc8 (diff) | |
download | jquery-ui-8634ba993ceec7c9bbd34b6e0e2a666494b385a4.tar.gz jquery-ui-8634ba993ceec7c9bbd34b6e0e2a666494b385a4.zip |
All mouse-based plugins: Extend $.ui.mouse.defaults. Changed $.ui.mouse.defaults.cancel to ":input,option" which is used by every plugin as its default. Fixes #4584 ($.ui.mouse.defaults never used).
Diffstat (limited to 'ui/ui.draggable.js')
-rw-r--r-- | ui/ui.draggable.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/ui.draggable.js b/ui/ui.draggable.js index 4a11d3a61..6057cdfbd 100644 --- a/ui/ui.draggable.js +++ b/ui/ui.draggable.js @@ -404,17 +404,14 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, { $.extend($.ui.draggable, { version: "@VERSION", eventPrefix: "drag", - defaults: { + defaults: $.extend({}, $.ui.mouse.defaults, { addClasses: true, appendTo: "parent", axis: false, - cancel: ":input,option", connectToSortable: false, containment: false, cursor: "auto", cursorAt: false, - delay: 0, - distance: 1, grid: false, handle: false, helper: "original", @@ -432,7 +429,7 @@ $.extend($.ui.draggable, { snapTolerance: 20, stack: false, zIndex: false - } + }) }); $.ui.plugin.add("draggable", "connectToSortable", { |