github/jquery-ui
1
1
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2026-05-13 03:01:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'selectmenu' of github.com:jquery/jquery-ui into selectmenu

Browse Source
This commit is contained in:
Felix Nagel
2011-12-01 20:10:48 +01:00
parent aef2d2fc6c c3369365c3
commit 9810d2d7f6
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/build.xml
View File

@@ -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
View File

@@ -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()