aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Schmitz <arschmitz@gmail.com>2015-07-14 21:59:10 -0400
committerAlexander Schmitz <arschmitz@gmail.com>2015-08-08 00:29:37 -0400
commit5efa98361e600ad9392297dd8550a873341fb615 (patch)
tree3080d3baf86edb6f109ff8e511c85d0dff8339a7
parentf1ce6e5de53a9e1f7d2a3d8bc067effe6b028022 (diff)
downloadjquery-ui-5efa98361e600ad9392297dd8550a873341fb615.tar.gz
jquery-ui-5efa98361e600ad9392297dd8550a873341fb615.zip
Dialog: Move dialog into widgets folder
Ref #13885
-rw-r--r--demos/bootstrap.js3
-rw-r--r--tests/unit/dialog/common-deprecated.js2
-rw-r--r--tests/unit/dialog/common.js2
-rw-r--r--tests/unit/dialog/core.js2
-rw-r--r--tests/unit/dialog/deprecated.js2
-rw-r--r--tests/unit/dialog/events.js2
-rw-r--r--tests/unit/dialog/helper.js2
-rw-r--r--tests/unit/dialog/methods.js2
-rw-r--r--tests/unit/dialog/options.js2
-rw-r--r--ui/widgets/dialog.js (renamed from ui/dialog.js)27
10 files changed, 23 insertions, 23 deletions
diff --git a/demos/bootstrap.js b/demos/bootstrap.js
index 79566fcef..8cc8d3878 100644
--- a/demos/bootstrap.js
+++ b/demos/bootstrap.js
@@ -28,7 +28,8 @@ var widgets = [
"accordion",
"autocomplete",
"button",
- "datepicker"
+ "datepicker",
+ "dialog"
];
function getPath( module ) {
diff --git a/tests/unit/dialog/common-deprecated.js b/tests/unit/dialog/common-deprecated.js
index 7b0091277..69153039c 100644
--- a/tests/unit/dialog/common-deprecated.js
+++ b/tests/unit/dialog/common-deprecated.js
@@ -1,6 +1,6 @@
define( [
"lib/common",
- "ui/dialog"
+ "ui/widgets/dialog"
], function( common ) {
common.testWidget( "dialog", {
diff --git a/tests/unit/dialog/common.js b/tests/unit/dialog/common.js
index 389b2ddff..8722d1753 100644
--- a/tests/unit/dialog/common.js
+++ b/tests/unit/dialog/common.js
@@ -1,6 +1,6 @@
define( [
"lib/common",
- "ui/dialog"
+ "ui/widgets/dialog"
], function( common ) {
common.testWidget( "dialog", {
diff --git a/tests/unit/dialog/core.js b/tests/unit/dialog/core.js
index 770d9f543..1560c34ac 100644
--- a/tests/unit/dialog/core.js
+++ b/tests/unit/dialog/core.js
@@ -1,6 +1,6 @@
define( [
"jquery",
- "ui/dialog"
+ "ui/widgets/dialog"
], function( $ ) {
// TODO add teardown callback to remove dialogs
diff --git a/tests/unit/dialog/deprecated.js b/tests/unit/dialog/deprecated.js
index 1f7087c57..2d75cad0d 100644
--- a/tests/unit/dialog/deprecated.js
+++ b/tests/unit/dialog/deprecated.js
@@ -1,6 +1,6 @@
define( [
"jquery",
- "ui/dialog"
+ "ui/widgets/dialog"
], function( $ ) {
module( "dialog (deprecated): options" );
diff --git a/tests/unit/dialog/events.js b/tests/unit/dialog/events.js
index 0e48b7afa..13c452501 100644
--- a/tests/unit/dialog/events.js
+++ b/tests/unit/dialog/events.js
@@ -1,7 +1,7 @@
define( [
"jquery",
"./helper",
- "ui/dialog"
+ "ui/widgets/dialog"
], function( $, testHelper ) {
module("dialog: events");
diff --git a/tests/unit/dialog/helper.js b/tests/unit/dialog/helper.js
index f84d1d624..87ca9c172 100644
--- a/tests/unit/dialog/helper.js
+++ b/tests/unit/dialog/helper.js
@@ -1,7 +1,7 @@
define( [
"jquery",
"lib/helper",
- "ui/dialog"
+ "ui/widgets/dialog"
], function( $, helper ) {
return $.extend( helper, {
diff --git a/tests/unit/dialog/methods.js b/tests/unit/dialog/methods.js
index cee0cd3a7..a730350b1 100644
--- a/tests/unit/dialog/methods.js
+++ b/tests/unit/dialog/methods.js
@@ -1,6 +1,6 @@
define( [
"jquery",
- "ui/dialog"
+ "ui/widgets/dialog"
], function( $ ) {
module("dialog: methods", {
diff --git a/tests/unit/dialog/options.js b/tests/unit/dialog/options.js
index 6de336fd6..ea0885de9 100644
--- a/tests/unit/dialog/options.js
+++ b/tests/unit/dialog/options.js
@@ -1,7 +1,7 @@
define( [
"jquery",
"./helper",
- "ui/dialog",
+ "ui/widgets/dialog",
"ui/effect-blind",
"ui/effect-explode"
], function( $, testHelper ) {
diff --git a/ui/dialog.js b/ui/widgets/dialog.js
index dc6632973..96e004b6c 100644
--- a/ui/dialog.js
+++ b/ui/widgets/dialog.js
@@ -22,20 +22,19 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
- "./core",
- "./version",
- "./keycode",
- "./widget",
- "./widgets/button",
- "./draggable",
- "./focusable",
- "./mouse",
- "./position",
- "./resizable",
- "./safe-active-element",
- "./safe-blur",
- "./tabbable",
- "./unique-id"
+ "./button",
+ "../mouse",
+ "../resizable",
+ "../draggable",
+ "../focusable",
+ "../keycode",
+ "../position",
+ "../safe-active-element",
+ "../safe-blur",
+ "../tabbable",
+ "../unique-id",
+ "../version",
+ "../widget"
], factory );
} else {