aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Schmitz <arschmitz@gmail.com>2015-07-14 22:08:51 -0400
committerAlexander Schmitz <arschmitz@gmail.com>2015-08-08 00:29:39 -0400
commit657b6d0f5862ca14f2bb996e105b20f0654483b6 (patch)
treeb7c9f8a65b3d0e3d815777c69fd0b29f64fc680e
parent149a1a2a824b09cec0202eba77ed3e51e9c165ae (diff)
downloadjquery-ui-657b6d0f5862ca14f2bb996e105b20f0654483b6.tar.gz
jquery-ui-657b6d0f5862ca14f2bb996e105b20f0654483b6.zip
Sortable: Move sortable into widgets folder
Ref #13885
-rw-r--r--demos/bootstrap.js3
-rw-r--r--tests/unit/draggable/options.js2
-rw-r--r--tests/unit/sortable/common.js2
-rw-r--r--tests/unit/sortable/core.js2
-rw-r--r--tests/unit/sortable/events.js2
-rw-r--r--tests/unit/sortable/methods.js2
-rw-r--r--tests/unit/sortable/options.js2
-rw-r--r--ui/widgets/sortable.js (renamed from ui/sortable.js)13
8 files changed, 14 insertions, 14 deletions
diff --git a/demos/bootstrap.js b/demos/bootstrap.js
index 30eba22bd..e9343faa9 100644
--- a/demos/bootstrap.js
+++ b/demos/bootstrap.js
@@ -38,7 +38,8 @@ var widgets = [
"resizable",
"selectable",
"selectmenu",
- "slider"
+ "slider",
+ "sortable"
];
function getPath( module ) {
diff --git a/tests/unit/draggable/options.js b/tests/unit/draggable/options.js
index 9be43b384..e1fd8288a 100644
--- a/tests/unit/draggable/options.js
+++ b/tests/unit/draggable/options.js
@@ -3,7 +3,7 @@ define( [
"./helper",
"ui/widgets/draggable",
"ui/widgets/droppable",
- "ui/sortable"
+ "ui/widgets/sortable"
], function( $, testHelper ) {
// TODO: This doesn't actually test whether append happened, possibly remove
diff --git a/tests/unit/sortable/common.js b/tests/unit/sortable/common.js
index ab43251ab..aefb28b70 100644
--- a/tests/unit/sortable/common.js
+++ b/tests/unit/sortable/common.js
@@ -1,6 +1,6 @@
define( [
"lib/common",
- "ui/sortable"
+ "ui/widgets/sortable"
], function( common ) {
common.testWidget( "sortable", {
diff --git a/tests/unit/sortable/core.js b/tests/unit/sortable/core.js
index 7e973ec05..68f275604 100644
--- a/tests/unit/sortable/core.js
+++ b/tests/unit/sortable/core.js
@@ -1,7 +1,7 @@
define( [
"jquery",
"./helper",
- "ui/sortable"
+ "ui/widgets/sortable"
], function( $, testHelper ) {
module( "sortable: core" );
diff --git a/tests/unit/sortable/events.js b/tests/unit/sortable/events.js
index f487e6380..bf5579fde 100644
--- a/tests/unit/sortable/events.js
+++ b/tests/unit/sortable/events.js
@@ -1,7 +1,7 @@
define( [
"jquery",
"./helper",
- "ui/sortable",
+ "ui/widgets/sortable",
"ui/widgets/draggable"
], function( $, testHelper ) {
diff --git a/tests/unit/sortable/methods.js b/tests/unit/sortable/methods.js
index d88b8089f..f58ac052d 100644
--- a/tests/unit/sortable/methods.js
+++ b/tests/unit/sortable/methods.js
@@ -1,7 +1,7 @@
define( [
"jquery",
"./helper",
- "ui/sortable"
+ "ui/widgets/sortable"
], function( $, testHelper ) {
module("sortable: methods");
diff --git a/tests/unit/sortable/options.js b/tests/unit/sortable/options.js
index 930f339e6..744839096 100644
--- a/tests/unit/sortable/options.js
+++ b/tests/unit/sortable/options.js
@@ -1,6 +1,6 @@
define( [
"jquery",
- "ui/sortable"
+ "ui/widgets/sortable"
], function( $ ) {
module("sortable: options");
diff --git a/ui/sortable.js b/ui/widgets/sortable.js
index ecf8bffb4..1d384a80e 100644
--- a/ui/sortable.js
+++ b/ui/widgets/sortable.js
@@ -20,13 +20,12 @@
// AMD. Register as an anonymous module.
define([
"jquery",
- "./core",
- "./data",
- "./version",
- "./ie",
- "./widgets/mouse",
- "./scroll-parent",
- "./widget"
+ "./mouse",
+ "../data",
+ "../ie",
+ "../scroll-parent",
+ "../version",
+ "../widget"
], factory );
} else {