diff options
| author | Alexander Schmitz <arschmitz@gmail.com> | 2015-07-14 22:03:37 -0400 |
|---|---|---|
| committer | Alexander Schmitz <arschmitz@gmail.com> | 2015-08-08 00:29:38 -0400 |
| commit | 8140d0c9017a1060155662a229fec49e82530117 (patch) | |
| tree | b0a5b42e0a1bd6942dfb90ea66e478f1887a4274 | |
| parent | 8b3005fd584fd637b38964ee8d09221da2490dbd (diff) | |
| download | jquery-ui-8140d0c9017a1060155662a229fec49e82530117.tar.gz jquery-ui-8140d0c9017a1060155662a229fec49e82530117.zip | |
Menu: Move menu into widgets folder
Ref #13885
| -rw-r--r-- | demos/bootstrap.js | 3 | ||||
| -rw-r--r-- | tests/unit/menu/common.js | 2 | ||||
| -rw-r--r-- | tests/unit/menu/core.js | 2 | ||||
| -rw-r--r-- | tests/unit/menu/events.js | 2 | ||||
| -rw-r--r-- | tests/unit/menu/methods.js | 2 | ||||
| -rw-r--r-- | tests/unit/menu/options.js | 2 | ||||
| -rw-r--r-- | ui/selectmenu.js | 2 | ||||
| -rw-r--r-- | ui/widgets/autocomplete.js | 2 | ||||
| -rw-r--r-- | ui/widgets/menu.js (renamed from ui/menu.js) | 13 |
9 files changed, 15 insertions, 15 deletions
diff --git a/demos/bootstrap.js b/demos/bootstrap.js index c45d5e3e0..15f220c21 100644 --- a/demos/bootstrap.js +++ b/demos/bootstrap.js @@ -31,7 +31,8 @@ var widgets = [ "datepicker", "dialog", "draggable", - "droppable" + "droppable", + "menu" ]; function getPath( module ) { diff --git a/tests/unit/menu/common.js b/tests/unit/menu/common.js index 0f0a04de8..81674be35 100644 --- a/tests/unit/menu/common.js +++ b/tests/unit/menu/common.js @@ -1,6 +1,6 @@ define( [ "lib/common", - "ui/menu" + "ui/widgets/menu" ], function( common ) { common.testWidget( "menu", { diff --git a/tests/unit/menu/core.js b/tests/unit/menu/core.js index dc853be3c..68f613ee1 100644 --- a/tests/unit/menu/core.js +++ b/tests/unit/menu/core.js @@ -1,7 +1,7 @@ define( [ "jquery", "./helper", - "ui/menu" + "ui/widgets/menu" ], function( $, testHelper ) { module( "menu: core" ); diff --git a/tests/unit/menu/events.js b/tests/unit/menu/events.js index 88a1f288c..8a4b92fff 100644 --- a/tests/unit/menu/events.js +++ b/tests/unit/menu/events.js @@ -1,7 +1,7 @@ define( [ "jquery", "./helper", - "ui/menu" + "ui/widgets/menu" ], function( $, testHelper ) { var log = testHelper.log, diff --git a/tests/unit/menu/methods.js b/tests/unit/menu/methods.js index e322ab214..28482d65d 100644 --- a/tests/unit/menu/methods.js +++ b/tests/unit/menu/methods.js @@ -1,7 +1,7 @@ define( [ "jquery", "./helper", - "ui/menu" + "ui/widgets/menu" ], function( $, testHelper ) { var log = testHelper.log, diff --git a/tests/unit/menu/options.js b/tests/unit/menu/options.js index 8994b026f..e22adccf6 100644 --- a/tests/unit/menu/options.js +++ b/tests/unit/menu/options.js @@ -1,7 +1,7 @@ define( [ "jquery", "./helper", - "ui/menu" + "ui/widgets/menu" ], function( $, testHelper ) { var log = testHelper.log, diff --git a/ui/selectmenu.js b/ui/selectmenu.js index 1cd50d127..19a9a05fe 100644 --- a/ui/selectmenu.js +++ b/ui/selectmenu.js @@ -24,7 +24,7 @@ "jquery", "./version", "./escape-selector", - "./menu", + "./widgets/menu", "./keycode", "./labels", "./position", diff --git a/ui/widgets/autocomplete.js b/ui/widgets/autocomplete.js index b91d6f113..a36282dd5 100644 --- a/ui/widgets/autocomplete.js +++ b/ui/widgets/autocomplete.js @@ -22,7 +22,7 @@ // AMD. Register as an anonymous module. define( [ "jquery", - "../menu", + "./menu", "../keycode", "../position", "../safe-active-element", diff --git a/ui/menu.js b/ui/widgets/menu.js index 7662d328f..3e1f71a3b 100644 --- a/ui/menu.js +++ b/ui/widgets/menu.js @@ -22,13 +22,12 @@ // AMD. Register as an anonymous module. define( [ "jquery", - "./core", - "./version", - "./keycode", - "./position", - "./safe-active-element", - "./unique-id", - "./widget" + "../keycode", + "../position", + "../safe-active-element", + "../unique-id", + "../version", + "../widget" ], factory ); } else { |