Commit Graph

5 Commits

Author SHA1 Message Date
Scott González
c07ae398fa Merge branch 'master' into interactions
Conflicts:
	demos/draggable/constrain-movement.html
	demos/draggable/cursor-style.html
	demos/draggable/handle.html
	demos/draggable/index.html
	demos/draggable/revert.html
	demos/draggable/visual-feedback.html
	demos/index.html
	ui/jquery.ui.draggable.js
	ui/jquery.ui.droppable.js
2012-11-05 16:49:51 -05:00
Richard D. Worth
1359a53afb Fixed demos to track update of jQuery from 1.7.1 to 1.7.2 2012-07-06 15:19:47 -04:00
Jörn Zaefferer
a065d35e10 Interactions: Reduce the container size on the map demo, makes it a little more intersting on big screens 2012-03-06 19:34:47 +01:00
Jörn Zaefferer
3df4bc1b01 Interactions: Add pointer and closedhand cursor to map demo 2012-03-05 12:02:34 +01:00
Jörn Zaefferer
0cc4329747 Interactions: Add a draggable map demo. Custom containment logic still needs some improvements. 2012-03-05 11:50:53 +01:00