mirror of
https://github.com/jquery/jquery-ui.git
synced 2025-01-07 20:34:24 +00:00
Merge branch 'selectmenu' of github.com:jquery/jquery-ui into selectmenu
This commit is contained in:
commit
9810d2d7f6
@ -123,6 +123,12 @@
|
||||
<mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
|
||||
<targetfile/>
|
||||
</apply>
|
||||
<apply executable="build/minify-js.sh">
|
||||
<fileset dir="${dist.dir}/ui/i18n" includes="**.js" />
|
||||
<srcfile />
|
||||
<mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
|
||||
<targetfile/>
|
||||
</apply>
|
||||
<apply executable="java" parallel="false">
|
||||
<fileset dir="${dist.dir}/themes/base" includes="*.css" />
|
||||
<arg line="-jar" />
|
||||
|
4
ui/jquery.ui.menu.js
vendored
4
ui/jquery.ui.menu.js
vendored
@ -20,7 +20,7 @@ $.widget( "ui.menu", {
|
||||
defaultElement: "<ul>",
|
||||
delay: 150,
|
||||
options: {
|
||||
items: "ul",
|
||||
menus: "ul",
|
||||
position: {
|
||||
my: "left top",
|
||||
at: "right top"
|
||||
@ -250,7 +250,7 @@ $.widget( "ui.menu", {
|
||||
|
||||
refresh: function() {
|
||||
// initialize nested menus
|
||||
var submenus = this.element.find( this.options.items + ":not( .ui-menu )" )
|
||||
var submenus = this.element.find( this.options.menus + ":not( .ui-menu )" )
|
||||
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
|
||||
.attr( "role", "menu" )
|
||||
.hide()
|
||||
|
Loading…
Reference in New Issue
Block a user