Commit Graph

62 Commits

Author SHA1 Message Date
Mike Sherov
a3c8c19775 Merge branch 'master' into interactions
Conflicts:
	tests/unit/draggable/draggable_options.js
	ui/jquery.ui.draggable.js
	ui/jquery.ui.droppable.js
	ui/jquery.ui.sortable.js
2013-01-01 23:43:34 -05:00
Mike Sherov
74d7eac2da All: Convert single quotes to double quotes. 2012-12-25 12:01:09 -05:00
Dave Stein
15e3f28c4f Grunt: Ran and fixed jshint errors 2012-12-21 11:33:13 -05:00
Scott González
8ec7a1b69f All: Use .addBack() instead of .andSelf(). 2012-12-14 11:13:50 -05:00
Scott González
fb38c20763 Droppable: Added missing semicolon. 2012-12-06 14:43:35 -05:00
Scott González
3ec0c2e572 Core: Removed $.ui.isOver() and $.ui.isOverAxis(). Fixes #8891 - Remove $.ui.isOver() and $.ui.isOverAxis(). 2012-12-06 14:42:10 -05:00
Mike Sherov
0e800636c4 Dev: Make droppable pass JSHint with no local settings overrides 2012-11-17 14:51:56 -05:00
Scott González
f5870712c1 Updated all widgets to use proper data keys when getting plugin instances. 2012-11-09 13:28:13 -05:00
Mike Sherov
d85b0160f2 Dev: Standardized the resizable test suite. Fixed #8754 - Dev: Get resizable test suite to pass 2012-10-31 09:50:36 -04:00
Mike Sherov
8746042ae1 Dev: Standardized the droppable test suite. Fixed #8753 - Dev: Get droppable test suite to pass 2012-10-30 22:24:41 -04:00
Scott González
149567e476 Updated docs URLS. 2012-09-26 18:06:20 -05:00
Philipp Benjamin Köppchen
bce0838938 Droppable: greedy children now consider only parents with same scope as parents. Fixed #8524 - Nested greedy droppables trigger parents events even when scopes are different 2012-08-29 08:24:14 -04:00
Scott González
485ca7192a Simplify licensing. 2012-08-09 15:09:50 -04:00
Jörn Zaefferer
afc6835cd2 Merge branch 'master' into interactions
Conflicts:
	ui/jquery.ui.draggable.js
2012-07-24 17:20:18 +02:00
Scott González
a4534bb993 Update copyright to jQuery Foundation. 2012-07-04 09:08:08 -04:00
Jörn Zaefferer
8b47438d6c Merge branch 'master' into interactions 2012-05-25 17:07:42 +02:00
Scott González
79e4ae93b5 Droppable: Fixed destroy method. 2012-05-24 15:20:10 -04:00
Jo Liss
37dcc3e21d Protect all copyright notices against minification
For instance, this is useful for the jquery-ui-rails gem, which does not
use jQuery UI's own minification, but relies on Rails to minify the
files where necessary. Rails in turn uses UglifyJS for JS and YUI for
CSS, both of which respect the /*! ... */ convention.
2012-04-02 15:21:06 +02:00
Scott González
adaf034f6d Merge branch 'master' into interactions
Conflicts:
	demos/draggable/cursor-style.html
	ui/jquery.ui.draggable.js
2012-03-14 13:38:26 -04:00
Scott González
932fe888c0 Updated copyright year. 2012-03-08 10:53:08 -05:00
Dave Stein
cac6901799 Droppable: Fixed reference to function name after change in 69b1df33f7 2012-01-29 19:54:56 -05:00
Scott González
69b1df33f7 Droppable: Renamed refreshPosition() to refresh(). 2012-01-29 13:08:38 -05:00
Scott González
74e2828ea0 Droppable: Added activate and deactivate events. 2012-01-29 13:04:40 -05:00
Scott González
8ebdba7346 Droppable: Added accept option. 2012-01-29 12:48:09 -05:00
Scott González
97af9236c2 Droppable: Use .outerWidth() and .outerHeight() when calculating proportions. 2012-01-28 20:20:26 -05:00
Scott González
7249124d85 Droppable: Only calculate draggable proportions once, regardless of how many droppable instances there are. 2012-01-28 20:19:13 -05:00
Scott González
0e96a50231 Droppable: Account for draggable helper when calculating proportions. 2012-01-15 13:44:52 -05:00
Scott González
2c9ee0252d Droppable: Only react to drag events if they're not canceled. Fixed pointer intersection. 2012-01-15 13:35:23 -05:00
Scott González
66a594ec76 Droppable: Added TODOs. 2012-01-15 13:08:41 -05:00
Scott González
3a90f455e6 Droppable: Refactored touch tolerance. 2012-01-15 12:49:44 -05:00
Scott González
d4bc923f56 Droppable: Fixed intersect tolerance. 2012-01-15 12:40:06 -05:00
Scott González
98795e3d91 Droppable: Use internal guid instead of jQuery.guid. 2012-01-15 11:52:01 -05:00
Scott González
a96232a591 Droppable: Removed interaction as dependency. 2012-01-08 21:54:49 -05:00
Scott González
c50c5c01ee Droppable: Hook directly into drag events. 2012-01-08 21:53:47 -05:00
Scott González
122b463c44 Droppable: Cleanup. 2012-01-07 20:45:10 -05:00
Scott González
247c29ee93 Draggable, Droppable: Updated dependencies. 2012-01-07 12:20:49 -05:00
Scott González
43a93e5c33 Droppable: Cleanup. 2012-01-07 11:55:33 -05:00
Dave Stein
da1b946e66 Droppable: Answered TODO comment about Math.round 2011-11-27 17:55:04 -05:00
Dave Stein
722e4bcf18 Droppable: Added pointer intersect 2011-11-27 16:59:11 -05:00
Michael P. Jung
fdc332ed5f Droppable: Make sure._drop is called for all relevant droppables. Fixes #6009 - Upper droppable should receive draggable. Fixes #6085 - Parent droppable takes precedence over dynamically created child droppable. 2011-11-21 16:16:32 -05:00
Scott González
e9f5c1857f Droppable: Cleanup. 2011-11-17 19:48:09 -05:00
Dave Stein
dac3dddd9e Droppable: Put tolerance in allowed array 2011-11-13 18:41:29 -05:00
Dave Stein
3914cebe66 Droppable: Intersect tolerance added 2011-11-13 18:39:04 -05:00
Dave Stein
9ee7c90a59 Droppable: Added refreshPosition public method 2011-11-13 17:49:37 -05:00
Dave Stein
e8e7847a41 Droppable: over, out, and drop callbacks working 2011-11-13 17:42:05 -05:00
Dave Stein
3c6455df0b Droppable: 2.0 initial commit 2011-11-13 17:28:56 -05:00
Scott González
6a5b21fda2 All: Moved version numbers into prototypes. Fixed #7436 - Widget: Store version numbers on instances. 2011-05-28 15:39:55 -04:00
kborchers
67bd872fe1 Droppable: Added dragStart and dragStop to ddmanager and call them from draggable to recalculate droppable positions after a drag causes a scroll. Fixes #5003 - Scroll on Droppable Demo Breaks Demo 2011-05-27 12:01:42 -05:00
Marcel Toele
86e6ed2eb1 Droppable: enabled and accepting droppables are now activated prior to evaluating their geometry. Fixes #7104 Droppable: if activeClass changes the geometry of a droppable, then dnd uses the wrong geometry. 2011-03-11 15:37:52 +01:00
Scott González
6e0482a9cb Updated copyright year. 2011-01-17 09:13:18 -05:00