diff options
author | Alexander Schmitz <arschmitz@gmail.com> | 2015-07-14 22:03:06 -0400 |
---|---|---|
committer | Alexander Schmitz <arschmitz@gmail.com> | 2015-08-08 00:29:38 -0400 |
commit | 8b3005fd584fd637b38964ee8d09221da2490dbd (patch) | |
tree | 4ae99e682fee3fbbff889208eb3f0b3fc756bdbe | |
parent | 59ea81003da93d74414989a6c49498183e501289 (diff) | |
download | jquery-ui-8b3005fd584fd637b38964ee8d09221da2490dbd.tar.gz jquery-ui-8b3005fd584fd637b38964ee8d09221da2490dbd.zip |
Droppable: Move droppable into widgets folder
Ref #13885
-rw-r--r-- | demos/bootstrap.js | 3 | ||||
-rw-r--r-- | tests/unit/draggable/core.js | 2 | ||||
-rw-r--r-- | tests/unit/draggable/options.js | 2 | ||||
-rw-r--r-- | tests/unit/droppable/common-deprecated.js | 2 | ||||
-rw-r--r-- | tests/unit/droppable/common.js | 2 | ||||
-rw-r--r-- | tests/unit/droppable/core.js | 2 | ||||
-rw-r--r-- | tests/unit/droppable/events.js | 2 | ||||
-rw-r--r-- | tests/unit/droppable/methods.js | 2 | ||||
-rw-r--r-- | tests/unit/droppable/options.js | 2 | ||||
-rw-r--r-- | ui/widgets/droppable.js (renamed from ui/droppable.js) | 8 |
10 files changed, 14 insertions, 13 deletions
diff --git a/demos/bootstrap.js b/demos/bootstrap.js index a182f7f1c..c45d5e3e0 100644 --- a/demos/bootstrap.js +++ b/demos/bootstrap.js @@ -30,7 +30,8 @@ var widgets = [ "button", "datepicker", "dialog", - "draggable" + "draggable", + "droppable" ]; function getPath( module ) { diff --git a/tests/unit/draggable/core.js b/tests/unit/draggable/core.js index d18917b4b..e4b7a53eb 100644 --- a/tests/unit/draggable/core.js +++ b/tests/unit/draggable/core.js @@ -2,7 +2,7 @@ define( [ "jquery", "./helper", "ui/widgets/draggable", - "ui/droppable", + "ui/widgets/droppable", "ui/resizable" ], function( $, testHelper ) { diff --git a/tests/unit/draggable/options.js b/tests/unit/draggable/options.js index 96db426f8..9be43b384 100644 --- a/tests/unit/draggable/options.js +++ b/tests/unit/draggable/options.js @@ -2,7 +2,7 @@ define( [ "jquery", "./helper", "ui/widgets/draggable", - "ui/droppable", + "ui/widgets/droppable", "ui/sortable" ], function( $, testHelper ) { diff --git a/tests/unit/droppable/common-deprecated.js b/tests/unit/droppable/common-deprecated.js index 9d2f6c6b6..e9fdc69cc 100644 --- a/tests/unit/droppable/common-deprecated.js +++ b/tests/unit/droppable/common-deprecated.js @@ -1,6 +1,6 @@ define( [ "lib/common", - "ui/droppable" + "ui/widgets/droppable" ], function( common ) { common.testWidget( "droppable", { diff --git a/tests/unit/droppable/common.js b/tests/unit/droppable/common.js index ef8e11692..d3bffc67b 100644 --- a/tests/unit/droppable/common.js +++ b/tests/unit/droppable/common.js @@ -1,6 +1,6 @@ define( [ "lib/common", - "ui/droppable" + "ui/widgets/droppable" ], function( common ) { common.testWidget( "droppable", { diff --git a/tests/unit/droppable/core.js b/tests/unit/droppable/core.js index 43608353d..75951c1bc 100644 --- a/tests/unit/droppable/core.js +++ b/tests/unit/droppable/core.js @@ -1,7 +1,7 @@ define( [ "jquery", "./helper", - "ui/droppable" + "ui/widgets/droppable" ], function( $, testHelper ) { module("droppable: core"); diff --git a/tests/unit/droppable/events.js b/tests/unit/droppable/events.js index a60d9292e..9c84b099f 100644 --- a/tests/unit/droppable/events.js +++ b/tests/unit/droppable/events.js @@ -1,6 +1,6 @@ define( [ "jquery", - "ui/droppable" + "ui/widgets/droppable" ], function( $ ) { module( "droppable: events" ); diff --git a/tests/unit/droppable/methods.js b/tests/unit/droppable/methods.js index 1c9bba023..10ac48499 100644 --- a/tests/unit/droppable/methods.js +++ b/tests/unit/droppable/methods.js @@ -1,7 +1,7 @@ define( [ "jquery", "./helper", - "ui/droppable" + "ui/widgets/droppable" ], function( $, testHelper ) { module("droppable: methods"); diff --git a/tests/unit/droppable/options.js b/tests/unit/droppable/options.js index c7c0dbdd6..2fdf483d2 100644 --- a/tests/unit/droppable/options.js +++ b/tests/unit/droppable/options.js @@ -1,6 +1,6 @@ define( [ "jquery", - "ui/droppable" + "ui/widgets/droppable" ], function( $ ) { module( "droppable: options" ); diff --git a/ui/droppable.js b/ui/widgets/droppable.js index ffa1db1c0..551828b6d 100644 --- a/ui/droppable.js +++ b/ui/widgets/droppable.js @@ -19,10 +19,10 @@ // AMD. Register as an anonymous module. define([ "jquery", - "./version", - "./widget", - "./mouse", - "./widgets/draggable" + "./draggable", + "../mouse", + "../version", + "../widget" ], factory ); } else { |