r2678 - All mouse-based plugins: Extend $.ui.mouse.defaults. Changed $.ui.mouse.defaults.cancel ...
Author: scott.gonzalez
Date: Mon Jun 8 17:46:00 2009
New Revision: 2678
Modified:
trunk/ui/ui.core.js
trunk/ui/ui.draggable.js
trunk/ui/ui.resizable.js
trunk/ui/ui.selectable.js
trunk/ui/ui.slider.js
trunk/ui/ui.sortable.js
Log:
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).
Modified: trunk/ui/ui.core.js
==============================================================================
--- trunk/ui/ui.core.js (original)
+++ trunk/ui/ui.core.js Mon Jun 8 17:46:00 2009
@@ -519,7 +519,7 @@
};
$.ui.mouse.defaults = {
- cancel: null,
+ cancel: ':input,option',
distance: 1,
delay: 0
};
Modified: trunk/ui/ui.draggable.js
==============================================================================
--- trunk/ui/ui.draggable.js (original)
+++ trunk/ui/ui.draggable.js Mon Jun 8 17:46:00 2009
@@ -404,17 +404,14 @@
$.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 @@
snapTolerance: 20,
stack: false,
zIndex: false
- }
+ })
});
$.ui.plugin.add("draggable", "connectToSortable", {
Modified: trunk/ui/ui.resizable.js
==============================================================================
--- trunk/ui/ui.resizable.js (original)
+++ trunk/ui/ui.resizable.js Mon Jun 8 17:46:00 2009
@@ -501,17 +501,14 @@
$.extend($.ui.resizable, {
version: "@VERSION",
eventPrefix: "resize",
- defaults: {
+ defaults: $.extend({}, $.ui.mouse.defaults, {
alsoResize: false,
animate: false,
animateDuration: "slow",
animateEasing: "swing",
aspectRatio: false,
autoHide: false,
- cancel: ":input,option",
containment: false,
- delay: 0,
- distance: 1,
ghost: false,
grid: false,
handles: "e,s,se",
@@ -521,7 +518,7 @@
minHeight: 10,
minWidth: 10,
zIndex: 1000
- }
+ })
});
/*
Modified: trunk/ui/ui.selectable.js
==============================================================================
--- trunk/ui/ui.selectable.js (original)
+++ trunk/ui/ui.selectable.js Mon Jun 8 17:46:00 2009
@@ -245,15 +245,13 @@
$.extend($.ui.selectable, {
version: "@VERSION",
- defaults: {
+ defaults: $.extend({}, $.ui.mouse.defaults, {
appendTo: 'body',
autoRefresh: true,
- cancel: ":input,option",
- delay: 0,
distance: 0,
filter: '*',
tolerance: 'touch'
- }
+ })
});
})(jQuery);
Modified: trunk/ui/ui.slider.js
==============================================================================
--- trunk/ui/ui.slider.js (original)
+++ trunk/ui/ui.slider.js Mon Jun 8 17:46:00 2009
@@ -541,9 +541,8 @@
$.extend($.ui.slider, {
version: "@VERSION",
eventPrefix: "slide",
- defaults: {
+ defaults: $.extend({}, $.ui.mouse.defaults, {
animate: false,
- delay: 0,
distance: 0,
max: 100,
min: 0,
@@ -552,7 +551,7 @@
step: 1,
value: 0,
values: null
- }
+ })
});
})(jQuery);
Modified: trunk/ui/ui.sortable.js
==============================================================================
--- trunk/ui/ui.sortable.js (original)
+++ trunk/ui/ui.sortable.js Mon Jun 8 17:46:00 2009
@@ -990,16 +990,13 @@
$.extend($.ui.sortable, {
version: "@VERSION",
eventPrefix: "sort",
- defaults: {
+ defaults: $.extend({}, $.ui.mouse.defaults, {
appendTo: "parent",
axis: false,
- cancel: ":input,option",
connectWith: false,
containment: false,
cursor: 'auto',
cursorAt: false,
- delay: 0,
- distance: 1,
dropOnEmpty: true,
forcePlaceholderSize: false,
forceHelperSize: false,
@@ -1016,7 +1013,7 @@
scope: "default",
tolerance: "intersect",
zIndex: 1000
- }
+ })
});
})(jQuery);