Merge branch 'master' into selectmenu

6 files changed, 51 insertions, 6 deletions

diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 9e3267aed..ba81e9f22 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -42,7 +42,12 @@ $.widget("ui.draggable", $.ui.mouse, {
 		snapMode: "both",
 		snapTolerance: 20,
 		stack: false,
-		zIndex: false
+		zIndex: false,
+
+		// callbacks
+		drag: null,
+		start: null,
+		stop: null
 	},
 	_create: function() {
 
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index 35a260151..0f75774a7 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -30,7 +30,14 @@ $.widget("ui.droppable", {
 		greedy: false,
 		hoverClass: false,
 		scope: "default",
-		tolerance: "intersect"
+		tolerance: "intersect",
+
+		// callbacks
+		activate: null,
+		deactivate: null,
+		drop: null,
+		out: null,
+		over: null
 	},
 	_create: function() {
 
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index ce3efeb9d..c255ccc5e 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -43,7 +43,12 @@ $.widget("ui.resizable", $.ui.mouse, {
 		minHeight: 10,
 		minWidth: 10,
 		// See #7960
-		zIndex: 90
+		zIndex: 90,
+
+		// callbacks
+		resize: null,
+		start: null,
+		stop: null
 	},
 	_create: function() {
 
diff --git a/ui/jquery.ui.selectable.js b/ui/jquery.ui.selectable.js
index 8e6d03c1f..8a6db9007 100644
--- a/ui/jquery.ui.selectable.js
+++ b/ui/jquery.ui.selectable.js
@@ -22,7 +22,15 @@ $.widget("ui.selectable", $.ui.mouse, {
 		autoRefresh: true,
 		distance: 0,
 		filter: "*",
-		tolerance: "touch"
+		tolerance: "touch",
+
+		// callbacks
+		selected: null,
+		selecting: null,
+		start: null,
+		stop: null,
+		unselected: null,
+		unselecting: null
 	},
 	_create: function() {
 		var selectees,
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index 712c6853d..46c8a83ae 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -32,7 +32,13 @@ $.widget( "ui.slider", $.ui.mouse, {
 		range: false,
 		step: 1,
 		value: 0,
-		values: null
+		values: null,
+
+		// callbacks
+		change: null,
+		slide: null,
+		start: null,
+		stop: null
 	},
 
 	_create: function() {
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index f13a1d6bd..ccd293fbd 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -47,7 +47,21 @@ $.widget("ui.sortable", $.ui.mouse, {
 		scrollSpeed: 20,
 		scope: "default",
 		tolerance: "intersect",
-		zIndex: 1000
+		zIndex: 1000,
+
+		// callbacks
+		activate: null,
+		beforeStop: null,
+		change: null,
+		deactivate: null,
+		out: null,
+		over: null,
+		receive: null,
+		remove: null,
+		sort: null,
+		start: null,
+		stop: null,
+		update: null
 	},
 	_create: function() {