diff options
author | Alexander Schmitz <arschmitz@gmail.com> | 2015-07-14 21:57:20 -0400 |
---|---|---|
committer | Alexander Schmitz <arschmitz@gmail.com> | 2015-08-08 00:29:37 -0400 |
commit | dd6a99f1400a3636467f9c775a2aba4bfa7e19d0 (patch) | |
tree | c31114ec36cc3d28eed87ff60df3a818086bf0ba | |
parent | 4c6b1463ea2be3e44f85bd13ef9780229ec0f2d4 (diff) | |
download | jquery-ui-dd6a99f1400a3636467f9c775a2aba4bfa7e19d0.tar.gz jquery-ui-dd6a99f1400a3636467f9c775a2aba4bfa7e19d0.zip |
Button: Move button into widgets folder
Ref #13885
-rw-r--r-- | demos/bootstrap.js | 3 | ||||
-rw-r--r-- | tests/unit/button/common.js | 2 | ||||
-rw-r--r-- | tests/unit/button/core.js | 2 | ||||
-rw-r--r-- | tests/unit/button/events.js | 2 | ||||
-rw-r--r-- | tests/unit/button/methods.js | 2 | ||||
-rw-r--r-- | tests/unit/button/options.js | 2 | ||||
-rw-r--r-- | ui/dialog.js | 2 | ||||
-rw-r--r-- | ui/spinner.js | 2 | ||||
-rw-r--r-- | ui/widgets/button.js (renamed from ui/button.js) | 10 |
9 files changed, 14 insertions, 13 deletions
diff --git a/demos/bootstrap.js b/demos/bootstrap.js index 71d2e4ef3..a2ce072ea 100644 --- a/demos/bootstrap.js +++ b/demos/bootstrap.js @@ -26,7 +26,8 @@ var effectsAll = [ ]; var widgets = [ "accordion", - "autocomplete" + "autocomplete", + "button" ]; function getPath( module ) { diff --git a/tests/unit/button/common.js b/tests/unit/button/common.js index d376f4f05..0372cddbf 100644 --- a/tests/unit/button/common.js +++ b/tests/unit/button/common.js @@ -1,6 +1,6 @@ define( [ "lib/common", - "ui/button" + "ui/widgets/button" ], function( common ) { common.testWidget( "button", { diff --git a/tests/unit/button/core.js b/tests/unit/button/core.js index 8539464ba..f3ae2e583 100644 --- a/tests/unit/button/core.js +++ b/tests/unit/button/core.js @@ -1,6 +1,6 @@ define( [ "jquery", - "ui/button" + "ui/widgets/button" ], function( $ ) { module("button: core"); diff --git a/tests/unit/button/events.js b/tests/unit/button/events.js index 63550e2f8..d778b4a2b 100644 --- a/tests/unit/button/events.js +++ b/tests/unit/button/events.js @@ -1,6 +1,6 @@ define( [ "jquery", - "ui/button" + "ui/widgets/button" ], function( $ ) { module("button: events"); diff --git a/tests/unit/button/methods.js b/tests/unit/button/methods.js index be36096b2..29e917022 100644 --- a/tests/unit/button/methods.js +++ b/tests/unit/button/methods.js @@ -1,6 +1,6 @@ define( [ "jquery", - "ui/button" + "ui/widgets/button" ], function( $ ) { module("button: methods"); diff --git a/tests/unit/button/options.js b/tests/unit/button/options.js index 23020fc10..ad4169e14 100644 --- a/tests/unit/button/options.js +++ b/tests/unit/button/options.js @@ -1,6 +1,6 @@ define( [ "jquery", - "ui/button" + "ui/widgets/button" ], function( $ ) { module( "button: options" ); diff --git a/ui/dialog.js b/ui/dialog.js index 2b1e71dbb..dc6632973 100644 --- a/ui/dialog.js +++ b/ui/dialog.js @@ -26,7 +26,7 @@ "./version", "./keycode", "./widget", - "./button", + "./widgets/button", "./draggable", "./focusable", "./mouse", diff --git a/ui/spinner.js b/ui/spinner.js index 241dcaa51..b8e6f88a0 100644 --- a/ui/spinner.js +++ b/ui/spinner.js @@ -26,7 +26,7 @@ "./keycode", "./safe-active-element", "./widget", - "./button" + "./widgets/button" ], factory ); } else { diff --git a/ui/button.js b/ui/widgets/button.js index bc391810f..f5509b520 100644 --- a/ui/button.js +++ b/ui/widgets/button.js @@ -22,11 +22,11 @@ // AMD. Register as an anonymous module. define([ "jquery", - "./data", - "./keycode", - "./labels", - "./version", - "./widget" + "../data", + "../keycode", + "../labels", + "../version", + "../widget" ], factory ); } else { |