From 8140d0c9017a1060155662a229fec49e82530117 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Tue, 14 Jul 2015 22:03:37 -0400
Subject: [PATCH] Menu: Move menu into widgets folder

Ref #13885
---
 demos/bootstrap.js         |  3 ++-
 tests/unit/menu/common.js  |  2 +-
 tests/unit/menu/core.js    |  2 +-
 tests/unit/menu/events.js  |  2 +-
 tests/unit/menu/methods.js |  2 +-
 tests/unit/menu/options.js |  2 +-
 ui/selectmenu.js           |  2 +-
 ui/widgets/autocomplete.js |  2 +-
 ui/{ => widgets}/menu.js   | 13 ++++++-------
 9 files changed, 15 insertions(+), 15 deletions(-)
 rename ui/{ => widgets}/menu.js (99%)

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
similarity index 99%
rename from ui/menu.js
rename to 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 {
 
-- 
2.39.5