aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demos/bootstrap.js3
-rw-r--r--tests/unit/draggable/common.js2
-rw-r--r--tests/unit/draggable/core.js2
-rw-r--r--tests/unit/draggable/events.js2
-rw-r--r--tests/unit/draggable/helper.js2
-rw-r--r--tests/unit/draggable/methods.js2
-rw-r--r--tests/unit/draggable/options.js2
-rw-r--r--tests/unit/sortable/events.js2
-rw-r--r--ui/droppable.js2
-rw-r--r--ui/widgets/dialog.js2
-rw-r--r--ui/widgets/draggable.js (renamed from ui/draggable.js)16
11 files changed, 19 insertions, 18 deletions
diff --git a/demos/bootstrap.js b/demos/bootstrap.js
index 8cc8d3878..92632919c 100644
--- a/demos/bootstrap.js
+++ b/demos/bootstrap.js
@@ -29,7 +29,8 @@ var widgets = [
"autocomplete",
"button",
"datepicker",
- "dialog"
+ "dialog",
+ "draggable"
];
function getPath( module ) {
diff --git a/tests/unit/draggable/common.js b/tests/unit/draggable/common.js
index 7ae032c0f..d09e6b7b7 100644
--- a/tests/unit/draggable/common.js
+++ b/tests/unit/draggable/common.js
@@ -1,6 +1,6 @@
define( [
"lib/common",
- "ui/draggable"
+ "ui/widgets/draggable"
], function( common ) {
common.testWidget( "draggable", {
diff --git a/tests/unit/draggable/core.js b/tests/unit/draggable/core.js
index 802ed2928..d18917b4b 100644
--- a/tests/unit/draggable/core.js
+++ b/tests/unit/draggable/core.js
@@ -1,7 +1,7 @@
define( [
"jquery",
"./helper",
- "ui/draggable",
+ "ui/widgets/draggable",
"ui/droppable",
"ui/resizable"
], function( $, testHelper ) {
diff --git a/tests/unit/draggable/events.js b/tests/unit/draggable/events.js
index ebbf606ef..7e276092b 100644
--- a/tests/unit/draggable/events.js
+++ b/tests/unit/draggable/events.js
@@ -1,6 +1,6 @@
define( [
"jquery",
- "ui/draggable"
+ "ui/widgets/draggable"
], function( $ ) {
var element;
diff --git a/tests/unit/draggable/helper.js b/tests/unit/draggable/helper.js
index 4af87d37f..7aabe2a00 100644
--- a/tests/unit/draggable/helper.js
+++ b/tests/unit/draggable/helper.js
@@ -1,7 +1,7 @@
define( [
"jquery",
"lib/helper",
- "ui/draggable"
+ "ui/widgets/draggable"
], function( $, helper ) {
return $.extend( helper, {
diff --git a/tests/unit/draggable/methods.js b/tests/unit/draggable/methods.js
index 195e9e2fb..10a17efdb 100644
--- a/tests/unit/draggable/methods.js
+++ b/tests/unit/draggable/methods.js
@@ -1,7 +1,7 @@
define( [
"jquery",
"./helper",
- "ui/draggable"
+ "ui/widgets/draggable"
], function( $, testHelper ) {
var element;
diff --git a/tests/unit/draggable/options.js b/tests/unit/draggable/options.js
index 877b4275c..96db426f8 100644
--- a/tests/unit/draggable/options.js
+++ b/tests/unit/draggable/options.js
@@ -1,7 +1,7 @@
define( [
"jquery",
"./helper",
- "ui/draggable",
+ "ui/widgets/draggable",
"ui/droppable",
"ui/sortable"
], function( $, testHelper ) {
diff --git a/tests/unit/sortable/events.js b/tests/unit/sortable/events.js
index 267534b16..f487e6380 100644
--- a/tests/unit/sortable/events.js
+++ b/tests/unit/sortable/events.js
@@ -2,7 +2,7 @@ define( [
"jquery",
"./helper",
"ui/sortable",
- "ui/draggable"
+ "ui/widgets/draggable"
], function( $, testHelper ) {
module("sortable: events");
diff --git a/ui/droppable.js b/ui/droppable.js
index c6bd35004..ffa1db1c0 100644
--- a/ui/droppable.js
+++ b/ui/droppable.js
@@ -22,7 +22,7 @@
"./version",
"./widget",
"./mouse",
- "./draggable"
+ "./widgets/draggable"
], factory );
} else {
diff --git a/ui/widgets/dialog.js b/ui/widgets/dialog.js
index 96e004b6c..856ad9bb0 100644
--- a/ui/widgets/dialog.js
+++ b/ui/widgets/dialog.js
@@ -23,9 +23,9 @@
define( [
"jquery",
"./button",
+ "./draggable",
"../mouse",
"../resizable",
- "../draggable",
"../focusable",
"../keycode",
"../position",
diff --git a/ui/draggable.js b/ui/widgets/draggable.js
index 007adf58d..e26be73b1 100644
--- a/ui/draggable.js
+++ b/ui/widgets/draggable.js
@@ -20,14 +20,14 @@
// AMD. Register as an anonymous module.
define([
"jquery",
- "./data",
- "./mouse",
- "./plugin",
- "./safe-active-element",
- "./safe-blur",
- "./scroll-parent",
- "./version",
- "./widget"
+ "../mouse",
+ "../data",
+ "../plugin",
+ "../safe-active-element",
+ "../safe-blur",
+ "../scroll-parent",
+ "../version",
+ "../widget"
], factory );
} else {