From: Alexander Schmitz Date: Wed, 15 Jul 2015 02:03:37 +0000 (-0400) Subject: Menu: Move menu into widgets folder X-Git-Tag: 1.12.0-beta.1~205 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8140d0c9017a1060155662a229fec49e82530117;p=jquery-ui.git Menu: Move menu into widgets folder Ref #13885 --- 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/menu.js b/ui/menu.js deleted file mode 100644 index 7662d328f..000000000 --- a/ui/menu.js +++ /dev/null @@ -1,663 +0,0 @@ -/*! - * jQuery UI Menu @VERSION - * http://jqueryui.com - * - * Copyright jQuery Foundation and other contributors - * Released under the MIT license. - * http://jquery.org/license - */ - -//>>label: Menu -//>>group: Widgets -//>>description: Creates nestable menus. -//>>docs: http://api.jqueryui.com/menu/ -//>>demos: http://jqueryui.com/menu/ -//>>css.structure: ../themes/base/core.css -//>>css.structure: ../themes/base/menu.css -//>>css.theme: ../themes/base/theme.css - -( function( factory ) { - if ( typeof define === "function" && define.amd ) { - - // AMD. Register as an anonymous module. - define( [ - "jquery", - "./core", - "./version", - "./keycode", - "./position", - "./safe-active-element", - "./unique-id", - "./widget" - ], factory ); - } else { - - // Browser globals - factory( jQuery ); - } -}( function( $ ) { - -return $.widget( "ui.menu", { - version: "@VERSION", - defaultElement: "